Changeset 479 for trunk/Modules/Portal

Timestamp:

Feb 5, 2013, 9:45:44 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Tabulka pro přiřazení více služeb jednomu zákazníkovi. Původní data jsou převedena do nové struktury. Tabulka Service je společná pro všechny typy služeb a pro každou službu se zobrazí nebo vyplní pouze určité použitelné sloupce.
• Opraveno: Korekce názvů modulů na názvy začínající slovem Module.

File:

• trunk/Modules/Portal/Portal.php (modified) (5 diffs)

trunk/Modules/Portal/Portal.php

@@ -41 +41 @@
     $Output = '<img alt="" src="images/favicons/comp.png" width="16" height="16" /> '.$OnlineComputers.' / '.$TotalComputers.' &nbsp;  &nbsp; ';
 
-    $DbResult = $this->Database->select('Member', 'COUNT(*)', 'MemberState=0');
+    $DbResult = $this->Database->select('Member', 'COUNT(*)', '1');
     $DbRow = $DbResult->fetch_array();
     $TotalUser = $DbRow[0];
@@ -246 +246 @@
         {
           $CustomerUserRel = $DbResult->fetch_assoc();
-          $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, '.
+          $DbResult = $this->Database->query('SELECT Member.Id, '.
             'Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, '.
             'Subject.AddressTown, Subject.AddressPSC, Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject '.
@@ -268 +268 @@
           $UserOptions->Values['BillingPeriodNext'] = 2;
           
-        $DbResult = $this->Database->update('Member', 'Id='.$this->System->Modules['User']->User['Member'], array('InternetTariffNextMonth' => $UserOptions->Values['InternetTariffNextMonth'], 'FamilyMemberCount' => $UserOptions->Values['FamilyMemberCount'], 'BillingPeriodNext' => $UserOptions->Values['BillingPeriodNext']));
+        $DbResult = $this->Database->update('Member', 'Id='.$this->System->Modules['User']->User['Member'], 
+           array('FamilyMemberCount' => $UserOptions->Values['FamilyMemberCount'], 
+           'BillingPeriodNext' => $UserOptions->Values['BillingPeriodNext']));
         $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$this->System->Modules['User']->User['Member']);
         $Member = $DbResult->fetch_assoc();
@@ -278 +280 @@
         $Output .= $this->SystemMessage('Nastavení', 'Nastavení domácnosti uloženo.');
         $this->System->Modules['Log']->NewRecord('Member+Subject', 'Nastavení člena/subjektu změněno', $UserOptions->Values['Name']);
-        $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->User['Member']);
+        $DbResult = $this->Database->query('SELECT Member.Id, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->User['Member']);
         $DbRow = $DbResult->fetch_array();
         foreach($UserOptions->Definition['Items'] as $Index => $Item)
@@ -324 +326 @@
 }
 
-class Portal extends AppModule
+class ModulePortal extends AppModule
 {
   function __construct($System)