node-red-contrib-eskomsepush 0.0.5 → 0.0.7

package/README.md

@@ -16,7 +16,7 @@ Internally the node checks every minute if a schedule is currently active or not
 
 The node has been made to work well together with the [@victronenergy/node-red-contrib-victron](https://flows.nodered.org/node/@victronenergy/node-red-contrib-victron) nodes. One of the main ones being the
 ESS control node for setting the MinSoc, based on the currently active stage. You can find the
-example flow for this via importing the [victron-minsoc-stage-based.json](examples/victron-minsoc-stage-based.json) example.
+example flow for this via importing the [victron-minsoc-stage-based.json](examples/victron-minsoc-stage-based.json) file.
 
 ### Configuration
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-eskomsepush",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Node-RED interface for the Eskomsepush API",
   "main": "index.js",
   "scripts": {

package/src/nodes/eskomsepush.js

@@ -105,6 +105,10 @@ module.exports = function (RED) {
             start: Date.parse(Schedule.schedule.days[0].date + ' ' + schedule.split('-')[0]),
             end: Date.parse(Schedule.schedule.days[0].date + ' ' + schedule.split('-')[1])
           }
+          LoadShedding.schedule.next = {
+            start : LoadShedding.schedule.start,
+            end : LoadShedding.schedule.end
+          }
         }
         if (nowtime < schedule.split('-')[0]) {
           LoadShedding.schedule.next = {
@@ -113,7 +117,7 @@ module.exports = function (RED) {
           }
         }
       }
-      if (Object.keys(LoadShedding.schedule.next).length === 0) {
+      if (!LoadShedding.schedule.active && Object.keys(LoadShedding.schedule.next).length === 0) {
         const s = Schedule.schedule.days[1].stages[stage - 1][0]
         LoadShedding.schedule.next = {
           start: Date.parse(Schedule.schedule.days[1].date + ' ' + s.split('-')[0]),
@@ -146,7 +150,7 @@ module.exports = function (RED) {
       statusText += 'Stage '+stage
       LoadShedding.active = (LoadShedding.schedule.active || LoadShedding.event.active)
       if (LoadShedding.active) {
-        statusText += ' - ' + new Date(LoadShedding.end).toLocaleTimeString()
+        statusText += ' - ' + new Date(LoadShedding.next.end).toLocaleTimeString()
         fill = 'red'
       } else {
         statusText += ' - ' + new Date(LoadShedding.next.start).toLocaleTimeString()