Changeset 182 for trunk

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

Files:

• LogShow.php (modified) (2 diffs)
• Readme.txt (modified) (1 diff)
• finance/manage.php (modified) (1 diff)
• finance/zivnost.php (modified) (1 diff)
• is/administration_page.php (modified) (1 diff)
• sql/updates/182.sql (added)

trunk/LogShow.php

@@ -17 +17 @@
 
     $Output = '<div align="center"><table class="WideTable" style="font-size: small;">';
-    $Output .= '<tr><th>Čas</th><th>Modul</th><th>Uživatel</th><th>Operace</th><th>Hodnota</th></tr>';
-    $DbResult = $this->Database->query('SELECT *, `User`.`Name` as UserName FROM `is`.`Log` JOIN `is`.`User` ON `User`.`Id` = `Log`.`User` ORDER BY Time DESC LIMIT '.$Page.','.$this->RowPerPage);
+    $Output .= '<tr><th>Čas</th><th>Uživatel</th><th>Modul</th><th>Operace</th><th>Hodnota</th></tr>';
+    $DbResult = $this->Database->query('SELECT *, `User`.`Name` as UserName FROM `is`.`Log` LEFT JOIN `is`.`User` ON `User`.`Id` = `Log`.`User` ORDER BY Time DESC LIMIT '.$Page * $this->RowPerPage.','.$this->RowPerPage);
     while($DbRow = $DbResult->fetch_array())
     {
-      $Output .= '<tr><td>'.$DbRow['Time'].'</td><td>'.$DbRow['Module'].'</td><td>'.$DbRow['UserName'].'</td><td>'.$DbRow['Operation'].'</td><td>'.$DbRow['Value'].'</td></tr>';
+      $Output .= '<tr><td>'.$DbRow['Time'].'</td><td>'.$DbRow['UserName'].'</td><td>'.$DbRow['Module'].'</td><td>'.$DbRow['Operation'].'</td><td>'.$DbRow['Value'].'</td></tr>';
     }
     $Output .= '</table>';
@@ -30 +30 @@
 }
 
-
 $System->AddModule(new LogShow());
 $System->Modules['LogShow']->GetOutput();

trunk/Readme.txt

@@ -18 +18 @@
 
   finance/doklady - účetní doklady
+  aktuality/uploads - přílohy aktualit
+
+
+4) Práva složek
+
+  webcam - vlastníka nastavit na apache
+  finance/doklady - vlastníka nastavit na apache
+  aktuality/uploads - vlastníka nastavit na apache
+  

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>';

trunk/is/administration_page.php

@@ -22 +22 @@
 <a href="'.$this->System->Config['Web']['RootFolder'].'/is/restart.php">Správa restartů služeb</a><br>
 <a href="'.$this->System->Config['Web']['RootFolder'].'/backup/index.php">Nastavení zálohování</a><br>
+<a href="'.$this->System->Config['Web']['RootFolder'].'/LogShow.php">Záznamy operací</a><br>
 <a href="tc.php?dev=imq0">Traffic control IMQ0(Inet down)</a><br>
 <a href="tc.php?dev=imq1">Traffic control IMQ1(Inet up)</a><br>