From e746d8b804f44ffbce1f5e2eaef7c0e0deeaa117 Mon Sep 17 00:00:00 2001
From: Ludovic Pouzenc <ludovic@pouzenc.fr>
Date: Sat, 23 Nov 2019 21:43:50 +0100
Subject: Merge

---
 api/gen_etat_reseau.php        |   3 ++-
 api/icons/edgepoint-s16.png    | Bin 0 -> 46065 bytes
 api/icons/emid54.png           |   1 +
 api/icons/emid56.png           |   1 +
 api/icons/emid57.png           | Bin 0 -> 4952 bytes
 api/icons/emid58.png           |   1 +
 api/icons/nanobeam-ac-gen2.png | Bin 0 -> 2852 bytes
 7 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 api/icons/edgepoint-s16.png
 create mode 120000 api/icons/emid54.png
 create mode 120000 api/icons/emid56.png
 create mode 100644 api/icons/emid57.png
 create mode 120000 api/icons/emid58.png
 create mode 100644 api/icons/nanobeam-ac-gen2.png

diff --git a/api/gen_etat_reseau.php b/api/gen_etat_reseau.php
index 53d3d78..b824649 100644
--- a/api/gen_etat_reseau.php
+++ b/api/gen_etat_reseau.php
@@ -56,7 +56,8 @@ $res = $mysqli->query("SELECT e.id,
 FROM equipements e
 LEFT JOIN relais r ON ( r.id = e.relais_id )
 WHERE (e.relais_id IS NOT NULL OR e.hostname='STG1')
-AND e.date_hs IS NULL");
+AND e.date_hs IS NULL
+AND e.equipement_mode_id != 'power'");
 $equipements = array();
 while ( $e_row = $res->fetch_assoc() ) {
   $id = $e_row['id'];
diff --git a/api/icons/edgepoint-s16.png b/api/icons/edgepoint-s16.png
new file mode 100644
index 0000000..5751fdc
Binary files /dev/null and b/api/icons/edgepoint-s16.png differ
diff --git a/api/icons/emid54.png b/api/icons/emid54.png
new file mode 120000
index 0000000..68857eb
--- /dev/null
+++ b/api/icons/emid54.png
@@ -0,0 +1 @@
+edgepoint-s16.png
\ No newline at end of file
diff --git a/api/icons/emid56.png b/api/icons/emid56.png
new file mode 120000
index 0000000..a760036
--- /dev/null
+++ b/api/icons/emid56.png
@@ -0,0 +1 @@
+nanobeam-ac-gen2.png
\ No newline at end of file
diff --git a/api/icons/emid57.png b/api/icons/emid57.png
new file mode 100644
index 0000000..dea5fb1
Binary files /dev/null and b/api/icons/emid57.png differ
diff --git a/api/icons/emid58.png b/api/icons/emid58.png
new file mode 120000
index 0000000..68857eb
--- /dev/null
+++ b/api/icons/emid58.png
@@ -0,0 +1 @@
+edgepoint-s16.png
\ No newline at end of file
diff --git a/api/icons/nanobeam-ac-gen2.png b/api/icons/nanobeam-ac-gen2.png
new file mode 100644
index 0000000..c2f3b8b
Binary files /dev/null and b/api/icons/nanobeam-ac-gen2.png differ
-- 
cgit v1.1