Changeset 452 for trunk/finance

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk/finance

Files:

• spotreba.php (modified) (1 diff)
• tarify.php (modified) (1 diff)
• zarizeni.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>';

trunk/finance/tarify.php

@@ -62 +62 @@
 
     $Output .= '<br />Tarif na další období si lze nastavit po přihlášení do systému pomocí nastavení domácnosti přes pravé užifatelské menu.<br />';
-    $Output .= '<a href="http://centrala.zdechov.net/forum/viewtopic.php?t=50">Diskuse</a><br />';
+    $Output .= '<a href="http://forum.zdechov.net/viewtopic.php?t=50">Diskuse</a><br />';
     return($Output);
   }

trunk/finance/zarizeni.php

@@ -11 +11 @@
   {
     // Seznam segmentů a zařízení
+    $Price = 0;
     $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($Segment = $DbResult->fetch_array())
+    while($Segment = $DbResult->fetch_assoc())
     {
       $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())
+      $DbResult2 = $this->Database->query('SELECT Product.Consumption AS Consumption, Product.Name AS Name, '.
+         'StockItem.BuyPrice AS Price, StockItem.TimeEnlistment AS Date '.
+         'FROM StockItem JOIN Product ON Product.Id = StockItem.Product WHERE (StockItem.Segment='.$Segment['Id'].') AND (StockItem.TimeElimination IS NULL)');
+      while($Row = $DbResult2->fetch_assoc())
       {
-        $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>';
       }
+      $Price = $Price + $Row['Price'];
     }
-    $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>';
+    $Output .= '<tr><td colspan="3"><strong>Celkem:</strong></td><td align="right"><strong>'.
+      $Price.'</strong></td></tr>';
     $Output .= '</table>';
     return($Output);