Update synoptique ADT -> Svc -> Equipement (icones et labels)

38 files changed, 44 insertions, 9 deletions

diff --git a/api/icons/AF5X-Mars.png b/api/icons/AF5X-Mars.png
new file mode 100644
index 0000000..64fdd2f
--- /dev/null
+++ b/api/icons/AF5X-Mars.png
diff --git a/api/icons/NBEM5-16.png b/api/icons/NBEM5-16.png
new file mode 100644
index 0000000..4b9ab62
--- /dev/null
+++ b/api/icons/NBEM5-16.png
diff --git a/api/icons/NBEM5-19.png b/api/icons/NBEM5-19.png
new file mode 100644
index 0000000..0e996d7
--- /dev/null
+++ b/api/icons/NBEM5-19.png
diff --git a/api/icons/NBEM5-400.png b/api/icons/NBEM5-400.png
new file mode 100644
index 0000000..fb18868
--- /dev/null
+++ b/api/icons/NBEM5-400.png
diff --git a/api/icons/TL-WR740N.png b/api/icons/TL-WR740N.png
new file mode 100644
index 0000000..75d0de6
--- /dev/null
+++ b/api/icons/TL-WR740N.png
diff --git a/api/icons/TL-WR841N.png b/api/icons/TL-WR841N.png
new file mode 100644
index 0000000..cb6630e
--- /dev/null
+++ b/api/icons/TL-WR841N.png
diff --git a/api/icons/adt.png b/api/icons/adt.png
index 83c9cc7..8a58ee3 120000..100644
--- a/api/icons/adt.png
+++ b/api/icons/adt.png
diff --git a/api/icons/ant.png b/api/icons/emid1.png
index 83c9cc7..83c9cc7 120000
--- a/api/icons/ant.png
+++ b/api/icons/emid1.png
diff --git a/api/icons/rt.png b/api/icons/emid10.png
index 83c9cc7..83c9cc7 120000
--- a/api/icons/rt.png
+++ b/api/icons/emid10.png
diff --git a/api/icons/emid11.png b/api/icons/emid11.png
new file mode 120000
index 0000000..b8c9aec
--- /dev/null
+++ b/api/icons/emid11.png
@@ -0,0 +1 @@
+AF5X-Mars.png
\ No newline at end of file
diff --git a/api/icons/emid12.png b/api/icons/emid12.png
new file mode 120000
index 0000000..0cfc010
--- /dev/null
+++ b/api/icons/emid12.png
@@ -0,0 +1 @@
+NBEM5-16.png
\ No newline at end of file
diff --git a/api/icons/emid13.png b/api/icons/emid13.png
new file mode 120000
index 0000000..024b01d
--- /dev/null
+++ b/api/icons/emid13.png
@@ -0,0 +1 @@
+NBEM5-19.png
\ No newline at end of file
diff --git a/api/icons/emid14.png b/api/icons/emid14.png
new file mode 120000
index 0000000..5317b9f
--- /dev/null
+++ b/api/icons/emid14.png
@@ -0,0 +1 @@
+thumb_nanobridge.png
\ No newline at end of file
diff --git a/api/icons/emid15.png b/api/icons/emid15.png
new file mode 120000
index 0000000..5317b9f
--- /dev/null
+++ b/api/icons/emid15.png
@@ -0,0 +1 @@
+thumb_nanobridge.png
\ No newline at end of file
diff --git a/api/icons/emid16.png b/api/icons/emid16.png
new file mode 120000
index 0000000..f34dcb6
--- /dev/null
+++ b/api/icons/emid16.png
@@ -0,0 +1 @@
+thumb_nsm.png
\ No newline at end of file
diff --git a/api/icons/emid17.png b/api/icons/emid17.png
new file mode 120000
index 0000000..a57e9fc
--- /dev/null
+++ b/api/icons/emid17.png
@@ -0,0 +1 @@
+thumb_locom.png
\ No newline at end of file
diff --git a/api/icons/emid18.png b/api/icons/emid18.png
new file mode 120000
index 0000000..c511b4f
--- /dev/null
+++ b/api/icons/emid18.png
@@ -0,0 +1 @@
+NBEM5-400.png
\ No newline at end of file
diff --git a/api/icons/emid19.png b/api/icons/emid19.png
new file mode 120000
index 0000000..f5a42da
--- /dev/null
+++ b/api/icons/emid19.png
@@ -0,0 +1 @@
+thumb_rocket.png
\ No newline at end of file
diff --git a/api/icons/emid2.png b/api/icons/emid2.png
new file mode 120000
index 0000000..4e028b4
--- /dev/null
+++ b/api/icons/emid2.png
@@ -0,0 +1 @@
+TL-WR740N.png
\ No newline at end of file
diff --git a/api/icons/emid20.png b/api/icons/emid20.png
new file mode 120000
index 0000000..83c9cc7
--- /dev/null
+++ b/api/icons/emid20.png
@@ -0,0 +1 @@
+/usr/share/pixmaps/debian-logo.png
\ No newline at end of file
diff --git a/api/icons/emid21.png b/api/icons/emid21.png
new file mode 120000
index 0000000..83c9cc7
--- /dev/null
+++ b/api/icons/emid21.png
@@ -0,0 +1 @@
+/usr/share/pixmaps/debian-logo.png
\ No newline at end of file
diff --git a/api/icons/emid3.png b/api/icons/emid3.png
new file mode 120000
index 0000000..4e028b4
--- /dev/null
+++ b/api/icons/emid3.png
@@ -0,0 +1 @@
+TL-WR740N.png
\ No newline at end of file
diff --git a/api/icons/emid4.png b/api/icons/emid4.png
new file mode 120000
index 0000000..4e028b4
--- /dev/null
+++ b/api/icons/emid4.png
@@ -0,0 +1 @@
+TL-WR740N.png
\ No newline at end of file
diff --git a/api/icons/emid41.png b/api/icons/emid41.png
new file mode 120000
index 0000000..83c9cc7
--- /dev/null
+++ b/api/icons/emid41.png
@@ -0,0 +1 @@
+/usr/share/pixmaps/debian-logo.png
\ No newline at end of file
diff --git a/api/icons/emid42.png b/api/icons/emid42.png
new file mode 120000
index 0000000..83c9cc7
--- /dev/null
+++ b/api/icons/emid42.png
@@ -0,0 +1 @@
+/usr/share/pixmaps/debian-logo.png
\ No newline at end of file
diff --git a/api/icons/emid43.png b/api/icons/emid43.png
new file mode 120000
index 0000000..83c9cc7
--- /dev/null
+++ b/api/icons/emid43.png
@@ -0,0 +1 @@
+/usr/share/pixmaps/debian-logo.png
\ No newline at end of file
diff --git a/api/icons/emid44.png b/api/icons/emid44.png
new file mode 120000
index 0000000..83c9cc7
--- /dev/null
+++ b/api/icons/emid44.png
@@ -0,0 +1 @@
+/usr/share/pixmaps/debian-logo.png
\ No newline at end of file
diff --git a/api/icons/emid5.png b/api/icons/emid5.png
new file mode 120000
index 0000000..4e028b4
--- /dev/null
+++ b/api/icons/emid5.png
@@ -0,0 +1 @@
+TL-WR740N.png
\ No newline at end of file
diff --git a/api/icons/emid6.png b/api/icons/emid6.png
new file mode 120000
index 0000000..808fe65
--- /dev/null
+++ b/api/icons/emid6.png
@@ -0,0 +1 @@
+TL-WR841N.png
\ No newline at end of file
diff --git a/api/icons/emid7.png b/api/icons/emid7.png
new file mode 120000
index 0000000..808fe65
--- /dev/null
+++ b/api/icons/emid7.png
@@ -0,0 +1 @@
+TL-WR841N.png
\ No newline at end of file
diff --git a/api/icons/emid8.png b/api/icons/emid8.png
new file mode 120000
index 0000000..808fe65
--- /dev/null
+++ b/api/icons/emid8.png
@@ -0,0 +1 @@
+TL-WR841N.png
\ No newline at end of file
diff --git a/api/icons/emid9.png b/api/icons/emid9.png
new file mode 120000
index 0000000..83c9cc7
--- /dev/null
+++ b/api/icons/emid9.png
@@ -0,0 +1 @@
+/usr/share/pixmaps/debian-logo.png
\ No newline at end of file
diff --git a/api/icons/thumb_bulletm.png b/api/icons/thumb_bulletm.png
new file mode 100644
index 0000000..2eccb22
--- /dev/null
+++ b/api/icons/thumb_bulletm.png
diff --git a/api/icons/thumb_locom.png b/api/icons/thumb_locom.png
new file mode 100644
index 0000000..e4fcaf3
--- /dev/null
+++ b/api/icons/thumb_locom.png
diff --git a/api/icons/thumb_nanobridge.png b/api/icons/thumb_nanobridge.png
new file mode 100644
index 0000000..4a99b5e
--- /dev/null
+++ b/api/icons/thumb_nanobridge.png
diff --git a/api/icons/thumb_nsm.png b/api/icons/thumb_nsm.png
new file mode 100644
index 0000000..542f72b
--- /dev/null
+++ b/api/icons/thumb_nsm.png
diff --git a/api/icons/thumb_rocket.png b/api/icons/thumb_rocket.png
new file mode 100644
index 0000000..0f206d1
--- /dev/null
+++ b/api/icons/thumb_rocket.png
diff --git a/api/img_adt_svc_relais.php b/api/img_adt_svc_relais.php
index 56fe7ee..a8ee294 100644
--- a/api/img_adt_svc_relais.php
+++ b/api/img_adt_svc_relais.php
@@ -72,13 +72,14 @@ EOD;
 }
 //	>];
 
-function node_equipement($eid, $shape, $img, $label) {
+function node_equipement($eid, $img, $label, $ip) {
 	$label = htmlentities($label);
+	$sub = (strlen($ip)>0)?$ip:"eid $eid";
 		return <<<EOD
-	"e$eid" [ margin=0, shape=$shape, label=<
+	"e$eid" [ margin=0, shape=none, label=<
 		<TABLE border="0" cellborder="0">
 		<TR><TD><IMG SRC="icons/$img"/></TD></TR>
-		<TR><TD>$label<br/><font point-size="8">eid $eid</font></TD></TR>
+		<TR><TD>$label<br/><font point-size="8">$sub</font></TD></TR>
 		</TABLE>
 	>, URL="/gestion/equipements/view/$eid"];
 
@@ -108,23 +109,34 @@ EOD;
 //	>, URL="/gestion/relais/view/$rid"];
 
 fwrite($fd, graph_header());
-$res = $mysqli->query("SELECT * FROM v_relais_detail WHERE adherent_id=" . $arg_adt);
+$sql = "SELECT v.adt, v.adt_title, v.service_id, v.service, v.relais_id, v.relais_degre, v.relais,
+	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,
+	e3.ipmgmt_id AS e3_ip, IF(LENGTH(e3.hostname)>0,e3.hostname,'Antenne2') AS e3_title, CONCAT('emid', e3.equipement_modele_id, '.png') AS e3_img
+FROM v_relais_detail v
+LEFT JOIN equipements e1 ON (e1.id = v.routeur_equipement_id)
+LEFT JOIN equipements e2 ON (e2.id = v.antenne1_equipement_id)
+LEFT JOIN equipements e3 ON (e3.id = v.antenne2_equipement_id)
+WHERE adherent_id=" . $arg_adt;
+
+$res = $mysqli->query($sql);
 $empty=true;
 while ( $row = $res->fetch_assoc() ) {
 	$empty=false;
 
 	if ( isset($row['adt']) && isset($row['service_id']) && isset($row['routeur_equipement_id']) ) {
-		fwrite($fd, node_adt($row['adherent_id'], 'none', $row['adt'], $row['adt_title'])); //egg
-		fwrite($fd, node_equipement($row['routeur_equipement_id'], 'none', 'rt.png', 'Routeur')); //rectangle
-		fwrite($fd, edge_service($row['adherent_id'],$row['routeur_equipement_id'], $row['service']));
+		fwrite($fd, node_adt($arg_adt, 'none', $row['adt'], $row['adt_title'])); //egg
+		fwrite($fd, node_equipement($row['routeur_equipement_id'], $row['e1_img'], $row['e1_title'], $row['e1_ip']));
+		fwrite($fd, edge_service($arg_adt,$row['routeur_equipement_id'], $row['service']));
 	}
 
 	if ( isset($row['antenne1_equipement_id']) ) {
-		fwrite($fd, node_equipement($row['antenne1_equipement_id'], 'none', 'ant.png', 'Antenne1'));
+		fwrite($fd, node_equipement($row['antenne1_equipement_id'], $row['e2_img'], $row['e2_title'], $row['e2_ip']));
 		fwrite($fd, "\te".$row['routeur_equipement_id']." -> e".$row['antenne1_equipement_id'].";\n");
 	}
 	if ( isset($row['antenne2_equipement_id']) ) {
-		fwrite($fd, node_equipement($row['antenne2_equipement_id'], 'none', 'ant.png', 'Antenne2'));
+		fwrite($fd, node_equipement($row['antenne2_equipement_id'], $row['e3_img'], $row['e3_title'], $row['e3_ip']));
 		fwrite($fd, "\te".$row['antenne1_equipement_id']." -> e".$row['antenne2_equipement_id'].";\n");
 	}
 	if ( isset($row['relais_id']) && isset($row['relais_degre']) ) {