Changeset 18797

Timestamp:

03/31/17 15:34:21 (8 years ago)

Author:

tbretz

Message:

Implemented that exclusive tasks are rejected if not scheduled exclusively.

File:

• trunk/FACT++/www/schedule/save.php (modified) (4 diffs)

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

@@ -181 +181 @@
         $save = $t;
         $id = 0;
+        $exclusive = 0;
     }
 
@@ -189 +190 @@
 
     if ($d==FALSE)
-        die("Could not parse time '".$t."' with date_parse");
+        die("Could not parse time '".$t."' with date_parse.");
 
     // Check all but the last task in a measurement whether
@@ -196 +197 @@
     {
         if ($measurements[$m]['fIsUnlimited']==true)
-            die("Unlimited task '".$measurements[$m]['fMeasurementTypeName']."' detected before end of observation\n[".$last."|".($id-1)."]");
+            die("Unlimited task '".$measurements[$m]['fMeasurementTypeName']."' detected before end of observation.\n[".$last."|".($id-1)."]");
     }
 
     if ($last>$t)
-        die("Times not sequential\n[".$last."|".$t."]");
+        die("Times not sequential.\n[".$last."|".$t."]");
 
     $last = $t;
@@ -207 +208 @@
     $s = $row[2]; // source
     $v = $row[3]; // value
+
+    // Check if measurement is exclusive
+    if ($measurements[$m]['fIsExclusive']==true || $exclusive>0)
+    {
+        if ($id>0)
+            die("Task '".$measurements[$m]['fMeasurementTypeName']."' must be scheduled exclusively.\n[".$t."|".$id."]");
+
+        $exclusive = $m+1;
+    }
 
     // Check if task need source or must not have a source