Changeset 486 for trunk/finance/user_state.php

Timestamp:

Feb 10, 2013, 9:20:06 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Příprava na zrušení tabulek dokladů a jejich převedení na tabulky File a FinanceInvoice.

File:

• trunk/finance/user_state.php (modified) (4 diffs)

trunk/finance/user_state.php

@@ -52 +52 @@
       else $SubjectParam = '';
     $Output .= 'Roky: ';
-    $DbResult = $this->Database->query('SELECT * FROM FinanceYear');
+    $DbResult = $this->Database->query('SELECT * FROM FinanceYear WHERE Year >= '.
+      substr($Member['MembershipDate'], 0, strpos($Member['MembershipDate'], '-')));
     while($FinanceYear = $DbResult->fetch_assoc())
     {
@@ -62 +63 @@
     
     // Account state    
-    $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, Bill, BillCode FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
-      '(SELECT Text, TimeCreation as Time, -Value as Value, Bill, BillCode FROM FinanceClaimsLiabilities WHERE (Subject='.$Subject['Id'].')) ORDER BY Time DESC) AS T1';
+    $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, Bill, BillCode, NULL AS PeriodFrom, NULL AS PeriodTo '.
+      'FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
+      '(SELECT (SELECT GROUP_CONCAT(Description SEPARATOR ",") FROM FinanceInvoiceItem WHERE FinanceInvoice=FinanceInvoice.Id) AS Text, '.
+      'TimeCreation as Time, -Value as Value, Bill, BillCode, PeriodFrom, PeriodTo FROM FinanceInvoice WHERE (Subject='.$Subject['Id'].')) ORDER BY Time DESC) AS T1';
     $DbResult = $this->Database->query('SELECT SUM(T1.Value) AS Total FROM '.$UserOperationTableQuery);
     $DbRow = $DbResult->fetch_array();
@@ -72 +75 @@
     // Tabulka operaci
     $Output .= 'Výpis operací pro subjekt '.$Subject['Name'].':<br />';
-    $Output .= '<table style="font-size: smaller;" class="WideTable"><tr><th>Datum</th><th>Popis</th><th>Částka</th><th>Doklad</th></tr>';
+    $Output .= '<table style="font-size: smaller;" class="WideTable"><tr>'.
+    '<th>Datum</th><th>Popis</th><th>Částka</th><th>Období</th><th>Doklad</th></tr>';
     $Operations = array();
     $DbResult = $this->Database->query('SELECT T1.* FROM '.$UserOperationTableQuery.$YearWhere);
@@ -83 +87 @@
       if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
       if($Row['BillCode'] == '') $Row['BillCode'] = 'PDF';
-      if($Row['Bill'] > 0) $Invoice = '<a href="bill.php?Id='.$Row['Bill'].'">'.$Row['BillCode'].'</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>';
+      if($Row['Bill'] > 0) $Invoice = '<a href="bill.php?Id='.$Row['Bill'].'">'.$Row['BillCode'].'</a>'; 
+        else $Invoice = '&nbsp;';
+      if($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);
+        else $Period = '&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;">'.$Period.'</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>';
+    $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>'.
+    '<td style="text-align: center;">&nbsp;</td></tr>';