Index: app/controllers/projects_controller.rb =================================================================== --- app/controllers/projects_controller.rb (revision 17836) +++ app/controllers/projects_controller.rb (working copy) @@ -158,6 +158,7 @@ if User.current.allowed_to_view_all_time_entries?(@project) @total_hours = TimeEntry.visible.where(cond).sum(:hours).to_f + @total_estimated_hours = Issue.visible.where(cond).sum(:estimated_hours).to_f end @key = User.current.rss_key Index: app/views/projects/show.html.erb =================================================================== --- app/views/projects/show.html.erb (revision 17836) +++ app/views/projects/show.html.erb (working copy) @@ -83,10 +83,15 @@ <% if User.current.allowed_to?(:view_time_entries, @project) %>
-

<%= l(:label_spent_time) %>

+

<%= l(:label_time_tracking) %>

+

<% if User.current.allowed_to?(:log_time, @project) %> <%= link_to l(:button_log_time), new_project_time_entry_path(@project) %> | Index: test/fixtures/issues.yml =================================================================== --- test/fixtures/issues.yml (revision 17836) +++ test/fixtures/issues.yml (working copy) @@ -15,6 +15,7 @@ status_id: 1 start_date: <%= 1.day.ago.to_date.to_s(:db) %> due_date: <%= 10.day.from_now.to_date.to_s(:db) %> + estimated_hours: 200.0 root_id: 1 lft: 1 rgt: 2 @@ -36,6 +37,7 @@ start_date: <%= 2.day.ago.to_date.to_s(:db) %> due_date: root_id: 2 + estimated_hours: 0.5 lft: 1 rgt: 2 lock_version: 3 @@ -56,6 +58,7 @@ status_id: 1 start_date: <%= 15.day.ago.to_date.to_s(:db) %> due_date: <%= 5.day.ago.to_date.to_s(:db) %> + estimated_hours: 1.0 root_id: 3 lft: 1 rgt: 2 @@ -90,6 +93,7 @@ assigned_to_id: author_id: 2 status_id: 1 + estimated_hours: 2.0 root_id: 5 lft: 1 rgt: 2 Index: test/functional/projects_controller_test.rb =================================================================== --- test/functional/projects_controller_test.rb (revision 17836) +++ test/functional/projects_controller_test.rb (working copy) @@ -575,6 +575,18 @@ assert_select 'table.issue-report td.total a', :text => %r{\A[1-9]\d*\z} end + def test_show_should_spent_and_estimated_time + @request.session[:user_id] = 1 + get :show, :params => { + :id => 'ecookbook' + } + + assert_select 'div.spent_time.box>ul' do + assert_select 'li:nth-child(1)', :text => 'Spent time: 162.90 hours' + assert_select 'li:nth-child(2)', :text => 'Estimated time: 203.50 hours' + end + end + def test_settings @request.session[:user_id] = 2 # manager get :settings, :params => {