Changeset 182 for trunk/finance

Timestamp:

Mar 25, 2009, 3:08:48 PM (16 years ago)

Author:

george

Message:

• Opraveno: Stránkování na stránce zobrazání záznamů.
• Opraveno: Zobrazování stránky seznamu subjektů.

Location:

trunk/finance

Files:

• manage.php (modified) (1 diff)
• zivnost.php (modified) (1 diff)

trunk/finance/manage.php

@@ -58 +58 @@
         //$Output .= '<a href="?Operation=ConvertData">Převést tabulky</a><br />';
                     $Output .= '<a href="prepocet.php">Přepočet financí</a><br />';
-                    $Output .= '<a href="clenove.php">Seznam subjektů</a><br />';
+                    $Output .= '<a href="clenove.php">Seznam členů</a><br />';
                     $Output .= '<a href="zivnost.php">Živnost</a><br />';
     }

trunk/finance/zivnost.php

@@ -197 +197 @@
         $Output .= '<table style="font-size: smaller;" class="WideTable">';
         $Output .= '<tr><th>Jméno</th><th>Závazky [Kč]</th><th>Pohledávky [Kč]</th><th>Příjmy [Kč]</th><th>Výdaje [Kč]</th><th>Stav účtu</th><th>Starý systém</th></tr>';
-        $DbResult = $this->Database->query('SELECT Id, Name, 0 AS Cash, (SELECT SUM(T1.Value) FROM FinanceOperation AS T1 WHERE T1.SourceSubject = Subject.Id AND T1.DestinationSubject = 71) as Claims, (SELECT SUM(T2.Value) FROM FinanceOperation AS T2 WHERE T2.SourceSubject = Subject.Id AND T2.DestinationSubject = 71 AND Time IS NULL) as OpenedClaims, (SELECT SUM(T3.Value) FROM FinanceOperation AS T3 WHERE T3.DestinationSubject = Subject.Id AND T3.SourceSubject = 71) as Liabilities, (SELECT SUM(T4.Value) FROM FinanceOperation AS T4 WHERE T4.DestinationSubject = Subject.Id AND T4.SourceSubject = 71 AND Time IS NULL) as OpenedLiabilities, (SELECT SUM(T5.Value) FROM FinanceOperation AS T5 WHERE T5.DestinationSubject = Subject.Id AND T5.SourceSubject = 96) as Gains, (SELECT SUM(T6.Value) FROM FinanceOperation AS T6 WHERE T6.SourceSubject = Subject.Id AND T6.DestinationSubject = 96) as Spends FROM Subject ORDER BY Name');
+        $DbResult = $this->Database->query('SELECT Id, Name, 0 AS Cash, '.
+        '(SELECT SUM(T1.Value) FROM FinanceClaimsLiabilities AS T1 WHERE (T1.Subject = Subject.Id) AND (T1.Value > 0)) as Claims, '.
+        '(SELECT SUM(T2.Value) FROM FinanceClaimsLiabilities AS T2 WHERE (T2.Subject = Subject.Id) AND (T2.Value > 0) AND (TimePayment IS NULL)) as OpenedClaims, '.
+        '(SELECT -SUM(T3.Value) FROM FinanceClaimsLiabilities AS T3 WHERE (T3.Subject = Subject.Id) AND (T3.Value  < 0)) as Liabilities, '.
+        '(SELECT -SUM(T4.Value) FROM FinanceClaimsLiabilities AS T4 WHERE (T4.Subject = Subject.Id) AND (T4.Value < 0) AND (TimePayment IS NULL)) AS OpenedLiabilities, '.
+        '(SELECT SUM(T5.Value) FROM FinanceOperation AS T5 WHERE (T5.Subject = Subject.Id) AND (T5.Value > 0)) AS Gains, '.
+        '(SELECT -SUM(T6.Value) FROM FinanceOperation AS T6 WHERE (T6.Subject = Subject.Id) AND (T6.Value < 0)) AS Spends '.
+        'FROM Subject ORDER BY Name');
         while($Row = $DbResult->fetch_assoc())
         {
-          $Output .= '<tr><td><a href="?table=SubjectAccount&Id='.$Row['Id'].'">'.$Row['Name'].'</a></td><td>'.$Row['Liabilities'].'/'.$Row['OpenedLiabilities'].'</td><td>'.$Row['Claims'].'/'.$Row['OpenedClaims'].'</td><td>'.$Row['Gains'].'</td><td>'.$Row['Spends'].'</td><td>'.($Row['Gains'] - $Row['Spends'] - $Row['Claims'] + $Row['Liabilities']).'</td><td>'.$Row['Cash'].'</td></tr>';
+          $Output .= '<tr><td style="text-align: left;"><a href="?table=SubjectAccount&Id='.$Row['Id'].'">'.$Row['Name'].'</a></td><td>'.$Row['Liabilities'].' / '.$Row['OpenedLiabilities'].'</td><td>'.$Row['Claims'].' / '.$Row['OpenedClaims'].'</td><td>'.$Row['Gains'].'</td><td>'.$Row['Spends'].'</td><td>'.($Row['Gains'] - $Row['Spends'] - $Row['Claims'] + $Row['Liabilities']).'</td><td>'.$Row['Cash'].'</td></tr>';
         }
         $Output .= '</table>';