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

Merge pull request #1516 from jbargu/jg_sci_3069_due_date_red

Browse source 
Due date is not red for today anymore [SCI-3069]
This commit is contained in:
Jure Grabnar 2019-02-25 13:20:50 +01:00 • committed by GitHub
commit 4edab957a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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? && datetime.utc > due_date.end_of_day.utc
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.end_of_day.utc > 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.end_of_day.utc.to_i) / 1.day.to_f).ceil
end
end
@ -264,7 +264,9 @@ 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.end_of_day.utc &&
datetime.utc > (due_date.end_of_day.utc - diff)
end
def space_taken