Allow remaining time of scheduled jobs to overflow one day

1 files changed, 15 insertions, 3 deletions

diff --git a/app/helpers/time_helper.rb b/app/helpers/time_helper.rb
index 94044d7b85e..737ec33b2dd 100644
--- a/app/helpers/time_helper.rb
+++ b/app/helpers/time_helper.rb
@@ -21,9 +21,21 @@ module TimeHelper
     "#{from.to_s(:short)} - #{to.to_s(:short)}"
   end
 
-  def duration_in_numbers(duration)
-    time_format = duration < 1.hour ? "%M:%S" : "%H:%M:%S"
+  def duration_in_numbers(duration_in_seconds, allow_overflow = false)
+    if allow_overflow
+      seconds = duration_in_seconds % 1.minute
+      minutes = (duration_in_seconds / 1.minute) % (1.hour / 1.minute)
+      hours = duration_in_seconds / 1.hour
 
-    Time.at(duration).utc.strftime(time_format)
+      if hours == 0
+        "%02d:%02d" % [minutes, seconds]
+      else
+        "%02d:%02d:%02d" % [hours, minutes, seconds]
+      end
+    else
+      time_format = duration_in_seconds < 1.hour ? "%M:%S" : "%H:%M:%S"
+
+      Time.at(duration_in_seconds).utc.strftime(time_format)
+    end
   end
 end