Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-20 22:24:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #1169 and also improve i18n on repeating todos

Browse source
This commit is contained in:
Reinier Balt 2011-05-08 20:37:07 +02:00
parent 739402fa7d
commit 7fb6fba6f2
7 changed files with 372 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/todos_controller.rb
View file

@ -627,25 +627,26 @@ class TodosController < ApplicationController
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
included_tables = [:taggings, :tags, :recurring_todo]
@due_today = current_user.todos.not_completed.find(:all,
:include => [:taggings, :tags],
:include => included_tables,
:conditions => ['todos.due <= ?', due_today_date],
:order => "due")
@due_this_week = current_user.todos.not_completed.find(:all,
:include => [:taggings, :tags],
:include => included_tables,
:conditions => ['todos.due > ? AND todos.due <= ?', due_today_date, due_this_week_date],
:order => "due")
@due_next_week = current_user.todos.not_completed.find(:all,
:include => [:taggings, :tags],
:include => included_tables,
:conditions => ['todos.due > ? AND todos.due <= ?', due_this_week_date, due_next_week_date],
:order => "due")
@due_this_month = current_user.todos.not_completed.find(:all,
:include => [:taggings, :tags],
:include => included_tables,
:conditions => ['todos.due > ? AND todos.due <= ?', due_next_week_date, due_this_month_date],
:order => "due")
@due_after_this_month = current_user.todos.not_completed.find(:all,
:include => [:taggings, :tags],
:include => included_tables,
:conditions => ['todos.due > ?', due_this_month_date],
:order => "due")