SlatePermutate Changeset - 19935ac489e5 · protofusion repositories

Changeset - 19935ac489e5

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 15 years ago 2011-03-29 22:25:12
ohnobinki@ohnopublishing.net

Fix duplicate times being displayed in output.

1 file changed with 9 insertions and 8 deletions:

inc/class.schedule.php

0 comments (0 inline, 0 general)

inc/class.schedule.php

➞

Show inline comments

@@ @@ -380,36 +380,37 @@ class Schedule @@
+	  {
 	    for ($si = 0; $si < $course->getnsections(); $si ++)
 	      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)
+		  while ((int)ltrim($meeting->getEndTime(), '0') > $max_time)
+		    {
 		      $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);
 		      $max_time += $max_time + 30;
 		      while ($max_time % 100 >= 60)
 			$max_time += 40; /* + 100 - 60 */
 		      $time[] = $max_time;
+		    }
 		  while ($meeting->getStartTime() < $min_time)
+		  while ((int)ltrim($meeting->getStartTime(), '0') < $min_time)
+		    {
 		      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);
 		      $max_time += 30;
 		      while ($min_time % 100 < 30)
 			$min_time -= 40; /* + 60 - 100 */
 		      $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>'

0 comments (0 inline, 0 general)