mirror of
https://github.com/redmine/redmine.git
synced 2025-11-15 17:56:03 +01:00
Add column totals to Issues Summary Report (#691).
Contributed by David Petersen (user:petersendidit). git-svn-id: https://svn.redmine.org/redmine/trunk@23163 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -352,6 +352,7 @@ tr.idnt-8 td.subject, tr.idnt-8 td.name {padding-left: 136px; background-positio
|
|||||||
tr.idnt-9 td.subject, tr.idnt-9 td.name {padding-left: 152px; background-position: 136px 50%;}
|
tr.idnt-9 td.subject, tr.idnt-9 td.name {padding-left: 152px; background-position: 136px 50%;}
|
||||||
|
|
||||||
table.issue-report {table-layout:fixed;}
|
table.issue-report {table-layout:fixed;}
|
||||||
|
table.issue-report tr.total, table.issue-report-detailed tr.total { font-weight: bold; border-top:2px solid #d0d7de;}
|
||||||
.issue-report-graph {width: 75%; margin: 2em 0;}
|
.issue-report-graph {width: 75%; margin: 2em 0;}
|
||||||
|
|
||||||
tr.entry td { white-space: nowrap; }
|
tr.entry td { white-space: nowrap; }
|
||||||
|
|||||||
@@ -24,6 +24,17 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
<tfoot>
|
||||||
|
<tr class="total">
|
||||||
|
<td><%= l(:label_total) %></td>
|
||||||
|
<% for status in @statuses %>
|
||||||
|
<td><%= aggregate data, { "status_id" => status.id } %></td>
|
||||||
|
<% end %>
|
||||||
|
<td><%= aggregate data, { "closed" => 0 } %></td>
|
||||||
|
<td><%= aggregate data, { "closed" => 1 } %></td>
|
||||||
|
<td><%= aggregate data, { } %></td>
|
||||||
|
</tr>
|
||||||
|
</tfoot>
|
||||||
</table>
|
</table>
|
||||||
<% other_formats_links do |f| %>
|
<% other_formats_links do |f| %>
|
||||||
<%= f.link_to_with_query_parameters 'CSV', {}, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
|
<%= f.link_to_with_query_parameters 'CSV', {}, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
|
||||||
|
|||||||
@@ -17,6 +17,14 @@
|
|||||||
<td><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*", :subproject_id => nil) %></td>
|
<td><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*", :subproject_id => nil) %></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<tfoot>
|
||||||
|
<tr class="total">
|
||||||
|
<td><%= l(:label_total) %></td>
|
||||||
|
<td><%= aggregate data, { "closed" => 0 } %></td>
|
||||||
|
<td><%= aggregate data, { "closed" => 1 } %></td>
|
||||||
|
<td><%= aggregate data, { } %></td>
|
||||||
|
</tr>
|
||||||
|
</tfoot>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -208,6 +208,17 @@ class ReportsControllerTest < Redmine::ControllerTest
|
|||||||
assert_select ':nth-child(9)', :text => '1' # closed
|
assert_select ':nth-child(9)', :text => '1' # closed
|
||||||
assert_select ':nth-child(10)', :text => '3' # total
|
assert_select ':nth-child(10)', :text => '3' # total
|
||||||
end
|
end
|
||||||
|
assert_select 'table.list tfoot :nth-child(1)' do
|
||||||
|
assert_select 'td', :text => 'Total'
|
||||||
|
assert_select ':nth-child(2)', :text => '3' # status:1
|
||||||
|
assert_select ':nth-child(3)', :text => '0' # status:2
|
||||||
|
assert_select ':nth-child(4)', :text => '0' # status:3
|
||||||
|
assert_select ':nth-child(5)', :text => '0' # status:4
|
||||||
|
assert_select ':nth-child(6)', :text => '1' # status:5
|
||||||
|
assert_select ':nth-child(8)', :text => '3' # open
|
||||||
|
assert_select ':nth-child(9)', :text => '1' # closed
|
||||||
|
assert_select ':nth-child(10)', :text => '4' # total
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_get_issue_report_details_by_assignee_should_show_non_assigned_issue_count
|
def test_get_issue_report_details_by_assignee_should_show_non_assigned_issue_count
|
||||||
|
|||||||
Reference in New Issue
Block a user