Merge branch 'fix-minus-remaining-time'

enpitut2018 · Nov 16, 2018 · f2a3fdb · f2a3fdb
2 parents d8e9753 + c9d7920
commit f2a3fdb
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/app/models/task.rb b/app/models/task.rb
@@ -5,12 +5,23 @@ def self.calc_deadtime id
     task = Task.all.find(id)
     time = task.deadline - Time.zone.now
     time / 60
+
+    if time < 0
+      time = 0
+    end
+
+    time
   end
 
   def self.calc_rate_busy id
     d_time = calc_deadtime(id)
-    f_time = TaskController.calc_available_time id
-    f_time / d_time
+
+    if d_time <= 0
+      1
+    else
+      f_time = TaskController.calc_available_time id
+      f_time / d_time
+    end
   end
 
   def self.createRecord name, deadline, user_id=nil