Changeset 377 for trunk/Modules/Finance

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ů.

Location:

trunk/Modules/Finance

Files:

• Finance.php (modified) (6 diffs)
• FinanceOverview.php (modified) (2 diffs)
• Manage.php (modified) (2 diffs)
• MonthlyOverall.php (modified) (1 diff)

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

trunk/Modules/Finance/FinanceOverview.php

@@ -23 +23 @@
     $Output .= '<br /><strong>Souhrn:</strong><br />';
 
-    $DbResult = $this->Database->query('SELECT * FROM finance_monthly_overall ORDER BY date DESC LIMIT 0,1');
+    $DbResult = $this->Database->query('SELECT * FROM FinanceMonthlyOverall ORDER BY Date DESC LIMIT 0,1');
     $Row = $DbResult->fetch_array();
     $Output .= 'Platba za internetovou linku ('.$Finance->RealMaxSpeed.'/'.$Finance->RealMaxSpeed.' kbit/s): <strong>'.$Finance->Internet.' Kč</strong><br />';
@@ -60 +60 @@
     $TotalGain = 0;
     $TotalExpense = 0;
-    $DbResult = $this->Database->query('SELECT SUM(consumption) FROM network_devices WHERE used=1');
+    $DbResult = $this->Database->query('SELECT SUM(Consumption) FROM network_devices WHERE used=1');
     $Row = $DbResult->fetch_array();
     $TotalConsumption = $this->System->Modules['Finance']->W2Kc($Row[0]);

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

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