Limit time tracking values to hours

Adds an instance setting to limit display of time tracking
values to hours only

3 files changed, 16 insertions, 4 deletions

diff --git a/app/assets/javascripts/boards/components/issue_time_estimate.vue b/app/assets/javascripts/boards/components/issue_time_estimate.vue
index 98c1d29db16..2545980163f 100644
--- a/app/assets/javascripts/boards/components/issue_time_estimate.vue
+++ b/app/assets/javascripts/boards/components/issue_time_estimate.vue
@@ -16,10 +16,15 @@ export default {
   },
   computed: {
     title() {
-      return stringifyTime(parseSeconds(this.estimate), true);
+      return stringifyTime(
+        parseSeconds(this.estimate, { limitToHours: gon.time_tracking_display_hours_only }),
+        true
+      );
     },
     timeEstimate() {
-      return stringifyTime(parseSeconds(this.estimate));
+      return stringifyTime(
+        parseSeconds(this.estimate, { limitToHours: gon.time_tracking_display_hours_only })
+      );
     },
   },
 };
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js
index d521c462ad8..f8398f2f780 100644
--- a/app/assets/javascripts/lib/utils/datetime_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -479,7 +479,10 @@ export const pikadayToString = date => {
  * Seconds can be negative or positive, zero or non-zero. Can be configured for any day
  * or week length.
  */
-export const parseSeconds = (seconds, { daysPerWeek = 5, hoursPerDay = 8 } = {}) => {
+export const parseSeconds = (
+  seconds,
+  { daysPerWeek = 5, hoursPerDay = 8, limitToHours = false } = {},
+) => {
   const DAYS_PER_WEEK = daysPerWeek;
   const HOURS_PER_DAY = hoursPerDay;
   const MINUTES_PER_HOUR = 60;
@@ -496,6 +499,10 @@ export const parseSeconds = (seconds, { daysPerWeek = 5, hoursPerDay = 8 } = {})
   let unorderedMinutes = Math.abs(seconds / MINUTES_PER_HOUR);
 
   return _.mapObject(timePeriodConstraints, minutesPerPeriod => {
+    if (limitToHours && minutesPerPeriod > MINUTES_PER_HOUR) {
+      return 0;
+    }
+
     const periodCount = Math.floor(unorderedMinutes / minutesPerPeriod);
 
     unorderedMinutes -= periodCount * minutesPerPeriod;
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
index f4d926cd3ec..cd3e7ce33f7 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
@@ -32,7 +32,7 @@ export default {
   computed: {
     parsedTimeRemaining() {
       const diffSeconds = this.timeEstimate - this.timeSpent;
-      return parseSeconds(diffSeconds);
+      return parseSeconds(diffSeconds, { limitToHours: gon.time_tracking_display_hours_only });
     },
     timeRemainingHumanReadable() {
       return stringifyTime(this.parsedTimeRemaining);