Changeset 452 for trunk/finance/spotreba.php

Timestamp:

Oct 28, 2012, 10:20:32 AM (12 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazování odkazů v aktualitách.
• Upraveno: Tabulka Product rozdělena na Product a StockItem. Upravena struktura.

File:

• trunk/finance/spotreba.php (modified) (1 diff)

trunk/finance/spotreba.php

@@ -16 +16 @@
     $CelkovaSpotreba = 0;
     $DbResult = $this->Database->query('SELECT * FROM NetworkSegment');
-    while($Segment = $DbResult->fetch_array())
+    while($Segment = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->query('SELECT SUM(Consumption) FROM Product WHERE Segment='.$Segment['Id'].' AND Used=1');
-      $Row2 = $DbResult2->fetch_array();
-      $CelkovaSpotreba = $CelkovaSpotreba + $Row2[0];
-      $Output .= '<tr><td>'.$Segment['Name'].'</td><td align="right">'.$Row2[0].'</td><td align="right">'.$this->System->Modules['Finance']->W2Kc($Row2[0]).'</td></tr>';
+      $DbResult2 = $this->Database->query('SELECT SUM(Product.Consumption) AS Consumption FROM StockItem JOIN Product ON Product.Id = StockItem.Product WHERE (StockItem.Segment='.$Segment['Id'].') AND (StockItem.TimeElimination IS NULL)');
+      $Row2 = $DbResult2->fetch_assoc();
+      $CelkovaSpotreba = $CelkovaSpotreba + $Row2['Consumption'];
+      $Output .= '<tr><td>'.$Segment['Name'].'</td><td align="right">'.$Row2['Consumption'].'</td><td align="right">'.$this->System->Modules['Finance']->W2Kc($Row2['Consumption']).'</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>';