Changeset 17707 for trunk/FACT++

Timestamp:

04/28/14 11:33:08 (10 years ago)

Author:

tbretz

Message:

Adapted table name from measurement to Measurement

Location:

trunk/FACT++/www/schedule

Files:

• load.php (modified) (1 diff)
• save.php (modified) (2 diffs)

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

@@ -54 +54 @@
 query("SELECT DISTINCT(DATE(ADDTIME(fStart, '-12:00'))) AS 'd' FROM Schedule");
 query("SELECT fSourceKEY AS 'key', fSourceName AS 'val' FROM Source WHERE fSourceTypeKEY=1");
-query("SELECT fMeasurementKEY AS 'key', fMeasurement AS 'val' FROM measurement");
+query("SELECT fMeasurementKEY AS 'key', fMeasurement AS 'val' FROM Measurement");
 query("SELECT * FROM Schedule WHERE DATE(ADDTIME(fStart, '-12:00:00')) = '".$_POST['n']."'".$cut."ORDER BY fScheduleID ASC, fMeasurementID ASC");
 

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

@@ -139 +139 @@
     die(mysql_error());
 
-$query = "SELECT * FROM measurement";
+$query = "SELECT * FROM Measurement";
 
 $sql = mysql_query($query);
@@ -206 +206 @@
     $v = $row[3]; // value
 
+    // Check if task need source or must not have a source
     if ($measurements[$m]['fNeedsSource']==true && $s==0)
         die("Task '".$measurements[$m]['fMeasurement']."' needs source.\n[".$t."|".$id."]");