Format date diff

eeroan · Jan 4, 2020 · 62db5dc · 62db5dc
1 parent 6daac17
commit 62db5dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/date.js b/src/date.js
@@ -20,9 +20,18 @@ function formatTime(minutes) {
     return `${fill(h)}:${fill(m)}`
 }
 
+function toDayHourMinute(totalMinutes) {
+    const minutes = totalMinutes % 60
+    const totalHours = Math.floor(minutes / 60)
+    const hours = totalHours % 24
+    const days = Math.floor(totalHours / 24)
+    return `${days ? `${days} päivää ` : ''}${hours ? `${hours} tuntia` : ''}${minutes} minuuttia`
+}
+
 module.exports = {
     freeSlots,
     minutes,
     formatTime,
-    notOverlapping
+    notOverlapping,
+    toDayHourMinute
 }
diff --git a/src/markupForDateRange.js b/src/markupForDateRange.js
@@ -3,13 +3,14 @@ const _ = require('lodash')
 const dateutils = require('dateutils')
 const DateTime = dateutils.DateTime
 const format = require('./format')
+const date = require('./date')
 
 module.exports = markupForDateRange
 
 function markupForDateRange(allDataWithDates, today) {
     return allDataWithDates.map(allDataWithDate => {
         const deltaMin = parseInt((new Date().getTime() - allDataWithDate.timestamp) / 60000, 10)
-        const timeStamp = `päivitetty ${deltaMin} minuuttia sitten`
+        const timeStamp = `päivitetty ${date.toDayHourMinute(deltaMin)} sitten`
         const currentDate = getCurrentDate(allDataWithDate.date)
         const data = allDataWithDate.freeCourts
         return groupBySortedAsList(data, 'date')