scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shift due day calculations for 1 day

Browse source 
Closes SCI-3069.
This commit is contained in:
Jure Grabnar 2019-02-22 08:01:15 +01:00
parent bcd0b433b6
commit 96f2da1e8b
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
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.utc
due_date.present? and datetime.utc > due_date_shifted
end
def overdue_for_days(datetime = DateTime.current)
if due_date.blank? or due_date.utc > datetime.utc
return 0
if due_date.blank? || due_date_shifted > datetime.utc
0
else
return ((datetime.utc.to_i - due_date.utc.to_i) / (60*60*24).to_f).ceil
((datetime.utc.to_i - due_date_shifted.to_i) / 1.day.to_f).ceil
end
end
@ -264,7 +264,14 @@ class MyModule < ApplicationRecord
end
def is_due_in?(datetime, diff)
due_date.present? and datetime.utc < due_date.utc and datetime.utc > (due_date.utc - 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
end
def space_taken