jro_apps/redmine Commit - r32:7473be407216

issues reports improvements...

Jean-Philippe Lang -

r32:7473be407216

parent child

Context file:

r32:7473be407216

Collapse all files

redmine/app/views/reports/_details.rhtml created 644 +47 0

@@ -0,0 +1,47
	1	<% if @statuses.empty? or rows.empty? %>
	2	<p><i><%=l(:label_no_data)%></i></p>
	3	<% else %>
	4	<% col_width = 70 / (@statuses.length+3) %>
	5	<table class="reportTableContent">
	6	<tr>
	7	<td width="25%"></td>
	8	<% for status in @statuses %>
	9	<td align="center" width="<%= col_width %>%" bgcolor="#<%= status.html_color %>"><small><%= status.name %></small></td>
	10	<% end %>
	11	<td align="center" width="<%= col_width %>%"><strong><%=l(:label_open_issues_plural)%></strong></td>
	12	<td align="center" width="<%= col_width %>%"><strong><%=l(:label_closed_issues_plural)%></strong></td>
	13	<td align="center" width="<%= col_width %>%"><strong><%=l(:label_total)%></strong></td>
	14	</tr>
	15
	16	<% for row in rows %>
	17	<tr class="<%= cycle("odd", "even") %>">
	18	<td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project,
	19	:set_filter => 1,
	20	"#{field_name}" => row.id %></td>
	21	<% for status in @statuses %>
	22	<td align="center"><%= link_to (aggregate data, { field_name => row.id, "status_id" => status.id }),
	23	:controller => 'projects', :action => 'list_issues', :id => @project,
	24	:set_filter => 1,
	25	"status_id" => status.id,
	26	"#{field_name}" => row.id %></td>
	27	<% end %>
	28	<td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
	29	:controller => 'projects', :action => 'list_issues', :id => @project,
	30	:set_filter => 1,
	31	"#{field_name}" => row.id,
	32	"status_id" => "O" %></td>
	33	<td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }),
	34	:controller => 'projects', :action => 'list_issues', :id => @project,
	35	:set_filter => 1,
	36	"#{field_name}" => row.id,
	37	"status_id" => "C" %></td>
	38	<td align="center"><%= link_to (aggregate data, { field_name => row.id }),
	39	:controller => 'projects', :action => 'list_issues', :id => @project,
	40	:set_filter => 1,
	41	"#{field_name}" => row.id,
	42	"status_id" => "A" %></td>
	43	<% end %>
	44	</tr>
	45	</table>
	46	<% end
	47	reset_cycle %> No newline at end of file

redmine/app/views/reports/issue_report_details.rhtml created 644 +7 0

@@ -0,0 +1,7
	1	<h2><%=l(:label_report_plural)%></h2>
	2
	3	<strong><%=@report_title%></strong>
	4	<%= render :partial => 'details', :locals => { :data => @data, :field_name => @field, :rows => @rows } %>
	5	<br />
	6	<%= link_to l(:button_back), :action => 'issue_report' %>
	7

redmine/public/images/user_new.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

redmine/app/controllers/reports_controller.rb +51 -17

@@ -21,9 +21,46 class ReportsController < ApplicationController
21		21
22	def issue_report	22	def issue_report
23	@statuses = IssueStatus.find_all	23	@statuses = IssueStatus.find_all
24	@trackers = Tracker.find_all	24
25	@issues_by_tracker =	25	case params[:detail]
26	ActiveRecord::Base.connection.select_all("select s.id as status_id,	26	when "tracker"
		27	@field = "tracker_id"
		28	@rows = Tracker.find_all
		29	@data = issues_by_tracker
		30	@report_title = l(:field_tracker)
		31	render :template => "reports/issue_report_details"
		32	when "priority"
		33	@field = "priority_id"
		34	@rows = Enumeration::get_values('IPRI')
		35	@data = issues_by_priority
		36	@report_title = l(:field_priority)
		37	render :template => "reports/issue_report_details"
		38	when "category"
		39	@field = "category_id"
		40	@rows = @project.issue_categories
		41	@data = issues_by_category
		42	@report_title = l(:field_category)
		43	render :template => "reports/issue_report_details"
		44	else
		45	@trackers = Tracker.find(:all)
		46	@priorities = Enumeration::get_values('IPRI')
		47	@categories = @project.issue_categories
		48	issues_by_tracker
		49	issues_by_priority
		50	issues_by_category
		51	render :template => "reports/issue_report"
		52	end
		53	end
		54
		55	private
		56	# Find project of id params[:id]
		57	def find_project
		58	@project = Project.find(params[:id])
		59	end
		60
		61	def issues_by_tracker
		62	@issues_by_tracker \|\|=
		63	ActiveRecord::Base.connection.select_all("select s.id as status_id,
27	s.is_closed as closed,	64	s.is_closed as closed,
28	t.id as tracker_id,	65	t.id as tracker_id,
29	count(i.id) as total	66	count(i.id) as total
@@ -33,9 +70,11 class ReportsController < ApplicationController
33	i.status_id=s.id	70	i.status_id=s.id
34	and i.tracker_id=t.id	71	and i.tracker_id=t.id
35	and i.project_id=#{@project.id}	72	and i.project_id=#{@project.id}
36	group by s.id, s.is_closed, t.id")	73	group by s.id, s.is_closed, t.id")
37	@priorities = Enumeration::get_values('IPRI')	74	end
38	@issues_by_priority =	75
		76	def issues_by_priority
		77	@issues_by_priority \|\|=
39	ActiveRecord::Base.connection.select_all("select s.id as status_id,	78	ActiveRecord::Base.connection.select_all("select s.id as status_id,
40	s.is_closed as closed,	79	s.is_closed as closed,
41	p.id as priority_id,	80	p.id as priority_id,
@@ -46,9 +85,11 class ReportsController < ApplicationController
46	i.status_id=s.id	85	i.status_id=s.id
47	and i.priority_id=p.id	86	and i.priority_id=p.id
48	and i.project_id=#{@project.id}	87	and i.project_id=#{@project.id}
49	group by s.id, s.is_closed, p.id")	88	group by s.id, s.is_closed, p.id")
50	@categories = @project.issue_categories	89	end
51	@issues_by_category =	90
		91	def issues_by_category
		92	@issues_by_category \|\|=
52	ActiveRecord::Base.connection.select_all("select s.id as status_id,	93	ActiveRecord::Base.connection.select_all("select s.id as status_id,
53	s.is_closed as closed,	94	s.is_closed as closed,
54	c.id as category_id,	95	c.id as category_id,
@@ -59,13 +100,6 class ReportsController < ApplicationController
59	i.status_id=s.id	100	i.status_id=s.id
60	and i.category_id=c.id	101	and i.category_id=c.id
61	and i.project_id=#{@project.id}	102	and i.project_id=#{@project.id}
62	group by s.id, s.is_closed, c.id")	103	group by s.id, s.is_closed, c.id")
63	end
64
65
66	private
67	# Find project of id params[:id]
68	def find_project
69	@project = Project.find(params[:id])
70	end	104	end
71	end	105	end

redmine/app/views/reports/_simple.rhtml +4 -15

             <% if @statuses.empty? or rows.empty? %>
                 <p><i><%=l(:label_no_data)%></i></p>
             <% else %>
-            <% col_width = 70 / (@statuses.length+3) %>
+            <table class="reportTableContent">
-            <table border="0" cellspacing="1" cellpadding="2" width="100%">
             <tr>
             <td width="25%"></td>
-            <% for status in @statuses %>
+            <td align="center" width="25%"><%=l(:label_open_issues_plural)%></td>
-              <td align="center" width="<%= col_width %>%" bgcolor="#<%= status.html_color %>"><small><%= status.name %></small></td>
+            <td align="center" width="25%"><%=l(:label_closed_issues_plural)%></td>
-            <% end %>
+            <td align="center" width="25%"><%=l(:label_total)%></td>
-            <td align="center" width="<%= col_width %>%"><strong><%=l(:label_open_issues_plural)%></strong></td>
-            <td align="center" width="<%= col_width %>%"><strong><%=l(:label_closed_issues_plural)%></strong></td>
-            <td align="center" width="<%= col_width %>%"><strong><%=l(:label_total)%></strong></td>
             </tr>
             <% for row in rows %>
               <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id %></td>
-              <% for status in @statuses %>
-                <td align="center"><%= link_to (aggregate data, { field_name => row.id, "status_id" => status.id }),
-                                                            :controller => 'projects', :action => 'list_issues', :id => @project,
-                                                            :set_filter => 1,
-                                                            "status_id" => status.id,
-                                                            "#{field_name}" => row.id %></td>
-              <% end %>
               <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
                                                             :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,

redmine/app/views/reports/issue_report.rhtml +8 -4

             <h2><%=l(:label_report_plural)%></h2>
-            <strong><%=l(:field_tracker)%></strong>
+            <div class="splitcontentleft">
+            <strong><%=l(:field_tracker)%></strong>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
-            <br />
+            <p align="right"><small><%= link_to l(:label_details), :detail => 'tracker' %></small>&nbsp;</p>
             <strong><%=l(:field_priority)%></strong>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
-            <br />
+            <p align="right"><small><%= link_to l(:label_details), :detail => 'priority' %></small>&nbsp;</p>
+            </div>
+            <div class="splitcontentright">
             <strong><%=l(:field_category)%></strong>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
+            <p align="right"><small><%= link_to l(:label_details), :detail => 'category' %></small>&nbsp;</p>
+            </div>
-            &nbsp;

redmine/lang/de.yml +2 0

             label_next: Weiter
             label_previous: Zurück
             label_used_by: Benutzt von
+            #label_details: Details...
             button_login: Einloggen
             button_submit: Einreichen
             button_list: Aufzulisten
             button_view: Siehe
             button_move: Bewegen
+            #button_back: Back
             text_select_mail_notifications: Aktionen für die Mailbenachrichtigung aktiviert werden soll.
             text_regexp_info: eg. ^[A-Z0-9]+$

redmine/lang/en.yml +2 0

             label_next: Next
             label_previous: Previous
             label_used_by: Used by
+            label_details: Details...
             button_login: Login
             button_submit: Submit
             button_list: List
             button_view: View
             button_move: Move
+            button_back: Back
             text_select_mail_notifications: Select actions for which mail notifications should be sent.
             text_regexp_info: eg. ^[A-Z0-9]+$

redmine/lang/es.yml +2 0

             label_next: Próximo
             label_previous: Precedente
             label_used_by: Utilizado por
+            #label_details: Details...
             button_login: Conexión
             button_submit: Someter
             button_list: Listar
             button_view: Ver
             button_move: Mover
+            #button_back: Back
             text_select_mail_notifications: Seleccionar las actividades que necesitan la activación de la notificación por mail.
             text_regexp_info: eg. ^[A-Z0-9]+$

redmine/lang/fr.yml +2 0

             label_next: Suivant
             label_previous: Précédent
             label_used_by: Utilisé par
+            label_details: Détails...
             button_login: Connexion
             button_submit: Soumettre
             button_list: Lister
             button_view: Voir
             button_move: Déplacer
+            button_back: Retour
             text_select_mail_notifications: Sélectionner les actions pour lesquelles la notification par mail doit être activée.
             text_regexp_info: ex. ^[A-Z0-9]+$

redmine/public/stylesheets/application.css +10 0

@@ -265,6 +265,16 tr.even {
265	background-color: #fff;	265	background-color: #fff;
266	}	266	}
267		267
		268	table.reportTableContent {
		269	border:1px solid #c0c0c0;
		270	width:99%;
		271	border-collapse: collapse;
		272	}
		273
		274	table.reportTableContent td {
		275	padding:2px;
		276	}
		277
268	hr { border:none; border-bottom: dotted 2px #c0c0c0; }	278	hr { border:none; border-bottom: dotted 2px #c0c0c0; }
269		279
270		280

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages