Changeset 379 for trunk

Timestamp:

Jan 20, 2012, 9:17:37 PM (13 years ago)

Author:

chronos

Message:

• Opraveno: Odkazy mezi modely.
• Přidáno: Definice NetworkAP.

Location:

trunk

Files:

• Common/Global.php (modified) (1 diff)
• Common/Module.php (modified) (3 diffs)
• Modules/Finance/Finance.php (modified) (5 diffs)
• Modules/Member/Member.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (2 diffs)
• index.php (modified) (1 diff)

trunk/Common/Global.php

@@ -62 +62 @@
   $System->Config = &$Config;
   $System->Install();
-  $System->ReloadList();
-  $System->Install();
   $System->Init();
 }

trunk/Common/Module.php

@@ -90 +90 @@
   function LoadModules($Installed = true)
   {
+    //DebugLog('Loading modules...');
+    $this->Modules = array();
     $Query = 'SELECT `Id`, `Name` FROM `SystemModule`';
     if($Installed) $Query .= ' WHERE `Installed`=1';
@@ -96 +98 @@
     while($Module = $DbResult->fetch_array())
     {
+      //echo($Module['Name'].',');
       include_once('Modules/'.$Module['Name'].'/'.$Module['Name'].'.php');
       $ModuleClassName = 'Module'.$Module['Name'];
-      $this->Modules[$Module['Name']] = new $ModuleClassName($this->Database, $this);
-      $this->Modules[$Module['Name']]->Id = $Module['Id'];
+      $NewModule = new $ModuleClassName($this->Database, $this);      
+      $NewModule->Id = $Module['Id'];
+      $this->Modules[$Module['Name']] = $NewModule;
     }     
   }
@@ -105 +109 @@
   function Init()
   {
+    $this->LoadModules();
     foreach($this->Modules as $Index => $Module)
       $this->Modules[$Index]->Init();

trunk/Modules/Finance/Finance.php

@@ -398 +398 @@
     
     $this->SpravaUsers = $this->InternetUsers;
-    $DbResult = $this->Database->query('SELECT SUM(`Consumption`) FROM `NetworkSegments`');
+    $DbResult = $this->Database->query('SELECT SUM(`Consumption`) FROM `NetworkSegment`');
     $TotalConsumption = $DbResult->fetch_array();
     $this->TotalConsumption = $TotalConsumption[0];
@@ -459 +459 @@
       while($ID != 0)
       {
-        $DbResult2 = $this->Database->query('SELECT * FROM `NetworkSegments` WHERE `Id`='.$ID);
+        $DbResult2 = $this->Database->query('SELECT * FROM `NetworkSegment` WHERE `Id`='.$ID);
         $Device = $DbResult2->fetch_assoc();
         $NetworkDevice += $Device['Price'] / $Device['Users'];
@@ -497 +497 @@
   {
     $Output = 'Aktualizuji parametry segmentů...<br />';
-    $this->Database->query('UPDATE `NetworkSegments` SET `Users` = 0, `UsersOverheads` = 0');     // Vynulovat počty uživatelů
-    $DbResult = $this->Database->query('SELECT * FROM `NetworkSegments`');
+    $this->Database->query('UPDATE `NetworkSegment` SET `Users` = 0, `UsersOverheads` = 0');     // Vynulovat počty uživatelů
+    $DbResult = $this->Database->query('SELECT * FROM `NetworkSegment`');
     while($NetworkSegment = $DbResult->fetch_array())
     {
       //echo('Segment '.$Row['name'].'<br>');
-      $DbResult2 = $this->Database->query('SELECT `Users` FROM `NetworkSegments` WHERE `Id`='.$NetworkSegment['Id']);
+      $DbResult2 = $this->Database->query('SELECT `Users` FROM `NetworkSegment` WHERE `Id`='.$NetworkSegment['Id']);
       $RowP = $DbResult2->fetch_array();
-      $DbResult2 = $this->Database->query('SELECT `UsersOverheads` FROM `NetworkSegments` WHERE `Id`='.$NetworkSegment['Id']);
+      $DbResult2 = $this->Database->query('SELECT `UsersOverheads` FROM `NetworkSegment` WHERE `Id`='.$NetworkSegment['Id']);
       $RowP2 = $DbResult2->fetch_array();
 
@@ -515 +515 @@
       {
         //echo($ID.', ');
-        $DbResult2 = $this->Database->query('SELECT * FROM NetworkSegments WHERE Id='.$ID);
+        $DbResult2 = $this->Database->query('SELECT * FROM NetworkSegment WHERE Id='.$ID);
         $Row4 = $DbResult2->fetch_array();
-        $this->Database->update('NetworkSegments', 'Id='.$Row4['Id'], array('Users' => ($Row4['Users'] + $Row3[0]), 'UsersOverheads' => ($Row4['UsersOverheads'] + $Row3[0])));
+        $this->Database->update('NetworkSegment', 'Id='.$Row4['Id'], array('Users' => ($Row4['Users'] + $Row3[0]), 'UsersOverheads' => ($Row4['UsersOverheads'] + $Row3[0])));
         $ID = $Row4['Parent'];
       }
-      $this->Database->update('NetworkSegments', 'Id='.$NetworkSegment['Id'], array('Price' => $Row2['Price'], 'Users' => ($Row3[0] + $RowP['Users']), 'Consumption' => $Row2['Consumption'], 'UsersOverheads' => ($Row3[0] + $RowP2['UsersOverheads'])));
+      $this->Database->update('NetworkSegment', 'Id='.$NetworkSegment['Id'], array('Price' => $Row2['Price'], 'Users' => ($Row3[0] + $RowP['Users']), 'Consumption' => $Row2['Consumption'], 'UsersOverheads' => ($Row3[0] + $RowP2['UsersOverheads'])));
     }
 
@@ -526 +526 @@
     $DbResult = $this->Database->select('Member', 'COUNT(*)');
     $Row = $DbResult->fetch_array();
-    $DbResult = $this->Database->update('NetworkSegments', 'Id='.$this->InternetSegmentId, array('Users' => $Row[0], 'UsersOverheads' => $Row[0]));
+    $DbResult = $this->Database->update('NetworkSegment', 'Id='.$this->InternetSegmentId, array('Users' => $Row[0], 'UsersOverheads' => $Row[0]));
     $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateSegmentParameters');
     return($Output);

trunk/Modules/Member/Member.php

@@ -26 +26 @@
     parent::__construct($Database, $System);
     $this->Name = 'Member';
-    $this->AddPropertyDateTime('Time');
-    $this->AddPropertyOneToMany('User', 'User');
-    $this->AddPropertyString('Module');
-    $this->AddPropertyString('Operation');
-    $this->AddPropertyString('Value');
+    $this->AddPropertyOneToMany('Subject', 'Subject');
+    $this->AddPropertyOneToMany('ResponsibleUser', 'User');
+    $this->AddPropertyInteger('FamilyMemberCount');
+    $this->AddPropertyDate('MembershipDate');
+    $this->AddPropertyInteger('MemberState');
+    $this->AddPropertyOneToMany('InternetTariffCurrentMonth', 'FinanceTariff');
+    $this->AddPropertyOneToMany('InternetTariffNextMonth', 'FinanceTariff');
+    $this->AddPropertyInteger('GPS');
+    $this->AddPropertyOneToMany('BillingPeriod', 'FinanceBillingPeriod');
+    $this->AddPropertyOneToMany('NetworkSegment', 'NetworkSegment');
+    $this->AddPropertyOneToMany('BillingPeriodNext', 'FinanceBillingPeriod');
+    $this->AddPropertyFloat('Hire');
+    $this->AddPropertyBoolean('Blocked');
   }
 }
@@ -40 +48 @@
     parent::__construct($Database, $System);
     $this->Name = 'MemberPayment';
-    $this->AddPropertyDateTime('Time');
-    $this->AddPropertyOneToMany('User', 'User');
-    $this->AddPropertyString('Module');
-    $this->AddPropertyString('Operation');
-    $this->AddPropertyString('Value');
+    $this->AddPropertyOneToMany('Member', 'Member');
+    $this->AddPropertyFloat('MonthlyTotal');
+    $this->AddPropertyFloat('MonthlyInternet');
+    $this->AddPropertyFloat('MonthlyConsumption');
+    $this->AddPropertyFloat('NetworkDevice');
+    $this->AddPropertyFloat('MonthlyPlus');
+    $this->AddPropertyFloat('Cash');
   }
 }

trunk/Modules/Network/Network.php

@@ -169 +169 @@
 }
 
+class NetworkAP extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'NetworkAP';
+    $this->AddPropertyString('SSID');
+    $this->AddPropertyInteger('Frequency');
+    $this->AddPropertyInteger('ChannelWidth');
+    $this->AddPropertyOneToMany('NetworkDevice', 'NetworkDevice');
+  }
+}
+
+
 
 class EmailView extends ViewForm
@@ -239 +253 @@
     $this->SupportedModels = array('NetworkDevice', 'NetworkDeviceType', 'NetworkInterface',
       'NetworkInterfaceType', 'NetworkPoint', 'NetworkLink', 'NetworkSubnet',
-      'NetworkSegment');
+      'NetworkSegment', 'NetworkAP');
   }
   

trunk/index.php

@@ -3 +3 @@
 include_once('Common/Global.php');
 GlobalInit();
-
 $System->PathItems = ProcessURL();
 //print_r($_GET);