Changeset 757

Timestamp:

Oct 26, 2015, 12:27:20 AM (9 years ago)

Author:

chronos

Message:

• Modified: Notification about network state should send only state changes.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Notify/Notify.php (modified) (1 diff)
• ToDo.txt (modified) (2 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 756; // Subversion revision
+$Revision = 757; // Subversion revision
 $DatabaseRevision = 755; // SQL structure revision
 $ReleaseTime = strtotime('2015-10-25');

trunk/Common/Setup/Updates.php

@@ -1524 +1524 @@
 {
   $Manager->Database->query('INSERT INTO `SchedulerAction` (`Id`, `Name`, `Class`) '.
-    'VALUES (NULL, "Kontrola změn stavů", "SchedulerNotifyCheck");');
+    'VALUES (NULL, "Kontrola změn stavů", "ScheduleNotifyCheck");');
 
   $Manager->Database->query('
@@ -1532 +1532 @@
   `Contact` int(11) NOT NULL,
   `Period` int(11) NOT NULL,
+  `LastTime` datetime NOT NULL,
   PRIMARY KEY (`Id`),
   KEY `User` (`User`),

trunk/Modules/Notify/Notify.php

@@ -51 +51 @@
       {
         if($Category['SysName'] == 'NetworkReachability') {
-          $DbResult3 = $this->Database->query('SELECT `Id`, `Name`, `Online`, `LastOnline` FROM `NetworkDevice` WHERE
-            (`LastOnline` > "'.$User['LastTime'].'") AND (`LastOnline` <= "'.TimeToMysqlDateTime($Time).'") '.
-            'AND (`PermanentOnline` = 1)');
+          $DbResult3 = $this->Database->query('SELECT CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) AS `Name`, '.
+            '`NetworkInterfaceUpDown`.`State`, `NetworkInterfaceUpDown`.`Duration`, `NetworkInterfaceUpDown`.`Time` FROM `NetworkInterfaceUpDown` '.
+            'LEFT JOIN `NetworkInterface` ON `NetworkInterface`.`Id` = `NetworkInterfaceUpDown`.`Interface` '.
+            'LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
+            'WHERE (`Time` > "'.$User['LastTime'].'") AND (`Time` <= "'.TimeToMysqlDateTime($Time).'") AND (`NetworkDevice`.`PermanentOnline`=1)');
           if($DbResult3->num_rows > 0) {
             $Output .= 'Category '.$Category['Name'].":\n";
             $Content .= 'Category '.$Category['Name']."<br>\n";
-            $Content .= '<table><tr><th>Jméno</th><th>Stav</th><th>Čas</th></tr>'."\n";
+            $Content .= '<table><tr><th align="center">Jméno</th><th align="center">Stav</th><th align="center">Čas</th><th align="center">Trvání</th></tr>'."\n";
             while($Item = $DbResult3->fetch_assoc())
             {
-              $Content .= '<tr><td>'.$Item['Name'].'</td><td>'.$OnlineText[$Item['Online']].'</td><td>'.$Item['LastOnline'].'</td></tr>'."\n";
+              $Duration = sprintf('%02d', floor($Item['Duration'] / 3600 % 24)).':'.
+                sprintf('%02d', floor($Item['Duration'] / 60 % 60)).':'.
+                sprintf('%02d', floor($Item['Duration'] % 60));
+              $Days = floor($Item['Duration'] / (60 * 60 * 24));
+              if($Days > 0) $Duration = $Days.' dnů '.$Duration;
+
+              $Content .= '<tr><td>'.$Item['Name'].'</td><td>'.$OnlineText[$Item['State']].
+                '</td><td>'.$Item['Time'].'</td><td>'.$Duration.'</td></tr>'."\n";
             }
             $Content .= '</table>'."\n";

trunk/ToDo.txt

@@ -28 +28 @@
   * Nastavení oprávnění uživatelů
   * API pro napojení jiných systémů
-  * Oblíbené položky nabídky uživatelů
   * Historie nabídky uživatelů
   * Předvolené sestavy filtrů, řazení, pořadí sloupců
@@ -53 +52 @@
 ======
 
+- IS: Oblíbené položky nabídky uživatelů
 - Ruční filtrování a vyhledávání v tabulkách
 - Zprovoznit obsluhu stránek přes virtuální URL