Changeset 408

Timestamp:

Oct 4, 2012, 8:29:32 AM (12 years ago)

Author:

chronos

Message:

• Upraveno: Přejmenována sql tabulka network_segments na NetworkSegment.

Location:

trunk

Files:

• finance/finance.php (modified) (5 diffs)
• finance/manage.php (modified) (1 diff)
• finance/spotreba.php (modified) (1 diff)
• finance/zarizeni.php (modified) (1 diff)
• form_classes.php (modified) (1 diff)
• sql/updates/408.sql (added)
• temp/CentralaModule (deleted)
• temp/MakeOpenERP.php (deleted)
• temp/sugar.php (deleted)

trunk/finance/finance.php

@@ -113 +113 @@
     
     $this->SpravaUsers = $this->InternetUsers;
-    $DbResult = $this->Database->query('SELECT SUM(consumption) FROM network_segments');
+    $DbResult = $this->Database->query('SELECT SUM(Consumption) FROM NetworkSegment');
     $TotalConsumption = $DbResult->fetch_array();
     $this->TotalConsumption = $TotalConsumption[0];
@@ -172 +172 @@
       $Consumption = 0;
       $ID = $Member['NetworkSegment'];
-      while($ID != 0)
-      {
-        $DbResult2 = $this->Database->query('SELECT * FROM `network_segments` WHERE `id`='.$ID);
+      while($ID != 'NULL')
+      {
+        $DbResult2 = $this->Database->query('SELECT * FROM `NetworkSegment` WHERE `Id`='.$ID);
         $Device = $DbResult2->fetch_assoc();
-        $NetworkDevice += $Device['price'] / $Device['users'];
-        $Consumption += $Device['consumption'] / $Device['users_overheads'];
+        $NetworkDevice += $Device['Price'] / $Device['Users'];
+        $Consumption += $Device['Consumption'] / $Device['UsersOverheads'];
         //echo($ID.' '.$InternetSegment.' '.$InternetSegmentId.' '.$Row['inet_hw'].' '.$Price.'<br>');
-        $ID = $Device['parent'];
+        $ID = $Device['Parent'];
       }
     
@@ -212 +212 @@
   {
     $Output = 'Aktualizuji parametry segmentů...<br />';
-    $this->Database->query('UPDATE `network_segments` SET `users` = 0, `users_overheads` = 0');     // Vynulovat počty uživatelů
-    $DbResult = $this->Database->query('SELECT * FROM `network_segments`');
+    $this->Database->query('UPDATE `NetworkSegment` SET `Users` = 0, `UsersOverheads` = 0');     // Vynulovat počty uživatelů
+    $DbResult = $this->Database->query('SELECT * FROM `NetworkSegments`');
     while($NetworkSegment = $DbResult->fetch_array())
     {
       //echo('Segment '.$Row['name'].'<br>');
-      $DbResult2 = $this->Database->query('SELECT `users` FROM `network_segments` WHERE `id`='.$NetworkSegment['id']);
+      $DbResult2 = $this->Database->query('SELECT `Users` FROM `NetworkSegment` WHERE `Id`='.$NetworkSegment['Id']);
       $RowP = $DbResult2->fetch_array();
-      $DbResult2 = $this->Database->query('SELECT `users_overheads` FROM `network_segments` WHERE `id`='.$NetworkSegment['id']);
+      $DbResult2 = $this->Database->query('SELECT `UsersOverheads` FROM `NetworkSegment` WHERE `Id`='.$NetworkSegment['Id']);
       $RowP2 = $DbResult2->fetch_array();
 
-      $DbResult2 = $this->Database->query('SELECT SUM(price) as Price, SUM(consumption) as Consumption FROM network_devices WHERE segment='.$NetworkSegment['id'].' AND used=1');
+      $DbResult2 = $this->Database->query('SELECT SUM(Price) AS Price, SUM(Consumption) AS Consumption FROM NetworkDevice WHERE Segment='.$NetworkSegment['Id'].' AND Used=1');
       $Row2 = $DbResult2->fetch_array();
       $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM Member WHERE NetworkSegment='.$NetworkSegment['id']);
@@ -230 +230 @@
       {
         //echo($ID.', ');
-        $DbResult2 = $this->Database->query('SELECT * FROM network_segments WHERE id='.$ID);
+        $DbResult2 = $this->Database->query('SELECT * FROM NetworkSegment WHERE Id='.$ID);
         $Row4 = $DbResult2->fetch_array();
-        $this->Database->update('network_segments', 'id='.$Row4['id'], array('users' => ($Row4['users'] + $Row3[0]), 'users_overheads' => ($Row4['users_overheads'] + $Row3[0])));
+        $this->Database->update('NetworkSegment', 'Id='.$Row4['Id'], array('Users' => ($Row4['Users'] + $Row3[0]), 'UsersOverheads' => ($Row4['UsersOverheads'] + $Row3[0])));
         $ID = $Row4['parent'];
       }
-      $this->Database->update('network_segments', 'id='.$NetworkSegment['id'], array('price' => $Row2['Price'], 'users' => ($Row3[0] + $RowP['users']), 'consumption' => $Row2['Consumption'], 'users_overheads' => ($Row3[0] + $RowP2['users_overheads'])));
+      $this->Database->update('NetworkSegment', 'Id='.$NetworkSegment['Id'], array('Price' => $Row2['Price'], 'Users' => ($Row3[0] + $RowP['Users']), 'Consumption' => $Row2['Consumption'], 'UsersOverheads' => ($Row3[0] + $RowP2['UsersOverheads'])));
     }
 
@@ -241 +241 @@
     $DbResult = $this->Database->select('Member', 'COUNT(*)');
     $Row = $DbResult->fetch_array();
-    $DbResult = $this->Database->update('network_segments','id='.$this->InternetSegmentId, array('users' => $Row[0], 'users_overheads' => $Row[0]));
+    $DbResult = $this->Database->update('NetworkSegments', 'Id='.$this->InternetSegmentId, array('Users' => $Row[0], 'UsersOverheads' => $Row[0]));
     $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateSegmentParameters');
     return($Output);

trunk/finance/manage.php

@@ -299 +299 @@
     $Output .= 'Celková cena zařízení: Zařízení('.$TotalDeviceCost;
     
-    $DbResult = $this->Database->query('SELECT SUM(price) FROM network_segments');
+    $DbResult = $this->Database->query('SELECT SUM(Price) FROM NetworkSegment');
     $Row = $DbResult->fetch_row();
     $TotalSegmentDeviceCost = $Row[0];

trunk/finance/spotreba.php

@@ -14 +14 @@
     $Output = 'Spotřeba zařízení jednotlivých segmentů:<div align="center"><table class="WideTable"><tr><th>Jméno segmentu</th><th>Spotřeba [W]</th><th>Cena [Kč/měsíc]</th></tr>';
     $CelkovaSpotreba = 0;
-    $DbResult = $this->Database->query("SELECT * FROM network_segments");
+    $DbResult = $this->Database->query("SELECT * FROM NetworkSegment");
     while($Row = $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 network_devices WHERE Segment=".$Row['Id']." AND Used=1");
       $Row2 = $DbResult2->fetch_array();
       $CelkovaSpotreba = $CelkovaSpotreba + $Row2[0];
-      $Output .= '<tr><td>'.$Row['name'].'</td><td align="right">'.$Row2[0].'</td><td align="right">'.$this->System->Modules['Finance']->W2Kc($Row2[0]).'</td></tr>';
+      $Output .= '<tr><td>'.$Row['Name'].'</td><td align="right">'.$Row2[0].'</td><td align="right">'.$this->System->Modules['Finance']->W2Kc($Row2[0]).'</td></tr>';
     }
     $Output .= '<tr style="font-weight: Bold;"><td><strong>Celkem</strong></td><td align="right">'.$CelkovaSpotreba.'</td><td align="right">'.$this->System->Modules['Finance']->W2Kc($CelkovaSpotreba).'</td></tr>';

trunk/finance/zarizeni.php

@@ -11 +11 @@
     // Seznam segmentů a zařízení
     $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 network_segments');    
+    $DbResult = $this->Database->query('SELECT * FROM NetworkSegment');    
     while($Row = $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: '.$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');
       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>';
       }
     }

trunk/form_classes.php

@@ -205 +205 @@
   'TNetworkSegment' => array(
     'Type' => 'Reference',
-    'Table' => 'network_segments',
+    'Table' => 'NetworkSegment',
     'Id' => 'id',
     'Name' => 'name',