Fixes to resolve tiezone related issues OpenEVSE#167 and a better fix…

… for OpenEVSE#170
Stef-Sijben · Apr 8, 2018 · 71473ba · 71473ba
1 parent a40e394
commit 71473ba
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/html/view_models/TimeViewModel.js b/src/html/view_models/TimeViewModel.js
@@ -39,7 +39,8 @@ function TimeViewModel(openevse)
         return "";
       }
 
-      return self.nowTimedate().toISOString().split("T")[0];
+      var dt = self.nowTimedate();
+      return (dt.getFullYear() + 1900)+"-"+addZero(dt.getMonth())+"-"+addZero(dt.getDate());
     },
     write: function (val) {
       self.evseTimedate(new Date(val));
@@ -65,8 +66,13 @@ function TimeViewModel(openevse)
     if(null === self.nowTimedate()) {
       return "0:00:00";
     }
-    var dt = self.elapsedNow();
-    return addZero(dt.getUTCHours())+":"+addZero(dt.getMinutes())+":"+addZero(dt.getSeconds());
+    var time = self.elapsedNow().getTime();
+    time = Math.round(time / 1000);
+    var seconds = time % 60;
+    time = Math.round(time / 60);
+    var minutes = time % 60;
+    var hours = Math.round(time / 60);
+    return hours+":"+addZero(minutes)+":"+addZero(seconds);
   });
 
   openevse.status.elapsed.subscribe(function (val) {