From 2534536d167c9da56705b39f4977c7b1d06b338a Mon Sep 17 00:00:00 2001 From: ronvs Date: Wed, 27 Feb 2013 17:57:43 -0800 Subject: [PATCH 1/5] Added check for undefined value when checking for SFU Computing ID --- public/sfu/js/course_request_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/sfu/js/course_request_form.js b/public/sfu/js/course_request_form.js index 1280f59b83ae6..243314adf9cce 100644 --- a/public/sfu/js/course_request_form.js +++ b/public/sfu/js/course_request_form.js @@ -66,7 +66,7 @@ url: "/sfu/user/" + sfuid, dataType: "json", success: function(data) { - if (data.login_id !== null){ + if (data.login_id !== null && data.login_id !== undefined){ course_list(sfuid); } else { $("#course_list").html("
Invalid SFU Computing ID
"); From a3d784df01fcf14c69853a2fa942236a038297b7 Mon Sep 17 00:00:00 2001 From: ronvs Date: Wed, 27 Feb 2013 17:58:09 -0800 Subject: [PATCH 2/5] Fix spacing between checkbox and course title --- public/sfu/js/course_request_form.js | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/public/sfu/js/course_request_form.js b/public/sfu/js/course_request_form.js index 243314adf9cce..137f5b587326a 100644 --- a/public/sfu/js/course_request_form.js +++ b/public/sfu/js/course_request_form.js @@ -106,7 +106,7 @@ $.each(data, function (index, term) { $("#course_list").append('

' + term.formatted1 + '

'); - $("#"+term.peopleSoftCode+"_courses").html("  Retrieving courses..."); + $("#"+term.peopleSoftCode+"_courses").html(""); courses_for_terms(sfuid, term.peopleSoftCode); }); sandbox_course(sfuid); @@ -134,10 +134,10 @@ var section_tutorials = course.sectionTutorials; var course_display = course.name + course.number + " - " + course.section + " " + course.title; if (section_tutorials) { - course_display += "
  (Includes section tutorials: " + section_tutorials + ")"; + course_display += "
"; } var course_value = course.key; - var checkbox_html = '

  ' + course_display + '

'; + var checkbox_html = '

  

'; $("#"+term+"_courses").append(checkbox_html); num++; }); @@ -211,7 +211,7 @@ success: function(data) { if (data.sis_source_id != "sandbox-" + sfuid + "-1:::course") { $("#course_list").append("

Other

"); - var checkbox_html = '

   ' + title + '

'; + var checkbox_html = '

  

'; $("#sandbox").append(checkbox_html); } }, @@ -219,16 +219,4 @@ }); } - function format_term(term_code) { - var terms = { - 1: "Spring", - 4: "Summer", - 7: "Fall" - }; - - var year = Number(term_code.toString().substring(0,3)) + 1900; - var term_index = term_code.toString().substring(3); - return year + " " + terms[term_index]; - } - })(jQuery); \ No newline at end of file From 1d0533fe273ddb3a7816930f950023de2ac4bbd5 Mon Sep 17 00:00:00 2001 From: ronvs Date: Wed, 27 Feb 2013 18:54:52 -0800 Subject: [PATCH 3/5] Fixed spacing issue on form to match html/css used by Canvas --- public/sfu/js/course_request_form.js | 4 ++-- .../app/views/course_form/_form.html.erb | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/public/sfu/js/course_request_form.js b/public/sfu/js/course_request_form.js index 137f5b587326a..7f56b568c1811 100644 --- a/public/sfu/js/course_request_form.js +++ b/public/sfu/js/course_request_form.js @@ -137,7 +137,7 @@ course_display += "
"; } var course_value = course.key; - var checkbox_html = '

  

'; + var checkbox_html = '

  

'; $("#"+term+"_courses").append(checkbox_html); num++; }); @@ -211,7 +211,7 @@ success: function(data) { if (data.sis_source_id != "sandbox-" + sfuid + "-1:::course") { $("#course_list").append("

Other

"); - var checkbox_html = '

  

'; + var checkbox_html = '

  

'; $("#sandbox").append(checkbox_html); } }, diff --git a/vendor/plugins/sfu_course_form/app/views/course_form/_form.html.erb b/vendor/plugins/sfu_course_form/app/views/course_form/_form.html.erb index efa51c84b1f0f..5e136e067e48c 100644 --- a/vendor/plugins/sfu_course_form/app/views/course_form/_form.html.erb +++ b/vendor/plugins/sfu_course_form/app/views/course_form/_form.html.erb @@ -11,8 +11,10 @@
<%= label_tag "Enroll Me", "Enroll Me", :class => "control-label" %>
- <%= check_box_tag "enroll_me", @sfuid, false, :disabled => true %> -
You will be enrolled as a Teacher to the selected courses
+
@@ -24,9 +26,11 @@
<%= label_tag "Cross-list", "Cross-List Courses", :class => "control-label" %>
- <%= check_box_tag "cross_list", true, false, :disabled => true %> -
Cross-listing will place all the selected courses into a single course container
-
+
From e6a21c60f032cb1943fa3bc763900f31d5c88f2a Mon Sep 17 00:00:00 2001 From: ronvs Date: Wed, 27 Feb 2013 19:10:48 -0800 Subject: [PATCH 4/5] Improved spacing between checkboxes Removed

tags around checkboxes --- public/sfu/js/course_request_form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/sfu/js/course_request_form.js b/public/sfu/js/course_request_form.js index 7f56b568c1811..e9397acb9c01a 100644 --- a/public/sfu/js/course_request_form.js +++ b/public/sfu/js/course_request_form.js @@ -137,7 +137,7 @@ course_display += "
"; } var course_value = course.key; - var checkbox_html = '

  

'; + var checkbox_html = ''; $("#"+term+"_courses").append(checkbox_html); num++; }); @@ -211,7 +211,7 @@ success: function(data) { if (data.sis_source_id != "sandbox-" + sfuid + "-1:::course") { $("#course_list").append("

Other

"); - var checkbox_html = '

  

'; + var checkbox_html = ''; $("#sandbox").append(checkbox_html); } }, From 7b61f90cc0dc1f446687d885f32008f83d2c6da5 Mon Sep 17 00:00:00 2001 From: ronvs Date: Wed, 27 Feb 2013 22:38:18 -0800 Subject: [PATCH 5/5] Disabled cross-list feature if selected courses span different terms --- public/sfu/js/course_request_form.js | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/public/sfu/js/course_request_form.js b/public/sfu/js/course_request_form.js index e9397acb9c01a..b925976730ea1 100644 --- a/public/sfu/js/course_request_form.js +++ b/public/sfu/js/course_request_form.js @@ -137,7 +137,7 @@ course_display += "
"; } var course_value = course.key; - var checkbox_html = ''; + var checkbox_html = ''; $("#"+term+"_courses").append(checkbox_html); num++; }); @@ -148,28 +148,29 @@ function enable_submit_crosslist() { var num_selected_courses = ""; + var selected_terms = []; $('input[type="checkbox"]:checked').each(function() { if ($(this).attr('id').match(/^selected_course_/)) { num_selected_courses++; + var checkbox_id_arr = $(this).attr('id').split("_"); + selected_terms.push(checkbox_id_arr[checkbox_id_arr.length-1]); } }).get(); if ( (num_selected_courses > 2) || (num_selected_courses > 1 && !$("#selected_course_sandbox").is(':checked')) ) { $("#create_course_btn").removeAttr("disabled"); $("#enroll_me").removeAttr("disabled"); - $("#cross_list").removeAttr("disabled"); + enable_cross_list(true); } else if (num_selected_courses > 0) { $("#create_course_btn").removeAttr("disabled"); $("#enroll_me").removeAttr("disabled"); - $("#cross_list").removeAttr("checked"); - $("#cross_list").attr("disabled", "disabled"); - $("#cross-list-course").html(""); + enable_cross_list(false); } else { $("#create_course_btn").attr("disabled", "disabled"); - $("#cross_list").attr("disabled", "disabled"); - $("#cross-list-course").html(""); + enable_cross_list(false); } + if (jQuery.unique(selected_terms).length > 1) enable_cross_list(false); // Cannot cross-list across terms } function cross_list_course_title() { @@ -203,6 +204,16 @@ } } + function enable_cross_list(enable){ + if (enable) { + $("#cross_list").removeAttr("disabled"); + } else { + $("#cross_list").removeAttr("checked"); + $("#cross_list").attr("disabled", "disabled"); + $("#cross-list-course").html(""); + } + } + function sandbox_course(sfuid) { var title = "Sandbox - " + sfuid; $.ajax({ @@ -211,7 +222,7 @@ success: function(data) { if (data.sis_source_id != "sandbox-" + sfuid + "-1:::course") { $("#course_list").append("

Other

"); - var checkbox_html = ''; + var checkbox_html = ''; $("#sandbox").append(checkbox_html); } },