Fixed date skew when computer is on different timezone

UtilitechAS · Aug 3, 2024 · de63263 · de63263
1 parent 8adb705
commit de63263
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/lib/SvelteUi/app/dist/index.js b/lib/SvelteUi/app/dist/index.js
diff --git a/lib/SvelteUi/app/src/lib/DayPlot.svelte b/lib/SvelteUi/app/src/lib/DayPlot.svelte
@@ -18,9 +18,13 @@
         let xTicks = [];
         let points = [];
         min = max = 0;
-        let cur = addHours(new Date(), -24);
-        let currentHour = new Date().getUTCHours();
-        addHours(cur, sysinfo.clock_offset - ((24 + cur.getHours() - cur.getUTCHours())%24));
+        let cur = new Date();
+        let lm = new Date();
+        lm.setDate(0);
+        lm.setHours(12);
+        let clock_adjust = ((lm.getHours() - lm.getUTCHours())%24) - sysinfo.clock_offset;
+        let currentHour = cur.getUTCHours();
+        addHours(cur, -clock_adjust-24);
         for(i = currentHour; i<24; i++) {
             let imp = json["i"+zeropad(i)];
             let exp = json["e"+zeropad(i)];

diff --git a/lib/SvelteUi/app/src/lib/MonthPlot.svelte b/lib/SvelteUi/app/src/lib/MonthPlot.svelte
@@ -20,10 +20,12 @@
         min = max = 0;
         let cur = new Date();
         let lm = new Date();
-        let clock_adjust = sysinfo.clock_offset - ((24 + cur.getHours() - cur.getUTCHours())%24);
+        lm.setDate(0);
+        lm.setHours(12);
+
+        let clock_adjust = ((lm.getHours() - lm.getUTCHours())%24) - sysinfo.clock_offset;
         addHours(cur, -clock_adjust);
         addHours(lm, -clock_adjust);
-        lm.setDate(0);
 
         for(i = cur.getDate(); i<=lm.getDate(); i++) {
             let imp = json["i"+zeropad(i)];