Changeset 921 for trunk/Modules/Network

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk/Modules/Network

Files:

• Network.php (modified) (3 diffs)
• NetworkModels.php (modified) (2 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(

trunk/Modules/Network/NetworkModels.php

@@ -192 +192 @@
     $Desc = new ModelDesc(self::GetClassName());
     $Desc->AddDateTime('Time');
-    $Desc->AddString('MAC');
+    $Desc->AddReference('MAC', NetworkMac::GetClassName());
     $Desc->AddReference('Interface', NetworkInterface::GetClassName());
     $Desc->AddInteger('Value');
@@ -342 +342 @@
   }
 }
+
+class NetworkMac extends Model
+{
+  static function GetModelDesc(): ModelDesc
+  {
+    $Desc = new ModelDesc(self::GetClassName());
+    $Desc->AddString('MAC'); // size=17
+    return $Desc;
+  }
+
+  function GetIndex(string $MAC)
+  {
+    $DbResult = $this->Database->select('NetworkMac', 'Id', 'MAC="'.$MAC.'"');
+    if ($DbResult->num_rows > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      return $DbRow['Id'];
+    } else 
+    {
+      return $this->Database->insert('NetworkMac', array('MAC' => $MAC));
+    }
+  }
+}