Changeset 899 for trunk/Modules/System

Timestamp:

Feb 17, 2021, 12:30:23 PM (4 years ago)

Author:

chronos

Message:

• Modified: AppModule renamed to Module. AppModuleManger renamed to ModuleManager.
• Fixed: Keep Modules Id in ModulesConfig.php in sync with database list of modules.

Location:

trunk/Modules/System

Files:

• System.php (modified) (3 diffs)
• SystemModels.php (modified) (7 diffs)

trunk/Modules/System/System.php

@@ -3 +3 @@
 include_once(dirname(__FILE__).'/SystemModels.php');
 
-class ModuleSystem extends AppModule
+class ModuleSystem extends Module
 {
   public bool $InstalledChecked;
@@ -13 +13 @@
     $this->Version = '1.0';
     $this->Creator = 'Chronos';
-    $this->License = 'GNU/GPL';
+    $this->License = 'GNU/GPLv3';
     $this->Description = 'Base system module';
-    $this->Dependencies = array();
     $this->Type = ModuleType::System;
-  }
-
-  function GetModels(): array
-  {
-    return array(UnitOfMeasure::GetClassName(), ActionIcon::GetClassName(), ActionGroup::GetClassName(),
+    $this->Models = array(UnitOfMeasure::GetClassName(), ActionIcon::GetClassName(), ActionGroup::GetClassName(),
       ActionType::GetClassName(), Action::GetClassName(), Language::GetClassName(), Country::GetClassName());
   }
@@ -141 +136 @@
   }
 
-  static function Cast(AppModule $AppModule): ModuleSystem
+  static function Cast(Module $Module): ModuleSystem
   {
-    if ($AppModule instanceof ModuleSystem)
+    if ($Module instanceof ModuleSystem)
     {
-      return $AppModule;
+      return $Module;
     }
-    throw new Exception('Expected ModuleSystem type but got '.gettype($AppModule));
+    throw new Exception('Expected ModuleSystem type but got '.gettype($Module));
   }
 

trunk/Modules/System/SystemModels.php

@@ -3 +3 @@
 class UnitOfMeasure extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -14 +14 @@
 class Action extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -30 +30 @@
 class ActionIcon extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -40 +40 @@
 class ActionGroup extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -50 +50 @@
 class ActionType extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -60 +60 @@
 class Language extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -70 +70 @@
 class Country extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());