Changeset 377 for trunk/Modules/Finance/Manage.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/Manage.php (modified) (2 diffs)

trunk/Modules/Finance/Manage.php

@@ -279 +279 @@
     
     // Načti poslední měsíční přehled a nastavení
-    $DbResult = $this->Database->select('finance_monthly_overall', '*', '1 ORDER BY date DESC LIMIT 1');
+    $DbResult = $this->Database->select('FinanceMonthlyOverall', '*', '1 ORDER BY Date DESC LIMIT 1');
     $Overall = $DbResult->fetch_array();
 
     $Output -= 'Datum: '.date('j.n.Y').'<br />';
     
-    $Datum = explode('-', $Overall['date']);
+    $Datum = explode('-', $Overall['Date']);
     $Mesic = date('m') + 0;
 
@@ -359 +359 @@
       // Update finance charge
       $Output .= 'Měním aktuální parametry sítě...<br>';
-      $this->Database->delete('finance_charge', 'period = 0');
-      $DbResult = $this->Database->select('finance_charge', '*', 'period = 1');
+      $this->Database->delete('FinanceCharge', 'Period = 0');
+      $DbResult = $this->Database->select('FinanceCharge', '*', 'Period = 1');
       $Charge = $DbResult->fetch_assoc();
       //print_r($Charge);
-      $DbResult = $this->Database->insert('finance_charge', array('period' => 0, 'internet' => $Charge['internet'], 'internet_speed' => $Charge['internet_speed'], 'internet_speed_reserve' => $Charge['internet_speed_reserve'], 'administration_per_user' => $Charge['administration_per_user'], 'kWh' => $Charge['kWh'], 'base_speed_element' => $Charge['base_speed_element'], 'BaseTariffPrice' => $Charge['BaseTariffPrice'], 'TopTariffPrice' => $Charge['TopTariffPrice']));
+      $DbResult = $this->Database->insert('FinanceCharge', array('Period' => 0, 
+         'Internet' => $Charge['Internet'], 'InternetSpeed' => $Charge['InternetSpeed'], 
+          'InternetSpeedReserve' => $Charge['InternetSpeedReserve'], 
+          'AdministrationPerUser' => $Charge['AdministrationPerUser'], 
+          'kWh' => $Charge['kWh'], 'BaseSpeedElement' => $Charge['BaseSpeedElement'], 
+          'BaseTariffPrice' => $Charge['BaseTariffPrice'], 'TopTariffPrice' => $Charge['TopTariffPrice']));
 
       $Output .= 'Přidávám měsíční přehled...<br />';
-      $this->Database->insert('finance_monthly_overall', array('date' => 'NOW()', 'money' => $Finance->Internet, 'kWh' => $Finance->kWh, 'administration' => $Finance->Sprava, 'administration_total' => $SpravaCelkem, 'consumption_total' => $TotalConsumptionCost, 'total_paid' => $Finance->TotalPaid, 'BaseTariffPrice' => $Charge['BaseTariffPrice'], 'TopTariffPrice' => $Charge['TopTariffPrice'], 'member_count' => $Finance->InternetUsers));
+      $this->Database->insert('FinanceMonthlyOverall', array('Date' => 'NOW()', 
+        'Money' => $Finance->Internet, 'kWh' => $Finance->kWh, 
+        'Administration' => $Finance->Sprava, 'AdministrationTotal' => $SpravaCelkem, 
+        'ConsumptionTotal' => $TotalConsumptionCost, 'TotalPaid' => $Finance->TotalPaid, 
+        'BaseTariffPrice' => $Charge['BaseTariffPrice'], 'TopTariffPrice' => $Charge['TopTariffPrice'], 'MemberCount' => $Finance->InternetUsers));
 
       // Update tarrifs