modif alert suivant time

WoCha-FR · Nov 16, 2023 · 2662594 · 2662594
1 parent 9206202
commit 2662594
Show file tree

Hide file tree

Showing 4 changed files with 132 additions and 36 deletions.
diff --git a/lib/infoville.js b/lib/infoville.js
@@ -303,21 +303,43 @@ class InfosVille {
         result[viginom[phenomenon.phenomenon_id] + 'D'] = Math.floor(new Date(jour.begin_validity_time).getTime() / 1000)
         result[viginom[phenomenon.phenomenon_id] + 'F'] = Math.floor(new Date(jour.end_validity_time).getTime() / 1000)
       } else {
-        result[viginom[phenomenon.phenomenon_id]] = couleur[phenomenon.timelaps_items[0].color_id]
-        result[viginom[phenomenon.phenomenon_id] + 'D'] = Math.floor(new Date(phenomenon.timelaps_items[0].begin_time).getTime() / 1000)
-        result[viginom[phenomenon.phenomenon_id] + 'F'] = Math.floor(new Date(phenomenon.timelaps_items[0].end_time).getTime() / 1000)
-      }
-      // Deuxième niveau du jour
-      if (timelength > 1) {
-        result[viginom[phenomenon.phenomenon_id] + '1'] = couleur[phenomenon.timelaps_items[1].color_id]
-        result[viginom[phenomenon.phenomenon_id] + '1D'] = Math.floor(new Date(phenomenon.timelaps_items[1].begin_time).getTime() / 1000)
-        result[viginom[phenomenon.phenomenon_id] + '1F'] = Math.floor(new Date(phenomenon.timelaps_items[1].end_time).getTime() / 1000)
-      }
-      // Troisième niveau du jour
-      if (timelength > 2) {
-        result[viginom[phenomenon.phenomenon_id] + '2'] = couleur[phenomenon.timelaps_items[2].color_id]
-        result[viginom[phenomenon.phenomenon_id] + '2D'] = Math.floor(new Date(phenomenon.timelaps_items[2].begin_time).getTime() / 1000)
-        result[viginom[phenomenon.phenomenon_id] + '2F'] = Math.floor(new Date(phenomenon.timelaps_items[2].end_time).getTime() / 1000)
+        const now = new Date().getTime()
+        // console.log(now + ' -- ' + new Date(phenomenon.timelaps_items[kid].end_time).getTime())
+        // Periode 1 se termine plus tard
+        if (now < new Date(phenomenon.timelaps_items[0].end_time).getTime()) {
+          result[viginom[phenomenon.phenomenon_id]] = couleur[phenomenon.timelaps_items[0].color_id]
+          result[viginom[phenomenon.phenomenon_id] + 'D'] = Math.floor(new Date(phenomenon.timelaps_items[0].begin_time).getTime() / 1000)
+          result[viginom[phenomenon.phenomenon_id] + 'F'] = Math.floor(new Date(phenomenon.timelaps_items[0].end_time).getTime() / 1000)
+          // Deuxième niveau du jour
+          if (timelength > 1) {
+            result[viginom[phenomenon.phenomenon_id] + '1'] = couleur[phenomenon.timelaps_items[1].color_id]
+            result[viginom[phenomenon.phenomenon_id] + '1D'] = Math.floor(new Date(phenomenon.timelaps_items[1].begin_time).getTime() / 1000)
+            result[viginom[phenomenon.phenomenon_id] + '1F'] = Math.floor(new Date(phenomenon.timelaps_items[1].end_time).getTime() / 1000)
+          }
+          // Troisième niveau du jour
+          if (timelength > 2) {
+            result[viginom[phenomenon.phenomenon_id] + '2'] = couleur[phenomenon.timelaps_items[2].color_id]
+            result[viginom[phenomenon.phenomenon_id] + '2D'] = Math.floor(new Date(phenomenon.timelaps_items[2].begin_time).getTime() / 1000)
+            result[viginom[phenomenon.phenomenon_id] + '2F'] = Math.floor(new Date(phenomenon.timelaps_items[2].end_time).getTime() / 1000)
+          }
+        } else {
+          // On teste période 2
+          if (now < new Date(phenomenon.timelaps_items[1].end_time).getTime()) {
+            result[viginom[phenomenon.phenomenon_id]] = couleur[phenomenon.timelaps_items[1].color_id]
+            result[viginom[phenomenon.phenomenon_id] + 'D'] = Math.floor(new Date(phenomenon.timelaps_items[1].begin_time).getTime() / 1000)
+            result[viginom[phenomenon.phenomenon_id] + 'F'] = Math.floor(new Date(phenomenon.timelaps_items[1].end_time).getTime() / 1000)
+            // Troisième niveau du jour
+            if (timelength > 2) {
+              result[viginom[phenomenon.phenomenon_id] + '1'] = couleur[phenomenon.timelaps_items[2].color_id]
+              result[viginom[phenomenon.phenomenon_id] + '1D'] = Math.floor(new Date(phenomenon.timelaps_items[2].begin_time).getTime() / 1000)
+              result[viginom[phenomenon.phenomenon_id] + '1F'] = Math.floor(new Date(phenomenon.timelaps_items[2].end_time).getTime() / 1000)
+            }
+          } else {
+            result[viginom[phenomenon.phenomenon_id]] = couleur[phenomenon.timelaps_items[2].color_id]
+            result[viginom[phenomenon.phenomenon_id] + 'D'] = Math.floor(new Date(phenomenon.timelaps_items[2].begin_time).getTime() / 1000)
+            result[viginom[phenomenon.phenomenon_id] + 'F'] = Math.floor(new Date(phenomenon.timelaps_items[2].end_time).getTime() / 1000)
+          }
+        }
       }
     }
     // Departement Vigilance code 9 - Peut être inexistant
@@ -528,9 +550,7 @@ class InfosVille {
       }
     }
     // Publish Data
-    if (_.isEmpty(result)) {
-      logger.warn('Pas de données de vigilance a envoyer')
-    } else {
+    if (!_.isEmpty(result)) {
       eventEmitter.emit('frame', `${topic}/vigilance`, result)
     }
   }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mqtt4frenchtools",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Publish multiple french data to MQTT",
   "main": "index.js",
   "bin": {
@@ -38,7 +38,7 @@
   "homepage": "https://github.com/WoCha-FR/mqtt4frenchtools#readme",
   "dependencies": {
     "async-mqtt": "^2.6.3",
-    "axios": "^1.6.1",
+    "axios": "^1.6.2",
     "lodash": "^4.17.21",
     "suncalc": "^1.9.0",
     "yalm": "^4.1.0",