SlatePermutate Changeset - 933c98416373 · protofusion repositories

Changeset - 933c98416373

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 15 years ago 2011-03-29 21:47:40
ohnobinki@ohnopublishing.net

Support very early morning and late night classes much better. Fixes bug 101.

2 files changed with 12 insertions and 5 deletions:

inc/class.schedule.php

scripts/scheduleInput.js

0 comments (0 inline, 0 general)

inc/class.schedule.php

➞

Show inline comments

@@ @@ -382,30 +382,34 @@ class Schedule @@
 	      foreach ($course->getSection($si)->getMeetings() as $meeting)
+		{
 		  /* Saturdayness */
 		  if ($meeting->getDay(5))
+		    {
 		      $max_day_plusone = 6;
 		      $have_saturday = TRUE;
+		    }
 		  /* very late / very early classes */
 		  while ($meeting->getEndTime() > $max_time)
+		    {
 		      $max_time += 30;
 		      $max_time = sprintf("%04d", $max_time + 30);
 		      while (substr($max_time, -2) >= 60)
 			$max_time = sprintf("%02d%02d", substr($max_time, 0, 2) + 1, substr($max_time, -2) - 60);
 		      $time[] = $max_time;
+		    }
 		  while ($meeting->getStartTime() < $min_time)
+		    {
 		      $min_time -= 30;
 		      if (substr($min_time, -2) < 30)
 			$min_time = sprintf("%02d%02d", substr($min_time, 0, 2) - 1, substr($min_time, -2) + 60);
 		      $min_time = sprintf("%04d", $min_time - 30);
 		      $time[] = $min_time;
 		      $sort_time = TRUE;
+		    }
+		}
+	  }
 	/* ensure that early times are actually first ;-) */
 	if ($sort_time)
 	  sort($time);
         echo '    <div id="regDialog" title="Registration Codes">' . PHP_EOL
 	  . '      <div id="regDialog-content"></div>' . PHP_EOL
 	  . '      <p id="regDialog-disclaimer" class="graytext"><em>Note: The registration information above corresponds to the sections displayed on the currently selected tab.</em></p>'

scripts/scheduleInput.js

➞

Show inline comments

@@ @@ -124,66 +124,69 @@ function add_section_n(cnum, name, synon @@
 	genOptionHtml("1400", "2:00 pm", stime) + genOptionHtml("1430", "2:30 pm", stime) +
 	genOptionHtml("1500", "3:00 pm", stime) + genOptionHtml("1530", "3:30 pm", stime) +
 	genOptionHtml("1600", "4:00 pm", stime) + genOptionHtml("1630", "4:30 pm", stime) +
 	genOptionHtml("1700", "5:00 pm", stime) + genOptionHtml("1730", "5:30 pm", stime) +
 	genOptionHtml("1800", "6:00 pm", stime) + genOptionHtml("1830", "6:30 pm", stime) +
 	genOptionHtml("1900", "7:00 pm", stime) + genOptionHtml("1930", "7:30 pm", stime) +
 	genOptionHtml("2000", "8:00 pm", stime) + genOptionHtml("2030", "8:30 pm", stime) +
 	genOptionHtml("2100", "9:00 pm", stime);
     if (stime.length > 0)
+    {
 	var stime_end = stime.substr(2);
 	if (stime_end != '00' && stime_end != '30')
 	var stime_begin = stime.substr(0, 2);
 	if (stime_end != '00' && stime_end != '30'
 	   || stime_begin < 7 || stime_begin > 21)
 	    section_html = section_html + genOptionHtml(stime, prettyTime(stime), stime);
+    }
     section_html = section_html + '</select></td>\
 <td><select class="selectRequired" name="postData[' + cnum + '][' + snum + '][end]"><option value="none"></option>' +
 	genOptionHtml("0720", "7:20 am", etime) + genOptionHtml("0750", "7:50 am", etime) +
 	genOptionHtml("0820", "8:20 am", etime) + genOptionHtml("0850", "8:50 am", etime) +
 	genOptionHtml("0920", "9:20 am", etime) + genOptionHtml("0950", "9:50 am", etime) +
 	genOptionHtml("1020", "10:20 am", etime) + genOptionHtml("1050", "10:50 am", etime) +
 	genOptionHtml("1120", "11:20 am", etime) + genOptionHtml("1150", "11:50 am", etime) +
 	genOptionHtml("1220", "12:20 pm", etime) + genOptionHtml("1250", "12:50 pm", etime) +
 	genOptionHtml("1320", "1:20 pm", etime) + genOptionHtml("1350", "1:50 pm", etime) +
 	genOptionHtml("1420", "2:20 pm", etime) + genOptionHtml("1450", "2:50 pm", etime) +
 	genOptionHtml("1520", "3:20 pm", etime) + genOptionHtml("1550", "3:50 pm", etime) +
 	genOptionHtml("1620", "4:20 pm", etime) + genOptionHtml("1650", "4:50 pm", etime) +
 	genOptionHtml("1720", "5:20 pm", etime) + genOptionHtml("1750", "5:50 pm", etime) +
 	genOptionHtml("1820", "6:20 pm", etime) + genOptionHtml("1850", "6:50 pm", etime) +
 	genOptionHtml("1920", "7:20 pm", etime) + genOptionHtml("1950", "7:50 pm", etime) +
 	genOptionHtml("2020", "8:20 pm", etime) + genOptionHtml("2050", "8:50 pm", etime) +
 	genOptionHtml("2120", "9:20 pm", etime);
     if (etime.length > 0)
+    {
 	var etime_end = etime.substr(2);
 	if (etime_end != '50' && etime_end != '20')
 	var etime_begin = etime.substr(0, 2);
 	if (etime_end != '50' && etime_end != '20'
 	   || etime_begin < 7 || etime_begin > 21)
 	    section_html = section_html + genOptionHtml(etime, prettyTime(etime), etime);
+    }
     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);
     sectionsOfClass[cnum] ++;
     var section_tr = jQuery('.pclass' + cnum).next();
     /* 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.
      */

0 comments (0 inline, 0 general)