node-red-contrib-eskomsepush 0.0.3 → 0.0.5

package/README.md

@@ -14,7 +14,7 @@ Internally the node checks every minute if a schedule is currently active or not
 
 ![EskomsePush Victron MinSOC](img/eskomsepush-victron-minsoc.png)
 
-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 once being the
+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.
 

package/package.json

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

package/src/nodes/eskomsepush.js

@@ -106,7 +106,7 @@ module.exports = function (RED) {
             end: Date.parse(Schedule.schedule.days[0].date + ' ' + schedule.split('-')[1])
           }
         }
-        if (Object.keys(LoadShedding.schedule.next).length === 0 && nowtime < schedule.split('-')[0]) {
+        if (nowtime < schedule.split('-')[0]) {
           LoadShedding.schedule.next = {
             start: Date.parse(Schedule.schedule.days[0].date + ' ' + schedule.split('-')[0]),
             end: Date.parse(Schedule.schedule.days[0].date + ' ' + schedule.split('-')[1])
@@ -116,8 +116,8 @@ module.exports = function (RED) {
       if (Object.keys(LoadShedding.schedule.next).length === 0) {
         const s = Schedule.schedule.days[1].stages[stage - 1][0]
         LoadShedding.schedule.next = {
-          start: Date.parse(Schedule.sschedule.days[1].date + s.split('-')[0]),
-          end: Date.parse(Schedule.sschedule.days[1].date + s.split('-')[1])
+          start: Date.parse(Schedule.schedule.days[1].date + ' ' + s.split('-')[0]),
+          end: Date.parse(Schedule.schedule.days[1].date + ' ' + s.split('-')[1])
         }
       }
       LoadShedding.event.next = {
@@ -132,6 +132,7 @@ module.exports = function (RED) {
 
       if (!LoadShedding.schedule.next.start || !LoadShedding.event.next.start) {
         node.warn('Unable to find next scheduled event and/or schedule')
+        node.warn(LoadShedding)
         return
       }
       if (LoadShedding.schedule.next.start <= LoadShedding.event.next.start) {