Changeset 311 for trunk

Timestamp:

Apr 9, 2011, 8:15:31 PM (14 years ago)

Author:

george

Message:

• Upraveno: Stránka zobrazující dostupnost nyní používá společný systém řazení sloupců a stránkování.

Location:

trunk

Files:

• aktuality/index.php (modified) (1 diff)
• network/dostupnost.php (modified) (6 diffs)
• network/subnet.php (modified) (1 diff)

trunk/aktuality/index.php

@@ -110 +110 @@
 
           $_POST['content'] = str_replace("\n",'<br />',$_POST['content']);
-          $this->Database->insert('News',array('Category' => $Category, 'Title' => $_POST['title'], 'Content' => $_POST['content'], 'Date' => 'NOW()', 'IP' => $RemoteAddr, 'Enclosure' => $Enclosures, 'Author' => $this->System->Modules['User']->User['Name'], 'User' => $this->System->Modules['User']->User['Id'], 'Link' => $_POST['link']));
+          $this->Database->insert('News', array('Category' => $Category, 'Title' => $_POST['title'], 'Content' => $_POST['content'], 'Date' => 'NOW()', 'IP' => $RemoteAddr, 'Enclosure' => $Enclosures, 'Author' => $this->System->Modules['User']->User['Name'], 'User' => $this->System->Modules['User']->User['Id'], 'Link' => $_POST['link']));
           $Output .= 'Aktualita přidána!<br />Pokud budete chtít vaši aktualitu smazat, klikněte na odkaz Smazat v seznamu všech aktualit v kategorii.<br /><br />';
           $Output .= '<a href="index.php?category='.$_POST['category'].'">Zpět na seznam aktualit</a>';

trunk/network/dostupnost.php

@@ -7 +7 @@
   var $FullTitle = 'Dostupnost aktivních prvků sítě';
   var $ShortTitle = 'Dostupnost sítě';
-  var $PeriodCount = 12;
+  var $PeriodCount = 24;
   var $Period = array(
     array('Column' => 'Hour', 'Title' => 'Hodina', 'Period' => 1, 'MinPercent' => 100), 
@@ -37 +37 @@
       $HostTypeList[$DbRow['Id']] = $DbRow;
    
-    // Zařízení
-    $Output .= '<br /><table class="WideTable" style="font-size: small;">';
-    $Output .= '<tr><th>Jméno</th>';
+    
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM NetworkInterface JOIN NetworkDevice ON NetworkInterface.Device = NetworkDevice.Id WHERE NetworkDevice.Used = 1 AND NetworkDevice.PermanentOnline=1');
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);    
+
+    $Output .= '<br />';
+
+    $Output .= $PageList['Output'];
+    $Output .= '<table class="WideTable" style="font-size: small;">';
+   
+    $TableColumns = array(
+      array('Name' => 'DeviceName', 'Title' => 'Jméno'), 
+    );   
+   
     
     $Join = '';
@@ -45 +56 @@
     if(!array_key_exists('Period', $_GET))
     {
-      foreach($this->Period as $Period)
+      foreach($this->Period as $Index => $Period)
       {
-        $Output .= '<th>'.$Period['Title'].' [%]</th>';
+        $TableColumns[] = array('Name' => $Period['Column'], 'Title' => $Period['Title'].' [%]');
         $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'];
@@ -58 +69 @@
         {
           $Period = $this->Period[$_GET['Period']];
-          $Output .= '<th>-'.$I.' [%]</th>';
+          $TableColumns[] = array('Name' => 'Period'.$I.'Column', 'Title' => $I.' [%]');
           $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';
@@ -65 +76 @@
     }
 
-    $Output .= '</tr>';
+    $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
+    $Output .= $Order['Output'];
       
-    $DbResult2 = $this->Database->query('SELECT NetworkInterface.Name'.$Columns.', NetworkDevice.Name AS DeviceName FROM NetworkInterface '.$Join.' JOIN NetworkDevice ON NetworkInterface.Device = NetworkDevice.Id WHERE NetworkDevice.Used = 1 AND NetworkDevice.PermanentOnline=1 ORDER BY DeviceName, Name');
+    $DbResult2 = $this->Database->query('SELECT NetworkInterface.Name AS InterfaceName'.$Columns.', CONCAT(NetworkDevice.Name, "-", NetworkInterface.Name) AS Name, NetworkDevice.Name AS DeviceName FROM NetworkInterface '.$Join.' JOIN NetworkDevice ON NetworkInterface.Device = NetworkDevice.Id WHERE NetworkDevice.Used = 1 AND NetworkDevice.PermanentOnline=1'.$Order['SQL'].$PageList['SQLLimit']);
     while($Interface = $DbResult2->fetch_assoc())
     {
       $Name = $Interface['DeviceName'];
-      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+      if($Interface['InterfaceName'] != '') $Name .= '-'.$Interface['InterfaceName'];
       $Output .= '<tr><td>'.$Name.'</td>';
       if(!array_key_exists('Period', $_GET))
@@ -96 +108 @@
     }
     $Output .= '</table></div>';
+    $Output .= $PageList['Output'];
     return($Output);
   }

trunk/network/subnet.php

@@ -26 +26 @@
       array('Name' => 'SubjectName', 'Title' => 'Účastník'), 
     );
-    $Order = GetOrderTableHeader($TableColumns, 'NetworkSubnet.AddressRange', 0);
+    $Order = GetOrderTableHeader($TableColumns, 'AddressRange', 0);
     $Output .= $Order['Output'];