Changeset 327 for trunk/finance/finance.php

Timestamp:

Dec 17, 2011, 3:10:03 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Tabulka FinanceTariff přetvořena tak, aby se bylo možné odkazovat z jiných tabulek přes standardní primární klíč. Doposud se odkazovalo na sloupec Tariff což dělalo paseku. Překlápění nových tarifů se nyní provádní namísto sloupce Period pomocí sloupece ReplaceId, kde u nových položek se nastaví Id tarifu, který bude v novém měsící aktualizován. Id tarifů nyní musí začínat od jedničky.

File:

• trunk/finance/finance.php (modified) (5 diffs)

trunk/finance/finance.php

@@ -25 +25 @@
   var $BillingPeriods;
   
-  function LoadTariffs($Period = 1)
+  function LoadTariffs()
   {
     $this->Tariffs = array();
-    $DbResult = $this->Database->select('FinanceTariff', '*', 'Period='.$Period.' ORDER BY Tariff, SpeedMax');
+    $DbResult = $this->Database->select('FinanceTariff', '*', 'ReplaceId IS NULL ORDER BY SpeedMax');
     while($Tariff = $DbResult->fetch_array())
     {
       $Tariff['SpeedMin'] = $Tariff['SpeedMin'] * 1024;
       $Tariff['SpeedMax'] = $Tariff['SpeedMax'] * 1024;
-      $this->Tariffs[$Tariff['Tariff']] = $Tariff;
+      $this->Tariffs[$Tariff['Id']] = $Tariff;
     }  
   }
   
-  function RecalculateTariffs($Period = 1)
+  function RecalculateTariffs()
   {
     $ResidualSpeed = $this->MaxSpeed * 1024;
   
-    $this->LoadTariffs($Period);
+    $this->LoadTariffs();
     
     $Column = array('Current', 'Next');
@@ -48 +48 @@
     foreach($this->Tariffs as $Index => $Tariff)
     {
-      $DbResult = $this->Database->select('Member', 'COUNT(*)', 'InternetTariff'.$Column[$Period].'Month='.$Index.' AND (BillingPeriod > 1)');
+      $DbResult = $this->Database->select('Member', 'COUNT(*)', 'InternetTariffCurrentMonth='.$Index.' AND (BillingPeriod > 1)');
       $Row = $DbResult->fetch_row();
       $this->Tariffs[$Index]['MemberCount'] = $Row[0];
@@ -85 +85 @@
       }
       //echo('MinSpeed: '.$Tariff['SpeedMin'].'<br />');
-      $this->Database->update('FinanceTariff', 'Tariff='.$Tariff['Tariff'], array('SpeedMin' => ($Tariff['SpeedMin'] / 1024), 'MemberCount' => $Tariff['MemberCount']));
-    }
-    $this->LoadTariffs($Period);
+      $this->Database->update('FinanceTariff', 'Id='.$Tariff['Id'], array('SpeedMin' => ($Tariff['SpeedMin'] / 1024), 'MemberCount' => $Tariff['MemberCount']));
+    }
+    $this->LoadTariffs();
   }
 
@@ -174 +174 @@
       while($ID != 0)
       {
-        $DbResult2 = $this->Database->query('SELECT * FROM network_segments WHERE id='.$ID);
+        $DbResult2 = $this->Database->query('SELECT * FROM `network_segments` WHERE `id`='.$ID);
         $Device = $DbResult2->fetch_assoc();
         $NetworkDevice += $Device['price'] / $Device['users'];
@@ -212 +212 @@
   {
     $Output = 'Aktualizuji parametry segmentů...<br />';
-    $this->Database->query('UPDATE network_segments SET users = 0, users_overheads = 0');     // Vynulovat počty uživatelů
-    $DbResult = $this->Database->query('SELECT * FROM network_segments');
+    $this->Database->query('UPDATE `network_segments` SET `users` = 0, `users_overheads` = 0');     // Vynulovat počty uživatelů
+    $DbResult = $this->Database->query('SELECT * FROM `network_segments`');
     while($NetworkSegment = $DbResult->fetch_array())
     {
       //echo('Segment '.$Row['name'].'<br>');
-      $DbResult2 = $this->Database->query('SELECT users FROM network_segments WHERE id='.$NetworkSegment['id']);
+      $DbResult2 = $this->Database->query('SELECT `users` FROM `network_segments` WHERE `id`='.$NetworkSegment['id']);
       $RowP = $DbResult2->fetch_array();
-      $DbResult2 = $this->Database->query('SELECT users_overheads FROM network_segments WHERE id='.$NetworkSegment['id']);
+      $DbResult2 = $this->Database->query('SELECT `users_overheads` FROM `network_segments` WHERE `id`='.$NetworkSegment['id']);
       $RowP2 = $DbResult2->fetch_array();