Changeset 907 for trunk

Timestamp:

Apr 16, 2021, 9:57:28 PM (4 years ago)

Author:

chronos

Message:

• Modified: Support AddressPlace in Member.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/System/System.php (modified) (2 diffs)
• style/new/style.css (modified) (1 diff)

trunk/Application/UpdateTrace.php

@@ -2152 +2152 @@
   $Manager->Execute("INSERT INTO `PermissionOperation` (`Id`, `Module`, `Operation`, `Item`, `ItemId`) VALUES (NULL, '4', 'DownloadById', '', '0');");
   $Manager->Execute("INSERT INTO `PermissionGroupAssignment` (`Id`, `Group`, `AssignedGroup`, `AssignedOperation`) VALUES (NULL, '4', NULL, '53');");
+}
+
+function UpdateTo907(UpdateManager $Manager): void
+{
+  $Manager->Execute('CREATE TABLE `AddressPlace` (
+  `Id` int(11) NOT NULL,
+  `Town` varchar(255) NOT NULL,
+  `Street` varchar(255) NOT NULL,
+  `HouseNumber` int(11) NOT NULL,
+  `HouseNumberType` int(11) NOT NULL,
+  `Psc` int(11) NOT NULL,
+  `RuianCode` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+  $Manager->Execute('ALTER TABLE `AddressPlace` ADD PRIMARY KEY (`Id`);');
+  $Manager->Execute('ALTER TABLE `AddressPlace` MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
+  $Manager->Execute('ALTER TABLE `Member` ADD `AddressPlace` INT NULL AFTER `Subject`;');
+  $Manager->Execute('ALTER TABLE `Member` ADD KEY (`AddressPlace`);');
+  $Manager->Execute('ALTER TABLE `Member` ADD FOREIGN KEY (`AddressPlace`) REFERENCES `AddressPlace`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
 }
 
@@ -2259 +2277 @@
       882 => array('Revision' => 885, 'Function' => 'UpdateTo885'),
       885 => array('Revision' => 901, 'Function' => 'UpdateTo901'),
+      907 => array('Revision' => 907, 'Function' => 'UpdateTo907'),
     );
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 906; // Subversion revision
-$DatabaseRevision = 901; // SQL structure revision
-$ReleaseTime = strtotime('2021-02-19');
+$Revision = 907; // Subversion revision
+$DatabaseRevision = 907; // SQL structure revision
+$ReleaseTime = strtotime('2021-03-24');

trunk/Modules/Network/Network.php

@@ -168 +168 @@
         'Member' => array('Type' => 'TMember', 'Caption' => 'Zákazník', 'Default' => '0'),
         'Location' => array('Type' => 'TMember', 'Caption' => 'Umístění', 'Default' => '0'),
+        'AddressPlace' => array('Type' => 'TAddressPlace', 'Caption' => 'Adresní místo', 'Default' => null, 'Null' => true),
         'Service' => array('Type' => 'TServiceCustomerRel', 'Caption' => 'Služba', 'Default' => '', 'Null' => true),
         'Used' => array('Type' => 'Boolean', 'Caption' => 'Použito', 'Default' => '1'),

trunk/Modules/System/System.php

@@ -18 +18 @@
     $this->Dependencies = array(ModuleModuleManager::GetName());
     $this->Models = array(UnitOfMeasure::GetClassName(), ActionIcon::GetClassName(), ActionGroup::GetClassName(),
-      ActionType::GetClassName(), Action::GetClassName(), Language::GetClassName(), Country::GetClassName());
+      ActionType::GetClassName(), Action::GetClassName(), Language::GetClassName(), Country::GetClassName(), AddressPlace::GetClassName());
   }
 
@@ -93 +93 @@
       'Filter' => '1',
     ));
+    $this->System->FormManager->RegisterFormType('TAddressPlace', array(
+      'Type' => 'Reference',
+      'Table' => 'AddressPlace',
+      'Id' => 'Id',
+      'Name' => 'CONCAT_WS(" ", NULLIF(AddressPlace.Town, ""), NULLIF(AddressPlace.HouseNumber, ""))',
+      'Filter' => '1',
+    ));
     $this->System->FormManager->RegisterFormType('TUnitOfMeasure', array(
       'Type' => 'Reference',

trunk/style/new/style.css

@@ -211 +211 @@
 }
 
+.Centered
+{
+  text-align: center;
+  margin-left: auto;
+  margin-right: auto;
+}
+
 .Form
 {