SlatePermutate Changeset - 4b85fc33379c · protofusion repositories

Changeset - 4b85fc33379c

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 14 years ago 2011-10-18 20:21:56
ohnobinki@ohnopublishing.net

Fix JavaScript errors on schedule print page and restrict output only to schedule selected for printing.

1 file changed with 31 insertions and 19 deletions:

inc/class.schedule.php

0 comments (0 inline, 0 general)

inc/class.schedule.php

➞

Show inline comments

@@ @@ -430,54 +430,44 @@ class Schedule @@
      * only display the ``this page doesn't exist'' 404 if there is at
      * least one permutation. Otherwise, we give an irrelevant 404 for
      * users with no permutations.
      */
     if ($this->nPermutations && $page >= $npages)
       Page::show_404('Unable to find page ' . $page . ', there are only ' . $this->nPermutations . ' non-conflicting permutations, for a total of ' . $npages . ' pages.');
     /* zero-based */
     $first_permutation = $page * SP_PERMUTATIONS_PER_PAGE;
     $last_permutation = min($this->nPermutations, $first_permutation + SP_PERMUTATIONS_PER_PAGE);
     $footcloser = '';
     $headcode = array('jQuery', 'jQueryUI', 'uiTabsKeyboard', 'displayTables', 'outputStyle', 'jQuery.cuteTime');
+    $headcode = array('jQuery', 'jQueryUI', 'uiTabsKeyboard', 'displayTables', 'outputStyle', 'jQuery.cuteTime', 'qTip2');
     if(!empty($_REQUEST['print']))
       array_push($headcode, 'outputPrintStyle');
     else
-      array_push($headcode, 'jAddress', 'qTip2');
       array_push($headcode, 'jAddress');
     $outputPage = page::page_create(htmlentities($this->getName()), $headcode,
 				    array('school' => $this->school_get(), 'semester' => $this->semester_get()));
     $outputPage->head();
     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){
 	  echo 'jQuery(\'#tabs-'.$item.'\').show();';
+	}
+      }
       echo '}); '; /* Close document.ready for jQuery */
       echo 'window.print(); </script>';
       echo '<p><a href="'.$_SERVER['SCRIPT_NAME'].'?s=' . $this->id_get() . '">&laquo; Return to normal view</a> </p>';
 	$script = ''
 	  . 'jQuery(document).ready( function() {' . PHP_EOL
 	  . '  window.print();' . PHP_EOL
 	  . '});';
 	echo $outputPage->script_wrap($script);
 	echo '<p><a href="'.$_SERVER['SCRIPT_NAME'].'?s=' . $this->id_get() . '">&laquo; Return to normal view</a> </p>';
+    }
     else {
       echo '        <script type="text/javascript">';
       echo '  jQuery(document).ready( function() {';
       echo '    jQuery("#tabs").tabs();';
       echo '    jQuery.address.change(function(event){';
       echo '      jQuery("#tabs").tabs( "select" , window.location.hash );';
       echo '    });';
       echo '    jQuery("#tabs").bind("tabsselect", function(event, ui) {';
       echo '      window.location.hash = ui.tab.hash;';
       echo '    });';
@@ @@ -592,49 +582,71 @@ class Schedule @@
 	echo '<div id="tabs">' . "\n" .
                '<div id="show-box" class="show-buttons">
                   <form action="#"><p class="nospace">
                     <label><strong>Display:</strong></label>
                     <input id="show-course-title" name="show-course-title" type="checkbox" /><label for="show-course-title">Course Title</label>
                     <input id="show-prof" name="show-prof" type="checkbox" checked="checked" /><label for="show-prof">Professor</label>
                     <input id="show-location" name="show-location" type="checkbox" /><label for="show-location">Room</label>
                     <input id="show-synonym" name="show-synonym" type="checkbox" /><label for="show-synonym">Synonym</label>
                     <span id="regCodes"><label><a href="#"><strong>Register for Classes</strong></a></label></span></p>
                   </form>
                 </div> <!-- id="show-box" -->'
 	     . '<div id="the-tabs"><ul>' . "\n";
 	$suppressed_permutations = array();
 	if (!empty($_REQUEST['print']))
+	  {
 	    $print = $_REQUEST['print'];
 	    if ($print !== 'all')
+	      {
 		for ($i = $first_permutation; $i <= $last_permutation; $i ++)
 		  $suppressed_permutations[$i] = TRUE;
 		foreach (explode(',', $print) as $item_to_print)
 		  unset($suppressed_permutations[((int)$item_to_print) - 1]);
+	      }
+	  }
 	for($nn = $first_permutation + 1; $nn <= $last_permutation; $nn++)
+	  {
 	    if (!empty($suppressed_permutations[$nn - 1]))
 	      continue;
 	    echo  "<li><a href=\"#tabs-" . $nn . "\">&nbsp;" . $nn . "&nbsp;</a></li>\n";
+	  }
 	echo "    </ul></div>\n  \n";
 	echo "    <div id=\"pagers\">\n";
 	/* Previous button */
 	if ($page > 0)
 	  echo '      <div id="pager-previous" class="pager left"><a href="' . htmlentities($this->my_url($this->id, $page - 1)) . '">&laquo; Previous</a></div>' . "\n";
 	/* Next button */
 	if ($page + 1 < $npages)
 	  echo '      <div id="pager-next" class="pager right"><a href="' . htmlentities($this->my_url($this->id, $page + 1)) . '">Next &raquo;</a></div>' . "\n";
 	echo "    </div> <!-- id=\"pagers\" -->\n";
 	echo "  <div class=\"scroller\">\n"
 	  . "    <div class=\"scontent\">\n";
 	for($i = $first_permutation; $i < $last_permutation; $i++)
+	  {
 	    /*
 	     * Skip suppressed permutations, such as when displaying a
 	     * page for printing a particular permutation.
 	     */
 	    if (!empty($suppressed_permutations[$i]))
 	      continue;
 	    /*
 	     * Store a JSON list of courses, each with only the one
 	     * section rendered in this permutation. This is used for
 	     * the ``Registration Numbers'' dialog which noramlly
 	     * shows users course synonyms.
 	     */
 	    $permutation_courses = array();
 	     echo  '      <div class="section" id="tabs-' . ($i+1) . "\">\n";
 	    // Beginning of table
 	    echo "        <table style=\"empty-cells:show;\" border=\"1\" cellspacing=\"0\">\n";

0 comments (0 inline, 0 general)