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

Merge pull request #1961 from C-Otto/sort-current-projects

Browse source 
Sort current projects
This commit is contained in:
Matt Rogers 2016-01-21 15:59:01 -06:00
commit 7d50ee5bdd
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/projects_controller.rb
View file

@ -57,12 +57,11 @@ class ProjectsController < ApplicationController
def review
@source_view = params['_source_view'] || 'review'
@page_title = t('projects.list_reviews')
@projects = current_user.projects.load
@contexts = current_user.contexts.load
@projects_to_review = current_user.projects.select {|p| p.needs_review?(current_user)}
@stalled_projects = current_user.projects.select {|p| p.stalled?}
@blocked_projects = current_user.projects.select {|p| p.blocked?}
@current_projects = current_user.projects.uncompleted.select {|p| not(p.needs_review?(current_user))}
projects = current_user.projects
@projects_to_review = projects.select {|p| p.needs_review?(current_user)}
@stalled_projects = projects.select {|p| p.stalled?}
@blocked_projects = projects.select {|p| p.blocked?}
@current_projects = projects.uncompleted.select { |p| not (p.needs_review?(current_user)) }.sort_by { |p| p.last_reviewed || Time.zone.at(0) }
init_not_done_counts(['project'])
init_project_hidden_todo_counts(['project'])

10
test/controllers/projects_controller_test.rb
View file

@ -25,6 +25,16 @@ class ProjectsControllerTest < ActionController::TestCase
assert_equal 2, assigns['deferred_todos'].size
end
def test_sorted_current_in_review
p = projects(:timemachine)
login_as :admin_user
get :review
current_projects = assigns['current_projects']
assert_equal 2, current_projects.length
assert_equal projects(:gardenclean), current_projects[0]
assert_equal projects(:moremoney), current_projects[1]
end
def test_show_exposes_next_project_in_same_state
login_as :admin_user
get :show, :id => projects(:timemachine).to_param

8
test/fixtures/projects.yml vendored
View file

@ -6,6 +6,12 @@
def today
Time.zone.now.utc.beginning_of_day.to_s(:db)
end
def yesterday
1.day.ago.utc.beginning_of_day.to_s(:db)
end
def last_week
1.week.ago.utc.beginning_of_day.to_s(:db)
end
%>
timemachine:
@ -28,6 +34,7 @@ moremoney:
user_id: 1
created_at: <%= today %>
updated_at: <%= today %>
last_reviewed: <%= yesterday %>
gardenclean:
id: 3
@ -38,6 +45,7 @@ gardenclean:
user_id: 1
created_at: <%= today %>
updated_at: <%= today %>
last_reviewed: <%= last_week %>
attendrailsconf:
id: 4