Changeset 409

Timestamp:

Oct 4, 2012, 9:01:28 AM (12 years ago)

Author:

chronos

Message:

• Upraveno: Přejmenovaná tabulka network_device a hosts_topology.

Location:

trunk

Files:

• finance/finance.php (modified) (1 diff)
• finance/index.php (modified) (2 diffs)
• finance/inventory.php (modified) (1 diff)
• finance/manage.php (modified) (3 diffs)
• finance/spotreba.php (modified) (1 diff)
• finance/user_state.php (modified) (1 diff)
• finance/zarizeni.php (modified) (1 diff)
• finance/zivnost.php (modified) (2 diffs)
• form_classes.php (modified) (2 diffs)
• is/topologie-img2.php (modified) (2 diffs)
• sql/updates/409.sql (added)
• topologie.php (deleted)

trunk/finance/finance.php

@@ -165 +165 @@
       $Cash = $Cash[0];
     
-      $DbResult2 = $this->Database->query('SELECT SUM(consumption) FROM network_devices WHERE (user='.$Member['Id'].') AND (used = 1)');
+      $DbResult2 = $this->Database->query('SELECT SUM(Consumption) FROM Product WHERE (User='.$Member['Id'].') AND (used = 1)');
       $ConsumptionPlus = $DbResult2->fetch_row();
       $ConsumptionPlus = $ConsumptionPlus[0];

trunk/finance/index.php

@@ -35 +35 @@
     $Output .= 'Počet platících klientů: <strong>'.$Row2[0].'</strong><br />';
 
-    //$DbResult = $this->Database->query('SELECT SUM(price) FROM network_devices WHERE used=1');
+    //$DbResult = $this->Database->query('SELECT SUM(Price) FROM Product WHERE Used=1');
     //$Row4 = $DbResult->fetch_array();
     //$Output .= 'Celková cena zařízení sítě: <strong>'.$Row4[0].' Kč</strong><br />';
@@ -60 +60 @@
     $TotalGain = 0;
     $TotalExpense = 0;
-    $DbResult = $this->Database->query('SELECT SUM(consumption) FROM network_devices WHERE used=1');
+    $DbResult = $this->Database->query('SELECT SUM(Consumption) FROM Product WHERE Used=1');
     $Row = $DbResult->fetch_array();
     $TotalConsumption = $this->System->Modules['Finance']->W2Kc($Row[0]);

trunk/finance/inventory.php

@@ -12 +12 @@
     $Output = 'Výpis skladových zásob:<br><table class="WideTable">';
     $Output .= '<tr><th>Název</th><th>Datum<br />zakoupení</th><th>Cena [Kč]</th><th>Počet</th><th>Cena<br /> dohromady [Kč]</th></tr>';
-    $DbResult = $this->Database->query("SELECT * FROM network_devices WHERE used=2");
+    $DbResult = $this->Database->query("SELECT * FROM Product WHERE Used=2");
     while($Row = $DbResult->fetch_array())
     {
-      $Output .= '<tr><td>'.$Row['name'].'</td><td align="right">'.HumanDate($Row['date']).'</td><td align="right">'.$Row['price'].'</td><td align="right">'.$Row['count'].'</td><td align="right">'.$Row['count'] * $Row['price'].'</td></tr>';
-      $TotalPrice = $TotalPrice + $Row['count'] * $Row['price'];
+      $Output .= '<tr><td>'.$Row['Name'].'</td><td align="right">'.HumanDate($Row['Date']).'</td><td align="right">'.$Row['Price'].'</td><td align="right">'.$Row['Count'].'</td><td align="right">'.$Row['Count'] * $Row['Price'].'</td></tr>';
+      $TotalPrice = $TotalPrice + $Row['Count'] * $Row['Price'];
     }
 

trunk/finance/manage.php

@@ -69 +69 @@
         $Output .= '<a href="clenove.php">Seznam členů</a><br />';
         $Output .= '<a href="zivnost.php">Živnost</a><br />';
+        $Output .= '<a href="inventory.php">Stav skladu</a><br />';
         $Output .= '<a href="?Operation=GenerateBills">Generovat chybějící doklady</a><br />';
         $Output .= '<a href="import.php">Import plateb</a><br />';
@@ -294 +295 @@
 
     // Celkovy prehled
-    $DbResult = $this->Database->query('SELECT SUM(price) FROM network_devices WHERE used = 1');
+    $DbResult = $this->Database->query('SELECT SUM(Price) FROM Product WHERE Used = 1');
     $Row = $DbResult->fetch_row();
     $TotalDeviceCost = $Row[0];
@@ -314 +315 @@
     $Output .= 'Stav pokladny: Členové('.$TotalMemberCash.')';   
 
-    $DbResult = $this->Database->query('SELECT SUM(consumption) FROM network_devices WHERE used=1');
+    $DbResult = $this->Database->query('SELECT SUM(Consumption) FROM Product WHERE Used=1');
     $Row = $DbResult->fetch_row();
     $TotalConsumption = $Row[0];

trunk/finance/spotreba.php

@@ -15 +15 @@
     $CelkovaSpotreba = 0;
     $DbResult = $this->Database->query("SELECT * FROM NetworkSegment");
-    while($Row = $DbResult->fetch_array())
+    while($Segment = $DbResult->fetch_array())
     {
-      $DbResult2 = $this->Database->query("SELECT SUM(consumption) FROM network_devices WHERE Segment=".$Row['Id']." AND Used=1");
+      $DbResult2 = $this->Database->query("SELECT SUM(Consumption) FROM Product WHERE Segment=".$Segment['Id']." AND Used=1");
       $Row2 = $DbResult2->fetch_array();
       $CelkovaSpotreba = $CelkovaSpotreba + $Row2[0];

trunk/finance/user_state.php

@@ -115 +115 @@
       $Output .= 'Měsíční příjem za spotřebu zařízení umístěných u uživatele:<br>';
       $Output .= '<table class="WideTable"><tr><th>Název zařízení</th><th>Spotřeba [W]</th><th>Příjem [Kč]</th></tr>';
-      $DbResult = $this->Database->query('SELECT * FROM network_devices WHERE user='.$Member['Subject'].' AND used=1');
+      $DbResult = $this->Database->query('SELECT * FROM Product WHERE User='.$Member['Subject'].' AND Used=1');
       $TotalW = 0;
       $TotalPrice = 0;
       while($Row = $DbResult->fetch_assoc())
       {
-        $Output .= '<tr><td>'.$Row['name'].'</td><td>'.$Row['consumption'].'</td><td>'.$this->System->Modules['Finance']->W2Kc($Row['consumption']).'</td></tr>';
-        $TotalW += $Row['consumption'];
-        $TotalPrice += $this->System->Modules['Finance']->W2Kc($Row['consumption']);
+        $Output .= '<tr><td>'.$Row['Name'].'</td><td>'.$Row['Consumption'].'</td><td>'.$this->System->Modules['Finance']->W2Kc($Row['Consumption']).'</td></tr>';
+        $TotalW += $Row['Consumption'];
+        $TotalPrice += $this->System->Modules['Finance']->W2Kc($Row['Consumption']);
       }
       $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$TotalW.'</strong></td><td><strong>'.$TotalPrice.'</strong></td></tr>';

trunk/finance/zarizeni.php

@@ -12 +12 @@
     $Output = 'Seznam segmentů a zařízení:<br><table style="font-size: smaller;" class="WideTable"><tr><th>Název</th><th>Spotřeba<br>[W]</th><th>Datum<br>zakoupení</th><th>Cena [Kč]</th></tr>';
     $DbResult = $this->Database->query('SELECT * FROM NetworkSegment');    
-    while($Row = $DbResult->fetch_array())
+    while($Segment = $DbResult->fetch_array())
     {
-      $Output .= '<tr><td style="text-align: left" colspan="3"><strong>Segment: '.$Row['Name'].' ('.$Row['Users'].')</strong></td><td style="font-weight: Bold;" align="right">'.$Row['Price'].'</td></tr>';
-      $DbResult2 = $this->Database->query('SELECT * FROM network_devices WHERE segment='.$Row['Id'].' AND used=1');
+      $Output .= '<tr><td style="text-align: left" colspan="3"><strong>Segment: '.$Segment['Name'].' ('.$Segment['Users'].')</strong></td><td style="font-weight: Bold;" align="right">'.$Segment['Price'].'</td></tr>';
+      $DbResult2 = $this->Database->query('SELECT * FROM Product WHERE Segment='.$Segment['Id'].' AND used=1');
       while($Row = $DbResult2->fetch_array())
       {
-        $Output .= '<tr><td style="text-align: left; padding-left: 20px;">'.$Row['Name'].'</td><td align="right">'.$Row['consumption'].'</td><td align="right">'.HumanDate($Row['Date']).'</td><td align="right">'.$Row['Price'].'</td></tr>';
+        $Output .= '<tr><td style="text-align: left; padding-left: 20px;">'.$Row['Name'].'</td><td align="right">'.$Row['Consumption'].'</td><td align="right">'.HumanDate($Row['Date']).'</td><td align="right">'.$Row['Price'].'</td></tr>';
       }
     }
-    $DbResult = $this->Database->query('SELECT SUM(price) FROM network_devices WHERE used=1');
+    $DbResult = $this->Database->query('SELECT SUM(Price) FROM Product WHERE Used=1');
     $Row = $DbResult->fetch_array();
     $Output .= '<tr><td colspan="3"><strong>Celkem:</strong></td><td align="right"><strong>'.$Row[0].'</strong></td></tr>';

trunk/finance/zivnost.php

@@ -64 +64 @@
 
     // SmallAssets
-    $DbResult = $this->Database->query('SELECT SUM(price) FROM network_devices WHERE (TimeEnlistment < "'.TimeToMysqlDateTime($StartTime).'") AND (TimeEnlistment != 0) AND ((TimeElimination > "'.TimeToMysqlDateTime($StartTime).'") OR (TimeElimination = 0))');
+    $DbResult = $this->Database->query('SELECT SUM(Price) FROM Product WHERE (TimeEnlistment < "'.TimeToMysqlDateTime($StartTime).'") AND (TimeEnlistment != 0) AND ((TimeElimination > "'.TimeToMysqlDateTime($StartTime).'") OR (TimeElimination = 0))');
     //$Output .= $Database->error;
     $Row = $DbResult->fetch_array();
     $Balance['SmallAssets']['Start'] = $Row[0] + 0;
-    $DbResult = $this->Database->query('SELECT SUM(price) FROM network_devices WHERE (TimeEnlistment < "'.TimeToMysqlDateTime($EndTime).'") AND (TimeEnlistment != 0) AND ((TimeElimination > "'.TimeToMysqlDateTime($EndTime).'") OR (TimeElimination = 0))');
+    $DbResult = $this->Database->query('SELECT SUM(Price) FROM Product WHERE (TimeEnlistment < "'.TimeToMysqlDateTime($EndTime).'") AND (TimeEnlistment != 0) AND ((TimeElimination > "'.TimeToMysqlDateTime($EndTime).'") OR (TimeElimination = 0))');
     $Row = $DbResult->fetch_array();
     $Balance['SmallAssets']['End'] = $Row[0] + 0;
@@ -248 +248 @@
         $Output .= '<table style="font-size: smaller;" border="1" cellspacing="0" cellpadding="3">';
         $Output .= '<tr><th>Název</th><th>Hodnota [Kč]</th><th>Datum zakoupení</th><th>Datum vyřezení</th></tr>';
-        $DbResult = $this->Database->query('SELECT * FROM network_devices WHERE used != 0');
-        while($Row = $DbResult->fetch_array())
-        {
-          $Output .= '<tr><td>'.$Row['name'].'</td><td>'.$Row['price'].'</td><td>'.$Row['TimeEnlistment'].'</td><td>'.$Row['TimeElimination'].'</td></tr>';
+        $DbResult = $this->Database->query('SELECT * FROM Product WHERE Used != 0');
+        while($Row = $DbResult->fetch_array())
+        {
+          $Output .= '<tr><td>'.$Row['Name'].'</td><td>'.$Row['Price'].'</td><td>'.$Row['TimeEnlistment'].'</td><td>'.$Row['TimeElimination'].'</td></tr>';
         }
         $Output .= '</table>';

trunk/form_classes.php

@@ -114 +114 @@
   'NewNetworkDevice' => array(
     'Title' => 'Vložit nové zařízení',
-    'Table' => 'network_devices',
+    'Table' => 'Product',
     'Items' => array(
       'name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
@@ -198 +198 @@
   'TNetworkDevice' => array(
     'Type' => 'Reference',
-    'Table' => 'network_devices',
+    'Table' => 'Product',
     'Id' => 'id',
     'Name' => 'name',

trunk/is/topologie-img2.php

@@ -9 +9 @@
 
 // === Vytvoř stromy a ulož výsledek do databáze ===============================
-$DbResult = $Database->query("SELECT MAX(pos), MAX(depth) FROM hosts_topology");
+$DbResult = $Database->query("SELECT MAX(Pos), MAX(Depth) FROM NetworkTopology");
 $item = $DbResult->fetch_array();
 $width = $item[0];
@@ -37 +37 @@
 
 //$DbResult = $Database->query("SELECT * FROM hosts, hosts_topology WHERE host = id AND used=1");
-$DbResult = $Database->query("SELECT tpl.*, tpl.host AS id, dev.name AS name, dev.online AS online, dtp.iconname AS iconname, 1 AS showonline
-  FROM hosts_topology tpl LEFT JOIN NetworkDevice dev ON dev.id = tpl.host LEFT JOIN NetworkDeviceType dtp ON dev.type = dtp.id");
+$DbResult = $Database->query("SELECT tpl.*, tpl.Host AS id, dev.Name AS name, dev.Online AS online, dtp.IconName AS iconname, 1 AS showonline
+  FROM NetworkTopology tpl LEFT JOIN NetworkDevice dev ON dev.id = tpl.host LEFT JOIN NetworkDeviceType dtp ON dev.type = dtp.id");
 while($item = $DbResult->fetch_array()) 
 {
   $id = $item['id'];
-  $vleft = $item['pos'];
-  $vtop = $item['depth'];
-  $vfirst = $item['first'];
-  $vlast = $item['last'];
+  $vleft = $item['Pos'];
+  $vtop = $item['Depth'];
+  $vfirst = $item['First'];
+  $vlast = $item['Last'];
   if(($vtop > 0) || ($item['name'] == $TopHostName)) 
   {