Changeset 865

Timestamp:

Dec 23, 2019, 12:31:52 AM (5 years ago)

Author:

chronos

Message:

• Added: Related lists for MapPosition and NetworkDeviceType.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Map/Map.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (4 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 862; // Subversion revision
+$Revision = 865; // Subversion revision
 $DatabaseRevision = 862; // SQL structure revision
-$ReleaseTime = strtotime('2019-10-04');
+$ReleaseTime = strtotime('2019-12-23');

trunk/Modules/Map/Map.php

@@ -277 +277 @@
         'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
         'Pos' => array('Type' => 'MapPosition', 'Caption' => 'Poloha', 'Default' => '0;0'),
+        'Subjects' => array('Type' => 'TSubjectListMapPosition', 'Caption' => 'Subjekty', 'Default' => ''),
+        'NetworkDevices' => array('Type' => 'TNetworkDeviceListMapPosition', 'Caption' => 'Síťová zařízení', 'Default' => ''),
       ),
       'ItemActions' => array(
@@ -292 +294 @@
       'Filter' => '1',
     ));
+    $this->System->FormManager->RegisterFormType('TSubjectListMapPosition', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'Subject',
+      'Id' => 'Id',
+      'Ref' => 'MapPosition',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkDeviceListMapPosition', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkDevice',
+      'Id' => 'Id',
+      'Ref' => 'MapPosition',
+      'Filter' => '1',
+    ));
   }
 

trunk/Modules/Network/Network.php

@@ -193 +193 @@
         'ShowOnline' => array('Type' => 'Boolean', 'Caption' => 'Ukázat online', 'Default' => '0'),
         'IconName' => array('Type' => 'String', 'Caption' => 'Jméno ikony', 'Default' => '0'),
-      ),
+        'Devices' => array('Type' => 'TNetworkDeviceListType', 'Caption' => 'Síťová zařízení', 'Default' => ''),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkDeviceListType', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkDevice',
+      'Id' => 'Id',
+      'Ref' => 'Type',
+      'Filter' => '1',
     ));
     $this->System->FormManager->RegisterClass('NetworkDeviceLog', array(
@@ -748 +756 @@
     $this->Database->query('DELETE FROM `NetworkInterfaceLatency` WHERE `Interface`='.$Id);
   }
-  
+
   function ImportNetworkLog($Parameters)
   {
     global $Config;
-    
+
     $DbResult = $this->System->Database->select('NetworkDeviceLog', 'Time',
       '1 ORDER BY Time DESC LIMIT 1');
@@ -762 +770 @@
 
     $RemoteDb = new Database();
-    $RemoteDb->Connect($Config['NetworkLog']['Host'], $Config['NetworkLog']['User'], 
+    $RemoteDb->Connect($Config['NetworkLog']['Host'], $Config['NetworkLog']['User'],
       $Config['NetworkLog']['Password'], $Config['NetworkLog']['Database']);
     $DbResult = $RemoteDb->select('SystemEvents', '*', '`ReceivedAt`>"'. TimeToMysqlDate($StartTime).'"'.$WhereTime.' ORDER BY `Time` DESC');
@@ -768 +776 @@
     {
       $DbResult2 = $this->System->Database->select('NetworkInterface', 'Device, CONCAT(CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")), ".") AS `Name` ', '`Name` LIKE "'.$DbRow['FromHost'].'"');
-      if ($DbResult2->num_rows > 0)              
+      if ($DbResult2->num_rows > 0)
       {
         $DbRow2 = $DbResult2->fetch_assoc();
         $DeviceID = $DbRow2['Device'];
-        $this->System->Database->insert('NetworkDeviceLog', array('Time' => $DbRow['ReceivedAt'], 
+        $this->System->Database->insert('NetworkDeviceLog', array('Time' => $DbRow['ReceivedAt'],
           'Device' => $DeviceId, 'Message' => $DbRow['Message'], 'Tags' => $DbRow['SysLogTag']));
       } else echo('Host '.$DbRow['Host'].' not paired with network device.'."\n");