Changeset 921 for trunk/Modules/Network/Network.php

Timestamp:

Feb 25, 2022, 9:30:55 AM (2 years ago)

Author:

chronos

Message:

• Modified: NetworkSignal MAC column transformed into separate table NetworkMac.

File:

• trunk/Modules/Network/Network.php (modified) (3 diffs)

trunk/Modules/Network/Network.php

@@ -120 +120 @@
       NetworkDomain::GetClassName(), NetworkDomainServer::GetClassName(), NetworkDomainView::GetClassName(),
       NetworkDomainItemFilter::GetClassName(), DeviceAPIType::GetClassName(), NetworkInterfaceWireless::GetClassName(),
-      NetworkInterfaceUpDown::GetClassName(), NetworkPortUpDown::GetClassName());
+      NetworkInterfaceUpDown::GetClassName(), NetworkPortUpDown::GetClassName(), NetworkMac::GetClassName());
 
     // TODO: Make notify time configurable
@@ -380 +380 @@
       'Items' => array(
         'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
-        'MAC' => array('Type' => 'MacAddress', 'Caption' => 'Fyzická adresa (MAC)', 'Default' => ''),
+        'MAC' => array('Type' => 'TNetworkMac', 'Caption' => 'Fyzická adresa (MAC)', 'Default' => ''),
         'Interface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => '', 'Null' => true),
         'Value' => array('Type' => 'Integer', 'Caption' => 'Signál', 'Default' => '0', 'Suffix' => 'dBm'),
@@ -608 +608 @@
         'Duration' => array('Type' => 'TimeDiff', 'Caption' => 'Trvání', 'Default' => '', 'ReadOnly' => true),
       ),
+    ));
+    $this->System->FormManager->RegisterClass('NetworkMac', array(
+      'Title' => 'Fyzická síťová adresa',
+      'Table' => 'NetworkMac',
+      'Items' => array(
+        'MAC' => array('Type' => 'String', 'Caption' => 'Fyzická adresa', 'Default' => ''),
+        'Signal' => array('Type' => 'TNetworkSignalListMac', 'Caption' => 'Signál rozhraní', 'Default' => ''),        
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkMac', array(
+      'Type' => 'Reference',
+      'Table' => 'NetworkMac',
+      'Id' => 'Id',
+      'Name' => 'MAC',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkSignalListMac', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkSignal',
+      'Id' => 'Id',
+      'Ref' => 'Mac',
+      'Filter' => '1',
     ));
     $this->System->FormManager->RegisterFormType('TNetworkProtocol', array(