Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-05 16:58:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use Todos::Calendar in the view

Browse source
This commit is contained in:
Matt Rogers 2013-04-26 23:23:56 -05:00
parent fb71441436
commit 6b8e745234
3 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/todos_controller.rb
View file

@ -784,17 +784,8 @@ class TodosController < ApplicationController
@source_view = params['_source_view'] || 'calendar'
@page_title = t('todos.calendar_page_title')
calendar = Todos::Calendar.new(current_user)
@projects = calendar.projects
due_this_month_date = Time.zone.now.end_of_month
included_tables = Todo::DEFAULT_INCLUDES
@due_today = calendar.due_today
@due_this_week = calendar.due_this_week
@due_next_week = calendar.due_next_week
@due_this_month = calendar.due_this_month
@due_after_this_month = calendar.due_after_this_month
@calendar = Todos::Calendar.new(current_user)
@projects = @calendar.projects
@count = current_user.todos.not_completed.are_due.count
respond_to do |format|

10
app/views/todos/calendar.html.erb
View file

@ -1,10 +1,10 @@
<div id="display_box">
<%= todos_calendar_container(:due_today, @due_today ) %>
<%= todos_calendar_container(:due_this_week, @due_this_week ) %>
<%= todos_calendar_container(:due_next_week, @due_next_week ) %>
<%= todos_calendar_container(:due_this_month, @due_this_month ) %>
<%= todos_calendar_container(:due_after_this_month, @due_after_this_month) %>
<%= todos_calendar_container(:due_today, @calendar.due_today ) %>
<%= todos_calendar_container(:due_this_week, @calendar.due_this_week ) %>
<%= todos_calendar_container(:due_next_week, @calendar.due_next_week ) %>
<%= todos_calendar_container(:due_this_month, @calendar.due_this_month ) %>
<%= todos_calendar_container(:due_after_this_month, @calendar.due_after_this_month) %>
</div><!-- End of display_box -->
<div class="input_box" id="input_box">

8
test/functional/todos_controller_test.rb
View file

@ -916,10 +916,10 @@ class TodosControllerTest < ActionController::TestCase
assert_equal "calendar", assigns['source_view']
assert_equal projects, assigns['projects']
assert_equal due_today, assigns['due_today']
assert_equal [], assigns['due_this_week']
assert_equal due_next_week, assigns['due_next_week']
assert_equal [], assigns['due_this_month']
assert_equal due_today, assigns['calendar'].due_today
assert_equal [], assigns['calendar'].due_this_week
assert_equal due_next_week, assigns['calendar'].due_next_week
assert_equal [], assigns['calendar'].due_this_month
assert_equal 8, assigns['count']
end
end