Cleanup the use of duration and optimize some queries

1 files changed, 3 insertions, 19 deletions

diff --git a/app/helpers/time_helper.rb b/app/helpers/time_helper.rb
index a031abb8676..271e839692a 100644
--- a/app/helpers/time_helper.rb
+++ b/app/helpers/time_helper.rb
@@ -15,25 +15,9 @@ module TimeHelper
     "#{from.to_s(:short)} - #{to.to_s(:short)}"
   end
 
-  def duration_in_numbers(finished_at, started_at)
-    interval = interval_in_seconds(started_at, finished_at)
+  def duration_in_numbers(duration)
+    time_format = duration < 1.hour ? "%M:%S" : "%H:%M:%S"
 
-    duration_in_numbers_from_interval(interval)
-  end
-
-  def duration_in_numbers_from_interval(interval)
-    time_format = interval < 1.hour ? "%M:%S" : "%H:%M:%S"
-
-    Time.at(interval).utc.strftime(time_format)
-  end
-
-  private
-
-  def interval_in_seconds(started_at, finished_at = nil)
-    if started_at && finished_at
-      finished_at.to_i - started_at.to_i
-    elsif started_at
-      Time.now.to_i - started_at.to_i
-    end
+    Time.at(duration).utc.strftime(time_format)
   end
 end