Changeset 271 for trunk

Timestamp:

Jan 8, 2010, 8:20:18 PM (15 years ago)

Author:

george

Message:

• Opraveno: Zobrazování hodinových period u dostupnosti zařízení.

File:

• trunk/network/dostupnost.php (modified) (4 diffs)

trunk/network/dostupnost.php

@@ -7 +7 @@
   var $FullTitle = 'Dostupnost aktivních prvků sítě';
   var $ShortTitle = 'Dostupnost sítě';
+  var $PeriodCount = 12;
   var $Period = array(
     array('Column' => 'Hour', 'Title' => 'Hodina', 'Period' => 1), 
@@ -47 +48 @@
       {
         $Output .= '<th>'.$Period['Title'].' [%]</th>';
-        $Join .= ' LEFT JOIN (SELECT NetworkInterfaceStat.NetworkInterface, (SUM(NetworkInterfaceStat. PingCount) / '.$Period['Period'].' / 60 * 100) AS Percent FROM NetworkInterfaceStat WHERE (Time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL '.$Period['Period'].' HOUR)) AND (Time < DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY NetworkInterface) AS Period'.$Period['Column'].' ON Period'.$Period['Column'].'.NetworkInterface = NetworkInterface.Id';
+        $Join .= ' LEFT JOIN (SELECT NetworkInterfaceStat.NetworkInterface, (SUM(NetworkInterfaceStat. PingCount) / '.$Period['Period'].' / 60 * 100) AS Percent FROM NetworkInterfaceStat WHERE (Time > DATE_SUB(NOW(), INTERVAL '.($Period['Period'] + 1).' HOUR)) AND (Time < DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY NetworkInterface) AS Period'.$Period['Column'].' ON Period'.$Period['Column'].'.NetworkInterface = NetworkInterface.Id';
         $Columns .= ', Period'.$Period['Column'].'.Percent AS '.$Period['Column'];
       }
@@ -54 +55 @@
       if(array_key_exists($_GET['Period'], $this->Period))
       {
-        for($I = 0; $I < 10; $I++)
+        for($I = 0; $I < $this->PeriodCount; $I++)
         {
           $Period = $this->Period[$_GET['Period']];
           $Output .= '<th>-'.$I.' [%]</th>';
-          $Join .= ' LEFT JOIN (SELECT NetworkInterfaceStat.NetworkInterface, (SUM(NetworkInterfaceStat. PingCount) / '.$Period['Period'].' / 60 * 100) AS Percent FROM NetworkInterfaceStat WHERE (Time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL '.($Period['Period'] * ($I + 1)).' HOUR)) AND (Time < DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL '.($Period['Period'] * $I + 1).' HOUR)) GROUP BY NetworkInterface) AS Period'.$I.' ON Period'.$I.'.NetworkInterface = NetworkInterface.Id';
+          $Join .= ' LEFT JOIN (SELECT NetworkInterfaceStat.NetworkInterface, (SUM(NetworkInterfaceStat. PingCount) / '.$Period['Period'].' / 60 * 100) AS Percent FROM NetworkInterfaceStat WHERE (Time > DATE_SUB(NOW(), INTERVAL '.($Period['Period'] * ($I + 1) + 1).' HOUR)) AND (Time < DATE_SUB(NOW(), INTERVAL '.($Period['Period'] * $I + 1).' HOUR)) GROUP BY NetworkInterface) AS Period'.$I.' ON Period'.$I.'.NetworkInterface = NetworkInterface.Id';
           $Columns .= ', Period'.$I.'.Percent AS Period'.$I.'Column';
         }
@@ -80 +81 @@
         if(array_key_exists($_GET['Period'], $this->Period))
         {
-          for($I = 0; $I < 10; $I++)
+          for($I = 0; $I < $this->PeriodCount; $I++)
           {
             $Output .= '<td style="text-align: center;">'.sprintf('%01.2f', $Interface['Period'.$I.'Column']).'</td>';