Redmine

      #[OHO-start] time info in issue lists

      @issue_sum_estimated = @query.issue_sum_estimated

      @issue_sum_spent = @query.issue_sum_spent

      #[OHO-end]

      #[OHO-start] time info in issue lists

      @issue_sum_spent_by_group = @query.issue_sum_spent_by_group

      @issue_sum_estimated_by_group = @query.issue_sum_estimated_by_group

      #[OHO-end]

#[OHO-start] modified function to handle 2 more variables for estimated and spent time

  def grouped_issue_list(issues, query, issue_count_by_group, issue_sum_estimated_by_group, issue_sum_spent_by_group, &block)

        issue_count_by_group.respond_to?(:has_key?) ? group_count = issue_count_by_group[group] : group_count = issue_count_by_group

        issue_sum_estimated_by_group.respond_to?(:has_key?) ? group_estimated_hours = issue_sum_estimated_by_group[group] : group_estimated_hours = 0

        issue_sum_spent_by_group.respond_to?(:has_key?) ? group_spent_hours = issue_sum_spent_by_group[group] : group_spent_hours = 0

        group_estimated_hours = 0 if group_estimated_hours.nil?

        group_spent_hours = 0 if group_spent_hours.nil?

      yield issue, level, group_name, group_count, group_estimated_hours, group_spent_hours

#[OHO-end] 

  #[OHO-start] time info for issue lists

  # Returns sum of all the issue's estimated_hours 

  def issue_sum_estimated

    Issue.visible.joins(:status, :project).where(statement).sum(:estimated_hours)

  rescue ::ActiveRecord::StatementInvalid => e

    raise StatementInvalid.new(e.message)  

  end

  # Returns sum of all the issue's spent time 

  def issue_sum_spent

    TimeEntry.visible.joins(:issue, :project).where(statement).sum(:hours)

  rescue ::ActiveRecord::StatementInvalid => e

    raise StatementInvalid.new(e.message)

  end

  #[OHO-end]

  #[OHO-start] time info for issue lists

  # Returns  sum of the issue's estimated_hours by group or nil if query is not grouped

  def issue_sum_estimated_by_group

    r = nil

    if grouped?

      begin

        r = Issue.visible. 

          joins(:status, :project). 

          where(statement).

          group(group_by_statement).

          joins(joins_for_order_statement(group_by_statement)).

          sum(:estimated_hours)

      rescue ActiveRecord::RecordNotFound

        r= {nil => 0}

      end

      c = group_by_column

      if c.is_a?(QueryCustomFieldColumn) && r.respond_to?(:has_keys?)

        r = r.keys.inject({}) {|h, k| h[c.custom_field.cast_value(k)] = r[k]; h}

      end

    end

    r

  rescue ::ActiveRecord::StatementInvalid => e

    raise StatementInvalid.new(e.message)

  end

  # Returns  sum of the issue's spent time by group or nil if query is not grouped

  def issue_sum_spent_by_group

    r = nil

    # Spent hours not available for project grouping as it leads to an ambiguous column name SQL issue

    if grouped? && group_by_statement != "project"

      begin

        # Problem with parent/child tasks: time is counted for both parents and children

        r = TimeEntry.visible.

          joins(:issue, :project).

          where(statement).

          joins(joins_for_order_statement(group_by_statement)).

          group(group_by_statement).

          sum(:hours)

      rescue ActiveRecord::RecordNotFound

        r= {nil => 0}

      end

      c = group_by_column

      if c.is_a?(QueryCustomFieldColumn) && r.respond_to?(:has_keys?)

        r = r.keys.inject({}) {|h, k| h[c.custom_field.cast_value(k)] = r[k]; h}

      end

    end

    r

  rescue ::ActiveRecord::StatementInvalid => e

    raise StatementInvalid.new(e.message)

  end

  #[OHO-end]

#[OHO-start] Added groupable fields to be able to group on those fields for spent time calculation in grouped issue lists (issue_query.rb)

  belongs_to :status, :class_name => 'IssueStatus'

  belongs_to :author, :class_name => 'User'

  belongs_to :assigned_to, :class_name => 'Principal'

  belongs_to :fixed_version, :class_name => 'Version'

  belongs_to :priority, :class_name => 'IssuePriority'

  belongs_to :category, :class_name => 'IssueCategory'

  belongs_to :tracker, :class_name => 'Tracker'

#[OHO-end]

  <% #[OHO-start] time info in issue lists: modified to add variables

   grouped_issue_list(issues, @query, @issue_count_by_group, @issue_sum_estimated_by_group, @issue_sum_spent_by_group) do |issue, level, group_name, group_count, group_estimated_hours, group_spent_hours| 

   #[OHO-end]

   -%>

        <% #[OHO-start] time info in issue lists

        if (group_estimated_hours > 0 || group_spent_hours > 0) %>(<%

          if group_estimated_hours > 0 

        %><%= l(:field_estimated_hours) %>: <%= l_hours(group_estimated_hours) %><%

          end

          if group_spent_hours > 0 && group_estimated_hours > 0 %>, <%

          end

          if group_spent_hours > 0 %><%= l(:label_spent_time) %>: <%= l_hours(group_spent_hours) %><%

          end%>)<%

        end

        #[OHO-end]

        %>

<% end %>

<%

  #[OHO] time info in issue lists

%>

<p align="right">

    <b><%= l(:field_estimated_hours) %>: <b><%= l_hours(@issue_sum_estimated) %></b><% if @issue_sum_spent.present? %>

         , <%= l(:label_spent_time) %>: <b><%= l_hours(@issue_sum_spent) %></b><% end %>)

</p>

# [OHO-2015-08-14] Added .join(',').to_s.split(',').uniq to remove duplicates

    order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?).join(',').to_s.split(',').uniq