SlatePermutate Changeset - 73334792195b · protofusion repositories

Changeset - 73334792195b

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 14 years ago 2011-04-10 00:34:30
ohnobinki@ohnopublishing.net

On the input page, append sections to a course rather than prepending them to the beginning of the course. Fixes bug 37.

1 file changed with 13 insertions and 14 deletions:

scripts/scheduleInput.js

0 comments (0 inline, 0 general)

scripts/scheduleInput.js

➞

Show inline comments

@@ @@ -108,25 +108,25 @@ function addTips() @@
 /**
  * \brief
  *   Add a section to a class.
  */
 function add_section_n(cnum, name, synonym, stime, etime, days, instructor, location, type)
+{
     var snum = last_section_i ++;
     var cssclasses = 'section class' + cnum;
     if(type == 'lab')
 	cssclasses += ' lab';
     var section_html = '<tr class="' + cssclasses + '"><td class="none"></td>' +
+    var section_html = '<tr id="tr-section-' + String(snum) + '" class="' + cssclasses + '"><td class="none"></td>' +
 	'<td class="sectionIdentifier center"><input type="text" size="1" class="required section-letter-entry" name="postData[' + cnum + '][' + snum + '][letter]" /><input class="section-synonym-entry" type="hidden" name="postData[' + cnum + '][' + snum + '][synonym]" /></td>' +
 	'<td class="professor center"><input type="text" size="10" class="profName" name="postData[' + cnum + ']['+ snum + '][professor]" /></td>' +
 	'<td><select class="selectRequired" name="postData[' + cnum + '][' + snum + '][start]"><option value="none"></option>' +
 	genOptionHtml("0700", "7:00 am", stime) + genOptionHtml("0730", "7:30 am", stime) +
 	genOptionHtml("0800", "8:00 am", stime) + genOptionHtml("0830", "8:30 am", stime) +
 	genOptionHtml("0900", "9:00 am", stime) + genOptionHtml("0930", "9:30 am", stime) +
 	genOptionHtml("1000", "10:00 am", stime) + genOptionHtml("1030", "10:30 am", stime) +
 	genOptionHtml("1100", "11:00 am", stime) + genOptionHtml("1130", "11:30 am", stime) +
 	genOptionHtml("1200", "12:00 pm", stime) + genOptionHtml("1230", "12:30 pm", stime) +
 	genOptionHtml("1300", "1:00 pm", stime) + genOptionHtml("1330", "1:30 pm", stime) +
 	genOptionHtml("1400", "2:00 pm", stime) + genOptionHtml("1430", "2:30 pm", stime) +
 	genOptionHtml("1500", "3:00 pm", stime) + genOptionHtml("1530", "3:30 pm", stime) +
@@ @@ -176,28 +176,28 @@ function add_section_n(cnum, name, synon @@
     section_html = section_html + '</select></td>\
 <td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][0]" value="1" ' + (days.m ? 'checked="checked"' : '') + ' /></td>\
 <td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][1]" value="1" ' + (days.t ? 'checked="checked"' : '') + ' /></td>\
 <td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][2]" value="1" ' + (days.w ? 'checked="checked"' : '') + ' /></td>\
 <td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][3]" value="1" ' + (days.h ? 'checked="checked"' : '') + ' /></td>\
 <td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][4]" value="1" ' + (days.f ? 'checked="checked"' : '') + ' /></td>\
 <td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][5]" value="1" ' + (days.s ? 'checked="checked"' : '') + ' /></td>' +
 	'<td class="removeCell"><div class="deleteSection"><input type="button" value="x" class="gray" /></div></td><td class="emptyCell">' +
 	'<input class="section-location-entry" type="hidden" name="postData[' + cnum + '][' + snum + '][location]" />' +
 	'<input class="section-type-entry" type="hidden" name="postData[' + cnum + '][' + snum + '][type]" />' +
 	'</td></tr>';
-    jQuery('.pclass' + cnum).after(section_html);
+    jQuery('tr.class' + cnum + ':last').after(section_html);
     sectionsOfClass[cnum] ++;
-    var section_tr = jQuery('.pclass' + cnum).next();
+    var section_tr = jQuery('#tr-section-' + String(snum));
     /* store course_i in a place the newly added section will look for it */
     section_tr.data({course_i: cnum});
     /*
      * Store data into the newly created HTML. With this method we
      * have to _avoid_ escaping entities in the text we're setting as
      * values because the DOM stuff will escape it for us.
      */
     section_tr.find('.section-letter-entry').val(name);
     section_tr.find('.section-synonym-entry').val(synonym);
     section_tr.find('.profName').val(instructor);
     section_tr.find('.section-location-entry').val(location);
@@ @@ -230,42 +230,41 @@ function add_sections(cnum, data) @@
     /*
      * If the user enterred something iffy, correct him. Or do so
      * regardless ;-).
      */
     /* this data['class'] stuff is for the old JSON format we used... */
     if (data['class'])
 	data.course = data['class'];
     if (data.course)
 	jQuery('.className' + cnum).val(data.course);
     if (!data.sections)
 	return;
     /*
      * we get the sections in the correct order. For the user to see
      * them in the correct order, we must reverse the add_setion_n()
      * calls.
      */
     for (i = data.sections.length - 1; i >= 0; i --)
+	{
 	    section = data.sections[i];
 	    add_section_n(cnum, section.section, section.synonym, section.time_start, section.time_end, section.days, section.instructor, section.location, section.type);
+	}
     jQuery.each(data.sections, function(i, section)
+		{
 		    add_section_n(cnum, section.section, section.synonym, section.time_start, section.time_end, section.days, section.instructor, section.location, section.type);
 		});
     /*
      * Handle course-level interdependencies.
      */
     if (data.dependencies)
 	jQuery.each(data.dependencies, function(i, dep)
+		    {
 			var new_course_num = add_class_n(dep['class'], dep['title'] ? dep['title'] : '');
 			/* Gracefully deprecate the old crawler's JSON format. */
 			if (dep['class'])
 			    dep.course = dep['class'];
 			var new_course_num = add_class_n(dep.course, dep['title'] ? dep['title'] : '');
 			add_sections(new_course_num, dep);
 		    });
+}
 /**
  * \brief
  *   Adds a new class to the input.
+ *
  * \param course_id
  *   The course_id.
  * \param title
  *   The human-friendly course title.

0 comments (0 inline, 0 general)