Changeset 482 for trunk/Modules/Map/Map.php

Timestamp:

Feb 7, 2013, 9:45:02 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Pozice zařízení se nyní zadává jako výběr položky ze samostatné tabulky pojmenovaných pozic. To by mělo zjednodušit zadávání pozice nových zařízení a sloučit do jedné značky více zařízení ve ze stejné pozice.
• Přidáno: Základní datová struktura pro evidenci zaměstnanců.

File:

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

trunk/Modules/Map/Map.php

@@ -61 +61 @@
     while($Link = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->query('SELECT * FROM NetworkDevice WHERE NetworkDevice.Id = (SELECT Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface1'].')');
-      $DbResult3 = $this->Database->query('SELECT * FROM NetworkDevice WHERE NetworkDevice.Id = (SELECT Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface2'].')');
+      $DbResult2 = $this->Database->query('SELECT NetworkDevice.Used, MapPosition.Latitude, MapPosition.Longitude FROM NetworkDevice JOIN MapPosition ON MapPosition.Id = NetworkDevice.MapPosition WHERE NetworkDevice.Id = (SELECT NetworkInterface.Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface1'].')');
+      $DbResult3 = $this->Database->query('SELECT NetworkDevice.Used, MapPosition.Latitude, MapPosition.Longitude FROM NetworkDevice JOIN MapPosition ON MapPosition.Id = NetworkDevice.MapPosition WHERE NetworkDevice.Id = (SELECT NetworkInterface.Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface2'].')');
       if(($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
       {
@@ -68 +68 @@
         $Device2 = $DbResult3->fetch_assoc();
         if(($Device1['Used'] == 1) and ($Device2['Used'] == 1))
-          $Output .= 'new GPolyline([new GLatLng('.$Device1['PositionLatitude'].', '.$Device1['PositionLongitude'].'),new GLatLng('.$Device2['PositionLatitude'].', '.$Device2['PositionLongitude'].')], "#4F4FBF", 3, 0.8), ';
+          $Output .= 'new GPolyline([new GLatLng('.$Device1['Latitude'].', '.$Device1['Longitude'].'),new GLatLng('.$Device2['Latitude'].', '.$Device2['Longitude'].')], "#4F4FBF", 3, 0.8), ';
       }
     }
@@ -99 +99 @@
                     NetworkDevices = [';
 
-    $DbResult = $this->Database->query('SELECT * FROM NetworkDevice WHERE Used=1');
+    $DbResult = $this->Database->query('SELECT GROUP_CONCAT(NetworkDevice.Name SEPARATOR ",") AS Name, '.
+      'MapPosition.Latitude AS Latitude, MapPosition.Longitude AS Longitude, MapPosition.Name AS NodeName '.
+      'FROM NetworkDevice LEFT JOIN MapPosition ON MapPosition.Id = NetworkDevice.MapPosition '.
+      'WHERE (NetworkDevice.Used=1) AND (NetworkDevice.MapPosition IS NOT NULL) '.
+      'GROUP BY NetworkDevice.MapPosition');
     while($Device = $DbResult->fetch_assoc())
     {
-      $Output .= 'new GMarker(new GLatLng('.$Device['PositionLatitude'].', '.$Device['PositionLongitude'].'), {title: "'.$Device['Name'].'", icon:tinyIcon }), ';
+      $Output .= 'new GMarker(new GLatLng('.$Device['Latitude'].', '.
+      $Device['Longitude'].'), {title: "'.$Device['NodeName'].': '.$Device['Name'].'", icon:tinyIcon }), ';
     }
     $Output .= '];