From 61a65d4624ff3a34dfb1e69ffb26695deda221e9 Mon Sep 17 00:00:00 2001
From: Holger Just <hjust@meine-er.de>
Date: Mon, 16 Jan 2012 13:48:06 +0100
Subject: [PATCH] [#827] Add status group in time entries report.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch provided by Jérôme BATAILLE.
Test from Jean-Philippe Lang.
---
 app/controllers/time_entry_reports_controller.rb      | 3 +++
 test/functional/time_entry_reports_controller_test.rb | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/app/controllers/time_entry_reports_controller.rb b/app/controllers/time_entry_reports_controller.rb
index e60a5238..ba9b7833 100644
--- a/app/controllers/time_entry_reports_controller.rb
+++ b/app/controllers/time_entry_reports_controller.rb
@@ -160,6 +160,9 @@ class TimeEntryReportsController < ApplicationController
     @available_criterias = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
                                           :klass => Project,
                                           :label => :label_project},
+                             'status' => {:sql => "#{Issue.table_name}.status_id",
+                                          :klass => IssueStatus,
+                                          :label => :field_status},
                              'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
                                           :klass => Version,
                                           :label => :label_version},
diff --git a/test/functional/time_entry_reports_controller_test.rb b/test/functional/time_entry_reports_controller_test.rb
index 5ad5c971..e96d640e 100644
--- a/test/functional/time_entry_reports_controller_test.rb
+++ b/test/functional/time_entry_reports_controller_test.rb
@@ -128,6 +128,14 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
     assert_equal "0.00", "%.2f" % assigns(:total_hours)
   end
 
+  def test_report_status_criterion
+    get :report, :project_id => 1, :criterias => ['status']
+    assert_response :success
+    assert_template 'report'
+    assert_tag :tag => 'th', :content => 'Status'
+    assert_tag :tag => 'td', :content => 'New'
+  end
+
   def test_report_all_projects_csv_export
     get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
     assert_response :success