SlatePermutate Changeset - 03fa89bf8deb · protofusion repositories

Changeset - 03fa89bf8deb

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Ethan Zonca - 15 years ago 2011-01-15 14:54:31
ez@ethanzonca.com

qTips are now shown on the first blank class (2nd to last row, first cell), fixing the issue from last commit.

3 files changed with 15 insertions and 9 deletions:

input.php

school.d/cedarville.inc

scripts/scheduleInput.js

0 comments (0 inline, 0 general)

input.php

➞

Show inline comments

@@ @@ -53,26 +53,28 @@ if ($sch) @@
+    {
       $my_hc .= input_class_js($sch->class_get($class_key), '    ');
+    }
+}
 else
+  {
     $default_classes = school_default_classes($school);
     foreach ($default_classes as $default_class)
       $my_hc .= input_class_js($default_class, '    ');
     $my_hc .= '    class_last = add_class();
 ';
+  }
 $my_hc .= '        addTips();';
 $my_hc .= '  });
 ';
 $inputPage->headcode_add('scheduleInput', $inputPage->script_wrap($my_hc), TRUE);
 $inputPage->head();
 /*
  * Force a student to choose a school or declare he's a generic
  * student before displaying the input form. To do this, we need
  * another variable in $_SESSION: $_SESSION['school_chosen'].
  */
 if ($school && (!empty($_REQUEST['school']) || $school['id'] != 'default'))
   $_SESSION['school_chosen'] = TRUE;
 if (!empty($_REQUEST['selectschool'])

school.d/cedarville.inc

➞

Show inline comments

@@ @@ -45,34 +45,34 @@ function cedarville_instructions_html() @@
 </ol> <!--'-->
 EOF;
+}
 /**
  * \brief
  *   Get a list of default classes (with sections (with meeting
  *   times)) for Cedarville students.
+ *
  * \return
  *   An array of Course objects.
  */
-/*
 function cedarville_default_classes()
+{
   $chapel = new Course('Chapel');
   $chapel->section_add(new Section('_', array(new SectionMeeting('mtwhf', '1000', '1045', '', 'chapel')),
 				   '', '_'));
   return array($chapel);
+}
-*/
 /**
  * \brief
  *   Parse given html into an array, first row is row headers
+ *
  * \param $html
  *   HTML that PHP's DOM would willingly would eat.
  */
 function table_parse($html)
+{
   libxml_use_internal_errors(true); // Suppress warnings
   $arr = array();

scripts/scheduleInput.js

➞

Show inline comments

@@ @@ -204,39 +204,46 @@ function genSectionHtml_n(cnum, name, sy @@
  * 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";
+}
 /** Add tooltips for user guidance */
 function addTips(id) {
   jQuery(id).qtip({
 function addTips() {
   var tr = jQuery('tr');
   var td = tr.eq(tr.length-2);
   jQuery('td:first', td).qtip({
     content: 'Type your class ID (such as PEF-1010)',
     style: {
       border: {
         width: 3,
         radius: 4,
         color: '#333'
       },
       name: 'dark',
       tip: true
     },
     show: { effect: { type: 'fade', length: 2000 } },
     show: { ready: true },
 /*    hide: { when: { event: 'inactive' } }, */
     corner: { target: 'topMiddle', tooltip: 'bottomMiddle' },
   });
+}
 /**
  * \brief
  *   Add a section to a class.
  */
 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, type));
     sectionsOfClass[cnum] ++;
+}
 function add_section(cnum)
+{
     return add_section_n(cnum, '', '', '', '', {'m':false, 't':false, 'w':false, 'h':false, 'f':false}, '', '', '');
@@ @@ -259,25 +266,25 @@ function add_sections(cnum, data) @@
+	{
 	    section = data.sections[i];
 	    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('#jsrows').append('<tr title="' + classNum + '" class="class class' + classNum + ' pclass' + classNum + '"><td class="nameTip"><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},
@@ @@ -285,27 +292,24 @@ function add_sections(cnum, data) @@
+							      {
 								  if (data.sections)
+								      {
 									  add_sections(this.class_num, data);
 									  add_class();
+								      }
+							      }
+						      }
 						      );
+				    }
 			    });
 		if(classNum == 0) {
 			addTips('.class'+classNum+ ' td:first');
+		}
 		classNum++;
 		return (classNum - 1);
 	};
 function add_class()
+{
     return add_class_n('');
+}
 /**
  * \brief

0 comments (0 inline, 0 general)