jro_apps/redmine Commit - r7906:caf898d7d13f

Extracted time report logic from the controller....

Jean-Philippe Lang -

r7906:caf898d7d13f

parent child

Context file:

r7906:caf898d7d13f

Collapse all files

lib/redmine/helpers/time_report.rb created 644 +164 0

@@ -0,0 +1,164
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2011 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	module Redmine
	19	module Helpers
	20	class TimeReport
	21	attr_reader :criteria, :columns, :from, :to, :hours, :total_hours, :periods
	22
	23	def initialize(project, issue, criteria, columns, from, to)
	24	@project = project
	25	@issue = issue
	26
	27	@criteria = criteria \|\| []
	28	@criteria = @criteria.select{\|criteria\| available_criteria.has_key? criteria}
	29	@criteria.uniq!
	30	@criteria = @criteria[0,3]
	31
	32	@columns = (columns && %w(year month week day).include?(columns)) ? columns : 'month'
	33	@from = from
	34	@to = to
	35
	36	run
	37	end
	38
	39	def available_criteria
	40	@available_criteria \|\| load_available_criteria
	41	end
	42
	43	private
	44
	45	def run
	46	unless @criteria.empty?
	47	sql_select = @criteria.collect{\|criteria\| @available_criteria[criteria][:sql] + " AS " + criteria}.join(', ')
	48	sql_group_by = @criteria.collect{\|criteria\| @available_criteria[criteria][:sql]}.join(', ')
	49	sql_condition = ''
	50
	51	if @project.nil?
	52	sql_condition = Project.allowed_to_condition(User.current, :view_time_entries)
	53	elsif @issue.nil?
	54	sql_condition = @project.project_condition(Setting.display_subprojects_issues?)
	55	else
	56	sql_condition = "#{Issue.table_name}.root_id = #{@issue.root_id} AND #{Issue.table_name}.lft >= #{@issue.lft} AND #{Issue.table_name}.rgt <= #{@issue.rgt}"
	57	end
	58
	59	sql = "SELECT #{sql_select}, tyear, tmonth, tweek, spent_on, SUM(hours) AS hours"
	60	sql << " FROM #{TimeEntry.table_name}"
	61	sql << time_report_joins
	62	sql << " WHERE"
	63	sql << " (%s) AND" % sql_condition
	64	sql << " (spent_on BETWEEN '%s' AND '%s')" % [ActiveRecord::Base.connection.quoted_date(@from), ActiveRecord::Base.connection.quoted_date(@to)]
	65	sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek, spent_on"
	66
	67	@hours = ActiveRecord::Base.connection.select_all(sql)
	68
	69	@hours.each do \|row\|
	70	case @columns
	71	when 'year'
	72	row['year'] = row['tyear']
	73	when 'month'
	74	row['month'] = "#{row['tyear']}-#{row['tmonth']}"
	75	when 'week'
	76	row['week'] = "#{row['tyear']}-#{row['tweek']}"
	77	when 'day'
	78	row['day'] = "#{row['spent_on']}"
	79	end
	80	end
	81
	82	@total_hours = @hours.inject(0) {\|s,k\| s = s + k['hours'].to_f}
	83
	84	@periods = []
	85	# Date#at_beginning_of_ not supported in Rails 1.2.x
	86	date_from = @from.to_time
	87	# 100 columns max
	88	while date_from <= @to.to_time && @periods.length < 100
	89	case @columns
	90	when 'year'
	91	@periods << "#{date_from.year}"
	92	date_from = (date_from + 1.year).at_beginning_of_year
	93	when 'month'
	94	@periods << "#{date_from.year}-#{date_from.month}"
	95	date_from = (date_from + 1.month).at_beginning_of_month
	96	when 'week'
	97	@periods << "#{date_from.year}-#{date_from.to_date.cweek}"
	98	date_from = (date_from + 7.day).at_beginning_of_week
	99	when 'day'
	100	@periods << "#{date_from.to_date}"
	101	date_from = date_from + 1.day
	102	end
	103	end
	104	end
	105	end
	106
	107	def load_available_criteria
	108	@available_criteria = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
	109	:klass => Project,
	110	:label => :label_project},
	111	'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
	112	:klass => Version,
	113	:label => :label_version},
	114	'category' => {:sql => "#{Issue.table_name}.category_id",
	115	:klass => IssueCategory,
	116	:label => :field_category},
	117	'member' => {:sql => "#{TimeEntry.table_name}.user_id",
	118	:klass => User,
	119	:label => :label_member},
	120	'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
	121	:klass => Tracker,
	122	:label => :label_tracker},
	123	'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
	124	:klass => TimeEntryActivity,
	125	:label => :label_activity},
	126	'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
	127	:klass => Issue,
	128	:label => :label_issue}
	129	}
	130
	131	# Add list and boolean custom fields as available criteria
	132	custom_fields = (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
	133	custom_fields.select {\|cf\| %w(list bool).include? cf.field_format }.each do \|cf\|
	134	@available_criteria["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = #{Issue.table_name}.id)",
	135	:format => cf.field_format,
	136	:label => cf.name}
	137	end if @project
	138
	139	# Add list and boolean time entry custom fields
	140	TimeEntryCustomField.find(:all).select {\|cf\| %w(list bool).include? cf.field_format }.each do \|cf\|
	141	@available_criteria["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'TimeEntry' AND c.customized_id = #{TimeEntry.table_name}.id)",
	142	:format => cf.field_format,
	143	:label => cf.name}
	144	end
	145
	146	# Add list and boolean time entry activity custom fields
	147	TimeEntryActivityCustomField.find(:all).select {\|cf\| %w(list bool).include? cf.field_format }.each do \|cf\|
	148	@available_criteria["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Enumeration' AND c.customized_id = #{TimeEntry.table_name}.activity_id)",
	149	:format => cf.field_format,
	150	:label => cf.name}
	151	end
	152
	153	@available_criteria
	154	end
	155
	156	def time_report_joins
	157	sql = ''
	158	sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
	159	sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
	160	sql
	161	end
	162	end
	163	end
	164	end

app/controllers/time_entry_reports_controller.rb +2 -129

@@ -1,7 +1,6
1	class TimeEntryReportsController < ApplicationController	1	class TimeEntryReportsController < ApplicationController
2	menu_item :issues	2	menu_item :issues
3	before_filter :find_optional_project	3	before_filter :find_optional_project
4	before_filter :load_available_criterias
5		4
6	helper :sort	5	helper :sort
7	include SortHelper	6	include SortHelper
@@ -12,78 +11,12 class TimeEntryReportsController < ApplicationController
12	include CustomFieldsHelper	11	include CustomFieldsHelper
13		12
14	def report	13	def report
15	@criterias = params[:criterias] \|\| []
16	@criterias = @criterias.select{\|criteria\| @available_criterias.has_key? criteria}
17	@criterias.uniq!
18	@criterias = @criterias[0,3]
19
20	@columns = (params[:columns] && %w(year month week day).include?(params[:columns])) ? params[:columns] : 'month'
21
22	retrieve_date_range	14	retrieve_date_range
23		15	@report = Redmine::Helpers::TimeReport.new(@project, @issue, params[:criteria], params[:columns], @from, @to)
24	unless @criterias.empty?
25	sql_select = @criterias.collect{\|criteria\| @available_criterias[criteria][:sql] + " AS " + criteria}.join(', ')
26	sql_group_by = @criterias.collect{\|criteria\| @available_criterias[criteria][:sql]}.join(', ')
27	sql_condition = ''
28
29	if @project.nil?
30	sql_condition = Project.allowed_to_condition(User.current, :view_time_entries)
31	elsif @issue.nil?
32	sql_condition = @project.project_condition(Setting.display_subprojects_issues?)
33	else
34	sql_condition = "#{Issue.table_name}.root_id = #{@issue.root_id} AND #{Issue.table_name}.lft >= #{@issue.lft} AND #{Issue.table_name}.rgt <= #{@issue.rgt}"
35	end
36
37	sql = "SELECT #{sql_select}, tyear, tmonth, tweek, spent_on, SUM(hours) AS hours"
38	sql << " FROM #{TimeEntry.table_name}"
39	sql << time_report_joins
40	sql << " WHERE"
41	sql << " (%s) AND" % sql_condition
42	sql << " (spent_on BETWEEN '%s' AND '%s')" % [ActiveRecord::Base.connection.quoted_date(@from), ActiveRecord::Base.connection.quoted_date(@to)]
43	sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek, spent_on"
44
45	@hours = ActiveRecord::Base.connection.select_all(sql)
46
47	@hours.each do \|row\|
48	case @columns
49	when 'year'
50	row['year'] = row['tyear']
51	when 'month'
52	row['month'] = "#{row['tyear']}-#{row['tmonth']}"
53	when 'week'
54	row['week'] = "#{row['tyear']}-#{row['tweek']}"
55	when 'day'
56	row['day'] = "#{row['spent_on']}"
57	end
58	end
59
60	@total_hours = @hours.inject(0) {\|s,k\| s = s + k['hours'].to_f}
61
62	@periods = []
63	# Date#at_beginning_of_ not supported in Rails 1.2.x
64	date_from = @from.to_time
65	# 100 columns max
66	while date_from <= @to.to_time && @periods.length < 100
67	case @columns
68	when 'year'
69	@periods << "#{date_from.year}"
70	date_from = (date_from + 1.year).at_beginning_of_year
71	when 'month'
72	@periods << "#{date_from.year}-#{date_from.month}"
73	date_from = (date_from + 1.month).at_beginning_of_month
74	when 'week'
75	@periods << "#{date_from.year}-#{date_from.to_date.cweek}"
76	date_from = (date_from + 7.day).at_beginning_of_week
77	when 'day'
78	@periods << "#{date_from.to_date}"
79	date_from = date_from + 1.day
80	end
81	end
82	end
83		16
84	respond_to do \|format\|	17	respond_to do \|format\|
85	format.html { render :layout => !request.xhr? }	18	format.html { render :layout => !request.xhr? }
86	format.csv { send_data(report_to_csv(@~~criterias~~, ~~@periods~~, ~~@hours~~), :type => 'text/csv; header=present', :filename => 'timelog.csv') }	19	format.csv { send_data(report_to_csv(@report), :type => 'text/csv; header=present', :filename => 'timelog.csv') }
87	end	20	end
88	end	21	end
89		22
@@ -146,64 +79,4 class TimeEntryReportsController < ApplicationController
146	@from \|\|= (TimeEntry.earilest_date_for_project(@project) \|\| Date.today)	79	@from \|\|= (TimeEntry.earilest_date_for_project(@project) \|\| Date.today)
147	@to \|\|= (TimeEntry.latest_date_for_project(@project) \|\| Date.today)	80	@to \|\|= (TimeEntry.latest_date_for_project(@project) \|\| Date.today)
148	end	81	end
149
150	def load_available_criterias
151	@available_criterias = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
152	:klass => Project,
153	:label => :label_project},
154	'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
155	:klass => Version,
156	:label => :label_version},
157	'category' => {:sql => "#{Issue.table_name}.category_id",
158	:klass => IssueCategory,
159	:label => :field_category},
160	'member' => {:sql => "#{TimeEntry.table_name}.user_id",
161	:klass => User,
162	:label => :label_member},
163	'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
164	:klass => Tracker,
165	:label => :label_tracker},
166	'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
167	:klass => TimeEntryActivity,
168	:label => :label_activity},
169	'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
170	:klass => Issue,
171	:label => :label_issue}
172	}
173
174	# Add list and boolean custom fields as available criterias
175	custom_fields = (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
176	custom_fields.select {\|cf\| %w(list bool).include? cf.field_format }.each do \|cf\|
177	@available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = #{Issue.table_name}.id)",
178	:format => cf.field_format,
179	:label => cf.name}
180	end if @project
181
182	# Add list and boolean time entry custom fields
183	TimeEntryCustomField.find(:all).select {\|cf\| %w(list bool).include? cf.field_format }.each do \|cf\|
184	@available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'TimeEntry' AND c.customized_id = #{TimeEntry.table_name}.id)",
185	:format => cf.field_format,
186	:label => cf.name}
187	end
188
189	# Add list and boolean time entry activity custom fields
190	TimeEntryActivityCustomField.find(:all).select {\|cf\| %w(list bool).include? cf.field_format }.each do \|cf\|
191	@available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Enumeration' AND c.customized_id = #{TimeEntry.table_name}.activity_id)",
192	:format => cf.field_format,
193	:label => cf.name}
194	end
195
196	call_hook(:controller_timelog_available_criterias, { :available_criterias => @available_criterias, :project => @project })
197	@available_criterias
198	end
199
200	def time_report_joins
201	sql = ''
202	sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
203	sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
204	# TODO: rename hook
205	call_hook(:controller_timelog_time_report_joins, {:sql => sql} )
206	sql
207	end
208
209	end	82	end

app/helpers/timelog_helper.rb +18 -18

                 export
               end
-              def format_criteria_value(criteria, value)
+              def format_criteria_value(criteria_options, value)
                 if value.blank?
                   l(:label_none)
-                elsif k = @available_criterias[criteria][:klass]
+                elsif k = criteria_options[:klass]
                   obj = k.find_by_id(value.to_i)
                   if obj.is_a?(Issue)
                     obj.visible? ? "#{obj.tracker} ##{obj.id}: #{obj.subject}" : "##{obj.id}"
                     obj
                   end
                 else
-                  format_value(value, @available_criterias[criteria][:format])
+                  format_value(value, criteria_options[:format])
                 end
               end
-              def report_to_csv(criterias, periods, hours)
+              def report_to_csv(report)
                 decimal_separator = l(:general_csv_decimal_separator)
                 export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
                   # Column headers
-                  headers = criterias.collect {|criteria| l(@available_criterias[criteria][:label]) }
+                  headers = report.criteria.collect {|criteria| l(report.available_criteria[criteria][:label]) }
-                  headers += periods
+                  headers += report.periods
                   headers << l(:label_total)
                   csv << headers.collect {|c| Redmine::CodesetUtil.from_utf8(
                                                 c.to_s,
                                                 l(:general_csv_encoding) ) }
                   # Content
-                  report_criteria_to_csv(csv, criterias, periods, hours)
+                  report_criteria_to_csv(csv, report.available_criteria, report.columns, report.criteria, report.periods, report.hours)
                   # Total row
                   str_total = Redmine::CodesetUtil.from_utf8(l(:label_total), l(:general_csv_encoding))
-                  row = [ str_total ] + [''] * (criterias.size - 1)
+                  row = [ str_total ] + [''] * (report.criteria.size - 1)
                   total = 0
-                  periods.each do |period|
+                  report.periods.each do |period|
-                    sum = sum_hours(select_hours(hours, @columns, period.to_s))
+                    sum = sum_hours(select_hours(report.hours, report.columns, period.to_s))
                     total += sum
                     row << (sum > 0 ? ("%.2f" % sum).gsub('.',decimal_separator) : '')
                   end
                 export
               end
-              def report_criteria_to_csv(csv, criterias, periods, hours, level=0)
+              def report_criteria_to_csv(csv, available_criteria, columns, criteria, periods, hours, level=0)
                 decimal_separator = l(:general_csv_decimal_separator)
-                hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value|
+                hours.collect {|h| h[criteria[level]].to_s}.uniq.each do |value|
-                  hours_for_value = select_hours(hours, criterias[level], value)
+                  hours_for_value = select_hours(hours, criteria[level], value)
                   next if hours_for_value.empty?
                   row = [''] * level
                   row << Redmine::CodesetUtil.from_utf8(
-                                    format_criteria_value(criterias[level], value).to_s,
+                                    format_criteria_value(available_criteria[criteria[level]], value).to_s,
                                     l(:general_csv_encoding) )
-                  row += [''] * (criterias.length - level - 1)
+                  row += [''] * (criteria.length - level - 1)
                   total = 0
                   periods.each do |period|
-                    sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s))
+                    sum = sum_hours(select_hours(hours_for_value, columns, period.to_s))
                     total += sum
                     row << (sum > 0 ? ("%.2f" % sum).gsub('.',decimal_separator) : '')
                   end
                   row << ("%.2f" % total).gsub('.',decimal_separator)
                   csv << row
-                  if criterias.length > level + 1
+                  if criteria.length > level + 1
-                    report_criteria_to_csv(csv, criterias, periods, hours_for_value, level + 1)
+                    report_criteria_to_csv(csv, available_criteria, columns, criteria, periods, hours_for_value, level + 1)
                   end
                 end
               end

app/views/time_entry_reports/_report_criteria.html.erb +4 -4

-            <% @hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value| %>
+            <% @report.hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value| %>
             <% hours_for_value = select_hours(hours, criterias[level], value) -%>
             <% next if hours_for_value.empty? -%>
             <tr class="<%= cycle('odd', 'even') %> <%= 'last-level' unless criterias.length > level+1 %>">
             <%= '<td></td>' * level %>
-            <td><%= h(format_criteria_value(criterias[level], value)) %></td>
+            <td><%= h(format_criteria_value(@report.available_criteria[criterias[level]], value)) %></td>
             <%= '<td></td>' * (criterias.length - level - 1) -%>
               <% total = 0 -%>
-              <% @periods.each do |period| -%>
+              <% @report.periods.each do |period| -%>
-                <% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)); total += sum -%>
+                <% sum = sum_hours(select_hours(hours_for_value, @report.columns, period.to_s)); total += sum -%>
                 <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
               <% end -%>
               <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>

app/views/time_entry_reports/report.html.erb +17 -17

             <h2><%= l(:label_spent_time) %></h2>
             <% form_tag({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
-              <% @criterias.each do |criteria| %>
+              <% @report.criteria.each do |criterion| %>
-                <%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
+                <%= hidden_field_tag 'criteria[]', criterion, :id => nil %>
               <% end %>
               <%= render :partial => 'timelog/date_range' %>
               <p><label for='columns'><%= l(:label_details) %></label>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
                                                                                         [l(:label_month), 'month'],
                                                                                         [l(:label_week), 'week'],
-                                                                                        [l(:label_day_plural).titleize, 'day']], @columns),
+                                                                                        [l(:label_day_plural).titleize, 'day']], @report.columns),
                                                                     :onchange => "this.form.onsubmit();" %>
-              <label for='criterias'><%= l(:button_add) %></label>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}),
+              <label for='criterias'><%= l(:button_add) %></label>: <%= select_tag('criteria[]', options_for_select([[]] + (@report.available_criteria.keys - @report.criteria).collect{|k| [l_or_humanize(@report.available_criteria[k][:label]), k]}),
                                                                       :onchange => "this.form.submit();",
                                                                       :style => 'width: 200px',
                                                                       :id => nil,
-                                                                      :disabled => (@criterias.length >= 3), :id => "criterias") %>
+                                                                      :disabled => (@report.criteria.length >= 3), :id => "criterias") %>
-                 <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'icon icon-reload' %></p>
+                 <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @report.columns}, :class => 'icon icon-reload' %></p>
             <% end %>
-            <% unless @criterias.empty? %>
+            <% unless @report.criteria.empty? %>
             <div class="total-hours">
-            <p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
+            <p><%= l(:label_total) %>: <%= html_hours(l_hours(@report.total_hours)) %></p>
             </div>
-            <% unless @hours.empty? %>
+            <% unless @report.hours.empty? %>
             <div class="autoscroll">
             <table class="list" id="time-report">
             <thead>
             <tr>
-            <% @criterias.each do |criteria| %>
+            <% @report.criteria.each do |criteria| %>
-              <th><%= l_or_humanize(@available_criterias[criteria][:label]) %></th>
+              <th><%= l_or_humanize(@report.available_criteria[criteria][:label]) %></th>
             <% end %>
-            <% columns_width = (40 / (@periods.length+1)).to_i %>
+            <% columns_width = (40 / (@report.periods.length+1)).to_i %>
-            <% @periods.each do |period| %>
+            <% @report.periods.each do |period| %>
               <th class="period" width="<%= columns_width %>%"><%= period %></th>
             <% end %>
               <th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
             </tr>
             </thead>
             <tbody>
-            <%= render :partial => 'report_criteria', :locals => {:criterias => @criterias, :hours => @hours, :level => 0} %>
+            <%= render :partial => 'report_criteria', :locals => {:criterias => @report.criteria, :hours => @report.hours, :level => 0} %>
               <tr class="total">
               <td><%= l(:label_total) %></td>
-              <%= '<td></td>' * (@criterias.size - 1) %>
+              <%= '<td></td>' * (@report.criteria.size - 1) %>
               <% total = 0 -%>
-              <% @periods.each do |period| -%>
+              <% @report.periods.each do |period| -%>
-                <% sum = sum_hours(select_hours(@hours, @columns, period.to_s)); total += sum -%>
+                <% sum = sum_hours(select_hours(@report.hours, @report.columns, period.to_s)); total += sum -%>
                 <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
               <% end -%>
               <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>

test/functional/time_entry_reports_controller_test.rb +34 -35

               end
               def test_report_all_projects_one_criteria
-                get :report, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
+                get :report, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criteria => ['project']
                 assert_response :success
                 assert_template 'report'
-                assert_not_nil assigns(:total_hours)
+                assert_not_nil assigns(:report)
-                assert_equal "8.65", "%.2f" % assigns(:total_hours)
+                assert_equal "8.65", "%.2f" % assigns(:report).total_hours
               end
               def test_report_all_time
-                get :report, :project_id => 1, :criterias => ['project', 'issue']
+                get :report, :project_id => 1, :criteria => ['project', 'issue']
                 assert_response :success
                 assert_template 'report'
-                assert_not_nil assigns(:total_hours)
+                assert_not_nil assigns(:report)
-                assert_equal "162.90", "%.2f" % assigns(:total_hours)
+                assert_equal "162.90", "%.2f" % assigns(:report).total_hours
               end
               def test_report_all_time_by_day
-                get :report, :project_id => 1, :criterias => ['project', 'issue'], :columns => 'day'
+                get :report, :project_id => 1, :criteria => ['project', 'issue'], :columns => 'day'
                 assert_response :success
                 assert_template 'report'
-                assert_not_nil assigns(:total_hours)
+                assert_not_nil assigns(:report)
-                assert_equal "162.90", "%.2f" % assigns(:total_hours)
+                assert_equal "162.90", "%.2f" % assigns(:report).total_hours
                 assert_tag :tag => 'th', :content => '2007-03-12'
               end
               def test_report_one_criteria
-                get :report, :project_id => 1, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
+                get :report, :project_id => 1, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criteria => ['project']
                 assert_response :success
                 assert_template 'report'
-                assert_not_nil assigns(:total_hours)
+                assert_not_nil assigns(:report)
-                assert_equal "8.65", "%.2f" % assigns(:total_hours)
+                assert_equal "8.65", "%.2f" % assigns(:report).total_hours
               end
-              def test_report_two_criterias
+              def test_report_two_criteria
-                get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criterias => ["member", "activity"]
+                get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["member", "activity"]
                 assert_response :success
                 assert_template 'report'
-                assert_not_nil assigns(:total_hours)
+                assert_not_nil assigns(:report)
-                assert_equal "162.90", "%.2f" % assigns(:total_hours)
+                assert_equal "162.90", "%.2f" % assigns(:report).total_hours
               end
               def test_report_one_day
-                get :report, :project_id => 1, :columns => 'day', :from => "2007-03-23", :to => "2007-03-23", :criterias => ["member", "activity"]
+                get :report, :project_id => 1, :columns => 'day', :from => "2007-03-23", :to => "2007-03-23", :criteria => ["member", "activity"]
                 assert_response :success
                 assert_template 'report'
-                assert_not_nil assigns(:total_hours)
+                assert_not_nil assigns(:report)
-                assert_equal "4.25", "%.2f" % assigns(:total_hours)
+                assert_equal "4.25", "%.2f" % assigns(:report).total_hours
               end
               def test_report_at_issue_level
-                get :report, :project_id => 1, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criterias => ["member", "activity"]
+                get :report, :project_id => 1, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["member", "activity"]
                 assert_response :success
                 assert_template 'report'
-                assert_not_nil assigns(:total_hours)
+                assert_not_nil assigns(:report)
-                assert_equal "154.25", "%.2f" % assigns(:total_hours)
+                assert_equal "154.25", "%.2f" % assigns(:report).total_hours
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/issues/1/time_entries/report", :id => 'query_form'}
               end
               def test_report_custom_field_criteria
-                get :report, :project_id => 1, :criterias => ['project', 'cf_1', 'cf_7']
+                get :report, :project_id => 1, :criteria => ['project', 'cf_1', 'cf_7']
                 assert_response :success
                 assert_template 'report'
-                assert_not_nil assigns(:total_hours)
+                assert_not_nil assigns(:report)
-                assert_not_nil assigns(:criterias)
+                assert_equal 3, assigns(:report).criteria.size
-                assert_equal 3, assigns(:criterias).size
+                assert_equal "162.90", "%.2f" % assigns(:report).total_hours
-                assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 # Custom field column
                 assert_tag :tag => 'th', :content => 'Database'
                 # Custom field row
               end
               def test_report_one_criteria_no_result
-                get :report, :project_id => 1, :columns => 'week', :from => "1998-04-01", :to => "1998-04-30", :criterias => ['project']
+                get :report, :project_id => 1, :columns => 'week', :from => "1998-04-01", :to => "1998-04-30", :criteria => ['project']
                 assert_response :success
                 assert_template 'report'
-                assert_not_nil assigns(:total_hours)
+                assert_not_nil assigns(:report)
-                assert_equal "0.00", "%.2f" % assigns(:total_hours)
+                assert_equal "0.00", "%.2f" % assigns(:report).total_hours
               end
               def test_report_all_projects_csv_export
                 get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30",
-                    :criterias => ["project", "member", "activity"], :format => "csv"
+                    :criteria => ["project", "member", "activity"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 lines = @response.body.chomp.split("\n")
               def test_report_csv_export
                 get :report, :project_id => 1, :columns => 'month',
                     :from => "2007-01-01", :to => "2007-06-30",
-                    :criterias => ["project", "member", "activity"], :format => "csv"
+                    :criteria => ["project", "member", "activity"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 get :report, :project_id => 1, :columns => 'day',
                     :from => "2011-11-11", :to => "2011-11-11",
-                    :criterias => ["member"], :format => "csv"
+                    :criteria => ["member"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 get :report, :project_id => 1, :columns => 'day',
                     :from => "2011-11-11", :to => "2011-11-11",
-                    :criterias => ["member"], :format => "csv"
+                    :criteria => ["member"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 lines = @response.body.chomp.split("\n")
                   get :report, :project_id => 1, :columns => 'day',
                       :from => "2011-11-11", :to => "2011-11-11",
-                      :criterias => ["member"], :format => "csv"
+                      :criteria => ["member"], :format => "csv"
                   assert_response :success
                   assert_equal 'text/csv', @response.content_type
                   lines = @response.body.chomp.split("\n")

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