SlatePermutate Changeset - 3a5b03ccb906 · protofusion repositories

Changeset - 3a5b03ccb906

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Nathan Brink (binki) - 15 years ago 2010-11-29 23:42:03
ohnobinki@ohnopublishing.net

Propagate the section meeting type through the JSON, JS, and form submission.

4 files changed with 12 insertions and 9 deletions:

class.schedule.php

inc/class.section_meeting.inc

process.php

scripts/scheduleInput.js

0 comments (0 inline, 0 general)

class.schedule.php

➞

Show inline comments

@@ @@ -66,76 +66,76 @@ class Schedule @@
     $this->title = "SlatePermutate - Scheduler";
     $this->section_format = 'numerous';
+  }
   //--------------------------------------------------
   // Mutators and Accessors
   //--------------------------------------------------
   public function getName()
+  {
     return $this->scheduleName;
+  }
   //--------------------------------------------------
   // Adds a new class to the schedule.
   //--------------------------------------------------
   function addClass($n)
+  {
     $this->classStorage[$this->nclasses] = new Classes($n);
     $this->nclasses++;
+  }
   //--------------------------------------------------
   // Adds a section to the desired class.
   //--------------------------------------------------
   function addSection($course_name, $letter, $time_start, $time_end, $days, $synonym = NULL, $faculty = NULL, $location = NULL)
+  function addSection($course_name, $letter, $time_start, $time_end, $days, $synonym = NULL, $faculty = NULL, $location = NULL, $type = 'lecture')
+  {
     $found = false;
     $counter = 0;
     while(!$found && ($counter < $this->nclasses))
+      {
 	$temp = $this->classStorage[$counter]->getName();
 	if(strcmp($temp,$course_name) == 0)
+	  {
 	    $found = true;
 	  } else {
 	  $counter++;
+	}
+      }
     if($counter == $this->nclasses)
+      {
 	echo 'Could not find class: ' . $course_name . "<br />\n";
       } else {
       $section = $this->classStorage[$counter]->section_get($letter);
       if (!$section)
+	{
 	  $section = new Section($letter, array(), $synonym, $faculty);
 	  $this->classStorage[$counter]->section_add($section);
+	}
       $section->meeting_add(new SectionMeeting($days, $time_start, $time_end, $location));
+      $section->meeting_add(new SectionMeeting($days, $time_start, $time_end, $location, $type));
+    }
+  }
   //--------------------------------------------------
   // Finds all of the possible permutations and stores
   // the results in the storage array.
   //--------------------------------------------------
 	function findPossibilities()
+	{
 		$this->possiblePermutations = 1;
 		/* special case: there is nothing entered into the schedule and thus there is one, NULL permutation */
 		if (!$this->nclasses)
+		{
 			/* have an empty schedule */
 			$this->classStorage[0] = array();
 			$this->nPermutations = 1;
 			return;
+		}
 		$position = 0;
 		$counter = 0;
 		for($i = 0; $i < $this->nclasses; $i++)
+		{

inc/class.section_meeting.inc

➞

Show inline comments

@@ @@ -197,32 +197,33 @@ class SectionMeeting @@
      * The sections meetings don't both share a day of the week.
      */
     return FALSE;
+  }
   /**
    * \brief
    *   Return an array of JSON keys specific to this section meeting
    *   time.
+   *
    * Currently, the AJAX UI doesn't recognize that a given section may
    * have multiple meeting times. Thus, we simulate this by having
    * multiple instances of the same section but just with different
    * times in the UI.
    */
   public function to_json_array()
+  {
     static $daymap = array(0 => 'm', 1 => 't', 2 => 'w', 3 => 'h', 4 => 'f');
     $json_array = array(
 			'time_start' => $this->time_start,
 			'time_end' => $this->time_end,
 			'days' => array(),
 			'location' => $this->location,
 			'type' => $this->type,
 			);
     for ($day = 0; $day < 5; $day ++)
       $json_array['days'][$daymap[$day]] = $this->getDay($day);
     return $json_array;
+  }
+}

process.php

➞

Show inline comments

@@ @@ -118,49 +118,49 @@ if(!$DEBUG) @@
+      {
 	/*
 	 * we probably have input from the user and should interpret
 	 * it as a schedule to permutate. Then we should redirect the
 	 * user to the canonical URL for that schedule.
 	 */
 		$allClasses = new Schedule($_POST['postData']['name']);
 		foreach($_POST['postData'] as $class)
+		{
 		  /*
 		   * Only add classes if the user added at least one
 		   * section to the class. We know that $class['name']
 		   * is not a section, so count() needs to be > 1 and
 		   * we need to skip over 'name' in our loop.
 		   */
 			if(is_array($class) && count($class) > 1)
+			{
 				$allClasses->addClass($class['name']);
 				foreach($class as $section)
 				  /* Skip the section name, which isn't a section */
 					if(is_array($section))
+					{
 					  $allClasses->addSection($class['name'], $section['letter'], $section['start'], $section['end'], arrayToDays($section['days'], 'alpha'), $section['synonym'], $section['professor'], $section['location']);
+					  $allClasses->addSection($class['name'], $section['letter'], $section['start'], $section['end'], arrayToDays($section['days'], 'alpha'), $section['synonym'], $section['professor'], $section['location'], $section['type']);
+					}
+			}
+		}
 		$allClasses->findPossibilities();
 		if (!isset($_SESSION['saved']))
 		  $_SESSION['saved'] = array();
 		$schedule_id = schedule_store_store($schedule_store, $allClasses);
 		if ($schedule_id != NULL)
 		  $_SESSION['saved'][$schedule_id] = $allClasses->getName();
 		$process_php_s = '';
 		if (!$clean_urls)
 		  $process_php_s = 'process.php?s=';
 		page::redirect($process_php_s . $schedule_id);
 		exit;
+      }
+  }
 else
+  {
 	echo '<pre>DEBUG OUTPUT: <br /><br />';
 	foreach($_POST['postData'] as $class) {
 		echo 'Class: ' . $class['name'] . '<br />';
 		foreach($class as $section)
 			if(is_array($section))

scripts/scheduleInput.js

➞

Show inline comments

@@ @@ -109,49 +109,49 @@ jQuery.validator.addMethod('classRequire @@
 	//--------------------------------------------------
 	jQuery.validator.addClassRules("selectRequired", {
 		selectNone: true
 	});
 	jQuery.validator.addClassRules("daysRequired", {
 		daysRequired: true
 	});
 jQuery.validator.addClassRules('classRequired', { classRequired: true });
     //--------------------------------------------------
     // General Input Functions
     //--------------------------------------------------
 /**
  * \brief
  * Returns the common inputs for each new section.
  */
 function genSectionHtml(cnum)
+{
     genSectionHtml_n(cnum, '', '', '', '', '', '', '');
+}
 /* @TODO: This should select & set items based on args, if the args != '' */
 function genSectionHtml_n(cnum, name, synonym, stime, etime, days, prof, location)
+function genSectionHtml_n(cnum, name, synonym, stime, etime, days, prof, location, type)
+{
 		var snum = sectionsOfClass[cnum];
 		var result = '<tr class="section class' + cnum + '"><td class="none"></td>';
 	        result = result + '<td class="sectionIdentifier center"><input type="hidden" name="postData[' + cnum + '][' + snum + '][synonym]" value="' + synonym + '" /><input type="text" size="1" class="required" name="postData[' + cnum + '][' + snum + '][letter]" value="' + name + '" /></td>';
 		result = result + '<td class="professor center"><input type="text" size="10" class="" name="postData[' + cnum + ']['+ snum + '][professor]" value="' + prof + '" /></td>';
 		result = result + '<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)
 				 + 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)
@@ @@ -172,95 +172,97 @@ function genSectionHtml_n(cnum, name, sy @@
 				 + 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')
 			    result = result + genOptionHtml(etime, prettyTime(etime), etime);
+		    }
 		result = result + '</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>';
 		result = result + '<td><div class="deleteSection"><input type="button" value="x" class="gray" /></div></td><td>'
 		    + '<input type="hidden" name="postData[' + cnum + '][' + snum + '][location]" value="' + location + '" />'+ '</td></tr>';
 		    + '<input type="hidden" name="postData[' + cnum + '][' + snum + '][location]" value="' + location + '" />'
 		    + '<input type="hidden" name="postData[' + cnum + '][' + snum + '][type]" value="' + type + '" />'
 		    + '</td></tr>';
 		return result;
+	}
 /**
  * Outputs an <option/> element. It will inlcude selected="selected"
  * if the value param equals the test_value param.
  */
 function genOptionHtml(value, content, test_value)
+{
     var selected = ' selected="selected"';
     if (value != test_value)
 	selected = '';
     return '<option value="' + value + '"' + selected + '>' + content + "</option>\n";
+}
 /**
  * \brief
  *   Add a section to a class.
  */
 function add_section_n(cnum, name, synonym, stime, etime, days, prof, location)
+function add_section_n(cnum, name, synonym, stime, etime, days, prof, location, type)
+{
     jQuery('.pclass'+cnum).after(genSectionHtml_n(cnum, name, synonym, stime, etime, days, prof, location));
+    jQuery('.pclass'+cnum).after(genSectionHtml_n(cnum, name, synonym, stime, etime, days, prof, location, type));
     sectionsOfClass[cnum] ++;
+}
 function add_section(cnum)
+{
     return add_section_n(cnum, '', '', '', '', {'m':false, 't':false, 'w':false, 'h':false, 'f':false}, '', '');
+    return add_section_n(cnum, '', '', '', '', {'m':false, 't':false, 'w':false, 'h':false, 'f':false}, '', '', '');
+}
 /**
  * Add a list of sections gotten via an AJAX call.
  */
 function add_sections(cnum, data)
+{
     var i;
     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.prof, section.location);
+	    add_section_n(cnum, section.section, section.synonym, section.time_start, section.time_end, section.days, section.prof, section.location, section.type);
+	}
+}
 	//--------------------------------------------------
 	// Adds a new class to the input.
 	//--------------------------------------------------
 	function add_class_n(name)
+	{
 		sectionsOfClass[classNum] = 0; // Initialize at 0
 		jQuery('#jsrows').append('<tr title="' + classNum + '" class="class class' + classNum + ' pclass' + classNum + '"><td><input type="text" class="classRequired defText className'+classNum+' className" title="Class Name" name="postData[' + classNum + '][name]" value="' + name + '" /></td><td colspan="9"></td><td class="tdInput"><div class="addSection"><input type="button" value="Add Section" class="gray" /></div></td><td class="tdInput"><div class="deleteClass"><input type="button" value="Remove" class="gray" /></div></td></tr>');
 		jQuery('.className' + classNum).autocomplete({ source: "auto.php" });
 		jQuery('.className' + classNum).bind('autocompleteselect', {'class_num': classNum},
 			function(event, ui)
+			    {
 				if (ui.item && ui.item.value.indexOf('-'))
+				    {
 					jQuery.ajax(
+						      {
 							  url: 'auto.php',
 							  data: {'getsections': 1, 'term': ui.item.value},
 							  context: {'class_num': event.data.class_num},
 							  success: function(data, textStatus, reqobj)
+							      {

0 comments (0 inline, 0 general)