Changeset 895 for trunk/Modules/Portal

Timestamp:

Jan 12, 2021, 10:29:50 PM (4 years ago)

Author:

chronos

Message:

• Modified: Setup is now AppModule and it is installed and stated as first module.
• Modified: Improved modular system.

File:

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

trunk/Modules/Portal/Portal.php

@@ -14 +14 @@
     $this->Description = 'Community portal.';
     $this->Dependencies = array('News', 'User');
+  }
+
+  function GetModels(): array
+  {
+    return array(Panel::GetClassName(), PanelColumn::GetClassName());
+  }
+
+  function DoInstall(): void
+  {
+   /* $this->Database->query("INSERT INTO `PanelColumn` (`Id`, `Width`) VALUES
+    (1, ''),
+    (2, ''),
+    (3, '70%');");
+    $this->Database->query("INSERT INTO `Panel` (`Id`, `Module`, `Parameters`, `Order`, `PanelColumn`) VALUES
+    (1, 'ActionGroup', 1, 2, 1),
+    (2, 'ActionGroup', 4, 1, 2),
+    (3, 'ActionGroup', 5, 2, 2),
+    (4, 'ActionGroup', 6, 3, 2),
+    (5, 'ActionGroup', 2, 4, 2),
+    (6, 'ActionGroup', 3, 5, 2),
+    (7, 'NewsGroupList', '', 2, 3),
+    (8, 'Webcam', '', 3, 1),
+    (9, 'UserOptions', '', 1, 3),
+    (10, 'ActionGroup', 9, 1, 1),
+    (11, 'Meteo', '', 4, 1);");*/
   }
 
@@ -35 +60 @@
     ));
     ModuleUser::Cast($this->System->GetModule('User'))->UserPanel[] = array('PagePortal', 'UserPanel');
+  }
+}
+
+class PanelColumn extends Model
+{
+  static function GetDesc(): ModelDesc
+  {
+    $Desc = new ModelDesc(self::GetClassName());
+    $Desc->AddString('Width');
+    return $Desc;
+  }
+}
+
+class Panel extends Model
+{
+  static function GetDesc(): ModelDesc
+  {
+    $Desc = new ModelDesc(self::GetClassName());
+    $Desc->AddString('Module');
+    $Desc->AddString('Parameters');
+    $Desc->AddInteger('Order');
+    $Desc->AddInteger('PanelColumn');
+    return $Desc;
   }
 }
@@ -216 +264 @@
 
         $User = &ModuleUser::Cast($this->System->GetModule('User'))->User;
-        $DbResult = $this->Database->update('Member', 'Id='.$User->User['Member'],
+        $DbResult = $this->Database->query('SELECT `Customer` FROM `UserCustomerRel` '.
+          'WHERE `User`='.ModuleUser::Cast($this->System->GetModule('User'))->User->User['Id']);
+        $CustomerUserRel = $DbResult->fetch_assoc();
+        $CustomerId = $CustomerUserRel['Member'];
+
+        $DbResult = $this->Database->update('Member', 'Id='.$CustomerId,
            array('FamilyMemberCount' => $Form->Values['FamilyMemberCount']));
-        $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$User->User['Member']);
+        $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$CustomerId);
         $Member = $DbResult->fetch_assoc();
         $DbResult = $this->Database->update('Subject', 'Id='.$Member['Subject'],
@@ -231 +284 @@
           '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='.$User->User['Member']);
+          'ON Subject.Id = Member.Subject WHERE Member.Id='.$CustomerId);
         $DbRow = $DbResult->fetch_array();
         foreach ($Form->Definition['Items'] as $Index => $Item)