ADD: fixes for plotting

Author: andrewjaykeller

CHANGELOG.md

@@ -1,5 +1,11 @@
 # 1.2.0
 
+## Fixes
+
+- Fix time stamps to be local time and not in 24 hour time
+
+# 1.2.0
+
 ## Enhancements
 
 - Add toggle for dim screen - closes #7

package-lock.json

@@ -73,6 +73,7 @@
     "electron-google-analytics": "^0.1.0",
     "frappe-charts": "^1.3.0",
     "hot-shots": "^6.8.1",
+    "moment": "^2.24.0",
     "osx-brightness": "^4.0.0",
     "regression": "^2.0.1",
     "rxjs": "^6.5.3",

package.json

@@ -3,6 +3,7 @@ import { pipe } from "rxjs";
 import { map, bufferCount, filter, share } from "rxjs/operators";
 
 // import Analytics from "electron-google-analytics";
+import * as moment from "moment";
 import * as ua from "universal-analytics";
 
 import * as doNotDisturb from "@sindresorhus/do-not-disturb";
@@ -290,7 +291,7 @@ export function showBiometrics(
     notionTime += currentFlowState.timeMultiplier;
     notionTimes.push();
     realTime += 1;
-    lastDate = new Date().toString();
+    lastDate = moment(Date.now()).format("hh:mm:ss A");
     dateArray.push(lastDate);
     flowStates.push(currentFlowState.val);
 
@@ -366,6 +367,7 @@ export function showBiometrics(
         notionTime: notionTimeStr,
         earthTime: earthTimeStr,
         paceTime: paceTimeStr,
+        timestamp: lastDate,
         state: currentFlowState,
         score: runningAverageCalmScore,
         doNotDisturb: doNotDisturbEnabled

src/biometrics.ts

@@ -129,7 +129,7 @@ export function getWebviewContent() {
   var layout = {
     title: 'Flow stages vs. time',
     xaxis: {
-      tickformat: '%H:%M:%S'
+      tickangle: 30
     },
     yaxis: {
       autotick: false,
@@ -151,11 +151,9 @@ export function getWebviewContent() {
       app.score = message.score;
       app.doNotDisturb = message.doNotDisturb;
       app.flowStage = message.state.str;
-      
-      const time = new Date();
-
-      console.log('time', time, 'message', message);
 
+      const time = message.timestamp;
+      
       if (loadedInitDataInGraph) {
         let update = {
           x:  [[time]],
@@ -170,7 +168,7 @@ export function getWebviewContent() {
           y: [0],
           mode: 'lines',
           line: {color: '#80CAF6'}
-        }] 
+        }]
       
         Plotly.plot('graph', data, layout, {responsive: true});  
       }