diff lib/redmine/helpers/time_report.rb @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration

--- a/lib/redmine/helpers/time_report.rb	Fri Jun 14 09:07:32 2013 +0100
+++ b/lib/redmine/helpers/time_report.rb	Fri Jun 14 09:28:30 2013 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2013  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -18,9 +18,9 @@
 module Redmine
   module Helpers
     class TimeReport
-      attr_reader :criteria, :columns, :from, :to, :hours, :total_hours, :periods
+      attr_reader :criteria, :columns, :hours, :total_hours, :periods
 
-      def initialize(project, issue, criteria, columns, from, to)
+      def initialize(project, issue, criteria, columns, time_entry_scope)
         @project = project
         @issue = issue
 
@@ -30,8 +30,7 @@
         @criteria = @criteria[0,3]
 
         @columns = (columns && %w(year month week day).include?(columns)) ? columns : 'month'
-        @from = from
-        @to = to
+        @scope = time_entry_scope
 
         run
       end
@@ -44,15 +43,12 @@
 
       def run
         unless @criteria.empty?
-          scope = TimeEntry.visible.spent_between(@from, @to)
-          if @issue
-            scope = scope.on_issue(@issue)
-          elsif @project
-            scope = scope.on_project(@project, Setting.display_subprojects_issues?)
-          end
           time_columns = %w(tyear tmonth tweek spent_on)
           @hours = []
-          scope.sum(:hours, :include => :issue, :group => @criteria.collect{|criteria| @available_criteria[criteria][:sql]} + time_columns).each do |hash, hours|
+          @scope.sum(:hours,
+              :include => [:issue, :activity],
+              :group => @criteria.collect{|criteria| @available_criteria[criteria][:sql]} + time_columns,
+              :joins => @criteria.collect{|criteria| @available_criteria[criteria][:joins]}.compact).each do |hash, hours|
             h = {'hours' => hours}
             (@criteria + time_columns).each_with_index do |name, i|
               h[name] = hash[i]
@@ -67,21 +63,17 @@
             when 'month'
               row['month'] = "#{row['tyear']}-#{row['tmonth']}"
             when 'week'
-              row['week'] = "#{row['tyear']}-#{row['tweek']}"
+              row['week'] = "#{row['spent_on'].cwyear}-#{row['tweek']}"
             when 'day'
               row['day'] = "#{row['spent_on']}"
             end
           end
           
-          if @from.nil?
-            min = @hours.collect {|row| row['spent_on']}.min
-            @from = min ? min.to_date : Date.today
-          end
+          min = @hours.collect {|row| row['spent_on']}.min
+          @from = min ? min.to_date : Date.today
 
-          if @to.nil?
-            max = @hours.collect {|row| row['spent_on']}.max
-            @to = max ? max.to_date : Date.today
-          end
+          max = @hours.collect {|row| row['spent_on']}.max
+          @to = max ? max.to_date : Date.today
           
           @total_hours = @hours.inject(0) {|s,k| s = s + k['hours'].to_f}
 
@@ -98,7 +90,7 @@
               @periods << "#{date_from.year}-#{date_from.month}"
               date_from = (date_from + 1.month).at_beginning_of_month
             when 'week'
-              @periods << "#{date_from.year}-#{date_from.to_date.cweek}"
+              @periods << "#{date_from.to_date.cwyear}-#{date_from.to_date.cweek}"
               date_from = (date_from + 7.day).at_beginning_of_week
             when 'day'
               @periods << "#{date_from.to_date}"
@@ -121,9 +113,9 @@
                                  'category' => {:sql => "#{Issue.table_name}.category_id",
                                                 :klass => IssueCategory,
                                                 :label => :field_category},
-                                 'member' => {:sql => "#{TimeEntry.table_name}.user_id",
+                                 'user' => {:sql => "#{TimeEntry.table_name}.user_id",
                                              :klass => User,
-                                             :label => :label_member},
+                                             :label => :label_user},
                                  'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
                                               :klass => Tracker,
                                               :label => :label_tracker},
@@ -135,24 +127,19 @@
                                              :label => :label_issue}
                                }
 
+        # Add time entry custom fields
+        custom_fields = TimeEntryCustomField.all
+        # Add project custom fields
+        custom_fields += ProjectCustomField.all
+        # Add issue custom fields
+        custom_fields += (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
+        # Add time entry activity custom fields
+        custom_fields += TimeEntryActivityCustomField.all
+
         # Add list and boolean custom fields as available criteria
-        custom_fields = (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
         custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
-          @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)",
-                                                 :format => cf.field_format,
-                                                 :label => cf.name}
-        end if @project
-
-        # Add list and boolean time entry custom fields
-        TimeEntryCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
-          @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)",
-                                                 :format => cf.field_format,
-                                                 :label => cf.name}
-        end
-
-        # Add list and boolean time entry activity custom fields
-        TimeEntryActivityCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
-          @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)",
+          @available_criteria["cf_#{cf.id}"] = {:sql => "#{cf.join_alias}.value",
+                                                 :joins => cf.join_for_order_statement,
                                                  :format => cf.field_format,
                                                  :label => cf.name}
         end