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

html fixes and sort by number of todos logic

Browse source
This commit is contained in:
waltercruz 2008-10-28 16:40:28 -02:00
parent 385f34d071
commit 0b57b23b2d
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/projects_controller.rb
View file

@ -188,7 +188,16 @@ class ProjectsController < ApplicationController
def actionize
@state = params['state']
@projects = current_user.projects.actionize(:state => @state) if @state
query_state = ''
query_state = 'AND project.state = "' + params['state'] +'" 'if @state
projects = Project.find_by_sql([
"SELECT project.id, count(todo.id) as p_count " +
"FROM projects as project " +
"LEFT OUTER JOIN todos as todo ON todo.project_id = project.id "+
"WHERE project.user_id = ? " +
query_state +
" GROUP BY project.id ORDER by p_count DESC",current_user.id])
@projects = current_user.projects.actionize(projects,:state => @state) if @state
@contexts = current_user.contexts
init_not_done_counts(['project'])
end

5
app/models/user.rb
View file

@ -51,10 +51,9 @@ class User < ActiveRecord::Base
self.update_positions(projects.map{ |p| p.id })
return projects
end
def actionize(scope_conditions = {})
def actionize(proj,scope_conditions = {})
self.update_positions(proj.map{ |p| p.id })
projects = find(:all, :conditions => scope_conditions)
projects.sort!{ |x,y| y.todos.count(:state == 'active') <=> x.todos.count(:state == 'active') }
self.update_positions(projects.map{ |p| p.id })
return projects
end
end

6
app/views/projects/_project_state_group.rhtml
View file

@ -1,8 +1,8 @@
<div class="project-state-group" id="list-<%= state %>-projects-container" <%= " style=\"display:none\"" if project_state_group.empty? %>>
<h2><span id="<%= state %>-projects-count" class="badge"><%= project_state_group.length %></span><%= state.titlecase %> Projects</h2>
<div class="menu_sort">
<div class="menu_sort"><span class="sort_separator">Sort&nbsp;</span>
<div class="alpha_sort">
<%= link_to("Sort Alphabetically", alphabetize_projects_path(:state => state),
<%= link_to("Alphabetically", alphabetize_projects_path(:state => state),
:class => "alphabetize_link", :title => "Sort these projects alphabetically") %>
<% apply_behavior '.alphabetize_link:click', :prevent_default => true do |page, element|
page.confirming 'Are you sure that you want to sort these projects alphabetically? This will replace the existing sort order.' do
@ -12,7 +12,7 @@
end
end
%></div><span class="sort_separator">&nbsp;|&nbsp;</span><div class="tasks_sort">
<%= link_to("Sort by number of tasks", actionize_projects_path(:state => state),
<%= link_to("By number of tasks", actionize_projects_path(:state => state),
:class => "actionize_link", :title => "Sort these projects by number of tasks") %>
<% apply_behavior '.actionize_link:click', :prevent_default => true do |page, element|
page.confirming 'Are you sure that you want to sort these projects by the number of tasks? This will replace the existing sort order.' do