SlatePermutate Changeset - 34ccb1607711 · protofusion repositories

Changeset - 34ccb1607711

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 14 years ago 2011-04-19 22:27:34
ohnobinki@ohnopublishing.net

Store timestamp of schedule creation in Schedule object. Use hacked up jQuery.cuteTime plugin to display the relative time of schedule creation to the user.

2 files changed with 59 insertions and 15 deletions:

inc/class.page.php

inc/class.schedule.php

0 comments (0 inline, 0 general)

inc/class.page.php

➞

Show inline comments

@@ @@ -122,12 +122,13 @@ class page @@
     /* Scripts and styles available for inclusion */
     $this->headCode['jQuery'] = '<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5/jquery.min.js" type="text/javascript"></script>';
     $this->headCode['jQueryUI'] = '<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js" type="text/javascript"></script><link rel="stylesheet" href="styles/jqueryui.css" type="text/css" media="screen" charset="utf-8" />';
     $this->headCode['jValidate'] = '<script type="text/javascript" src="http://ajax.microsoft.com/ajax/jquery.validate/1.7/jquery.validate.pack.js"></script>';
     $this->headCode['jAddress'] = '<script type="text/javascript" src="http://ohnopub.net/js/jquery.address-1.3.2.min.js"></script>';
     $this->headCode['jQuery.cuteTime'] = '<script type="text/javascript" src="http://ohnopub.net/~ohnobinki/CuteTime/js/jquery.cuteTime.js"></script>';
     $this->headCode['qTip'] = '<script type="text/javascript" src="http://ohnopub.net/js/jquery.qtip-1.0.min.js"></script>';
     $this->headCode['qTip2'] = '<script type="text/javascript" src="http://ohnopub.net/js/2011.03.21/jquery.qtip.min.js"></script><link rel="stylesheet" href="http://ohnopub.net/js/2011.03.21/jquery.qtip.min.css" type="text/css" media="screen" />';
     $this->headCode['schedInput'] = '<script type="text/javascript" src="scripts/scheduleInput.js"></script>';
     $this->headCode['outputPrintStyle'] = '<link rel="stylesheet" href="styles/print.css" type="text/css" media="screen" charset="utf-8" />';
     $this->headCode['outputStyle'] = '<link rel="stylesheet" href="styles/output.css" type="text/css" media="screen" charset="utf-8" />';
     $this->headCode['gliderHeadcode'] = '<link rel="stylesheet" href="styles/glider.css" type="text/css" media="screen" charset="utf-8" />';
@@ @@ -255,20 +256,30 @@ class page @@
           '    <!--[if IE]>'. PHP_EOL .
           '      <link rel="stylesheet" type="text/css" media="screen" charset="utf-8" href="styles/ie.css" />'. PHP_EOL .
           '    <![endif]-->'. PHP_EOL .
           '    <link rel="shortcut icon" href="images/favicon.png" />'. PHP_EOL
       . '    <style type="text/css">' . PHP_EOL
       . $this->cdata_wrap(school_page_css($this->school))
       . '    </style>' . PHP_EOL
       . $this->script_wrap(''
 			   . 'var slate_permutate_school = ' . json_encode($this->school['id']) . ';' . PHP_EOL
 			   . 'var slate_permutate_semester = ' . json_encode($this->semester['id']) . ';' . PHP_EOL);
       . '    </style>' . PHP_EOL;
     // Write out all passed scripts
     foreach ($this->scripts as $i)
       echo '    ' . $this->headCode["$i"] . "\n";
     /*
      * Perhaps we should have a separate array for javascript library
      * initialization snippets.
      */
     $javascript_init = '';
     if (in_array('jQuery.cuteTime', $this->scripts))
       $javascript_init .= 'jQuery.extend(jQuery.fn.cuteTime.settings, {refresh: 10000, use_html_attribute: false});' . PHP_EOL;
     echo $this->script_wrap(''
 			    . 'var slate_permutate_school = ' . json_encode($this->school['id']) . ';' . PHP_EOL
 			    . 'var slate_permutate_semester = ' . json_encode($this->semester['id']) . ';' . PHP_EOL
 			    . $javascript_init);
     $selectschool_query = '&amp;school=' . $this->school['id'];
     /* kludge */
     if (!empty($_REQUEST['s']))
       $selectschool_query .= '&amp;s=' . (int)$_REQUEST['s'];
     echo '  </head>' . PHP_EOL .

inc/class.schedule.php

➞

Show inline comments

@@ @@ -101,12 +101,18 @@ class Schedule @@
    * derived or NULL.
    */
   private $parent_id;
   /**
    * \brief
    *   When I was created, a unix timestamp.
    */
   private $created;
   /**
    * \brief
    *   Create a schedule with the given name.
+   *
    * \param $name
    *   A string, the friendly name the user gave this schedule.
    * \param $parent
    *   An integer, the id of the schedule from which this schedule is
@@ @@ -139,12 +145,14 @@ class Schedule @@
     if (empty($semester))
+      {
 	$semester = school_semester_guess($school);
+      }
     $this->semester = $semester;
     $this->created = time();
     /* mark this as an upgraded Schedule class. See __wakeup() */
     $this->nclasses = -1;
+  }
   //--------------------------------------------------
   // Mutators and Accessors
@@ @@ -428,28 +436,28 @@ class Schedule @@
     /* zero-based */
     $first_permutation = $page * SP_PERMUTATIONS_PER_PAGE;
     $last_permutation = min($this->nPermutations, $first_permutation + SP_PERMUTATIONS_PER_PAGE);
     $footcloser = '';
     if(isset($_REQUEST['print']) && $_REQUEST['print'] != ''){
       $headcode = array('jQuery', 'jQueryUI', 'uiTabsKeyboard', 'outputStyle', 'outputPrintStyle', 'displayTables');
+    }
     else {
       $headcode = array('outputStyle',  'jQuery', 'jQueryUI', 'jAddress', 'uiTabsKeyboard', 'qTip2','displayTables');
+    }
     $headcode = array('jQuery', 'jQueryUI', 'uiTabsKeyboard', 'displayTables', 'outputStyle', 'jQuery.cuteTime');
     if(!empty($_REQUEST['print']))
       array_push($headcode, 'outputPrintStyle');
     else
       array_push($headcode, 'jAddress', 'qTip2');
     $outputPage = page::page_create(htmlentities($this->getName()), $headcode,
 				    array('school' => $this->school_get(), 'semester' => $this->semester_get()));
     $outputPage->head();
     if(isset($_REQUEST['print'])) {
      echo '<script type="text/javascript">';
       echo 'jQuery(document).ready( function() {';
     if(!empty($_REQUEST['print']))
+      {
 	echo '<script type="text/javascript">';
 	echo 'jQuery(document).ready( function() {';
       /* If user entered items to print */
       if($_REQUEST['print'] != 'all'){
 	echo 'jQuery(\'.section\').hide();';
 	$items = explode(',', $_REQUEST['print']);
 	foreach($items as $item){
@@ @@ -481,12 +489,14 @@ class Schedule @@
       echo '    jQuery(\'#printItems\').click( function() {
 		  window.location = "'.$_SERVER['SCRIPT_NAME'].'?s='.$this->id_get().'&amp;print=" + (jQuery(\'#tabs\').tabs(\'option\',\'selected\') + 1);
 	        });
 	        jQuery(\'#cancelItems\').click( function() {
 		  jQuery(\'#selectItemsInput\').hide();
 	        });'
 	. '    ' . PHP_EOL
 	. '    jQuery(\'.cute-time\').cuteTime();' . PHP_EOL
 	. '  });' . PHP_EOL
 	. '        </script>' . PHP_EOL;
       echo '        <div id="sharedialog" title="Share Schedule">' . PHP_EOL
 	. '          <p class="indent"><img class="noborder" src="http://facebook.com/favicon.ico" /> <a target="_blank" href="http://www.facebook.com/sharer.php?u=' . urlencode(htmlentities($outputPage->gen_share_url($this->id_get()))) .'&amp;t=My%20Schedule">Share on Facebook</a></p><p class="indent">You can also share your schedule with the URL below:<br /><em class="centeredtext smallurl">' . htmlentities($outputPage->gen_share_url($this->id_get())) . '</em></p>' . PHP_EOL
 	. '        </div>' . PHP_EOL
@@ @@ -754,13 +764,20 @@ class Schedule @@
 	     . "</div> <!-- id=\"my-glider\" -->\n"
 	     . $footcloser; // Closes off the content div
       } else {
       echo '<html><body><p>There are no possible schedules. Please <a href="input.php?s='.$this->id.'">try again</a>.</p></body></html>';
+    }
     echo "<p id=\"possiblestats\">There were a total of " . $this->possiblePermutations . " possible permutations. Only " . $this->nPermutations . " permutations had no class conflicts.</p>";
     echo '<p id="possiblestats">' . PHP_EOL
       . '  There were a total of ' . $this->possiblePermutations . ' possible permutations. Only ' . $this->nPermutations . ' permutations had no class conflicts.' . PHP_EOL
       . '</p>' . PHP_EOL;
     if ($this->created)
       echo ''
 	. '<p id="created-time">' . PHP_EOL
 	. '  Created <span class="cute-time">' . date('c', $this->created) . '</span>.' . PHP_EOL
 	. '</p>' . PHP_EOL;
     $outputPage->foot();
+  }
   //--------------------------------------------------
   // Changes the title of the page.
@@ @@ -899,12 +916,25 @@ class Schedule @@
+  {
     return $this->parent_id;
+  }
   /**
    * \brief
    *   Get the unix timestamp of when this schedule was created
    *   (saved).
+   *
    * \return
    *   A unix timestamp. 0 if the timestamp is unavailable.
    */
   public function created_get()
+  {
     return $this->created;
+  }
   /**
    * \brief
    *   A magic function which tries to upgrade old serialized sections
    *   to the new format.
    */
   function __wakeup()
+  {
     if ($this->nclasses != -1)
@@ @@ -942,8 +972,11 @@ class Schedule @@
     if (empty($this->course_slot_mappings))
+      {
 	$this->course_slot_mappings = array();
 	foreach ($this->courses as $course_i => $course)
 	  $this->course_slot_mappings[$course_i] = count($this->course_slot_mappings);
+      }
     if (empty($this->created))
       $this->created = 0;
+  }
+}

0 comments (0 inline, 0 general)