Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Course form plugin #24

Merged
merged 5 commits into from
Feb 28, 2013
Merged

Course form plugin #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2534536
Added check for undefined value when checking for SFU Computing ID
ronvs Feb 28, 2013
a3d784d
Fix spacing between checkbox and course title
ronvs Feb 28, 2013
1d0533f
Fixed spacing issue on form to match html/css used by Canvas
ronvs Feb 28, 2013
e6a21c6
Improved spacing between checkboxes
ronvs Feb 28, 2013
7b61f90
Disabled cross-list feature if selected courses span different terms
ronvs Feb 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 22 additions & 23 deletions public/sfu/js/course_request_form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("<h5>Invalid SFU Computing ID</h5>");
Expand Down Expand Up @@ -106,7 +106,7 @@

$.each(data, function (index, term) {
$("#course_list").append('<div id="' + term.peopleSoftCode + '"><h4>' + term.formatted1 + '</h4><div id="' + term.peopleSoftCode + '_courses"></div></div>');
$("#"+term.peopleSoftCode+"_courses").html("&nbsp;&nbsp;Retrieving courses...");
$("#"+term.peopleSoftCode+"_courses").html("<label> Retrieving courses... </label>");
courses_for_terms(sfuid, term.peopleSoftCode);
});
sandbox_course(sfuid);
Expand Down Expand Up @@ -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 += "<br>&nbsp;&nbsp;(Includes section tutorials: " + section_tutorials + ")";
course_display += "<br><label> (Includes section tutorials: " + section_tutorials + ") </label>";
}
var course_value = course.key;
var checkbox_html = '<p>&nbsp;&nbsp;<input type="checkbox" name="selected_course_'+ num +'" id="selected_course_'+ num +'" value="' + course_value + '">' + course_display + '</p>';
var checkbox_html = '<label class="checkbox"><input type="checkbox" name="selected_course_'+ num +'_'+ term +'" id="selected_course_'+ num +'_'+ term +'" value="'+ course_value + '">' + course_display +'</label>';
$("#"+term+"_courses").append(checkbox_html);
num++;
});
Expand All @@ -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() {
Expand Down Expand Up @@ -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({
Expand All @@ -211,24 +222,12 @@
success: function(data) {
if (data.sis_source_id != "sandbox-" + sfuid + "-1:::course") {
$("#course_list").append("<div id='sandbox'><h4>Other</h4></div>");
var checkbox_html = '<p>&nbsp;&nbsp;<input type="checkbox" name="selected_course_sandbox" id="selected_course_sandbox" value="sandbox" onchange="enable_submit_crosslist();"> ' + title + '</p>';
var checkbox_html = '<label class="checkbox"><input type="checkbox" name="selected_course_sandbox" id="selected_course_sandbox" value="sandbox" onchange="enable_submit_crosslist();">'+ title +'</label>';
$("#sandbox").append(checkbox_html);
}
},
error: function() { /* TODO: do something useful here */ }
});
}

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);
14 changes: 9 additions & 5 deletions vendor/plugins/sfu_course_form/app/views/course_form/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
<div class="control-group" id="enroll_me_div">
<%= label_tag "Enroll Me", "Enroll Me", :class => "control-label" %>
<div class="controls">
<%= check_box_tag "enroll_me", @sfuid, false, :disabled => true %>
<div>You will be enrolled as a Teacher to the selected courses</div>
<label class="checkbox">
<%= check_box_tag "enroll_me", @sfuid, false, :disabled => true %>
<div>You will be enrolled as a Teacher to the selected courses</div>
</label>
</div>
</div>

Expand All @@ -24,9 +26,11 @@
<div class="control-group">
<%= label_tag "Cross-list", "Cross-List Courses", :class => "control-label" %>
<div class="controls">
<%= check_box_tag "cross_list", true, false, :disabled => true %>
<div>Cross-listing will place all the selected courses into a single course container</div>
<div id="cross-list-course"></div>
<label class="checkbox">
<%= check_box_tag "cross_list", true, false, :disabled => true %>
<div>Cross-listing will place all the selected courses into a single course container</div>
<div id="cross-list-course"></div>
</label>
</div>
</div>
<hr>
Expand Down