Merge pull request #30 from jonez1/feature/issue-29-manage-time

Merged feature/issue #30
danniehansen · Mar 5, 2021 · deee1bb · deee1bb
2 parents 34c38cc + 0c97aaf
commit deee1bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/js/shared.js b/src/js/shared.js
@@ -304,7 +304,9 @@ function formatTime (secondsToFormat, allowSeconds) {
  *
  * @returns {string}
  */
-function formatDate (date) {
+function formatDate (date, returnOnlyTimeString) {
+    returnOnlyTimeString = returnOnlyTimeString || false;
+
     const dateStr = [
         date.getFullYear(),
         ((date.getMonth() + 1) < 10 ? '0' : '') + (date.getMonth() + 1),
@@ -316,7 +318,7 @@ function formatDate (date) {
         (date.getMinutes() < 10 ? '0' : '') + date.getMinutes()
     ];
 
-    return dateStr.join('-') + ' ' + timeStr.join(':');
+    return (returnOnlyTimeString ? '' : dateStr.join('-') + ' ') + timeStr.join(':');
 }
 
 /**
@@ -623,11 +625,14 @@ function cardButtons (t) {
                                 memberRanges.forEach((range) => {
                                     const start = new Date(range.item.start * 1000);
                                     const end = new Date(range.item.end * 1000);
+                                    const rangeOnTheSameDay = start.toDateString() === end.toDateString();
+                                    const rangeLengthInSeconds = range.item.end - range.item.start;
+
                                     const _rangeIndex = range.rangeIndex;
                                     const _range = range;
 
                                     items.push({
-                                        text: formatDate(start) + ' - ' + formatDate(end),
+                                        text: formatDate(start) + ' - ' + formatDate(end, rangeOnTheSameDay) + ' ('+ formatTime(rangeLengthInSeconds, false) +')',
                                         callback: function (t) {
                                             return t.popup({
                                                 title: 'Edit time range',

diff --git a/src/sass/main.scss b/src/sass/main.scss
@@ -114,4 +114,4 @@ input[type="range"] {
 
 label {
     user-select: none;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,4 +114,4 @@ input[type="range"] { @@
     label {
         user-select: none;
-    }
+    }