Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 15:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2535 from TracksApp/bug/2534_calendar_due_fix

Browse source 
#2534: Fix setting the due date in the calendar view.
This commit is contained in:
Jyri-Petteri Paloposki 2021-01-05 07:33:26 +02:00 • committed by GitHub
commit 45f5c1d3a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/todos_controller.rb
View file

@ -1121,18 +1121,19 @@ end
end end
def count_old_due_empty(id) def count_old_due_empty(id)
due_today_date = Time.zone.now
due_this_week_date = Time.zone.now.end_of_week
due_next_week_date = due_this_week_date + 7.days
due_this_month_date = Time.zone.now.end_of_month
case id case id
when "due_today" when "due_today"
due_today_date = Time.zone.now
return current_user.todos.not_completed.where('todos.due <= ?', due_today_date).count return current_user.todos.not_completed.where('todos.due <= ?', due_today_date).count
when "due_this_week" when "due_this_week"
due_this_week_date = Time.zone.now.end_of_week
return current_user.todos.not_completed.where('todos.due > ? AND todos.due <= ?', due_today_date, due_this_week_date).count return current_user.todos.not_completed.where('todos.due > ? AND todos.due <= ?', due_today_date, due_this_week_date).count
when "due_next_week" when "due_next_week"
due_next_week_date = due_this_week_date + 7.days
return current_user.todos.not_completed.where('todos.due > ? AND todos.due <= ?', due_this_week_date, due_next_week_date).count return current_user.todos.not_completed.where('todos.due > ? AND todos.due <= ?', due_this_week_date, due_next_week_date).count
when "due_this_month" when "due_this_month"
due_this_month_date = Time.zone.now.end_of_month
return current_user.todos.not_completed.where('todos.due > ? AND todos.due <= ?', due_next_week_date, due_this_month_date).count return current_user.todos.not_completed.where('todos.due > ? AND todos.due <= ?', due_next_week_date, due_this_month_date).count
when "due_after_this_month" when "due_after_this_month"
return current_user.todos.not_completed.where('todos.due > ?', due_this_month_date).count return current_user.todos.not_completed.where('todos.due > ?', due_this_month_date).count