fix minute formatter

andreidimaano · Aug 24, 2021 · f6c4c66 · f6c4c66
1 parent 498173d
commit f6c4c66
Showing 1 changed file with 6 additions and 42 deletions.
diff --git a/src/util/minutesToHours.js b/src/util/minutesToHours.js
@@ -2,48 +2,12 @@ const moment = require("moment");
 
 module.exports = {
   formatDuration: (totalMinutes) => {
-
-  let num = totalMinutes;
-  let hours = (num / 60);
-  let rhours = Math.floor(hours);
-  let minutes = (hours - rhours) * 60;
-  let rminutes = Math.round(minutes);
-  return num + " minutes = " + rhours + " hour(s) and " + rminutes + " minute(s).";
-    // const duration = moment.duration(totalMinutes * 60000);
+    let hours = Math.floor(totalMinutes / 60);
+    let minutes = totalMinutes % 60;
+    let hourSingularOrPlural = hours === 1 ? "hour" : "hours";
 
-    // let m = "";
-    // let h = "";
-    // let d = "";
-    // let mo = "";
-    // let y = "";
-
-    // if (duration._data.minutes !== 0) {
-    //   let s = duration._data.minutes !== 1 ? "s" : "";
-    //   m = `${duration._data.minutes} minute${s}`;
-    // }
-
-    // if (duration._data.hours !== 0) {
-    //   let s = duration._data.hours !== 1 ? "s" : "";
-    //   h = `${duration._data.hours} hour${s} `;
-    // }
-
-    // if (duration._data.days !== 0) {
-    //   let s = duration._data.hours !== 1 ? "s" : "";
-    //   d = `${duration._data.days} day${s} `;
-    // }
-
-    // if (duration._data.months !== 0) {
-    //   let s = duration._data.months !== 1 ? "s" : "";
-    //   mo = `${duration._data.months} mth${s} `;
-    // }
-
-    // if (duration._data.years !== 0) {
-    //   let s = duration._data.years !== 1 ? "s" : "";
-    //   y = `${duration._data.years} yr${s} `;
-    // }
-
-
-
-    return `${y}${mo}${d}${h}${m}`;
+    return hours === 0
+      ? `${minutes} minutes`
+      : `${hours} ${hourSingularOrPlural} ${minutes} minutes`;
   },
 };