Changeset 195 for trunk/finance

Timestamp:

Apr 27, 2009, 7:25:40 AM (16 years ago)

Author:

george

Message:

• Upraveno: Kódování tabulek a sloupců sjednoceno na utf8_czech_ci.
• Opraveno: Zobrazení seznamu počítačů uživatele.

Location:

trunk/finance

Files:

• finance.php (modified) (1 diff)
• zarizeni.php (modified) (2 diffs)

trunk/finance/finance.php

@@ -216 +216 @@
         $ID = $Row4['parent'];
       }
-      //echo('Pocet '.$Row3[0].','.$Row['hosts'].'<br>');
       $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'])));
     }

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 network_segments');    
     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");
+      $DbResult2 = $this->Database->query('SELECT * FROM network_devices WHERE segment='.$Row['id'].' AND used=1');
       while($Row = $DbResult2->fetch_array())
       {
@@ -21 +21 @@
       }
     }
-    $DbResult = $this->Database->query("SELECT SUM(price) FROM network_devices WHERE used=1");
+    $DbResult = $this->Database->query('SELECT SUM(price) FROM network_devices 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>';