Changeset 293 for trunk

Timestamp:

Oct 2, 2010, 5:19:22 PM (14 years ago)

Author:

george

Message:

• Opraveno: Zachování výběru člena při přepínání roků ve výpisu operací.

Location:

trunk

Files:

• finance/user_state.php (modified) (5 diffs)
• sql/updates/293.sql (added)

trunk/finance/user_state.php

@@ -44 +44 @@
     if(array_key_exists('year', $_GET))
     {
-      $DbResult = $this->Database->query('SELECT * FROM FinanceYear WHERE Id='.$_GET['year']);
+      $DbResult = $this->Database->query('SELECT * FROM FinanceYear WHERE Id='.addslashes($_GET['year'] * 1));
     } else 
     {
@@ -52 +52 @@
     $YearWhere = ' WHERE (Time >= "'.$FinanceYearSelected['DateStart'].'") AND (Time <= "'.$FinanceYearSelected['DateEnd'].'")';
 
+    
+    
+    // Year list
+    if(array_key_exists('Subject', $_GET)) $SubjectParam = '&amp;Subject='.($_GET['Subject'] * 1);
+      else $SubjectParam = '';
     $Output .= 'Roky: ';
     $DbResult = $this->Database->query('SELECT * FROM FinanceYear');
     while($FinanceYear = $DbResult->fetch_assoc())
     {
-      $Year = '<a href="?year='.$FinanceYear['Id'].'">'.$FinanceYear['Year'].'</a> ';
+      $Year = '<a href="?year='.$FinanceYear['Id'].$SubjectParam.'">'.$FinanceYear['Year'].'</a> ';
       if($FinanceYear['Id'] == $FinanceYearSelected['Id']) $Output .= '<strong>'.$Year.'</strong>';
         else $Output .= $Year;
@@ -62 +67 @@
     $Output .= '<br/><br/>';   
     
+    // Account state    
     $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, Bill FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
       '(SELECT Text, TimeCreation as Time, -Value as Value, Bill FROM FinanceClaimsLiabilities WHERE (Subject='.$Subject['Id'].')) ORDER BY Time DESC) AS T1';
-    $DbResult = $this->Database->query('SELECT SUM(T1.Value) AS Total FROM '.$UserOperationTableQuery.$YearWhere);
+    $DbResult = $this->Database->query('SELECT SUM(T1.Value) AS Total FROM '.$UserOperationTableQuery);
     $DbRow = $DbResult->fetch_array();
     $Total = $DbRow['Total'];
@@ -77 +83 @@
     while($DbRow = $DbResult->fetch_array())
       $Operations[] = $DbRow;
+    $SumValue = 0;
     foreach($Operations as $Row)
     {
@@ -83 +90 @@
       if($Row['Bill'] > 0) $Invoice = '<a href="bill.php?Id='.$Row['Bill'].'">PDF</a>'; else $Invoice = '&nbsp;';
       $Output .= '<tr><td style="text-align: right;">'.HumanDate($Row['Time']).'</td><td style="text-align: left;">'.$Row['Text'].'</td><td style="text-align: right;">'.$Row['Value'].'</td><td style="text-align: center;">'.$Invoice.'</td></tr>';
+      $SumValue = $SumValue + $Row['Value'];
     }
+      $Output .= '<tr><td style="text-align: right;" colspan="2"><strong>Celkem za rok</strong></td><td style="text-align: right;"><strong>'.$SumValue.'</strong></td><td style="text-align: center;">&nbsp;</td></tr>';
+    
+    
     //echo('<tr><td>&nbsp;</td><td>-'.$Row2['network_device'].'</td><td>Proměnná cena za zařízení</td></tr>
     $Output .= '</table>';