Changeset 18044 for trunk

Timestamp:

12/29/14 22:06:33 (10 years ago)

Author:

tbretz

Message:

If only have of the schedule is trasmitted, also the first entry must be checked about the limit not just the order of all entries.

Location:

trunk/FACT++/www/schedule

Files:

• index.js (modified) (3 diffs)
• save.php (modified) (3 diffs)

trunk/FACT++/www/schedule/index.js

@@ -31 +31 @@
         if (!el.valueAsDate)
         {
-            el.setAttribute("style", "color:#000000");
-            return;
+//            el.setAttribute("style", "color:#000000");
+            continue;
         }
 
@@ -144 +144 @@
         input1p.setAttribute("hidden", "true");
     // FIXME: Enable if this is the last "+" in tonight
-    if (disabled)
+    if (disabled && ! (table.isTonight && row.last))
         input1p.setAttribute("disabled", "true");
     input1p.onclick = function()
@@ -453 +453 @@
         table.cutTime = "12:00:00";
 
-    // Now loop over all rows and add them oine by one to the table
+    // Now loop over all rows and add them one by one to the table
     for (var i=0; i<schedule.length; i++)
     {
+        schedule[i].last   = schedule[schedule.length-1].fStart==schedule[i].fStart;
         schedule[i].fStart = schedule[i].fStart.replace('-', '/');
         schedule[i].fStart = schedule[i].fStart.replace('-', '/');

trunk/FACT++/www/schedule/save.php

@@ -96 +96 @@
 // Note that there is no sanity check yet, therefore the data and the
 // time variable must be consistent
+// FIXME: This should be 11:59:59 the prev day to allow for 12:00 being
+// the first possible entry, but this makes things below more complicated
 $time = isset($_POST['t']) ? $_POST['t'] : "12:00:00";
 
@@ -160 +162 @@
 // ----------------------------------------------------------------
 
+$last = $cut;
+
 foreach ($data as $row)
 {
@@ -183 +187 @@
     $t = $d['hour']<12 ? $nextDay." ".$t : $day." ".$t;
 
-    if (!isset($last))
-    {
-        $last = $t;
-    }
-    else
-    {
-        // Check all but the last task in a measurement whether
-        // the are not unlimited
-        if ($last==$t)
-        {
-            if ($measurements[$m]['fIsUnlimited']==true)
-                die("Unlimited task '".$measurements[$m]['fMeasurement']."' detected before end of observation\n[".$last."|".($id-1)."]");
-        }
-
-        if ($last>$t)
-            die("Times not sequential\n[".$last."|".$t."]");
-        $last = $t;
-    }
+    // Check all but the last task in a measurement whether
+    // the are not unlimited
+    if ($last==$t)
+    {
+        if ($measurements[$m]['fIsUnlimited']==true)
+            die("Unlimited task '".$measurements[$m]['fMeasurement']."' detected before end of observation\n[".$last."|".($id-1)."]");
+    }
+
+    if ($last>$t)
+        die("Times not sequential\n[".$last."|".$t."]");
+
+    $last = $t;
 
     $m = $row[1]; // measurement