jro_apps/redmine Commit - r2932:3d926660ba01

Merged r3009 from trunk....

Eric Davis -

r2932:3d926660ba01

parent child

Context file:

r2932:3d926660ba01

app/controllers/timelog_controller.rb +1 -1

                   sql << " WHERE"
                   sql << " (%s) AND" % @project.project_condition(Setting.display_subprojects_issues?) if @project
                   sql << " (%s) AND" % Project.allowed_to_condition(User.current, :view_time_entries)
-                  sql << " (spent_on BETWEEN '%s' AND '%s')" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_date(@to.to_time)]
+                  sql << " (spent_on BETWEEN '%s' AND '%s')" % [ActiveRecord::Base.connection.quoted_date(@from), ActiveRecord::Base.connection.quoted_date(@to)]
                   sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek, spent_on"
                   @hours = ActiveRecord::Base.connection.select_all(sql)

test/functional/timelog_controller_test.rb +16 0

                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
               end
+              def test_report_one_day
+                get :report, :project_id => 1, :columns => 'day', :from => "2007-03-23", :to => "2007-03-23", :criterias => ["member", "activity"]
+                assert_response :success
+                assert_template 'report'
+                assert_not_nil assigns(:total_hours)
+                assert_equal "4.25", "%.2f" % assigns(:total_hours)
+              end
               def test_report_custom_field_criteria
                 get :report, :project_id => 1, :criterias => ['project', 'cf_1']
                 assert_response :success
                 assert_equal Date.today - 7, assigns(:from)
                 assert_equal Date.today, assigns(:to)
               end
+              def test_details_one_day
+                get :details, :project_id => 1, :from => "2007-03-23", :to => "2007-03-23"
+                assert_response :success
+                assert_template 'details'
+                assert_not_nil assigns(:total_hours)
+                assert_equal "4.25", "%.2f" % assigns(:total_hours)
+              end
               def test_details_at_issue_level
                 get :details, :issue_id => 1

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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