jro_apps/redmine Commit - r1325:a3c89d4f697e

Custom fields (list and boolean) can be used as criteria in time report (#1012)....

Jean-Philippe Lang -

r1325:a3c89d4f697e

parent child

Context file:

r1325:a3c89d4f697e

Collapse all files

app/controllers/timelog_controller.rb +9 0

               include SortHelper
               helper :issues
               include TimelogHelper
+              helper :custom_fields
+              include CustomFieldsHelper
               def report
                 @available_criterias = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
                                                      :label => :label_issue}
                                        }
+                # Add list and boolean custom fields as available criterias
+                @project.all_custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
+                  @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM custom_values c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = issues.id)",
+                                                         :format => cf.field_format,
+                                                         :label => cf.name}
+                end
                 @criterias = params[:criterias] || []
                 @criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria}
                 @criterias.uniq!

app/helpers/timelog_helper.rb +6 -2

                 export
               end
+              def format_criteria_value(criteria, value)
+                value.blank? ? l(:label_none) : ((k = @available_criterias[criteria][:klass]) ? k.find_by_id(value.to_i) : format_value(value, @available_criterias[criteria][:format]))
+              end
               def report_to_csv(criterias, periods, hours)
                 export = StringIO.new
                 CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
               end
               def report_criteria_to_csv(csv, criterias, periods, hours, level=0)
-                hours.collect {|h| h[criterias[level]]}.uniq.each do |value|
+                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?
                   row = [''] * level
-                  row << to_utf8(value.nil? ? l(:label_none) : @available_criterias[criterias[level]][:klass].find_by_id(value))
+                  row << to_utf8(format_criteria_value(criterias[level], value))
                   row += [''] * (criterias.length - level - 1)
                   total = 0
                   periods.each do |period|

app/views/timelog/_report_criteria.rhtml +2 -2

-            <% @hours.collect {|h| h[criterias[level]]}.uniq.each do |value| %>
+            <% @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><%= value.nil? ? l(:label_none) : @available_criterias[criterias[level]][:klass].find_by_id(value) %></td>
+            <td><%= format_criteria_value(criterias[level], value) %></td>
             <%= '<td></td>' * (criterias.length - level - 1) -%>
               <% total = 0 -%>
               <% @periods.each do |period| -%>

test/fixtures/custom_fields.yml +1 -1

               name: Database
               min_length: 0
               regexp: ""
-              is_for_all: false
+              is_for_all: true
               type: IssueCustomField
               max_length: 0
               possible_values: MySQL|PostgreSQL|Oracle

test/fixtures/time_entries.yml +1 -1

               updated_on: 2007-04-21 12:20:48 +02:00
               activity_id: 9
               spent_on: 2007-04-21
-              issue_id: 2
+              issue_id: 3
               id: 3
               hours: 1.0
               user_id: 1

test/functional/issues_controller_test.rb +3 -2

               end
               def test_destroy_issue_with_no_time_entries
+                assert_nil TimeEntry.find_by_issue_id(2)
                 @request.session[:user_id] = 2
-                post :destroy, :id => 3
+                post :destroy, :id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
-                assert_nil Issue.find_by_id(3)
+                assert_nil Issue.find_by_id(2)
               end
               def test_destroy_issues_with_time_entries

test/functional/timelog_controller_test.rb +19 -2

             class TimelogController; def rescue_action(e) raise e end; end
             class TimelogControllerTest < Test::Unit::TestCase
-              fixtures :projects, :enabled_modules, :roles, :members, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses
+              fixtures :projects, :enabled_modules, :roles, :members, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses, :custom_fields, :custom_values
               def setup
                 @controller = TimelogController.new
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
               end
+              def test_report_custom_field_criteria
+                get :report, :project_id => 1, :criterias => ['project', 'cf_1']
+                assert_response :success
+                assert_template 'report'
+                assert_not_nil assigns(:total_hours)
+                assert_not_nil assigns(:criterias)
+                assert_equal 2, assigns(:criterias).size
+                assert_equal "162.90", "%.2f" % assigns(:total_hours)
+                # Custom field column
+                assert_tag :tag => 'th', :content => 'Database'
+                # Custom field row
+                assert_tag :tag => 'td', :content => 'MySQL',
+                                         :sibling => { :tag => 'td', :attributes => { :class => 'hours' },
+                                                                     :child => { :tag => 'span', :attributes => { :class => 'hours hours-int' },
+                                                                                                 :content => '1' }}
+              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']
                 assert_response :success
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
-                assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,2,Feature request,Add ingredients categories,1.0,\"\"\n")
+                assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
               end
             end

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