Changeset 164 for www/otevreno.php

Timestamp:

Feb 21, 2009, 11:04:42 AM (15 years ago)

Author:

george

Message:

• Opraveno: Mazání položek ze seznamu online uživatelů.
• Upraveno: Zobrazování členů sítě správcům financí.
• Opraveno: Další menší opravy v souvislosti s předěláváním tabulky users.

File:

• www/otevreno.php (modified) (4 diffs)

www/otevreno.php

@@ -7 +7 @@
   var $ShortTitle = 'Otvírací doby';
   var $DaysOfWeek = array('Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota', 'Neděle');
+  var $DayShift = 3;
 
   function Show()
@@ -15 +16 @@
     {
       $Output .= '<strong>'.$Subject['Name'].':</strong><br />';
-      $DbResult2 = $this->Database->query('SELECT Subject, OpenTime, CloseTime, TIMEDIFF(CloseTime, DATE_FORMAT(NOW(), "0000-01-%w %T")) as RemainTime FROM `SubjectOpenTimeInterval` WHERE DATE_FORMAT(NOW(), "0000-01-%w %T") > OpenTime AND DATE_FORMAT(NOW(), "0000-01-%w %T") < CloseTime AND Subject='.$Subject['Subject']);
+          
+      $DbResult2 = $this->Database->query('SELECT Subject, OpenTime, CloseTime, TIMEDIFF(DATE_FORMAT(CloseTime, "0000-01-%w %T"), DATE_FORMAT(NOW(), "0000-01-%w %T")) as RemainTime FROM `SubjectOpenTimeInterval` WHERE DATE_FORMAT(NOW(), "0000-01-%w %T") > OpenTime AND DATE_FORMAT(NOW(), "0000-01-%w %T") < CloseTime AND Subject='.$Subject['Subject']);
       if($DbResult2->num_rows > 0)
       {
@@ -26 +28 @@
         $Output .= 'Otevírá za '.$DbRow['RemainTime'];
       }
-      $Output .= '<table class="WideTable">
+
+          $Output .= '<table class="WideTable">
 <tr><th>Den</th><th>Čas</th></tr>';
       foreach($this->DaysOfWeek as $DayIndex => $DayOfWeek)
       {
-        $DbResult2 = $this->Database->query('SELECT *, DATE_FORMAT(OpenTime, "%k:%i") as OpenTime, DATE_FORMAT(CloseTime, "%k:%i") as CloseTime FROM SubjectOpenTimeInterval WHERE SubjectOpenTimeInterval.Subject = '.$Subject['Subject'].' AND ((DAYOFWEEK(OpenTime) + 0) MOD 7)='.$DayIndex);
+        $DbResult2 = $this->Database->query('SELECT *, DATE_FORMAT(OpenTime, "%k:%i") as OpenTime2, DATE_FORMAT(CloseTime, "%k:%i") as CloseTime2, DAYOFWEEK(OpenTime) as Week FROM SubjectOpenTimeInterval WHERE SubjectOpenTimeInterval.Subject = '.$Subject['Subject'].' AND ((DAYOFWEEK(OpenTime) + 7) MOD 7)='.$DayIndex);
         $Output .= '<tr><td>'.$DayOfWeek.'</td><td align="center">';
         if($DbResult2->num_rows)
@@ -36 +39 @@
           while($TimeInterval = $DbResult2->fetch_assoc())
           {
-            $Output .= $TimeInterval['OpenTime'].' - '.$TimeInterval['CloseTime'].' &nbsp;&nbsp; ';
+            $Output .= $TimeInterval['OpenTime2'].' - '.$TimeInterval['CloseTime2'].' &nbsp;&nbsp; ';
           }
         } else