Changeset 407

Timestamp:

Oct 4, 2012, 8:12:31 AM (12 years ago)

Author:

chronos

Message:

• Upraveno: Tabulky finance_monthly_overall a finance_carge přejmenovaný na názvy s velkými prvními písmeny.

Location:

trunk

Files:

• finance/finance.php (modified) (1 diff)
• finance/index.php (modified) (1 diff)
• finance/manage.php (modified) (2 diffs)
• finance/monthly_overall.php (modified) (1 diff)
• sql/updates/407.sql (added)

trunk/finance/finance.php

@@ -96 +96 @@
       $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'];

trunk/finance/index.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 />';

trunk/finance/manage.php

@@ -280 +280 @@
     
     // 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;
 
@@ -360 +360 @@
       // 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/finance/monthly_overall.php

@@ -12 +12 @@
 
     $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['ConsumptionTotal'].'</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);