Fix MariaDB/MySQL power events
Noah Zalev committed
Nov 29, 2021 at 15:40 UTC
e19dcef6d711e2d2d1ffb7d18c531e05678fd203
1 file changed
+8
-4
webserver.js
+8
-4
@@ -5413,18 +5413,22 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
5413
var xevents = ['UTC Time, Local Time, State, Previous State'], prevState = 0;
5414
for (var i in docs) {
5415
if (docs[i].power != prevState) {
5416
+ var timedoc = docs[i].time;
5417
+ if (typeof timedoc == 'string') {
5418
+ timedoc = new Date(timedoc);
5419
+ }
5420
prevState = docs[i].power;
5421
var localTime = '';
5422
if (timeConversionSystem == 1) { // Good way
5419
- localTime = new Date(docs[i].time.getTime()).toLocaleString(req.query.l, { timeZone: req.query.tz })
5423
+ localTime = new Date(timedoc.getTime()).toLocaleString(req.query.l, { timeZone: req.query.tz })
5424
} else if (timeConversionSystem == 2) { // Bad way
5421
- localTime = new Date(docs[i].time.getTime() + (localTimeOffset * 60000)).toISOString();
5425
+ localTime = new Date(timedoc.getTime() + (localTimeOffset * 60000)).toISOString();
5426
localTime = localTime.substring(0, localTime.length - 1);
5427
}
5428
if (docs[i].oldPower != null) {
5425
- xevents.push('\"' + docs[i].time.toISOString() + '\",\"' + localTime + '\",' + docs[i].power + ',' + docs[i].oldPower);
5429
+ xevents.push('\"' + timedoc.toISOString() + '\",\"' + localTime + '\",' + docs[i].power + ',' + docs[i].oldPower);
5430
} else {
5427
- xevents.push('\"' + docs[i].time.toISOString() + '\",\"' + localTime + '\",' + docs[i].power);
5431
+ xevents.push('\"' + timedoc.toISOString() + '\",\"' + localTime + '\",' + docs[i].power);
5432
}
5433
}
5434
}