Changeset 894 for trunk/Modules/Subject/Subject.php

Timestamp:

Jan 5, 2021, 10:30:31 PM (3 years ago)

Author:

chronos

Message:

• Modified: Further improved models initialization system.

File:

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

trunk/Modules/Subject/Subject.php

@@ -133 +133 @@
   function GetModels(): array
   {
-    return array('Country', 'Subject', 'ContactCategory', 'Contact');
+    return array(Country::GetClassName(), Subject::GetClassName(), ContactCategory::GetClassName(),
+      Contact::GetClassName());
   }
 
@@ -149 +150 @@
   static function GetDesc(): ModelDesc
   {
-    $Desc = new ModelDesc('Subject');
+    $Desc = new ModelDesc(self::GetClassName());
     $Desc->AddString('Name');
     $Desc->AddString('AddressStreet');
     $Desc->AddString('AddressTown');
     $Desc->AddString('AddressPSC');
-    $Desc->AddReference('AddressCountry', 'Country', true);
+    $Desc->AddReference('AddressCountry', Country::GetClassName(), true);
     $Desc->AddString('IC');
     $Desc->AddString('DIC');
     $Desc->AddBoolean('PayVAT');
-    $Desc->AddReference('MapPosition', 'MapPosition', true);
+    $Desc->AddReference('MapPosition', MapPosition::GetClassName(), true);
     $Desc->AddString('WWW');
     $Desc->AddString('Note');
@@ -169 +170 @@
   static function GetDesc(): ModelDesc
   {
-    $Desc = new ModelDesc('Country');
+    $Desc = new ModelDesc(self::GetClassName());
     $Desc->AddString('Name');
     return $Desc;
@@ -179 +180 @@
   static function GetDesc(): ModelDesc
   {
-    $Desc = new ModelDesc('Contact');
-    $Desc->AddReference('Category', 'ContactCategory', true);
+    $Desc = new ModelDesc(self::GetClassName());
+    $Desc->AddReference('Category', ContactCategory::GetClassName(), true);
     $Desc->AddString('Value');
-    $Desc->AddReference('Subject', 'Subject', true);
-    $Desc->AddReference('User', 'User', true);
+    $Desc->AddReference('Subject', Subject::GetClassName(), true);
+    $Desc->AddReference('User', User::GetClassName(), true);
     $Desc->AddString('Description');
     $Desc->AddBoolean('Receive');
@@ -194 +195 @@
   static function GetDesc(): ModelDesc
   {
-    $Desc = new ModelDesc('ContactCategory');
+    $Desc = new ModelDesc(self::GetClassName());
     $Desc->AddString('Name');
     return $Desc;