Changeset 17558

Timestamp:

02/15/14 14:24:13 (11 years ago)

Author:

tose

Message:

Modified enabling/disabling for current schedule

File:

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

schedule/Module/control.php

@@ -342 +342 @@
             $curSchedId = $times['fScheduleID'];
             $actualtime = date('Y-m-d H:i:s', $timestamp);
-            if($prevday == 'false') {
+
+            if($prevday == 'false') {
                 if(strtotime(date('Y-m-d H:i', $timestamp)) < strtotime(date('Y-m-d H:i', time()))) {
                     $pastdate = 'true';
@@ -349 +350 @@
                     $pastdate = 'false';
                 }
-            }
-
+            } 
+            
+            
             if(strtotime(date('Y-m-d', $timestamp)) == strtotime(date('Y-m-d', time()))) {
                 $fetch_next = mysql_query("SELECT DISTINCT fStart FROM schedule WHERE (fStart > '$testing' AND date(fStart) = '$day') ORDER BY fScheduleID ASC LIMIT 1");
@@ -371 +373 @@
                 }
             }
-            else {
+            else if(strtotime(date('Y-m-d', $timestamp)) < strtotime(date('Y-m-d', time()))) {
+                $pasttime = 'true';
+                $pastdate = 'true';
+            } else {
+                $pasttime = 'false';
+                $pastdate = 'false';
+            }
+
+            if($prevday == 'true') {
+                $pastdate = 'false';
                 $pasttime = 'false';
             }
-
                 $date_time = date('H:i', $timestamp);
                 $prev_time[$cnt3]= $date_time;
 
                 ?>
-
                     $('#save').attr('value','UPDATE');
                        var targetView = document.getElementById("Data");
@@ -450 +459 @@
                                         }
                                     );
-                                <?php } else { if ($pastdate == 'true') { ?>
+                                <?php } else { /*if ($pastdate == 'true') { ?>
                                     newtd_c1.appendChild(
                                         input_data = document.createElement("input"),
@@ -460 +469 @@
                                         }
                                     );
-                                <?php } else {  ?>
+                                <?php } else {  ?>*/ ?>
                                     newtd_c1.appendChild(
                                         input_data = document.createElement("input"),
@@ -469 +478 @@
                                         }
                                 );
-                                <?php }}
+                                <?php }
                         $observations = mysql_query("SELECT * FROM schedule WHERE fStart = '$actualtime'");