Changeset 691

Timestamp:

Sep 7, 2014, 10:50:01 PM (10 years ago)

Author:

chronos

Message:

• Přidáno: Zobrazení průběžného zůstatku ve zobrazení financí zákazníků.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Finance/UserState.php (modified) (6 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 690; // Subversion revision
+$Revision = 691; // Subversion revision
 $DatabaseRevision = 688; // SQL structure revision
 $ReleaseTime = strtotime('2014-09-07');

trunk/Modules/Finance/UserState.php

@@ -12 +12 @@
           'FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
                 '(SELECT (SELECT GROUP_CONCAT(Description SEPARATOR ",") FROM FinanceInvoiceItem WHERE FinanceInvoice=FinanceInvoice.Id) AS Text, '.
-                'Time, -Value as Value, File, BillCode, PeriodFrom, PeriodTo FROM FinanceInvoice WHERE (Subject='.$Subject['Id'].')) ORDER BY Time DESC) AS T1';
+                'Time, -Value as Value, File, BillCode, PeriodFrom, PeriodTo FROM FinanceInvoice WHERE (Subject='.$Subject['Id'].')))';
 
     $Output = '<div style="text-align:center">Výpis finančních operací</div>';
-        $DbResult = $this->Database->query('SELECT COUNT(*) FROM '.$UserOperationTableQuery.'');
+        $DbResult = $this->Database->query('SELECT COUNT(*) FROM '.$UserOperationTableQuery.' AS T1');
         $DbRow = $DbResult->fetch_row();
         $PageList = GetPageList($DbRow[0]);
@@ -25 +25 @@
                         array('Name' => 'Time', 'Title' => 'Datum'),
                         array('Name' => 'Description', 'Title' => 'Popis'),
-                        array('Name' => 'Value', 'Title' => 'Částka [Kč]'),
+                        array('Name' => 'Value', 'Title' => 'Změna [Kč]'),
+                        array('Name' => 'State', 'Title' => 'Zůstatek [Kč]'),
                         array('Name' => 'Period', 'Title' => 'Období'),
                         array('Name' => 'Bill', 'Title' => 'Doklad'),
@@ -32 +33 @@
         $Output .= $Order['Output'];
 
-        $Query = 'SELECT * FROM '.$UserOperationTableQuery.' '.$Order['SQL'].$PageList['SQLLimit'];
+        $StateQuery = 'SELECT SUM(T2.Value) FROM '.$UserOperationTableQuery.
+          ' AS T2 WHERE T2.Time <= T1.Time ';
+        $Query = 'SELECT *, ('.$StateQuery.') AS State FROM '.$UserOperationTableQuery.' AS T1 '.$Order['SQL'].$PageList['SQLLimit'];
 
         $DbResult = $this->Database->query($Query);
@@ -38 +41 @@
         while($Row = $DbResult->fetch_assoc())
         {
+                $Row['State'] = round($Row['State'], 2);
+                if($Row['State'] > 0) $Row['State'] = '<span style="color:green;">'.$Row['State'].'</span>';
+                if($Row['State'] < 0) $Row['State'] = '<span style="color:red;">'.$Row['State'].'</span>';
                 if($Row['Value'] == -0) $Row['Value'] = 0;
                 if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
@@ -48 +54 @@
                                 '<td style="text-align: left;">'.$Row['Text'].'</td>'.
                                 '<td style="text-align: right;">'.round($Row['Value'], 2).'</td>'.
+                                '<td style="text-align: right;">'.$Row['State'].'</td>'.
                                 '<td>'.$Period.'</td>'.
                                 '<td>'.$Invoice.'</td></tr>';
@@ -67 +74 @@
       if(!$this->System->User->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
       $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id='.$_GET['Subject']);
-      $Subject = $DbResult->fetch_assoc();
+      if($DbResult->num_rows > 0)
+        $Subject = $DbResult->fetch_assoc();
+      else return($this->SystemMessage('Chyba', 'Subjekt nenalezen'));
     } else
     {