##// END OF EJS Templates
jro_apps » redmine
RSS
Rename the Member column to User on the time entries list....
Jean-Philippe Lang -
r10741:d6ecfcf50cfa
parent child
Show More
Side by Side Unified
Context file:
r10741:d6ecfcf50cfa Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,55 +1,55
1 1 <%= form_tag({}) do -%>
2 2 <%= hidden_field_tag 'back_url', url_for(params) %>
3 3 <div class="autoscroll">
4 4 <table class="list time-entries">
5 5 <thead>
6 6 <tr>
7 7 <th class="checkbox hide-when-print">
8 8 <%= link_to image_tag('toggle_check.png'),
9 9 {},
10 10 :onclick => 'toggleIssuesSelection(this); return false;',
11 11 :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
12 12 </th>
13 13 <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
14 <%= sort_header_tag('user', :caption => l(:label_member)) %>
14 <%= sort_header_tag('user', :caption => l(:label_user)) %>
15 15 <%= sort_header_tag('activity', :caption => l(:label_activity)) %>
16 16 <%= sort_header_tag('project', :caption => l(:label_project)) %>
17 17 <%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %>
18 18 <th><%= l(:field_comments) %></th>
19 19 <%= sort_header_tag('hours', :caption => l(:field_hours)) %>
20 20 <th></th>
21 21 </tr>
22 22 </thead>
23 23 <tbody>
24 24 <% entries.each do |entry| -%>
25 25 <tr class="time-entry <%= cycle("odd", "even") %> hascontextmenu">
26 26 <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", entry.id, false, :id => nil) %></td>
27 27 <td class="spent_on"><%= format_date(entry.spent_on) %></td>
28 28 <td class="user"><%= link_to_user(entry.user) %></td>
29 29 <td class="activity"><%=h entry.activity %></td>
30 30 <td class="project"><%= link_to_project(entry.project) %></td>
31 31 <td class="subject">
32 32 <% if entry.issue -%>
33 33 <%= entry.issue.visible? ? link_to_issue(entry.issue, :truncate => 50) : "##{entry.issue.id}" -%>
34 34 <% end -%>
35 35 </td>
36 36 <td class="comments"><%=h entry.comments %></td>
37 37 <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
38 38 <td align="center">
39 39 <% if entry.editable_by?(User.current) -%>
40 40 <%= link_to image_tag('edit.png'), edit_time_entry_path(entry),
41 41 :title => l(:button_edit) %>
42 42 <%= link_to image_tag('delete.png'), time_entry_path(entry),
43 43 :data => {:confirm => l(:text_are_you_sure)},
44 44 :method => :delete,
45 45 :title => l(:button_delete) %>
46 46 <% end -%>
47 47 </td>
48 48 </tr>
49 49 <% end -%>
50 50 </tbody>
51 51 </table>
52 52 </div>
53 53 <% end -%>
54 54
55 55 <%= context_menu time_entries_context_menu_path %>
Show file before | Show file after | Hide comments
@@ -1,153 +1,153
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 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, :include => :issue, :group => @criteria.collect{|criteria| @available_criteria[criteria][:sql]} + time_columns).each do |hash, hours|
49 49 h = {'hours' => hours}
50 50 (@criteria + time_columns).each_with_index do |name, i|
51 51 h[name] = hash[i]
52 52 end
53 53 @hours << h
54 54 end
55 55
56 56 @hours.each do |row|
57 57 case @columns
58 58 when 'year'
59 59 row['year'] = row['tyear']
60 60 when 'month'
61 61 row['month'] = "#{row['tyear']}-#{row['tmonth']}"
62 62 when 'week'
63 63 row['week'] = "#{row['tyear']}-#{row['tweek']}"
64 64 when 'day'
65 65 row['day'] = "#{row['spent_on']}"
66 66 end
67 67 end
68 68
69 69 min = @hours.collect {|row| row['spent_on']}.min
70 70 @from = min ? min.to_date : Date.today
71 71
72 72 max = @hours.collect {|row| row['spent_on']}.max
73 73 @to = max ? max.to_date : Date.today
74 74
75 75 @total_hours = @hours.inject(0) {|s,k| s = s + k['hours'].to_f}
76 76
77 77 @periods = []
78 78 # Date#at_beginning_of_ not supported in Rails 1.2.x
79 79 date_from = @from.to_time
80 80 # 100 columns max
81 81 while date_from <= @to.to_time && @periods.length < 100
82 82 case @columns
83 83 when 'year'
84 84 @periods << "#{date_from.year}"
85 85 date_from = (date_from + 1.year).at_beginning_of_year
86 86 when 'month'
87 87 @periods << "#{date_from.year}-#{date_from.month}"
88 88 date_from = (date_from + 1.month).at_beginning_of_month
89 89 when 'week'
90 90 @periods << "#{date_from.year}-#{date_from.to_date.cweek}"
91 91 date_from = (date_from + 7.day).at_beginning_of_week
92 92 when 'day'
93 93 @periods << "#{date_from.to_date}"
94 94 date_from = date_from + 1.day
95 95 end
96 96 end
97 97 end
98 98 end
99 99
100 100 def load_available_criteria
101 101 @available_criteria = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
102 102 :klass => Project,
103 103 :label => :label_project},
104 104 'status' => {:sql => "#{Issue.table_name}.status_id",
105 105 :klass => IssueStatus,
106 106 :label => :field_status},
107 107 'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
108 108 :klass => Version,
109 109 :label => :label_version},
110 110 'category' => {:sql => "#{Issue.table_name}.category_id",
111 111 :klass => IssueCategory,
112 112 :label => :field_category},
113 'member' => {:sql => "#{TimeEntry.table_name}.user_id",
113 'user' => {:sql => "#{TimeEntry.table_name}.user_id",
114 114 :klass => User,
115 :label => :label_member},
115 :label => :label_user},
116 116 'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
117 117 :klass => Tracker,
118 118 :label => :label_tracker},
119 119 'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
120 120 :klass => TimeEntryActivity,
121 121 :label => :label_activity},
122 122 'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
123 123 :klass => Issue,
124 124 :label => :label_issue}
125 125 }
126 126
127 127 # Add list and boolean custom fields as available criteria
128 128 custom_fields = (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
129 129 custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
130 130 @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 ORDER BY c.value LIMIT 1)",
131 131 :format => cf.field_format,
132 132 :label => cf.name}
133 133 end if @project
134 134
135 135 # Add list and boolean time entry custom fields
136 136 TimeEntryCustomField.all.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
137 137 @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 ORDER BY c.value LIMIT 1)",
138 138 :format => cf.field_format,
139 139 :label => cf.name}
140 140 end
141 141
142 142 # Add list and boolean time entry activity custom fields
143 143 TimeEntryActivityCustomField.all.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
144 144 @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 ORDER BY c.value LIMIT 1)",
145 145 :format => cf.field_format,
146 146 :label => cf.name}
147 147 end
148 148
149 149 @available_criteria
150 150 end
151 151 end
152 152 end
153 153 end
Show file before | Show file after | Hide comments
@@ -1,332 +1,332
1 1 # -*- coding: utf-8 -*-
2 2 # Redmine - project management software
3 3 # Copyright (C) 2006-2012 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 get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["member", "activity"]
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 get :report, :project_id => 1, :columns => 'day', :from => "2007-03-23", :to => "2007-03-23", :criteria => ["member", "activity"]
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 get :report, :project_id => 1, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["member", "activity"]
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 128 def test_report_custom_field_criteria
129 129 get :report, :project_id => 1, :criteria => ['project', 'cf_1', 'cf_7']
130 130 assert_response :success
131 131 assert_template 'report'
132 132 assert_not_nil assigns(:report)
133 133 assert_equal 3, assigns(:report).criteria.size
134 134 assert_equal "162.90", "%.2f" % assigns(:report).total_hours
135 135 # Custom field column
136 136 assert_tag :tag => 'th', :content => 'Database'
137 137 # Custom field row
138 138 assert_tag :tag => 'td', :content => 'MySQL',
139 139 :sibling => { :tag => 'td', :attributes => { :class => 'hours' },
140 140 :child => { :tag => 'span', :attributes => { :class => 'hours hours-int' },
141 141 :content => '1' }}
142 142 # Second custom field column
143 143 assert_tag :tag => 'th', :content => 'Billable'
144 144 end
145 145
146 146 def test_report_one_criteria_no_result
147 147 get :report, :project_id => 1, :columns => 'week', :from => "1998-04-01", :to => "1998-04-30", :criteria => ['project']
148 148 assert_response :success
149 149 assert_template 'report'
150 150 assert_not_nil assigns(:report)
151 151 assert_equal "0.00", "%.2f" % assigns(:report).total_hours
152 152 end
153 153
154 154 def test_report_status_criterion
155 155 get :report, :project_id => 1, :criteria => ['status']
156 156 assert_response :success
157 157 assert_template 'report'
158 158 assert_tag :tag => 'th', :content => 'Status'
159 159 assert_tag :tag => 'td', :content => 'New'
160 160 end
161 161
162 162 def test_report_all_projects_csv_export
163 163 get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30",
164 :criteria => ["project", "member", "activity"], :format => "csv"
164 :criteria => ["project", "user", "activity"], :format => "csv"
165 165 assert_response :success
166 166 assert_equal 'text/csv; header=present', @response.content_type
167 167 lines = @response.body.chomp.split("\n")
168 168 # Headers
169 assert_equal 'Project,Member,Activity,2007-3,2007-4,Total', lines.first
169 assert_equal 'Project,User,Activity,2007-3,2007-4,Total', lines.first
170 170 # Total row
171 171 assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
172 172 end
173 173
174 174 def test_report_csv_export
175 175 get :report, :project_id => 1, :columns => 'month',
176 176 :from => "2007-01-01", :to => "2007-06-30",
177 :criteria => ["project", "member", "activity"], :format => "csv"
177 :criteria => ["project", "user", "activity"], :format => "csv"
178 178 assert_response :success
179 179 assert_equal 'text/csv; header=present', @response.content_type
180 180 lines = @response.body.chomp.split("\n")
181 181 # Headers
182 assert_equal 'Project,Member,Activity,2007-3,2007-4,Total', lines.first
182 assert_equal 'Project,User,Activity,2007-3,2007-4,Total', lines.first
183 183 # Total row
184 184 assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
185 185 end
186 186
187 187 def test_csv_big_5
188 188 Setting.default_language = "zh-TW"
189 189 str_utf8 = "\xe4\xb8\x80\xe6\x9c\x88"
190 190 str_big5 = "\xa4@\xa4\xeb"
191 191 if str_utf8.respond_to?(:force_encoding)
192 192 str_utf8.force_encoding('UTF-8')
193 193 str_big5.force_encoding('Big5')
194 194 end
195 195 user = User.find_by_id(3)
196 196 user.firstname = str_utf8
197 197 user.lastname = "test-lastname"
198 198 assert user.save
199 199 comments = "test_csv_big_5"
200 200 te1 = TimeEntry.create(:spent_on => '2011-11-11',
201 201 :hours => 7.3,
202 202 :project => Project.find(1),
203 203 :user => user,
204 204 :activity => TimeEntryActivity.find_by_name('Design'),
205 205 :comments => comments)
206 206
207 207 te2 = TimeEntry.find_by_comments(comments)
208 208 assert_not_nil te2
209 209 assert_equal 7.3, te2.hours
210 210 assert_equal 3, te2.user_id
211 211
212 212 get :report, :project_id => 1, :columns => 'day',
213 213 :from => "2011-11-11", :to => "2011-11-11",
214 :criteria => ["member"], :format => "csv"
214 :criteria => ["user"], :format => "csv"
215 215 assert_response :success
216 216 assert_equal 'text/csv; header=present', @response.content_type
217 217 lines = @response.body.chomp.split("\n")
218 218 # Headers
219 s1 = "\xa6\xa8\xad\xfb,2011-11-11,\xc1`\xadp"
219 s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xc1`\xadp"
220 220 s2 = "\xc1`\xadp"
221 221 if s1.respond_to?(:force_encoding)
222 222 s1.force_encoding('Big5')
223 223 s2.force_encoding('Big5')
224 224 end
225 225 assert_equal s1, lines.first
226 226 # Total row
227 227 assert_equal "#{str_big5} #{user.lastname},7.30,7.30", lines[1]
228 228 assert_equal "#{s2},7.30,7.30", lines[2]
229 229
230 230 str_tw = "Traditional Chinese (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)"
231 231 if str_tw.respond_to?(:force_encoding)
232 232 str_tw.force_encoding('UTF-8')
233 233 end
234 234 assert_equal str_tw, l(:general_lang_name)
235 235 assert_equal 'Big5', l(:general_csv_encoding)
236 236 assert_equal ',', l(:general_csv_separator)
237 237 assert_equal '.', l(:general_csv_decimal_separator)
238 238 end
239 239
240 240 def test_csv_cannot_convert_should_be_replaced_big_5
241 241 Setting.default_language = "zh-TW"
242 242 str_utf8 = "\xe4\xbb\xa5\xe5\x86\x85"
243 243 if str_utf8.respond_to?(:force_encoding)
244 244 str_utf8.force_encoding('UTF-8')
245 245 end
246 246 user = User.find_by_id(3)
247 247 user.firstname = str_utf8
248 248 user.lastname = "test-lastname"
249 249 assert user.save
250 250 comments = "test_replaced"
251 251 te1 = TimeEntry.create(:spent_on => '2011-11-11',
252 252 :hours => 7.3,
253 253 :project => Project.find(1),
254 254 :user => user,
255 255 :activity => TimeEntryActivity.find_by_name('Design'),
256 256 :comments => comments)
257 257
258 258 te2 = TimeEntry.find_by_comments(comments)
259 259 assert_not_nil te2
260 260 assert_equal 7.3, te2.hours
261 261 assert_equal 3, te2.user_id
262 262
263 263 get :report, :project_id => 1, :columns => 'day',
264 264 :from => "2011-11-11", :to => "2011-11-11",
265 :criteria => ["member"], :format => "csv"
265 :criteria => ["user"], :format => "csv"
266 266 assert_response :success
267 267 assert_equal 'text/csv; header=present', @response.content_type
268 268 lines = @response.body.chomp.split("\n")
269 269 # Headers
270 s1 = "\xa6\xa8\xad\xfb,2011-11-11,\xc1`\xadp"
270 s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xc1`\xadp"
271 271 if s1.respond_to?(:force_encoding)
272 272 s1.force_encoding('Big5')
273 273 end
274 274 assert_equal s1, lines.first
275 275 # Total row
276 276 s2 = ""
277 277 if s2.respond_to?(:force_encoding)
278 278 s2 = "\xa5H?"
279 279 s2.force_encoding('Big5')
280 280 elsif RUBY_PLATFORM == 'java'
281 281 s2 = "??"
282 282 else
283 283 s2 = "\xa5H???"
284 284 end
285 285 assert_equal "#{s2} #{user.lastname},7.30,7.30", lines[1]
286 286 end
287 287
288 288 def test_csv_fr
289 289 with_settings :default_language => "fr" do
290 290 str1 = "test_csv_fr"
291 291 user = User.find_by_id(3)
292 292 te1 = TimeEntry.create(:spent_on => '2011-11-11',
293 293 :hours => 7.3,
294 294 :project => Project.find(1),
295 295 :user => user,
296 296 :activity => TimeEntryActivity.find_by_name('Design'),
297 297 :comments => str1)
298 298
299 299 te2 = TimeEntry.find_by_comments(str1)
300 300 assert_not_nil te2
301 301 assert_equal 7.3, te2.hours
302 302 assert_equal 3, te2.user_id
303 303
304 304 get :report, :project_id => 1, :columns => 'day',
305 305 :from => "2011-11-11", :to => "2011-11-11",
306 :criteria => ["member"], :format => "csv"
306 :criteria => ["user"], :format => "csv"
307 307 assert_response :success
308 308 assert_equal 'text/csv; header=present', @response.content_type
309 309 lines = @response.body.chomp.split("\n")
310 310 # Headers
311 s1 = "Membre;2011-11-11;Total"
311 s1 = "Utilisateur;2011-11-11;Total"
312 312 s2 = "Total"
313 313 if s1.respond_to?(:force_encoding)
314 314 s1.force_encoding('ISO-8859-1')
315 315 s2.force_encoding('ISO-8859-1')
316 316 end
317 317 assert_equal s1, lines.first
318 318 # Total row
319 319 assert_equal "#{user.firstname} #{user.lastname};7,30;7,30", lines[1]
320 320 assert_equal "#{s2};7,30;7,30", lines[2]
321 321
322 322 str_fr = "Fran\xc3\xa7ais"
323 323 if str_fr.respond_to?(:force_encoding)
324 324 str_fr.force_encoding('UTF-8')
325 325 end
326 326 assert_equal str_fr, l(:general_lang_name)
327 327 assert_equal 'ISO-8859-1', l(:general_csv_encoding)
328 328 assert_equal ';', l(:general_csv_separator)
329 329 assert_equal ',', l(:general_csv_decimal_separator)
330 330 end
331 331 end
332 332 end
General Comments 0
You need to be logged in to leave comments. Login now