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

Timestamp:

Apr 6, 2015, 11:08:10 PM (9 years ago)

Author:

chronos

Message:

• Modified: Merged NetworkLink Interface1 and Interface2 to single column in subtable of NetworkInterface.
• Added: Table NetworkLinkType.
• Fixed: Do not show symbol "-" if network interface doesn't have a name.

File:

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

trunk/Modules/Network/Network.php

@@ -186 +186 @@
         'Online' => array('Type' => 'TOnlineState', 'Caption' => 'Běží', 'Default' => '0', 'ReadOnly' => true),
         'LastOnline' => array('Type' => 'DateTime', 'Caption' => 'Naposledy běželo', 'Default' => '', 'ReadOnly' => true),
-        'Links1' => array('Type' => 'TNetworkLinkListInterface1', 'Caption' => 'Propojení 1', 'Default' => ''),
-        'Links2' => array('Type' => 'TNetworkLinkListInterface2', 'Caption' => 'Propojení 2', 'Default' => ''),
+        'Links' => array('Type' => 'TNetworkLinkListInterface', 'Caption' => 'Propojení', 'Default' => ''),
         'UpDown' => array('Type' => 'TNetworkInterfaceUpDown', 'Caption' => 'Změny stavu', 'Default' => ''),
         'Signal' => array('Type' => 'TNetworkSignalListInterface', 'Caption' => 'Signál', 'Default' => ''),
@@ -193 +192 @@
 
       ),
-    ));
+    ));    
     $this->System->FormManager->RegisterClass('NetworkInterfaceType', array(
       'Title' => 'Typ síťového rozhraní',
@@ -229 +228 @@
       'Table' => 'NetworkLink',
       'Items' => array(
-        'Type' => array('Type' => 'Integer', 'Caption' => 'Typ', 'Default' => '1'),
+        'Type' => array('Type' => 'TNetworkLinkType', 'Caption' => 'Typ', 'Default' => '1'),
         'Interface1' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní 1', 'Default' => ''),
         'Interface2' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní 2', 'Default' => ''),
+      ),
+    ));
+    $this->System->FormManager->RegisterClass('NetworkLinkUnion', array(
+      'Title' => 'Síťové propojení',
+        'BaseTable' => 'NetworkLink',
+      'SQL' => '(SELECT `Id`, `Type`, `Interface1` AS `Interface`, `Interface2` AS `InterfaceOther` FROM `NetworkLink`) '.
+                'UNION (SELECT `Id`, `Type`, `Interface2` AS `Interface`, `Interface1` AS `InterfaceOther` FROM `NetworkLink`)',
+      'Items' => array(
+        'Type' => array('Type' => 'TNetworkLinkType', 'Caption' => 'Typ', 'Default' => '1', 'ReadOnly' => true),
+        'Interface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní 1', 'Default' => '', 'ReadOnly' => true),
+                'InterfaceOther' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní 2', 'Default' => '', 'ReadOnly' => true),
+      ),
+    ));
+    
+    $this->System->FormManager->RegisterClass('NetworkLinkType', array(
+      'Title' => 'Typ síťového propojení',
+      'Table' => 'NetworkLinkType',
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
       ),
     ));
@@ -369 +387 @@
         'Type' => 'Reference',
         'Table' => 'NetworkInterface',
-        'View' => '(SELECT NetworkInterface.*, CONCAT(NetworkDevice.Name, "-", NetworkInterface.Name) AS DeviceName FROM NetworkInterface '.
+        'View' => '(SELECT NetworkInterface.*, CONCAT_WS("-", NetworkDevice.Name, NULLIF(NetworkInterface.Name, "")) AS DeviceName FROM NetworkInterface '.
         'LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device) AS T',
         'Id' => 'Id',
@@ -396 +414 @@
       'Filter' => '1',
     ));
+    $this->System->FormManager->RegisterFormType('TNetworkLinkType', array(
+      'Type' => 'Reference',
+        'Table' => 'NetworkLinkType',
+        'Id' => 'Id',
+        'Name' => 'Name',
+        'Filter' => '1',
+    ));    
     $this->System->FormManager->RegisterFormType('TDeviceAPIType', array(
       'Type' => 'Reference',
@@ -417 +442 @@
       'Filter' => '1',
     ));
+    $this->System->FormManager->RegisterFormType('TNetworkLinkListInterface', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkLinkUnion',
+        'Id' => 'Id',
+        'Ref' => 'Interface',
+        'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkLinkListInterface1', array(
+        'Type' => 'ManyToOne',
+        'Table' => 'NetworkLink',
+        'Id' => 'Id',
+        'Ref' => 'Interface1',
+        'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkLinkListInterface2', array(
+        'Type' => 'ManyToOne',
+        'Table' => 'NetworkLink',
+        'Id' => 'Id',
+        'Ref' => 'Interface2',
+        'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkInterfaceUpDown', array(
+        'Type' => 'ManyToOne',
+        'Table' => 'NetworkInterfaceUpDown',
+        'Id' => 'Id',
+        'Ref' => 'Interface',
+        'Filter' => '1',
+    ));
+   
   }