##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r11471 from trunk (#5329)....
Jean-Philippe Lang -
r11335:83430dacd948
parent child
Show More
Side by Side Unified
Context file:
r11335:83430dacd948 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,151 +1,151
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 module Redmine
19 19 module Helpers
20 20 class TimeReport
21 21 attr_reader :criteria, :columns, :hours, :total_hours, :periods
22 22
23 23 def initialize(project, issue, criteria, columns, time_entry_scope)
24 24 @project = project
25 25 @issue = issue
26 26
27 27 @criteria = criteria || []
28 28 @criteria = @criteria.select{|criteria| available_criteria.has_key? criteria}
29 29 @criteria.uniq!
30 30 @criteria = @criteria[0,3]
31 31
32 32 @columns = (columns && %w(year month week day).include?(columns)) ? columns : 'month'
33 33 @scope = time_entry_scope
34 34
35 35 run
36 36 end
37 37
38 38 def available_criteria
39 39 @available_criteria || load_available_criteria
40 40 end
41 41
42 42 private
43 43
44 44 def run
45 45 unless @criteria.empty?
46 46 time_columns = %w(tyear tmonth tweek spent_on)
47 47 @hours = []
48 48 @scope.sum(:hours,
49 49 :include => [:issue, :activity],
50 50 :group => @criteria.collect{|criteria| @available_criteria[criteria][:sql]} + time_columns,
51 51 :joins => @criteria.collect{|criteria| @available_criteria[criteria][:joins]}.compact).each do |hash, hours|
52 52 h = {'hours' => hours}
53 53 (@criteria + time_columns).each_with_index do |name, i|
54 54 h[name] = hash[i]
55 55 end
56 56 @hours << h
57 57 end
58 58
59 59 @hours.each do |row|
60 60 case @columns
61 61 when 'year'
62 62 row['year'] = row['tyear']
63 63 when 'month'
64 64 row['month'] = "#{row['tyear']}-#{row['tmonth']}"
65 65 when 'week'
66 row['week'] = "#{row['tyear']}-#{row['tweek']}"
66 row['week'] = "#{row['spent_on'].cwyear}-#{row['tweek']}"
67 67 when 'day'
68 68 row['day'] = "#{row['spent_on']}"
69 69 end
70 70 end
71 71
72 72 min = @hours.collect {|row| row['spent_on']}.min
73 73 @from = min ? min.to_date : Date.today
74 74
75 75 max = @hours.collect {|row| row['spent_on']}.max
76 76 @to = max ? max.to_date : Date.today
77 77
78 78 @total_hours = @hours.inject(0) {|s,k| s = s + k['hours'].to_f}
79 79
80 80 @periods = []
81 81 # Date#at_beginning_of_ not supported in Rails 1.2.x
82 82 date_from = @from.to_time
83 83 # 100 columns max
84 84 while date_from <= @to.to_time && @periods.length < 100
85 85 case @columns
86 86 when 'year'
87 87 @periods << "#{date_from.year}"
88 88 date_from = (date_from + 1.year).at_beginning_of_year
89 89 when 'month'
90 90 @periods << "#{date_from.year}-#{date_from.month}"
91 91 date_from = (date_from + 1.month).at_beginning_of_month
92 92 when 'week'
93 @periods << "#{date_from.year}-#{date_from.to_date.cweek}"
93 @periods << "#{date_from.to_date.cwyear}-#{date_from.to_date.cweek}"
94 94 date_from = (date_from + 7.day).at_beginning_of_week
95 95 when 'day'
96 96 @periods << "#{date_from.to_date}"
97 97 date_from = date_from + 1.day
98 98 end
99 99 end
100 100 end
101 101 end
102 102
103 103 def load_available_criteria
104 104 @available_criteria = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
105 105 :klass => Project,
106 106 :label => :label_project},
107 107 'status' => {:sql => "#{Issue.table_name}.status_id",
108 108 :klass => IssueStatus,
109 109 :label => :field_status},
110 110 'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
111 111 :klass => Version,
112 112 :label => :label_version},
113 113 'category' => {:sql => "#{Issue.table_name}.category_id",
114 114 :klass => IssueCategory,
115 115 :label => :field_category},
116 116 'user' => {:sql => "#{TimeEntry.table_name}.user_id",
117 117 :klass => User,
118 118 :label => :label_user},
119 119 'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
120 120 :klass => Tracker,
121 121 :label => :label_tracker},
122 122 'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
123 123 :klass => TimeEntryActivity,
124 124 :label => :label_activity},
125 125 'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
126 126 :klass => Issue,
127 127 :label => :label_issue}
128 128 }
129 129
130 130 # Add time entry custom fields
131 131 custom_fields = TimeEntryCustomField.all
132 132 # Add project custom fields
133 133 custom_fields += ProjectCustomField.all
134 134 # Add issue custom fields
135 135 custom_fields += (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
136 136 # Add time entry activity custom fields
137 137 custom_fields += TimeEntryActivityCustomField.all
138 138
139 139 # Add list and boolean custom fields as available criteria
140 140 custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
141 141 @available_criteria["cf_#{cf.id}"] = {:sql => "#{cf.join_alias}.value",
142 142 :joins => cf.join_for_order_statement,
143 143 :format => cf.field_format,
144 144 :label => cf.name}
145 145 end
146 146
147 147 @available_criteria
148 148 end
149 149 end
150 150 end
151 151 end
Show file before | Show file after | Hide comments
@@ -1,346 +1,372
1 1 # -*- coding: utf-8 -*-
2 2 # Redmine - project management software
3 3 # Copyright (C) 2006-2013 Jean-Philippe Lang
4 4 #
5 5 # This program is free software; you can redistribute it and/or
6 6 # modify it under the terms of the GNU General Public License
7 7 # as published by the Free Software Foundation; either version 2
8 8 # of the License, or (at your option) any later version.
9 9 #
10 10 # This program is distributed in the hope that it will be useful,
11 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
12 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 13 # GNU General Public License for more details.
14 14 #
15 15 # You should have received a copy of the GNU General Public License
16 16 # along with this program; if not, write to the Free Software
17 17 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
18 18
19 19 require File.expand_path('../../test_helper', __FILE__)
20 20
21 21 class TimeEntryReportsControllerTest < ActionController::TestCase
22 22 tests TimelogController
23 23
24 24 fixtures :projects, :enabled_modules, :roles, :members, :member_roles,
25 25 :issues, :time_entries, :users, :trackers, :enumerations,
26 26 :issue_statuses, :custom_fields, :custom_values
27 27
28 28 include Redmine::I18n
29 29
30 30 def setup
31 31 Setting.default_language = "en"
32 32 end
33 33
34 34 def test_report_at_project_level
35 35 get :report, :project_id => 'ecookbook'
36 36 assert_response :success
37 37 assert_template 'report'
38 38 assert_tag :form,
39 39 :attributes => {:action => "/projects/ecookbook/time_entries/report", :id => 'query_form'}
40 40 end
41 41
42 42 def test_report_all_projects
43 43 get :report
44 44 assert_response :success
45 45 assert_template 'report'
46 46 assert_tag :form,
47 47 :attributes => {:action => "/time_entries/report", :id => 'query_form'}
48 48 end
49 49
50 50 def test_report_all_projects_denied
51 51 r = Role.anonymous
52 52 r.permissions.delete(:view_time_entries)
53 53 r.permissions_will_change!
54 54 r.save
55 55 get :report
56 56 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Ftime_entries%2Freport'
57 57 end
58 58
59 59 def test_report_all_projects_one_criteria
60 60 get :report, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criteria => ['project']
61 61 assert_response :success
62 62 assert_template 'report'
63 63 assert_not_nil assigns(:report)
64 64 assert_equal "8.65", "%.2f" % assigns(:report).total_hours
65 65 end
66 66
67 67 def test_report_all_time
68 68 get :report, :project_id => 1, :criteria => ['project', 'issue']
69 69 assert_response :success
70 70 assert_template 'report'
71 71 assert_not_nil assigns(:report)
72 72 assert_equal "162.90", "%.2f" % assigns(:report).total_hours
73 73 end
74 74
75 75 def test_report_all_time_by_day
76 76 get :report, :project_id => 1, :criteria => ['project', 'issue'], :columns => 'day'
77 77 assert_response :success
78 78 assert_template 'report'
79 79 assert_not_nil assigns(:report)
80 80 assert_equal "162.90", "%.2f" % assigns(:report).total_hours
81 81 assert_tag :tag => 'th', :content => '2007-03-12'
82 82 end
83 83
84 84 def test_report_one_criteria
85 85 get :report, :project_id => 1, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criteria => ['project']
86 86 assert_response :success
87 87 assert_template 'report'
88 88 assert_not_nil assigns(:report)
89 89 assert_equal "8.65", "%.2f" % assigns(:report).total_hours
90 90 end
91 91
92 92 def test_report_two_criteria
93 93 get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["user", "activity"]
94 94 assert_response :success
95 95 assert_template 'report'
96 96 assert_not_nil assigns(:report)
97 97 assert_equal "162.90", "%.2f" % assigns(:report).total_hours
98 98 end
99 99
100 100 def test_report_custom_field_criteria_with_multiple_values
101 101 field = TimeEntryCustomField.create!(:name => 'multi', :field_format => 'list', :possible_values => ['value1', 'value2'])
102 102 entry = TimeEntry.create!(:project => Project.find(1), :hours => 1, :activity_id => 10, :user => User.find(2), :spent_on => Date.today)
103 103 CustomValue.create!(:customized => entry, :custom_field => field, :value => 'value1')
104 104 CustomValue.create!(:customized => entry, :custom_field => field, :value => 'value2')
105 105
106 106 get :report, :project_id => 1, :columns => 'day', :criteria => ["cf_#{field.id}"]
107 107 assert_response :success
108 108 end
109 109
110 110 def test_report_one_day
111 111 get :report, :project_id => 1, :columns => 'day', :from => "2007-03-23", :to => "2007-03-23", :criteria => ["user", "activity"]
112 112 assert_response :success
113 113 assert_template 'report'
114 114 assert_not_nil assigns(:report)
115 115 assert_equal "4.25", "%.2f" % assigns(:report).total_hours
116 116 end
117 117
118 118 def test_report_at_issue_level
119 119 get :report, :project_id => 1, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["user", "activity"]
120 120 assert_response :success
121 121 assert_template 'report'
122 122 assert_not_nil assigns(:report)
123 123 assert_equal "154.25", "%.2f" % assigns(:report).total_hours
124 124 assert_tag :form,
125 125 :attributes => {:action => "/projects/ecookbook/issues/1/time_entries/report", :id => 'query_form'}
126 126 end
127 127
128 def test_report_by_week_should_use_commercial_year
129 TimeEntry.delete_all
130 TimeEntry.generate!(:hours => '2', :spent_on => '2009-12-25') # 2009-52
131 TimeEntry.generate!(:hours => '4', :spent_on => '2009-12-31') # 2009-53
132 TimeEntry.generate!(:hours => '8', :spent_on => '2010-01-01') # 2009-53
133 TimeEntry.generate!(:hours => '16', :spent_on => '2010-01-05') # 2010-1
134
135 get :report, :columns => 'week', :from => "2009-12-25", :to => "2010-01-05", :criteria => ["project"]
136 assert_response :success
137
138 assert_select '#time-report thead tr' do
139 assert_select 'th:nth-child(1)', :text => 'Project'
140 assert_select 'th:nth-child(2)', :text => '2009-52'
141 assert_select 'th:nth-child(3)', :text => '2009-53'
142 assert_select 'th:nth-child(4)', :text => '2010-1'
143 assert_select 'th:nth-child(5)', :text => 'Total'
144 end
145 assert_select '#time-report tbody tr' do
146 assert_select 'td:nth-child(1)', :text => 'eCookbook'
147 assert_select 'td:nth-child(2)', :text => '2.00'
148 assert_select 'td:nth-child(3)', :text => '12.00'
149 assert_select 'td:nth-child(4)', :text => '16.00'
150 assert_select 'td:nth-child(5)', :text => '30.00' # Total
151 end
152 end
153
128 154 def test_report_should_propose_association_custom_fields
129 155 get :report
130 156 assert_response :success
131 157 assert_template 'report'
132 158
133 159 assert_select 'select[name=?]', 'criteria[]' do
134 160 assert_select 'option[value=cf_1]', {:text => 'Database'}, 'Issue custom field not found'
135 161 assert_select 'option[value=cf_3]', {:text => 'Development status'}, 'Project custom field not found'
136 162 assert_select 'option[value=cf_7]', {:text => 'Billable'}, 'TimeEntryActivity custom field not found'
137 163 end
138 164 end
139 165
140 166 def test_report_with_association_custom_fields
141 167 get :report, :criteria => ['cf_1', 'cf_3', 'cf_7']
142 168 assert_response :success
143 169 assert_template 'report'
144 170 assert_not_nil assigns(:report)
145 171 assert_equal 3, assigns(:report).criteria.size
146 172 assert_equal "162.90", "%.2f" % assigns(:report).total_hours
147 173
148 174 # Custom fields columns
149 175 assert_select 'th', :text => 'Database'
150 176 assert_select 'th', :text => 'Development status'
151 177 assert_select 'th', :text => 'Billable'
152 178
153 179 # Custom field row
154 180 assert_select 'tr' do
155 181 assert_select 'td', :text => 'MySQL'
156 182 assert_select 'td.hours', :text => '1.00'
157 183 end
158 184 end
159 185
160 186 def test_report_one_criteria_no_result
161 187 get :report, :project_id => 1, :columns => 'week', :from => "1998-04-01", :to => "1998-04-30", :criteria => ['project']
162 188 assert_response :success
163 189 assert_template 'report'
164 190 assert_not_nil assigns(:report)
165 191 assert_equal "0.00", "%.2f" % assigns(:report).total_hours
166 192 end
167 193
168 194 def test_report_status_criterion
169 195 get :report, :project_id => 1, :criteria => ['status']
170 196 assert_response :success
171 197 assert_template 'report'
172 198 assert_tag :tag => 'th', :content => 'Status'
173 199 assert_tag :tag => 'td', :content => 'New'
174 200 end
175 201
176 202 def test_report_all_projects_csv_export
177 203 get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30",
178 204 :criteria => ["project", "user", "activity"], :format => "csv"
179 205 assert_response :success
180 206 assert_equal 'text/csv; header=present', @response.content_type
181 207 lines = @response.body.chomp.split("\n")
182 208 # Headers
183 209 assert_equal 'Project,User,Activity,2007-3,2007-4,Total', lines.first
184 210 # Total row
185 211 assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
186 212 end
187 213
188 214 def test_report_csv_export
189 215 get :report, :project_id => 1, :columns => 'month',
190 216 :from => "2007-01-01", :to => "2007-06-30",
191 217 :criteria => ["project", "user", "activity"], :format => "csv"
192 218 assert_response :success
193 219 assert_equal 'text/csv; header=present', @response.content_type
194 220 lines = @response.body.chomp.split("\n")
195 221 # Headers
196 222 assert_equal 'Project,User,Activity,2007-3,2007-4,Total', lines.first
197 223 # Total row
198 224 assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
199 225 end
200 226
201 227 def test_csv_big_5
202 228 Setting.default_language = "zh-TW"
203 229 str_utf8 = "\xe4\xb8\x80\xe6\x9c\x88"
204 230 str_big5 = "\xa4@\xa4\xeb"
205 231 if str_utf8.respond_to?(:force_encoding)
206 232 str_utf8.force_encoding('UTF-8')
207 233 str_big5.force_encoding('Big5')
208 234 end
209 235 user = User.find_by_id(3)
210 236 user.firstname = str_utf8
211 237 user.lastname = "test-lastname"
212 238 assert user.save
213 239 comments = "test_csv_big_5"
214 240 te1 = TimeEntry.create(:spent_on => '2011-11-11',
215 241 :hours => 7.3,
216 242 :project => Project.find(1),
217 243 :user => user,
218 244 :activity => TimeEntryActivity.find_by_name('Design'),
219 245 :comments => comments)
220 246
221 247 te2 = TimeEntry.find_by_comments(comments)
222 248 assert_not_nil te2
223 249 assert_equal 7.3, te2.hours
224 250 assert_equal 3, te2.user_id
225 251
226 252 get :report, :project_id => 1, :columns => 'day',
227 253 :from => "2011-11-11", :to => "2011-11-11",
228 254 :criteria => ["user"], :format => "csv"
229 255 assert_response :success
230 256 assert_equal 'text/csv; header=present', @response.content_type
231 257 lines = @response.body.chomp.split("\n")
232 258 # Headers
233 259 s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xc1`\xadp"
234 260 s2 = "\xc1`\xadp"
235 261 if s1.respond_to?(:force_encoding)
236 262 s1.force_encoding('Big5')
237 263 s2.force_encoding('Big5')
238 264 end
239 265 assert_equal s1, lines.first
240 266 # Total row
241 267 assert_equal "#{str_big5} #{user.lastname},7.30,7.30", lines[1]
242 268 assert_equal "#{s2},7.30,7.30", lines[2]
243 269
244 270 str_tw = "Traditional Chinese (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)"
245 271 if str_tw.respond_to?(:force_encoding)
246 272 str_tw.force_encoding('UTF-8')
247 273 end
248 274 assert_equal str_tw, l(:general_lang_name)
249 275 assert_equal 'Big5', l(:general_csv_encoding)
250 276 assert_equal ',', l(:general_csv_separator)
251 277 assert_equal '.', l(:general_csv_decimal_separator)
252 278 end
253 279
254 280 def test_csv_cannot_convert_should_be_replaced_big_5
255 281 Setting.default_language = "zh-TW"
256 282 str_utf8 = "\xe4\xbb\xa5\xe5\x86\x85"
257 283 if str_utf8.respond_to?(:force_encoding)
258 284 str_utf8.force_encoding('UTF-8')
259 285 end
260 286 user = User.find_by_id(3)
261 287 user.firstname = str_utf8
262 288 user.lastname = "test-lastname"
263 289 assert user.save
264 290 comments = "test_replaced"
265 291 te1 = TimeEntry.create(:spent_on => '2011-11-11',
266 292 :hours => 7.3,
267 293 :project => Project.find(1),
268 294 :user => user,
269 295 :activity => TimeEntryActivity.find_by_name('Design'),
270 296 :comments => comments)
271 297
272 298 te2 = TimeEntry.find_by_comments(comments)
273 299 assert_not_nil te2
274 300 assert_equal 7.3, te2.hours
275 301 assert_equal 3, te2.user_id
276 302
277 303 get :report, :project_id => 1, :columns => 'day',
278 304 :from => "2011-11-11", :to => "2011-11-11",
279 305 :criteria => ["user"], :format => "csv"
280 306 assert_response :success
281 307 assert_equal 'text/csv; header=present', @response.content_type
282 308 lines = @response.body.chomp.split("\n")
283 309 # Headers
284 310 s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xc1`\xadp"
285 311 if s1.respond_to?(:force_encoding)
286 312 s1.force_encoding('Big5')
287 313 end
288 314 assert_equal s1, lines.first
289 315 # Total row
290 316 s2 = ""
291 317 if s2.respond_to?(:force_encoding)
292 318 s2 = "\xa5H?"
293 319 s2.force_encoding('Big5')
294 320 elsif RUBY_PLATFORM == 'java'
295 321 s2 = "??"
296 322 else
297 323 s2 = "\xa5H???"
298 324 end
299 325 assert_equal "#{s2} #{user.lastname},7.30,7.30", lines[1]
300 326 end
301 327
302 328 def test_csv_fr
303 329 with_settings :default_language => "fr" do
304 330 str1 = "test_csv_fr"
305 331 user = User.find_by_id(3)
306 332 te1 = TimeEntry.create(:spent_on => '2011-11-11',
307 333 :hours => 7.3,
308 334 :project => Project.find(1),
309 335 :user => user,
310 336 :activity => TimeEntryActivity.find_by_name('Design'),
311 337 :comments => str1)
312 338
313 339 te2 = TimeEntry.find_by_comments(str1)
314 340 assert_not_nil te2
315 341 assert_equal 7.3, te2.hours
316 342 assert_equal 3, te2.user_id
317 343
318 344 get :report, :project_id => 1, :columns => 'day',
319 345 :from => "2011-11-11", :to => "2011-11-11",
320 346 :criteria => ["user"], :format => "csv"
321 347 assert_response :success
322 348 assert_equal 'text/csv; header=present', @response.content_type
323 349 lines = @response.body.chomp.split("\n")
324 350 # Headers
325 351 s1 = "Utilisateur;2011-11-11;Total"
326 352 s2 = "Total"
327 353 if s1.respond_to?(:force_encoding)
328 354 s1.force_encoding('ISO-8859-1')
329 355 s2.force_encoding('ISO-8859-1')
330 356 end
331 357 assert_equal s1, lines.first
332 358 # Total row
333 359 assert_equal "#{user.firstname} #{user.lastname};7,30;7,30", lines[1]
334 360 assert_equal "#{s2};7,30;7,30", lines[2]
335 361
336 362 str_fr = "Fran\xc3\xa7ais"
337 363 if str_fr.respond_to?(:force_encoding)
338 364 str_fr.force_encoding('UTF-8')
339 365 end
340 366 assert_equal str_fr, l(:general_lang_name)
341 367 assert_equal 'ISO-8859-1', l(:general_csv_encoding)
342 368 assert_equal ';', l(:general_csv_separator)
343 369 assert_equal ',', l(:general_csv_decimal_separator)
344 370 end
345 371 end
346 372 end
General Comments 0
You need to be logged in to leave comments. Login now