Changeset 900

Timestamp:

Feb 17, 2021, 5:15:29 PM (4 years ago)

Author:

chronos

Message:

• Modified: Insert sample data action partially implemented.

Location:

trunk

Files:

• Modules/Config/Config.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/Portal/Portal.php (modified) (2 diffs)
• Modules/System/System.php (modified) (1 diff)
• Modules/User/User.php (modified) (1 diff)
• Modules/User/UserModel.php (modified) (1 diff)
• Packages/Common/Database.php (modified) (1 diff)
• Packages/Common/Module.php (modified) (3 diffs)
• Packages/Common/ModuleManager.php (modified) (2 diffs)
• Packages/Common/Modules/ModuleManager.php (modified) (1 diff)
• Packages/Common/Modules/Setup.php (modified) (3 diffs)

trunk/Modules/Config/Config.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->Name = 'Desc';
+    $this->Name = 'Config';
     $this->Version = '1.0';
     $this->Creator = 'Chronos';

trunk/Modules/Finance/Finance.php

@@ -267 +267 @@
       'Table' => 'FinanceTreasuryCheck',
       'DefaultSortColumn' => 'Time',
+      'DefaultSortOrder' => 1,
       'Items' => array(
         'Treasury' => array('Type' => 'TFinanceTreasury', 'Caption' => 'Pokladna', 'Default' => ''),

trunk/Modules/Portal/Portal.php

@@ -17 +17 @@
   }
 
-  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);");*/
+  function DoInsertSampleData(): void
+  {
+    $ActionGroup1 = $this->Database->insert('ActionGroup', array('Name' => 'Síť'));
+    $ActionGroup2 = $this->Database->insert('ActionGroup', array('Name' => 'Místní organizace'));
+    $ActionGroup3 = $this->Database->insert('ActionGroup', array('Name' => 'Stránky občanů'));
+    $ActionGroup4 = $this->Database->insert('ActionGroup', array('Name' => 'Vyhledávání'));
+    $ActionGroup5 = $this->Database->insert('ActionGroup', array('Name' => 'Užitečné'));
+    $ActionGroup6 = $this->Database->insert('ActionGroup', array('Name' => 'Zábava'));
+    $ActionGroup7 = $this->Database->insert('ActionGroup', array('Name' => 'Hostované stránky'));
+    $ActionGroup8 = $this->Database->insert('ActionGroup', array('Name' => 'Prodej počítačů'));
+    $ActionGroup9 = $this->Database->insert('ActionGroup', array('Name' => 'Různé'));
+
+    $PanelColumn1 = $this->Database->insert('PanelColumn', array('Width' => ''));
+    $PanelColumn2 = $this->Database->insert('PanelColumn', array('Width' => ''));
+    $PanelColumn3 = $this->Database->insert('PanelColumn', array('Width' => '70%'));
+
+    $this->Database->insert('Panel', array('Module' => 'ActionGroup', 'Parameters' => $ActionGroup1, 'Order' => 2, 'PanelColumn' => $PanelColumn1));
+    $this->Database->insert('Panel', array('Module' => 'ActionGroup', 'Parameters' => $ActionGroup4, 'Order' => 1, 'PanelColumn' => $PanelColumn2));
+    $this->Database->insert('Panel', array('Module' => 'ActionGroup', 'Parameters' => $ActionGroup5, 'Order' => 2, 'PanelColumn' => $PanelColumn2));
+    $this->Database->insert('Panel', array('Module' => 'ActionGroup', 'Parameters' => $ActionGroup6, 'Order' => 3, 'PanelColumn' => $PanelColumn2));
+    $this->Database->insert('Panel', array('Module' => 'ActionGroup', 'Parameters' => $ActionGroup2, 'Order' => 4, 'PanelColumn' => $PanelColumn2));
+    $this->Database->insert('Panel', array('Module' => 'ActionGroup', 'Parameters' => $ActionGroup3, 'Order' => 5, 'PanelColumn' => $PanelColumn2));
+    $this->Database->insert('Panel', array('Module' => 'NewsGroupList', 'Parameters' => '', 'Order' => 2, 'PanelColumn' => $PanelColumn3));
+    $this->Database->insert('Panel', array('Module' => 'Webcam', 'Parameters' => '', 'Order' => 3, 'PanelColumn' => $PanelColumn1));
+    $this->Database->insert('Panel', array('Module' => 'UserOptions', 'Parameters' => '', 'Order' => 1, 'PanelColumn' => $PanelColumn3));
+    $this->Database->insert('Panel', array('Module' => 'ActionGroup', 'Parameters' => $ActionGroup9, 'Order' => 1, 'PanelColumn' => $PanelColumn1));
+    $this->Database->insert('Panel', array('Module' => 'Meteo', 'Parameters' => '', 'Order' => 4, 'PanelColumn' => $PanelColumn1));
   }
 
@@ -297 +306 @@
     $Output = '';
     $DbResult = $this->Database->query('SELECT * FROM `ActionGroup`');
+    $ActionGroups = array();
     while ($DbRow = $DbResult->fetch_assoc())
       $ActionGroups[$DbRow['Id']] = $DbRow;

trunk/Modules/System/System.php

@@ -16 +16 @@
     $this->Description = 'Base system module';
     $this->Type = ModuleType::System;
+    $this->Dependencies = array(ModuleModuleManager::GetName());
     $this->Models = array(UnitOfMeasure::GetClassName(), ActionIcon::GetClassName(), ActionGroup::GetClassName(),
       ActionType::GetClassName(), Action::GetClassName(), Language::GetClassName(), Country::GetClassName());

trunk/Modules/User/User.php

@@ -27 +27 @@
   function DoInstall(): void
   {
-    $this->Database->insert('PermissionGroup', array('Id' => 1, 'Description' => 'Ostatní'));
-    $this->Database->insert('PermissionGroup', array('Id' => 2, 'Description' => 'Registrovaní uživatelé'));
-    $this->Database->insert('PermissionGroup', array('Id' => 3, 'Description' => 'Zákazníci'));
-    $this->Database->insert('PermissionGroup', array('Id' => 4, 'Description' => 'Správci sítě'));
-    $this->Database->insert('PermissionGroup', array('Id' => 5, 'Description' => 'Systémoví správci'));
+  }
+
+  function DoInsertSampleData(): void
+  {
+    $DbResult = $this->Database->select('User', 'Id', 'Login="admin"');
+    if ($DbResult->num_rows == 0)
+    {
+      $UserId = $this->Database->insert('User', array('Id' => 1, 'Login' => 'admin', 'Name' => 'Admin', 'Password' => 'd04b7c77a814de3207315c2f82dcd97a90ed33ca',
+        'Salt' => 'd5d8eb61e1a20d98b45b415ccd2fae802cb41294', 'Email' => 'admin@localhost', 'LastIpAddress' => null, 'LastLoginTime' => null,
+        'RegistrationTime' => '2021-02-17 14:56:22', 'Locked' => 0, 'InitPassword' => null));
+
+      $PermissionGroup1 = $this->Database->insert('PermissionGroup', array('Description' => 'Ostatní'));
+      $PermissionGroup2 = $this->Database->insert('PermissionGroup', array('Description' => 'Registrovaní uživatelé'));
+      $PermissionGroup3 = $this->Database->insert('PermissionGroup', array('Description' => 'Zákazníci'));
+      $PermissionGroup4 = $this->Database->insert('PermissionGroup', array('Description' => 'Správci sítě'));
+      $PermissionGroup5 = $this->Database->insert('PermissionGroup', array('Description' => 'Systémoví správci'));
+
+      $this->Database->insert('PermissionUserAssignment', array('User' => $UserId, 'AssignedGroup' => $PermissionGroup5));
+    }
   }
 

trunk/Modules/User/UserModel.php

@@ -505 +505 @@
   {
     $Desc = new ModelDesc(self::GetClassName());
-    //$Desc->AddReference('Module', Module::GetClassName());
+    $Desc->AddReference('Module', Module::GetClassName());
     $Desc->AddString('Operation');
     $Desc->AddString('Item');

trunk/Packages/Common/Database.php

@@ -134 +134 @@
   }
 
-  function insert(string $Table, array $Data): void
+  function insert(string $Table, array $Data): int
   {
     $this->query($this->GetInsert($Table, $Data));
     $this->insert_id = $this->PDO->lastInsertId();
+    return $this->insert_id;
   }
 

trunk/Packages/Common/Module.php

@@ -17 +17 @@
   const Enable = 5;
   const Disable = 6;
+  const InsertSampleData = 7;
 }
 
@@ -141 +142 @@
   }
 
+  function InsertSampleData(): void
+  {
+    $this->DoInsertSampleData();
+  }
+
   function Reinstall(): void
   {
@@ -224 +230 @@
   }
 
+  protected function DoInsertSampleData(): void
+  {
+  }
+
   function AddModel(Model $Model): void
   {

trunk/Packages/Common/ModuleManager.php

@@ -57 +57 @@
           if ($Action == ModuleAction::Disable) $Module->Disable();
           if ($Action == ModuleAction::Upgrade) $Module->Upgrade();
+          if ($Action == ModuleAction::InsertSampleData) $Module->InsertSampleData();
         }
       }
@@ -227 +228 @@
   function RegisterModule(Module $Module): void
   {
+    if (array_key_exists($Module->Name, $this->Modules))
+      die('Can\'t register module '.$Module->Name.' because it already exists.');
     $this->Modules[$Module->Name] = &$Module;
     $Module->Manager = &$this;

trunk/Packages/Common/Modules/ModuleManager.php

@@ -260 +260 @@
       $ModelId = $DbRow['Id'];
       $DbResult = $this->Database->delete('ModelField', '(Model='.$ModelId.')');
-    }
-    $this->Database->delete('Model', '(Id='.$ModelId.')');
+      $this->Database->delete('Model', '(Id='.$ModelId.')');
+    } else echo('Can\'t remove model '.$ModelDesc->Name.'<br/>');
     $this->RemoveModelDatabase($ModelDesc);
   }

trunk/Packages/Common/Modules/Setup.php

@@ -59 +59 @@
     $Output = $this->UpdateManager->Upgrade();
     return $Output;
-  }
-
-  function InsertSampleData(): void
-  {
   }
 }
@@ -81 +77 @@
     $this->FullTitle = T('Application setup');
     $this->ShortTitle = T('Application setup');
-    //$this->ParentClass = 'PagePortal';
+    //$this->ParentClass = 'PageSetupRedirect';
     $this->ConfigDir = dirname(dirname(dirname(__FILE__))).'/Config';
     $this->YesNo = array(false => T('No'), true => T('Yes'));
@@ -212 +208 @@
         {
           $Output .= '<h3>Vložení vzorových dat</h3>';
-          ModuleSetup::Cast($this->System->GetModule('Setup'))->InsertSampleData();
+          $this->System->ModuleManager->Perform(array(ModuleAction::InsertSampleData), array(ModuleCondition::Installed));
           $Output .= $this->ControlPanel();
         }