From 7aaa13cc92e81cfb2c923809d48337c15254284a Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sun, 11 Mar 2018 20:40:14 +0100 Subject: Display sectoeur_id rather than relais title. --- api/img_adt_svc_relais.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/api/img_adt_svc_relais.php b/api/img_adt_svc_relais.php index 40b6ddf..9b5e44d 100644 --- a/api/img_adt_svc_relais.php +++ b/api/img_adt_svc_relais.php @@ -139,11 +139,12 @@ function edge_service($adherent_id, $routeur_eid, $service) { EOD; } -function node_relais($rid, $eid, $shape, $label) { +function node_relais($rid, $eid, $shape, $label, $rtitle) { $label = htmlentities($label); + $rtitle = htmlentities($rtitle); return << 
+ $rtitle
$label
rid $rid >, URL="/gestion/relais/view/$rid"]; @@ -154,7 +155,7 @@ EOD; // >, URL="/gestion/relais/view/$rid"]; fwrite($fd, graph_header()); -$sql = "SELECT v.adt, v.adt_title, v.service_id, v.service, v.relais_id, v.relais_degre, v.relais, +$sql = "SELECT v.adt, v.adt_title, v.service_id, v.service, v.relais_id, v.relais_degre, v.relais, v.secteur_id, v.routeur_equipement_id, v.antenne1_equipement_id, v.antenne2_equipement_id, e1.ipmgmt_id AS e1_ip, IF(LENGTH(e1.hostname)>0,e1.hostname,'Routeur') AS e1_title, CONCAT('emid', e1.equipement_modele_id, '.png') AS e1_img, e2.ipmgmt_id AS e2_ip, IF(LENGTH(e2.hostname)>0,e2.hostname,'Antenne1') AS e2_title, CONCAT('emid', e2.equipement_modele_id, '.png') AS e2_img, @@ -195,7 +196,7 @@ while ( $row = $res->fetch_assoc() ) { default: continue; } - fwrite($fd, node_relais($row['relais_id'], $e_node, 'none', $row['relais'])); + fwrite($fd, node_relais($row['relais_id'], $e_node, 'none', 'Secteur '.$row['secteur_id'], $row['relais'])); } } if ($empty) { -- cgit v1.1