diff options
| author | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2019-11-23 21:43:50 +0100 |
|---|---|---|
| committer | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2019-11-23 21:43:50 +0100 |
| commit | e746d8b804f44ffbce1f5e2eaef7c0e0deeaa117 (patch) | |
| tree | a22714b2699b7968b8af891730e4355b767ab5a3 | |
| parent | 3ab8ca3441e26198dfe11dc88de03ac81882fec8 (diff) | |
| download | chd_gestion-e746d8b804f44ffbce1f5e2eaef7c0e0deeaa117.zip chd_gestion-e746d8b804f44ffbce1f5e2eaef7c0e0deeaa117.tar.gz chd_gestion-e746d8b804f44ffbce1f5e2eaef7c0e0deeaa117.tar.bz2 | |
Merge
| -rw-r--r-- | api/gen_etat_reseau.php | 3 | ||||
| -rw-r--r-- | api/icons/edgepoint-s16.png | bin | 0 -> 46065 bytes | |||
| l--------- | api/icons/emid54.png | 1 | ||||
| l--------- | api/icons/emid56.png | 1 | ||||
| -rw-r--r-- | api/icons/emid57.png | bin | 0 -> 4952 bytes | |||
| l--------- | api/icons/emid58.png | 1 | ||||
| -rw-r--r-- | api/icons/nanobeam-ac-gen2.png | bin | 0 -> 2852 bytes |
7 files changed, 5 insertions, 1 deletions
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 Binary files differnew file mode 100644 index 0000000..5751fdc --- /dev/null +++ b/api/icons/edgepoint-s16.png 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 Binary files differnew file mode 100644 index 0000000..dea5fb1 --- /dev/null +++ b/api/icons/emid57.png 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 Binary files differnew file mode 100644 index 0000000..c2f3b8b --- /dev/null +++ b/api/icons/nanobeam-ac-gen2.png |
