Changeset 454 for trunk/finance/zivnost.php

Timestamp:

Oct 28, 2012, 9:32:54 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: SQL dotazy obsahující odkazy na tabulky Product a StockItem.

File:

• trunk/finance/zivnost.php (modified) (3 diffs)

trunk/finance/zivnost.php

@@ -65 +65 @@
 
     // SmallAssets
-    $DbResult = $this->Database->query('SELECT SUM(Price) FROM Product WHERE (TimeEnlistment < "'.TimeToMysqlDateTime($StartTime).'") AND (TimeEnlistment != 0) AND ((TimeElimination > "'.TimeToMysqlDateTime($StartTime).'") OR (TimeElimination = 0))');
+    $DbResult = $this->Database->query('SELECT SUM(SellPrice) FROM StockItem WHERE (TimeEnlistment < "'.TimeToMysqlDateTime($StartTime).'") AND (TimeEnlistment != 0) AND ((TimeElimination > "'.TimeToMysqlDateTime($StartTime).'") OR (TimeElimination IS NULL))');
     //$Output .= $Database->error;
     $Row = $DbResult->fetch_array();
     $Balance['SmallAssets']['Start'] = $Row[0] + 0;
-    $DbResult = $this->Database->query('SELECT SUM(Price) FROM Product WHERE (TimeEnlistment < "'.TimeToMysqlDateTime($EndTime).'") AND (TimeEnlistment != 0) AND ((TimeElimination > "'.TimeToMysqlDateTime($EndTime).'") OR (TimeElimination = 0))');
+    $DbResult = $this->Database->query('SELECT SUM(SellPrice) FROM StockItem WHERE (TimeEnlistment < "'.TimeToMysqlDateTime($EndTime).'") AND (TimeEnlistment != 0) AND ((TimeElimination > "'.TimeToMysqlDateTime($EndTime).'") OR (TimeElimination IS NULL))');
     $Row = $DbResult->fetch_array();
     $Balance['SmallAssets']['End'] = $Row[0] + 0;
@@ -281 +281 @@
         $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 Product WHERE Used != 0');
+        $DbResult = $this->Database->query('SELECT Product.Name AS Name, StockItem.SellPrice AS Price, StockItem.TimeEnlistment AS TimeEnlistment, StockItem.TimeElimination AS TimeElimination '.
+          'FROM StockItem JOIN Product ON Product.Id = StockItem.Product '.
+          'WHERE (TimeElimination IS NOT NULL)');
         while($Row = $DbResult->fetch_array())
         {
@@ -339 +341 @@
         $Output .= '<strong>Roční přehledy</strong><br/>';
         $Output .= $this->ShowFinanceYears();
-        $Year = $_GET['year'] * 1;
-        $Output .= '<a href="?table=Incomes&amp;year='.$Year.'">Příjmy</a><br />';
-        $Output .= '<a href="?table=Expenses&amp;year='.$Year.'">Výdaje</a><br />';
-        $Output .= '<a href="?table=Claims&amp;year='.$Year.'">Pohledávky</a><br />';
-        $Output .= '<a href="?table=Liabilities&amp;year='.$Year.'">Závazky</a><br />';
-        $Output .= '<a href="?table=Advantages&amp;year='.$Year.'">Zálohy</a><br />';
+        if(array_key_exists('year', $_GET)) 
+        {
+          $Year = $_GET['year'] * 1;
+          $Output .= '<a href="?table=Incomes&amp;year='.$Year.'">Příjmy</a><br />';
+          $Output .= '<a href="?table=Expenses&amp;year='.$Year.'">Výdaje</a><br />';
+          $Output .= '<a href="?table=Claims&amp;year='.$Year.'">Pohledávky</a><br />';
+          $Output .= '<a href="?table=Liabilities&amp;year='.$Year.'">Závazky</a><br />';
+          $Output .= '<a href="?table=Advantages&amp;year='.$Year.'">Zálohy</a><br />';
+        }
     }
     return($Output);