Changeset 17488 for schedule/Module

Timestamp:

01/07/14 10:53:56 (11 years ago)

Author:

tose

Message:

 

File:

• schedule/Module/control.php (modified) (7 diffs)

schedule/Module/control.php

@@ -1 +1 @@
 <script language="javascript">
-
         var ctr;
         
@@ -146 +145 @@
 $days = Date('Y-m-d',strtotime($day));  
 $prev_time = array();
+$previousData = "false";
+$transaction = "save";
+
 ?>
 function addRowCloneNew(nextrow){
@@ -212 +214 @@
                                 )
                                 })
-                        
                         }
                         }) // End of retrieving
@@ -303 +304 @@
 }
 
-
 function addRowClone(nextrow){
         <?php
-        $fetch = mysql_query("SELECT * FROM schedule WHERE date(fStart) = '$days' ORDER BY fScheduleID ASC, fMeasurementID ASC") or die(mysql_error());
+        if($previousData == "true") {
+                $fetch = mysql_query("SELECT * FROM schedule WHERE date(fStart) < '$days' ORDER BY date(fStart) DESC, fScheduleID ASC, fMeasurementID ASC") or die(mysql_error());      
+                $firstRecord = mysql_fetch_array($fetch);
+                if($firstRecord != null) {
+                        $firstRecordDate = strtotime($firstRecord['fStart']);
+                        $days = date('Y-m-d', $firstRecordDate);
+                }
+                $previousData = "false";
+        }
+        else {
+                $fetch = mysql_query("SELECT * FROM schedule WHERE date(fStart) = '$days' ORDER BY fScheduleID ASC, fMeasurementID ASC") or die(mysql_error());
+                $transaction = "update";
+        }
+
         $observationsCount = mysql_query("SELECT COUNT(DISTINCT fStart) FROM schedule WHERE date(fStart) = '$days'");
         $observationsTime = mysql_query("SELECT DISTINCT fStart FROM schedule WHERE date(fStart) = '$days'");
@@ -320 +333 @@
                         $prev_time[$cnt3]= $date_time;
         ?>
-                        $('#save').attr('value','UPDATE');
                                 var targetView = document.getElementById("Data");
                                 // CREATE ELEMENT
@@ -399 +411 @@
                                 } 
                                 ?>
-                                                
-                                                
                                                         selection.setAttribute('id','measure'),
                                                         selection.setAttribute('class','measure')
@@ -501 +511 @@
         }
 
-        if(mysql_num_rows($fetch)<1)
-        {
+        if((mysql_num_rows($fetch)<1) || ($transaction == "save"))      
+        { 
+                $transaction = "save";
         ?>
-                $('#save').attr('value','SAVE');
+                $('#save').attr('value','SAVE');                
                 addRowCloneNew();
         <?php
+        } 
+        else {
+        ?>      
+                $('#save').attr('value','UPDATE');
+        <?php
         }
         ?>
-                
 }
 
+function loadPreviousData(){
+        <?php $previousData = "true"; ?>
+        addRowClone();
+}
  </script>