From: Jean-Philippe Lang Date: Thu, 10 Jan 2008 19:20:36 +0000 (+0000) Subject: Added details by assignees on issue summary view (Hans Yoon). X-Git-Tag: 0.7.0-RC1~228 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a39f655a7c86fab775e725505f262692ced2c2ca;p=redmine.git Added details by assignees on issue summary view (Hans Yoon). git-svn-id: http://redmine.rubyforge.org/svn/trunk@1052 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index e18e117a6..e33fe8412 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -47,6 +47,12 @@ class ReportsController < ApplicationController @data = issues_by_category @report_title = l(:field_category) render :template => "reports/issue_report_details" + when "assigned_to" + @field = "assigned_to_id" + @rows = @project.members.collect { |m| m.user } + @data = issues_by_assigned_to + @report_title = l(:field_assigned_to) + render :template => "reports/issue_report_details" when "author" @field = "author_id" @rows = @project.members.collect { |m| m.user } @@ -64,12 +70,14 @@ class ReportsController < ApplicationController @versions = @project.versions.sort @priorities = Enumeration::get_values('IPRI') @categories = @project.issue_categories + @assignees = @project.members.collect { |m| m.user } @authors = @project.members.collect { |m| m.user } @subprojects = @project.active_children issues_by_tracker issues_by_version issues_by_priority issues_by_category + issues_by_assigned_to issues_by_author issues_by_subproject @@ -180,7 +188,22 @@ private and i.project_id=#{@project.id} group by s.id, s.is_closed, c.id") end - + + def issues_by_assigned_to + @issues_by_assigned_to ||= + ActiveRecord::Base.connection.select_all("select s.id as status_id, + s.is_closed as closed, + a.id as assigned_to_id, + count(i.id) as total + from + #{Issue.table_name} i, #{IssueStatus.table_name} s, #{User.table_name} a + where + i.status_id=s.id + and i.assigned_to_id=a.id + and i.project_id=#{@project.id} + group by s.id, s.is_closed, a.id") + end + def issues_by_author @issues_by_author ||= ActiveRecord::Base.connection.select_all("select s.id as status_id, diff --git a/app/views/reports/issue_report.rhtml b/app/views/reports/issue_report.rhtml index 0eaba58dc..1ed16ea3b 100644 --- a/app/views/reports/issue_report.rhtml +++ b/app/views/reports/issue_report.rhtml @@ -4,8 +4,11 @@

<%=l(:field_tracker)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'tracker' %>

<%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
-

<%=l(:field_version)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'version' %>

-<%= render :partial => 'simple', :locals => { :data => @issues_by_version, :field_name => "fixed_version_id", :rows => @versions } %> +

<%=l(:field_priority)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'priority' %>

+<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %> +
+

<%=l(:field_assigned_to)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'assigned_to' %>

+<%= render :partial => 'simple', :locals => { :data => @issues_by_assigned_to, :field_name => "assigned_to_id", :rows => @assignees } %>

<%=l(:field_author)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'author' %>

<%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %> @@ -13,8 +16,8 @@
-

<%=l(:field_priority)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'priority' %>

-<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %> +

<%=l(:field_version)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'version' %>

+<%= render :partial => 'simple', :locals => { :data => @issues_by_version, :field_name => "fixed_version_id", :rows => @versions } %>
<% if @project.children.any? %>

<%=l(:field_subproject)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'subproject' %>