Changeset 7827 for trunk/src/map/inc

Timestamp:

Apr 18, 2010, 2:00:42 PM (15 years ago)

Author:

janveeden

Message:

Gebruiker and beheerder view are now different. Beheerder view shows all info, gebruiker only a bit of info. Fixed typo in kmlHandler.php. Added a Math.random to calls to node_info.php to prevent unwanted caching.

Location:

trunk/src/map/inc

Files:

• kmlHandler.php (modified) (2 diffs)
• node_info.php (modified) (6 diffs)
• nodemapWL.js (modified) (5 diffs)

trunk/src/map/inc/kmlHandler.php

@@ -59 +59 @@
                                         $type = $data->value;
                                         
-                                if($name == "hostname")
+                                if($name == "hostName")
                                         $hostname = $data->value;
                                         
@@ -67 +67 @@
                                 if($name == "checkExecutionTime")
                                         $checkExecutionTime = $data->value;
+                                        
+                                if($name == "lastCheck")
+                                        $lastCheck = $data->value;
                                         
                                 if($name == "currentState")

trunk/src/map/inc/node_info.php

@@ -5 +5 @@
 {
         setcookie("view", $_GET['view']); 
+        header('P3P: CP="IDC DSP COR CURa ADMa OUR IND PHY ONL COM STA"'); 
         $view = $_GET['view'];
 }
@@ -56 +57 @@
                         $name = $marker['name'];
                         $location = $marker['location'];
+                        $status = $marker['status'];
+                        $interfaces = $marker['interfaces'];
+                        $masterIP = $marker['masterIP'];
+                        $nodeType = $marker['nodeType'];
+                        $type = $marker['type'];
+                        $hostname = $marker['hostname'];
+                        $hasBeenChecked = $marker['hasBeenChecked'];
+                        $checkExecutionTime = $marker['checkExecutionTime'];
+                        $currentState = $marker['currentState'];
+                        $problemHasBeenAcknowledged = $marker['problemHasBeenAcknowledged'];
+                        
+                        $lastcheck = $marker['lastCheck'];
+                        $lastcheck = date('d-m-Y H:i:s', (int)$lastcheck);
+
                 }
         }
@@ -64 +79 @@
                 echo <<<EOF
                 <div id='nodeinfo'>
-                {$name}<br/>
-                Locatie: {$location}
+                <b>{$name}</b>
+                        <div id="information">
+                        <p>Locatie: {$location}
+                        <p>Status: {$status}
+                        <p>Inferfaces: {$interfaces}
+                        <p>Master IP: {$masterIP}
+                        <p>Node type: {$nodeType}
+                        <p>Type: {$type}
+                        <p>Hostname: {$hostname}
+                        <p>Has been check: {$hasBeenChecked}
+                        <p>Check execution time: {$checkExecutionTime}
+                        <p>Current state: {$currentState}
+                        <p>Problem has been acknowledged: {$problemHasBeenAcknowledged}
                 </div>
                 <div id="timestamp">
-                        Laatste update: 15:42 <br/>
-                        Do 25 maart
+                        Laatste update: {$lastcheck}    
                 </div>
 EOF;
@@ -77 +102 @@
                 echo <<<EOF
                 <div id='nodeinfo'>
-                {$name}<br/>
-                Locatie: {$location}
+                <b>{$name}</b>
+                        <div id="information">
+                        <p>Locatie: {$location}
+                        <p>Status: {$status}
+                        <p>Type: {$type}
+                        <p>Hostname: {$hostname}
                 </div>
                 <div id="timestamp">
@@ -93 +122 @@
         echo <<<EOF
         <div id="nodeinfo">
-                <h1>Nodes:</h1>
-                <h2>
+                <b>Nodes:</b><br/>
+        
                 Lijst met nodes in deze cluster<br/>
                 <div id="clusterlist$selected" >
@@ -105 +134 @@
 
         echo <<<EOF
-                </select><br/>
+                </select>
                 </div>
-                </h2>
-        </div>
-        <div id="timestamp">
-                Laatste update: 15:42 <br/>
-                Do 25 maart
         </div>
 EOF;

trunk/src/map/inc/nodemapWL.js

@@ -100 +100 @@
                 markerSelected = marker;
                 marker.setImage("../img/sleutelGroenSelected.png");//Path should be in config
-                loadXMLDoc("inc/node_info.php?type=single&name="+name+""); //Should also be in config   
+                loadXMLDoc("inc/node_info.php?type=single&name="+name+"&a="+Math.random()); //Should also be in config  
         }
 }
@@ -114 +114 @@
                 map.addOverlay(polygon);
                 
-                loadXMLDoc("inc/node_info.php?type=single&name="+name+"");//Path should be in config
+                loadXMLDoc("inc/node_info.php?type=single&name="+name+"&a="+Math.random());//Path should be in config
 
                 /*
@@ -221 +221 @@
         //end
         
-        loadXMLDoc("inc/node_info.php?type=cluster&markers="+a_php+"&sel=selected")
+        loadXMLDoc("inc/node_info.php?type=cluster&markers="+a_php+"&sel=selected"+"&a="+Math.random())
 }
 
@@ -356 +356 @@
 function suggestMarkers(value)
 {
-        loadSuggest("inc/suggestions.php?value="+value);
+        loadSuggest("inc/suggestions.php?value="+value+"&a="+Math.random());
 }
 
@@ -368 +368 @@
                 {
                         map.setCenter(markerArray[i].getLatLng(), 15);
-                        loadXMLDoc("inc/node_info.php?type=single&name="+value+"")
+                        loadXMLDoc("inc/node_info.php?type=single&name="+value+"&a="+Math.random())
                 }
         }