SlatePermutate Changeset - b7ba846fb562 · protofusion repositories

Changeset - b7ba846fb562

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 2 0

Nathan Brink (binki) - 15 years ago 2010-09-23 20:36:28
ohnobinki@ohnopublishing.net

merge in normaldotcom's changes.

2 files changed with 63 insertions and 5 deletions:

input.php

scripts/scheduleInput.js

0 comments (0 inline, 0 general)

input.php

➞

Show inline comments

 <?php
 include_once 'errors.php';
 include_once 'class.schedule.php';
 include_once 'class.class.php';
 include_once 'class.section.php';
 include_once 'inc/class.page.php';
 $scripts = array('jQuery','jValidate','schedInput');
 $inputPage = new page('Scheduler', $scripts);
 $inputPage->showSavedScheds($_SESSION);
 ?>
 <form method="post" action="process.php" id="scheduleForm">
 <table id="jsrows">
 	<tr>
 		<td colspan="11" style="padding-bottom:2em;"><input id="scheduleName" class="defText" type="text" class="required" title="Schedule Name" name="postData[name]" />
 			<em>(For example: Fall <?php echo Date("Y"); ?>)</em>
 		</td>
 	</tr>
 	<tr>
 		<td colspan="11" style="padding-bottom: 2em;">Sections at my school are <select id="isNumeric" type="text" class="required" name="isnumbered" ><option value="numbered">Numbered</option><option value="lettered">Lettered</option></select>
 	<!-- Header -->
 	<tr>
 		<td>Class</td>
-		<td class="center">Letter</td>
+		<td class="center" id="letterNumber">Number</td>
 		<td class="center">Start Time</td>
 		<td class="center">End Time</td>
 		<td class="center">M</td>
 		<td class="center">Tu</td>
 		<td class="center">W</td>
 		<td class="center">Th</td>
 		<td class="center">F</td>
 		<td class="center">Add</td>
 		<td class="center">Delete</td>
 	</tr>
 </table>
 <div class="paddingtop" id="classage"><input type="button" value="Add class" /></div>
 <div class="paddingtop"><input style="float:left;" type="submit" value="Submit" /></div>
 </form>
 <p>&nbsp;<br /></p>
 <h3>TODO:</h3>
 <ul>
 	<li>Form validation to ensure endtime is after starttime, at least one day is checked.</li>
 	<li>Auto-populate form based on saved schedule?</li>

scripts/scheduleInput.js

➞

Show inline comments

@@ @@ -36,60 +36,88 @@ @@
 		"<p class=\"error\">Please select one or more days!.</p>"
 	);
 */
 	jQuery.validator.addClassRules("selectRequired", {
 		selectNone: true
 	});
 	jQuery.validator.addClassRules("daysRequire", {
 		daysRequired: true
 	});
     jQuery(document).ready(function() {
 	//--------------------------------------------------
 	// Validates the form (pre-submission check)
 	//--------------------------------------------------
 		jQuery('#scheduleForm').validate({
 			debug: false,
 		});
 	var classNum = 0;
 	var sectionsOfClass = new Array(); // holds number of sections for each class
         function numberedIds(name){
 		return '<td class="sectionIdentifier">\
                                 <select name="'+name+'"><option value="-">-</option><option value="1">1</option><option value="2">2</option>\
                                 <option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option>\
                                 <option value="8">8</option><option value="9">9</option><option value="10">10</option><option value="11">11</option></select></td>\
                                 </select></td>';
+        }
 	function letteredIds(name){
 		return '<td class="sectionIdentifier">\
                                 <select name="'+name+'"><option value="-">-</option><option value="A">A</option><option value="B">B</option>\
                                 <option value="C">C</option><option value="D">D</option><option value="E">E</option><option value="F">F</option><option value="G">G</option>\
                                 <option value="H">H</option><option value="I">I</option><option value="J">J</option><option value="K">K</option></select></td>\
                                 </select></td>';
+	}
 	//--------------------------------------------------
 	// Returns the common inputs for each new section.
 	//--------------------------------------------------
 	function getCommonInputs(cnum) {
 		var snum = sectionsOfClass[cnum];
 		var result = '<td>\
 		var result = '';
 		if(jQuery('#isNumeric').val() == "lettered"){
 			result = result + letteredIds('postData[' + cnum + '][' + snum + '][letter]') /* '<td class="sectionIdentifier">\
 				<select name="postData[' + cnum + '][' + snum + '][letter]"><option value="-">-</option><option value="A">A</option><option value="B">B</option>\
 				<option value="C">C</option><option value="D">D</option><option value="E">E</option><option value="F">F</option><option value="G">G</option>\
 				<option value="H">H</option><option value="I">I</option><option value="J">J</option><option value="K">K</option></select></td>\
 				</select></td>\
 			<td><select class="selectRequired" name="postData[' + cnum + '][' + snum + '][start]"><option value="none"></option>\
 				</select></td>'*/;
+		}
 		else {
                         result = result + numberedIds('postData[' + cnum + '][' + snum + '][letter]') /* '<td class="sectionIdentifier">\
                                 <select name="postData[' + cnum + '][' + snum + '][letter]"><option value="-">-</option><option value="1">1</option><option value="2">2</option>\
                                 <option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option>\
                                 <option value="8">8</option><option value="9">9</option><option value="10">10</option><option value="11">11</option></select></td>\
                                 </select></td>' */;
+		}
 		result = result + '<td><select class="selectRequired" name="postData[' + cnum + '][' + snum + '][start]"><option value="none"></option>\
 				<option value="700">7:00 am</option><option value="730">7:30 am</option>\
 				<option value="800">8:00 am</option><option value="830">8:30 am</option>\
 				<option value="900">9:00 am</option><option value="930">9:30 am</option>\
 				<option value="1000">10:00 am</option><option value="1030">10:30 am</option>\
 				<option value="1100">11:00 am</option><option value="1130">11:30 am</option>\
 				<option value="1200">12:00 pm</option><option value="1230">12:30 pm</option>\
 				<option value="1300">1:00 pm</option><option value="1330">1:30 pm</option>\
 				<option value="1400">2:00 pm</option><option value="1430">2:30 pm</option>\
 				<option value="1500">3:00 pm</option><option value="1530">3:30 pm</option>\
 				<option value="1600">4:00 pm</option><option value="1630">4:30 pm</option>\
 				<option value="1700">5:00 pm</option><option value="1730">5:30 pm</option>\
 				<option value="1800">6:00 pm</option><option value="1830">6:30 pm</option>\
 				<option value="1900">7:00 pm</option><option value="1930">7:30 pm</option>\
 				<option value="2000">8:00 pm</option><option value="2030">8:30 pm</option>\
 				<option value="2100">9:00 pm</option></select></td>\
 			<td><select class="selectRequired" name="postData[' + cnum + '][' + snum + '][end]"><option value="none"></option>\
 				<option value="720">7:20 am</option><option value="750">7:50 am</option>\
 				<option value="820">8:20 am</option><option value="850">8:50 am</option>\
 				<option value="920">9:20 am</option><option value="950">9:50 am</option>\
 				<option value="1020">10:20 am</option><option value="1050">10:50 am</option>\
 				<option value="1120">11:20 am</option><option value="1150">11:50 am</option>\
 				<option value="1220">12:20 pm</option><option value="1250">12:50 pm</option>\
 				<option value="1320">1:20 pm</option><option value="1350">1:50 pm</option>\
 				<option value="1420">2:20 pm</option><option value="1450">2:50 pm</option>\
@@ @@ -156,28 +184,56 @@ @@
 	//--------------------------------------------------
 	jQuery('#reset').click(function() {
 		jQuery('#scheduleForm').resetForm();
     });
 	//--------------------------------------------------
 	// Default text stuff
 	//--------------------------------------------------
     jQuery(".defText").focus(function(srcc)
+    {
         if (jQuery(this).val() == jQuery(this)[0].title)
+        {
             jQuery(this).removeClass("defaultTextActive");
             jQuery(this).val("");
+        }
     });
     jQuery(".defText").blur(function()
+    {
         if (jQuery(this).val() == "")
+        {
             jQuery(this).addClass("defaultTextActive");
             jQuery(this).val($(this)[0].title);
+        }
     });
     jQuery(".defText").blur();
     jQuery(".defText").blur();
     //--------------------------------------------------
     // Change between numbered and lettered on event
     //--------------------------------------------------
     jQuery("#isNumeric").live('change', function() {
       if(this.value == "lettered"){
          /* Replace with lettered */
          jQuery(".sectionIdentifier").each( function(index) {
            var name = jQuery("select", this).attr("name");
            jQuery(this).empty();
            jQuery(this).append(letteredIds(name));
            jQuery("#letterNumber").empty();
            jQuery("#letterNumber").append("Letter");
          });
+      }
       else {
          /* Replace with numbered */
          jQuery(".sectionIdentifier").each( function(index) {
            var name = jQuery("select", this).attr("name");
            jQuery(this).empty();
            jQuery(this).append(numberedIds(name));
            jQuery("#letterNumber").empty();
            jQuery("#letterNumber").append("Number");
          });
+      }
     });
 });

0 comments (0 inline, 0 general)