fixed statitstics for "today"

windkh · Sep 25, 2023 · 42e2e9e · 42e2e9e
1 parent ca8a0ad
commit 42e2e9e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.18.0] [2023-09-25]
+### fixed statistics for today - [#13](https://github.com/windkh/node-red-contrib-grohe-sense/issues/13) 
+
 ## [0.17.0] [2023-09-24]
-### fixed examples and added groupBy option - [#12](https://github.com/windkh/node-red-contrib-grohe-sense/issues/13) 
+### fixed examples and added groupBy option - [#13](https://github.com/windkh/node-red-contrib-grohe-sense/issues/13) 
 
 ## [0.16.0] [2023-09-15]
 ### breaking change in API: data is now data/aggregated - [#12](https://github.com/windkh/node-red-contrib-grohe-sense/issues/12) 

diff --git a/grohe/99-grohe.js b/grohe/99-grohe.js
@@ -149,26 +149,28 @@ module.exports = function (RED) {
  let todayMaxFlowrate = Number.NaN;
 
  let length = withdrawals.length;
- let latestDate = withdrawals[length - 1].date;
- let today = new Date(new Date(latestDate).toDateString());
-
- for (let i=0; i < length; i++) {
- let item = withdrawals[i];
-
- let date = new Date(item.date);
- totalWaterConsumption += item.waterconsumption;
- totalWaterCost += item.water_cost;
- totalEnerygCost += item.energy_cost;
- totalHotwaterShare += item.hotwater_share;
- let flowrate = item.maxflowrate;
- totalMaxFlowrate = getMax(flowrate, totalMaxFlowrate);
-
- if(date > today) {
- todayWaterConsumption += item.waterconsumption;
- todayWaterCost += item.water_cost;
- todayEnerygCost += item.energy_cost;
- todayHotwaterShare += item.hotwater_share;
- todayMaxFlowrate = getMax(flowrate, todayMaxFlowrate);
+ if(length > 0) {
+ let todayDate = withdrawals[0].date;
+ let today = new Date(new Date(todayDate).toDateString());
+
+ for (let i=0; i < length; i++) {
+ let item = withdrawals[i];
+
+ let date = new Date(item.date);
+ totalWaterConsumption += item.waterconsumption;
+ totalWaterCost += item.water_cost;
+ totalEnerygCost += item.energy_cost;
+ totalHotwaterShare += item.hotwater_share;
+ let flowrate = item.maxflowrate;
+ totalMaxFlowrate = getMax(flowrate, totalMaxFlowrate);
+
+ if(date >= today) {
+ todayWaterConsumption += item.waterconsumption;
+ todayWaterCost += item.water_cost;
+ todayEnerygCost += item.energy_cost;
+ todayHotwaterShare += item.hotwater_share;
+ todayMaxFlowrate = getMax(flowrate, todayMaxFlowrate);
+ }
  }
  }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "node-red-contrib-grohe-sense",
- "version": "0.17.0",
+ "version": "0.18.0",
  "description": "Grohe sense nodes via ondus API.",
  "node-red": {
  "version": ">=0.1.0",