summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Pouzenc <ludovic@pouzenc.fr>2018-03-11 20:40:14 +0100
committerLudovic Pouzenc <ludovic@pouzenc.fr>2018-03-11 20:40:14 +0100
commit7aaa13cc92e81cfb2c923809d48337c15254284a (patch)
tree636015750a07376a5c7cd119c9c5840e4b34b895
parentc27cdf5554ce65c9685c3aba43421e2488ad4c1a (diff)
downloadchd_gestion-7aaa13cc92e81cfb2c923809d48337c15254284a.zip
chd_gestion-7aaa13cc92e81cfb2c923809d48337c15254284a.tar.gz
chd_gestion-7aaa13cc92e81cfb2c923809d48337c15254284a.tar.bz2
Display sectoeur_id rather than relais title.
-rw-r--r--api/img_adt_svc_relais.php9
1 files 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 <<<EOD
"r$rid" [ margin=0, shape=$shape, label=<
- <font point-size="8">&nbsp;</font><br/>
+ <font point-size="8">$rtitle</font><br/>
$label<br/>
<font point-size="8">rid $rid</font>
>, 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) {