Changeset 909 for trunk

Timestamp:

May 3, 2021, 9:48:26 PM (4 years ago)

Author:

chronos

Message:

• Added: Support for customer address places.
• Added: Limit direct traffic to router.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (4 diffs)
• Modules/Network/Network.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/Generators/FirewallMangle.php (modified) (1 diff)
• Modules/System/System.php (modified) (2 diffs)

trunk/Application/UpdateTrace.php

@@ -2277 +2277 @@
       882 => array('Revision' => 885, 'Function' => 'UpdateTo885'),
       885 => array('Revision' => 901, 'Function' => 'UpdateTo901'),
-      907 => array('Revision' => 907, 'Function' => 'UpdateTo907'),
+      901 => array('Revision' => 907, 'Function' => 'UpdateTo907'),
     );
   }

trunk/Modules/Customer/Customer.php

@@ -13 +13 @@
     $this->Dependencies = array(ModuleUser::GetName(), ModuleFinance::GetName());
     $this->Models = array(Member::GetClassName(), MemberPayment::GetClassName(), SupportActivity::GetClassName(), ServiceCategory::GetClassName(),
-      Service::GetClassName(), ServiceCustomerRel::GetClassName(), UserCustomerRel::GetClassName());
+      Service::GetClassName(), ServiceCustomerRel::GetClassName(), UserCustomerRel::GetClassName(), AddressPlace::GetClassName());
   }
 
@@ -26 +26 @@
         'ResponsibleUser' => array('Type' => 'TUser', 'Caption' => 'Zodpovědný uživatel', 'Default' => ''),
         'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
+        'AddressPlace' => array('Type' => 'TAddressPlace', 'Caption' => 'Adresní místo', 'Default' => '', 'Null' => true),
         'FamilyMemberCount' => array('Type' => 'String', 'Caption' => 'Bydlících osob', 'Default' => '0', 'Suffix' => 'osob'),
         'MembershipDate' => array('Type' => 'Date', 'Caption' => 'Datum členství', 'Default' => ''),
@@ -115 +116 @@
       ),
     ));
+    $this->System->FormManager->RegisterClass('AddressPlace', array(
+      'Title' => 'Adresní místno',
+      'Table' => 'AddressPlace',
+      'DefaultSortColumn' => 'HouseNumber',
+      'DefaultSortOrder' => 1,
+      'Items' => array(
+        'Town' => array('Type' => 'String', 'Caption' => 'Město', 'Default' => ''),
+        'Street' => array('Type' => 'String', 'Caption' => 'Ulice', 'Default' => ''),
+        'HouseNumber' => array('Type' => 'Integer', 'Caption' => 'Číslo domu', 'Default' => ''),
+        'HouseNumberType' => array('Type' => 'THouseNumberType', 'Caption' => 'Typ čísla', 'Default' => ''),
+        'Psc' => array('Type' => 'Integer', 'Caption' => 'PSČ', 'Default' => ''),
+        'RuianCode' => array('Type' => 'Integer', 'Caption' => 'Kód Ruian', 'Default' => ''),
+        'Customers' => array('Type' => 'TCustomerListAddressPlace', 'Caption' => 'Zákazníci', 'Default' => '', 'Null' => true, 'NotInList' => true),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TAddressPlace', array(
+      'Type' => 'Reference',
+      'Table' => 'AddressPlace',
+      'Id' => 'Id',
+      'Name' => 'CONCAT_WS(" ", NULLIF(AddressPlace.Town, ""), REPLACE(REPLACE(AddressPlace.HouseNumberType, "0", ""), 1, "e.v."), NULLIF(AddressPlace.HouseNumber, ""))',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('THouseNumberType', array(
+      'Type' => 'Enumeration',
+      'States' => array(0 => 'Popisné', 1 => 'Evidenční'),
+    ));
+    $this->System->FormManager->RegisterFormType('TCustomerListAddressPlace', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'Member',
+      'Id' => 'Id',
+      'Ref' => 'AddressPlace',
+      'Filter' => '1',
+    ));
     $this->System->FormManager->RegisterFormType('TServiceCategory', array(
       'Type' => 'Reference',
@@ -387 +421 @@
   }
 }
+
+class AddressPlace extends Model
+{
+  static function GetModelDesc(): ModelDesc
+  {
+    $Desc = new ModelDesc(self::GetClassName());
+    $Desc->AddString('Town');
+    $Desc->AddString('Street');
+    $Desc->AddString('HouseNumber');
+    $Desc->AddEnum('HouseNumberType', array('Popisné', 'Evidenční'));
+    $Desc->AddString('Psc');
+    $Desc->AddInteger('RuianCode');
+    return $Desc;
+  }
+}

trunk/Modules/Network/Network.php

@@ -63 +63 @@
         foreach ($ChannelList as $Frequency)
         {
-          if (($DbRow2['Frequency'] == $Frequency)) $Color = '#000000';
-            else if (($LowFrequency <= ($Frequency - 2.5)) and ($HighFrequency >= ($Frequency + 2.5))) $Color = '#808080';
-            else if (($LowFrequency == $Frequency) or ($HighFrequency == $Frequency)) $Color = '#c0c0c0';
+          if (($DbRow2['Frequency'] == $Frequency)) $Color = '#408040';
+            else if (($LowFrequency <= ($Frequency - 2.5)) and ($HighFrequency >= ($Frequency + 2.5))) $Color = '#50d050';
+            else if (($LowFrequency == $Frequency) or ($HighFrequency == $Frequency)) $Color = '#a0d0a0';
             else $Color = '#ffffff';
           $Output .= '<td style="background-color: '.$Color.';">&nbsp;</td>';
@@ -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/NetworkConfigRouterOS/Generators/FirewallMangle.php

@@ -238 +238 @@
     $this->ProcessNode($AddressTree);
 
+    // Limit direct input/output traffic to gateway
+    $PacketMark = GetMarkByComment('rt-gateway-3-out');
+    $ItemsFirewall[] = array('chain' => 'output', 'out-interface' => $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'local-out',);
+    $PacketMark = GetMarkByComment('rt-gateway-3-in');
+    $ItemsFirewall[] = array('chain' => 'input', 'in-interface' => $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'local-in',);
+
     // Limited free internet
     $PacketMark = GetMarkByComment('free-out');

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(), AddressPlace::GetClassName());
+      ActionType::GetClassName(), Action::GetClassName(), Language::GetClassName(), Country::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',