Changeset - 6b2333baf9c2
[Not reviewed]
Merge default
0 3 0
ethanzonca - 15 years ago 2010-10-01 21:53:37

Merge
3 files changed with 4 insertions and 5 deletions:
0 comments (0 inline, 0 general)
class.class.php
Show inline comments
 
@@ -82,8 +82,7 @@ class Classes
 

	
 
      foreach ($this->sections as $key => $section)
 
	$out .= $section->input_form_render($class_key, $key);
 

	
 
      return $out;
 
    }
 

	
 
}
class.schedule.php
Show inline comments
 
@@ -305,15 +305,12 @@ class Schedule
 
			echo '<div  id="selectItemsInput"><p><form action="'.$_SERVER["SCRIPT_NAME"].'?savedkey=0"><label><strong>Schedules to Print</strong> <em>(seperate with commas, "all" for all)</em></label><br /><input type="text" name="print" value="'.$_REQUEST['print'].'" /><input type="submit" value="submit" /><span id="cancelItems"><input type="button" value="cancel" /></span></form></p></div>';
 
		}
 
		else {
 
			echo '<p><a href="'.$_SERVER["SCRIPT_NAME"].'?savedkey=0&amp;print=all">Print</a> :: <a href="input.php">Home</a></p>';
 
		}
 

	
 
		echo "<p>There were a total of " . $this->possiblePermutations . " possible permutations. Only " . $this->nPermutations . " permutations had no class conflicts.</p>";
 
		
 

	
 
		if($this->nPermutations > 0)
 
		{
 
			$table .= "<div id=\"my-glider\">\n"
 
			  . "  <div class=\"controls\">\n";
 
			
 
			for($nn = 1; $nn <= $this->nPermutations; $nn++)
 
@@ -589,12 +586,14 @@ class Schedule
 
		       * next item added to $_SESSION['saved']
 
		       */
 
		      $savedkey = max(array_keys($_SESSION['saved'])) + 1;
 
		  }
 
		echo '<form method="get" action="input.php"><p><input type="hidden" name="savedkey" value="' . $savedkey . '" /><input type="submit" value="edit" /></p></form>';
 

	
 
    echo "<p>There were a total of " . $this->possiblePermutations . " possible permutations. Only " . $this->nPermutations . " permutations had no class conflicts.</p>";
 

	
 
		$outputPage->foot();
 
	}
 

	
 
	/**
 
	 * \brief
 
	 *   Render the input table form for editing a saved schedule in input.php.
class.section.php
Show inline comments
 
@@ -5,13 +5,14 @@ include_once 'errors.php';
 
//--------------------------------------------------
 
// class.section.php  Author:Nathan Gelderloos
 
//
 
// Represents a section of a class.
 
//--------------------------------------------------
 
   
 
class Section {
 
class Section
 
{
 

	
 
   private $letter;	// Section letter
 
   private $prof;	// Professor
 
   private $start;	// Start time
 
   private $tend;	// End time
 
   private $idays;	// Integer version of meeting days
0 comments (0 inline, 0 general)