Changeset 377 for trunk/Modules/Finance/MonthlyOverall.php

Timestamp:

Jan 20, 2012, 3:05:24 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Testována instalace čisté databáze na základě definic modulů a jejich modelů.
• Opraveno: Doplněny definice modelů pro FinanceMonthlyOverall a FinanceCharge.
• Přidáno: Podpora pro nastavitelnost NULL hodnoty u vlastností modelů.
• Opraveno: Řešení správného kaskádového načítání závislostí modulů.

File:

• trunk/Modules/Finance/MonthlyOverall.php (modified) (1 diff)

trunk/Modules/Finance/MonthlyOverall.php

@@ -11 +11 @@
 
     $Output = '<table class="WideTable"><tr><th>Rok</th><th>Měsíc</th><th>Internet [Kč]</th><th>Účastníků</th><th>Správa [Kč/účastníka]</th><th>Správa [Kč]</th><th>Spotřeba [Kč/kWh]</th><th>Spotřeba [Kč]</th><th>Obrat [Kč]</th><th>Průměrná cena [Kč/účastníka]</th><th align="center">Investice [Kč]</th></tr>';
-    $Total = array('money' => 0, 'administration_total' => 0, 'consumption_total' => 0, 'total_paid' => 0, 'investment' => 0);
-    $DbResult = $this->Database->select('finance_monthly_overall', '*', '1 ORDER BY date DESC');
+    $Total = array('Money' => 0, 'AdministrationTotal' => 0, 'ConsumptionTotal' => 0, 'TotalPaid' => 0, 'Investment' => 0);
+    $DbResult = $this->Database->select('FinanceMonthlyOverall', '*', '1 ORDER BY Date DESC');
     while($Month = $DbResult->fetch_array())
     {
-      $DateParts = explode('-', $Month['date']);
-      $Output .= '<tr><td>'.$DateParts[0].'</td><td align="center">'.$MonthNames[$DateParts[1] * 1].'</td><td align="center">'.$Month['money'].'</td><td align="center">'.$Month['member_count'].'</td><td align="center">'.$Month['administration'].'</td><td align="center">'.$Month['administration_total'].'</td><td align="center">'.$Month['kWh'].'</td><td align="center">'.$Month['consumption_total'].'</td><td align="center">'.$Month['total_paid'].'</td><td align="center">'.round($Month['total_paid'] / $Month['member_count']).'</td><td align="center">'.$Month['investment'].'</td></tr>';
+      $DateParts = explode('-', $Month['Date']);
+      $Output .= '<tr><td>'.$DateParts[0].'</td><td align="center">'.
+        $MonthNames[$DateParts[1] * 1].'</td><td align="center">'.$Month['Money'].
+        '</td><td align="center">'.$Month['MemberCount'].'</td><td align="center">'.
+        $Month['Administration'].'</td><td align="center">'.$Month['AdministrationTotal'].
+        '</td><td align="center">'.$Month['kWh'].'</td><td align="center">'.
+        $Month['Consumption_Total'].'</td><td align="center">'.$Month['TotalPaid'].
+        '</td><td align="center">'.round($Month['TotalPaid'] / $Month['MemberCount']).
+        '</td><td align="center">'.$Month['Investment'].'</td></tr>';
 
-      $Total['money'] += $Month['money'];
-      $Total['administration_total'] += $Month['administration_total'];
-      $Total['consumption_total'] += $Month['consumption_total'];
-      $Total['total_paid'] += $Month['total_paid'];
-          $Total['investment'] += $Month['investment'];
+      $Total['Money'] += $Month['Money'];
+      $Total['AdministrationTotal'] += $Month['AdministrationTotal'];
+      $Total['ConsumptionTotal'] += $Month['ConsumptionTotal'];
+      $Total['TotalPaid'] += $Month['TotalPaid'];
+      $Total['Investment'] += $Month['Investment'];
       //if($DateParts[1] == '01') echo('<tr><td style="font-size: 4;" colspan="10">&nbsp;</td></tr>');
     }
-    $Output .= '<tr><th colspan="2">Celkem</th><th>'.$Total['money'].'</th><th>&nbsp;</th><th>&nbsp;</th><th>'.$Total['administration_total'].'</th><th>&nbsp;</th><th>'.$Total['consumption_total'].'</th><th>'.$Total['total_paid'].'</th><th>&nbsp;</th><th>'.$Total['investment'].'</th>';
+    $Output .= '<tr><th colspan="2">Celkem</th><th>'.$Total['Money'].'</th><th>&nbsp;</th><th>&nbsp;</th><th>'.$Total['AdministrationTotal'].'</th><th>&nbsp;</th><th>'.$Total['ConsumptionTotal'].'</th><th>'.$Total['TotalPaid'].'</th><th>&nbsp;</th><th>'.$Total['Investment'].'</th>';
     $Output .= '</table>';
     return($Output);