SlatePermutate Changeset - 6acad3f307d2 · protofusion repositories

Changeset - 6acad3f307d2

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 15 years ago 2011-02-05 22:03:42
ohnobinki@ohnopublishing.net

Automatically expands the number of time slots that the output page displays if a schedule have courses which go early or late (such as courses that end at 22:30). Fixes an infinite loop.

1 file changed with 34 insertions and 9 deletions:

inc/class.schedule.php

0 comments (0 inline, 0 general)

inc/class.schedule.php

➞

Show inline comments

@@ @@ -297,28 +297,51 @@ class Schedule @@
     if($this->nPermutations > 0)
+      {
 	/*
 	 * Figure out if we have to deal with Saturday and then deal
 	 * with it.
+	 *
 	 * Also, ensure that our $time array is big enough for all of
 	 * these courses.
 	 */
 	$max_day_plusone = 5;
 	$have_saturday = FALSE;
 	$max_time = (int)max($time);
 	$min_time = (int)min($time);
 	$sort_time = FALSE;
 	foreach ($this->courses as $course)
+	  {
 	    for ($si = 0; $si < $course->getnsections(); $si ++)
 	      foreach ($course->getSection($si)->getMeetings() as $meeting)
 		if ($meeting->getDay(5))
+		  {
 		    $max_day_plusone = 6;
 		    $have_saturday = TRUE;
 		    break;
+		  }
 	    if ($have_saturday)
 	      break;
+		{
 		  /* 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;
 		      $time[] = $max_time;
+		    }
 		  while ($meeting->getStartTime() < $min_time)
+		    {
 		      $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"><p>Enter these codes into your school\'s online course registration system to register for classes:</p><div id="regDialogList"></div></div>';
 	echo '<div id="tabs">' . "\n" .
                '<div id="show-box" class="show-buttons">
                   <form action="#"><p class="nospace">
                     <label><strong>Display:</strong></label>
@@ @@ -406,13 +429,15 @@ class Schedule @@
+					}
+				    }
 				  if ($current_meeting)
+				    {
 				      /* calculate how many rows this section should span */
 				      for ($my_r = $r; $current_meeting->getEndTime() > $time[$my_r]; $my_r ++)
 				      for ($my_r = $r;
 					   $my_r < (count($time)-1) && $current_meeting->getEndTime() > $time[$my_r];
 					   $my_r ++)
+					;
 				      $rowspan[$dayLoop] = $my_r - $r;
 				      $single_multi = 'single';
 				      if ($rowspan[$dayLoop] > 1)
 					$single_multi = 'multi';

0 comments (0 inline, 0 general)