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

trunk/Modules/Finance/Finance.php

@@ -83 +83 @@
 }
 
+class FinanceBillingPeriod extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'FinanceBillingPeriod';
+    $this->AddPropertyString('Name');
+    $this->AddPropertyInteger('MonthCount');
+  }
+}
+
 class FinanceTariff extends Model
 {
@@ -127 +138 @@
     $this->AddPropertyString('BillCode');
     $this->AddPropertyOneToMany('Subject', 'Subject');
-    $this->AddPropertyDateTime('TimeCreate');
+    $this->AddPropertyDateTime('TimeCreation');
     $this->AddPropertyDateTime('TimeDue');
     $this->AddPropertyDateTime('TimePayment');
@@ -163 +174 @@
     $this->AddPropertyFloat('Price');
     $this->AddPropertyFloat('Quantity');
+  }
+}
+
+class FinanceCharge extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'FinanceCharge';
+    $this->AddPropertyInteger('Period');
+    $this->AddPropertyInteger('Internet');
+    $this->AddPropertyInteger('InternetSpeed');
+    $this->AddPropertyInteger('InternetSpeedReserve');
+    $this->AddPropertyInteger('AdministrationPerUser');
+    $this->AddPropertyInteger('kWh');
+    $this->AddPropertyInteger('BaseSpeedElement');
+    $this->AddPropertyInteger('BaseTariffPrice');
+    $this->AddPropertyInteger('TopTariffPrice');
+  }
+}
+
+class FinanceMonthlyOverall extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'FinanceMonthlyOverall';
+    $this->AddPropertyInteger('Money');
+    $this->AddPropertyDate('Date');
+    $this->AddPropertyInteger('Administration');
+    $this->AddPropertyInteger('kWh');
+    $this->AddPropertyInteger('AdministrationTotal');
+    $this->AddPropertyInteger('ConsumptionTotal');
+    $this->AddPropertyInteger('TotalPaid');
+    $this->AddPropertyInteger('BaseTariffPrice');
+    $this->AddPropertyInteger('TopTariffPrice');
+    $this->AddPropertyInteger('MemberCount');
+    $this->AddPropertyInteger('Investment');
   }
 }
@@ -237 +286 @@
     $this->License = 'GNU/GPL';
     $this->Description = 'Accounting processing';
-    $this->Dependencies = array('User');
+    $this->Dependencies = array('User', 'Subject');
     $this->Models = array('FinanceYear', 'DocumentLine', 'DocumentLineSequence',
       'FinanceTariff', 'FinanceOperation', 'FinanceClaimsLiabilities',
-      'FinanceBills', 'FinanceBillsItems');
+      'FinanceBills', 'FinanceBillsItems', 'FinanceBillingPeriod', 'FinanceCharge',
+      'FinanceMonthlyOverall');
     $this->Views = array('FinanceOperation', 'FinanceClaimsLiabilities'); 
   }
@@ -331 +381 @@
       $this->BillingPeriods[$BillingPeriod['Id']] = $BillingPeriod;
     
-    $DbResult = $this->Database->query('SELECT * FROM finance_charge WHERE period='.$Period);
+    $DbResult = $this->Database->query('SELECT * FROM FinanceCharge WHERE period='.$Period);
     $Row = $DbResult->fetch_array();
     $this->kWh = $Row['kWh'];
-    $this->Internet = $Row['internet'];
-    $this->Sprava = $Row['administration_per_user'];
-    $this->RealMaxSpeed = $Row['internet_speed'];
-    $this->SpeedReserve = $Row['internet_speed_reserve'];
-    $this->BaseSpeedElement = $Row['base_speed_element'];
+    $this->Internet = $Row['Internet'];
+    $this->Sprava = $Row['AdministrationPerUser'];
+    $this->RealMaxSpeed = $Row['InternetSpeed'];
+    $this->SpeedReserve = $Row['InternetSpeedReserve'];
+    $this->BaseSpeedElement = $Row['BaseSpeedElement'];
     $this->MaxSpeed = $this->RealMaxSpeed - $this->SpeedReserve;
     $this->TopTariffPrice = $Row['TopTariffPrice'];
@@ -348 +398 @@
     
     $this->SpravaUsers = $this->InternetUsers;
-    $DbResult = $this->Database->query('SELECT SUM(`consumption`) FROM `network_segments`');
+    $DbResult = $this->Database->query('SELECT SUM(`Consumption`) FROM `network_segments`');
     $TotalConsumption = $DbResult->fetch_array();
     $this->TotalConsumption = $TotalConsumption[0];