scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-24 11:09:40 +08:00
Code Issues Projects Releases Packages Wiki Activity

Change due_date calculation to DateTime#end_of_day

Browse source
This commit is contained in:
Jure Grabnar 2019-02-22 10:23:12 +01:00
parent 96f2da1e8b
commit 87dcf301fb
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/models/my_module.rb
View file

@ -248,14 +248,14 @@ class MyModule < ApplicationRecord
end
def is_overdue?(datetime = DateTime.current)
due_date.present? and datetime.utc > due_date_shifted
due_date.present? && datetime.utc > due_date.end_of_day
end
def overdue_for_days(datetime = DateTime.current)
if due_date.blank? || due_date_shifted > datetime.utc
if due_date.blank? || due_date.end_of_day > datetime.utc
0
else
((datetime.utc.to_i - due_date_shifted.to_i) / 1.day.to_f).ceil
((datetime.utc.to_i - due_date.end_of_day.to_i) / 1.day.to_f).ceil
end
end
@ -265,13 +265,8 @@ class MyModule < ApplicationRecord
def is_due_in?(datetime, diff)
due_date.present? &&
datetime.utc < due_date_shifted &&
datetime.utc > (due_date_shifted - diff)
end
def due_date_shifted
# Selected due date should still be included
due_date.utc + 1.day
datetime.utc < due_date.end_of_day &&
datetime.utc > (due_date.end_of_day - diff)
end
def space_taken