replaces moment.humanize with a more exact value

RingoRohe · May 6, 2020 · be9e5ec · be9e5ec
1 parent 8080115
commit be9e5ec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/components/naps/charts/daily/ChartDaily.js b/src/components/naps/charts/daily/ChartDaily.js
@@ -10,7 +10,7 @@ import '../tooltip.scss';
 import Duration from 'components/shared/duration/Duration';
 
 const ChartDaily = props => {
-    var moment = require("moment");
+    const moment = require("moment");
     moment().format();
 
     let data = [];
@@ -19,11 +19,11 @@ const ChartDaily = props => {
     const tooltip = (nap) => {
         let startDate = moment(nap.start);
         let endDate = moment(nap.end);
-        let duration = moment.duration(endDate.diff(startDate));
+        let duration = moment(moment.duration(endDate.diff(startDate)).asMilliseconds()).utc();
         return `<div class="tootltip">
             <h3>${nap.notes ? nap.notes : "no notes"}</h3>
             <p class="duration">${startDate.format('HH:mm')} - ${endDate.format('HH:mm')}</p>
-            <p class="duration">${duration.humanize()}</p>
+            <p class="duration">${duration.format('HH:mm')}</p>
             </div>`;
     }
 
@@ -65,13 +65,13 @@ const ChartDaily = props => {
                     newEndDate.setTime(newEndDate.getTime() - offset);
                 }
 
-                let duration = moment.duration(
-                    moment(newEndDate).diff(newStartDate)
-                );
+                let duration = moment(
+                    moment.duration(moment(newEndDate).diff(newStartDate)).asMilliseconds()
+                ).utc();
 
                 return [
                     "naps",
-                    duration.humanize(),
+                    duration.format('HH:mm'),
                     tooltip(nap),
                     newStartDate,
                     newEndDate,

diff --git a/src/components/naps/charts/sleeptime/ChartSleeptime.js b/src/components/naps/charts/sleeptime/ChartSleeptime.js
@@ -9,6 +9,9 @@ import styles from './chartSleeptime.scss';
 import { useEffect } from 'react';
 
 const ChartSleeptime = props => {
+    const moment = require("moment");
+    moment().format();
+
     let data = [];
     let timeout = null;
     const { maxDays = 5 } = props;
@@ -105,7 +108,7 @@ const ChartSleeptime = props => {
                 data.push([
                     date,
                     decimalTime,
-                    decimalTime
+                    moment(dates[date]).utc().format('HH:mm')
                 ]);
             }
         }
@@ -124,7 +127,7 @@ const ChartSleeptime = props => {
 
             dataTable.addColumn("string", "Date");
             dataTable.addColumn("number", "Hours of Sleep");
-            dataTable.addColumn({ type: "number", role: "annotation" });
+            dataTable.addColumn({ type: "string", role: "annotation" });
             dataTable.addRows(data);
 
             const min = Math.floor(data.reduce((a, b) => a[1] < b[1] ? a : b)[1]) - 2;