Fixed power state time localization, #2817
Ylian Saint-Hilaire committed
Jun 28, 2021 at 18:40 UTC
ac3817682873a60fcec1db005b675c7f555edb88
2 files changed
+25
-8
views/default.handlebars
+6
-1
@@ -1394,6 +1394,7 @@
1394
mql.addEventListener('change', function() { console.log('Dark Change'); });
1395
*/
1396
1397
+
1398
function startup() {
1399
if ((features & 32) == 0) {
1400
// Guard against other site's top frames (web bugs).
@@ -7244,7 +7245,10 @@
7245
++count;
7246
date = new Date(date.getTime() - (1000 * 60 * 60 * 24)); // Substract one day
7247
}
7247
- QH('p10html2', '<table cellpadding=2 cellspacing=0><thead><tr style=><th scope=col style=text-align:center;width:150px>' + "Day" + '</th><th scope=col style=text-align:center><a onclick=downloadFile("devicepowerevents.ashx?id=' + currentNode._id + '&tf=' + new Date().getTimezoneOffset() + (urlargs.key?('&key=' + urlargs.key):'') + '",null,true)><img title="' + "Download power events" + '" src="images/link4.png" /></a>' + "7 Day Power State" + '</th></tr></thead><tbody>' + x + '</tbody></table>');
7248
+ // Add the language and timezone of the browser to the server so the server can localize the time correctly.
7249
+ var tz = '';
7250
+ try { tz = '&tz=' + encodeURIComponentEx(Intl.DateTimeFormat().resolvedOptions().timeZone); } catch (ex) {}
7251
+ QH('p10html2', '<table cellpadding=2 cellspacing=0><thead><tr style=><th scope=col style=text-align:center;width:150px>' + "Day" + '</th><th scope=col style=text-align:center><a onclick=downloadFile("devicepowerevents.ashx?id=' + currentNode._id + '&tf=' + new Date().getTimezoneOffset() + '&l=' + encodeURIComponentEx(getLang()) + tz + (urlargs.key?('&key=' + urlargs.key):'') + '",null,true)><img title="' + "Download power events" + '" src="images/link4.png" /></a>' + "7 Day Power State" + '</th></tr></thead><tbody>' + x + '</tbody></table>');
7252
}
7253
7254
// Return a color for the given power state
@@ -15640,6 +15644,7 @@
15644
return new Blob([bytes2], { type: 'application/octet-stream' }) // application/json;charset=utf-8
15645
}
15646
15647
+ function getLang() { if (navigator.languages != undefined) { return navigator.languages[0]; } return navigator.language; }
15648
function getNodeAmtVersion(node) { if ((node == null) || (node.intelamt == null) || (typeof node.intelamt.ver != 'string')) return 0; var verSplit = node.intelamt.ver.split('.'); if (verSplit.length < 2) return 0; return parseInt(verSplit[0]) + (parseInt(verSplit[1]) / 100); }
15649
function getstore(name, val) { try { if (typeof (localStorage) === 'undefined') return val; var v = localStorage.getItem(name); if ((v == null) || (v == null)) return val; return v; } catch (e) { return val; } }
15650
function addLink(x, f) { return '<span tabindex=0 style=cursor:pointer;text-decoration:none onclick=\'' + f + '\' onkeypress="if (event.key==\'Enter\') {' + f + '} ">' + x + ' <img class=hoverButton src=images/link5.png></span>'; }
webserver.js
+19
-7
@@ -5208,10 +5208,17 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
5208
// Check if we have right to this node
5209
if (obj.GetNodeRights(user, node.meshid, node._id) == 0) { res.sendStatus(401); return; }
5210
5211
- // Get local time offset
5211
+ // See how we will convert UTC time to local time
5212
var localTimeOffset = 0;
5213
- if (req.query.tf != null) { localTimeOffset = parseInt(req.query.tf) }
5214
- if (isNaN(localTimeOffset)) { localTimeOffset = 0; }
5213
+ var timeConversionSystem = 0;
5214
+ if ((req.query.l != null) && (req.query.tz != null)) {
5215
+ timeConversionSystem = 1;
5216
+ } else if (req.query.tf != null) {
5217
+ // Get local time offset (bad way)
5218
+ timeConversionSystem = 2;
5219
+ localTimeOffset = parseInt(req.query.tf);
5220
+ if (isNaN(localTimeOffset)) { localTimeOffset = 0; }
5221
+ }
5222
5223
// Get the list of power events and send them
5224
setContentDispositionHeader(res, 'application/octet-stream', 'powerevents.csv', null, 'powerevents.csv');
@@ -5220,12 +5227,17 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
5227
for (var i in docs) {
5228
if (docs[i].power != prevState) {
5229
prevState = docs[i].power;
5223
- var localTime = new Date(docs[i].time.getTime() + (localTimeOffset * 60000)).toISOString();
5224
- localTime = localTime.substring(0, localTime.length - 1);
5230
+ var localTime = '';
5231
+ if (timeConversionSystem == 1) { // Good way
5232
+ localTime = new Date(docs[i].time.getTime()).toLocaleString(req.query.l, { timeZone: req.query.tz })
5233
+ } else if (timeConversionSystem == 2) { // Bad way
5234
+ localTime = new Date(docs[i].time.getTime() + (localTimeOffset * 60000)).toISOString();
5235
+ localTime = localTime.substring(0, localTime.length - 1);
5236
+ }
5237
if (docs[i].oldPower != null) {
5226
- xevents.push(docs[i].time.toISOString() + ',' + localTime + ',' + docs[i].power + ',' + docs[i].oldPower);
5238
+ xevents.push('\"' + docs[i].time.toISOString() + '\",\"' + localTime + '\",' + docs[i].power + ',' + docs[i].oldPower);
5239
} else {
5228
- xevents.push(docs[i].time.toISOString() + ',' + localTime + ',' + docs[i].power);
5240
+ xevents.push('\"' + docs[i].time.toISOString() + '\",\"' + localTime + '\",' + docs[i].power);
5241
}
5242
}
5243
}