Index: openacs-4/contrib/packages/project-manager/www/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.tcl,v
diff -u -N -r1.5.2.2 -r1.5.2.3
--- openacs-4/contrib/packages/project-manager/www/tasks.tcl	2 Jul 2004 23:13:49 -0000	1.5.2.2
+++ openacs-4/contrib/packages/project-manager/www/tasks.tcl	9 Jul 2004 17:38:28 -0000	1.5.2.3
@@ -126,9 +126,8 @@
                 <b>@tasks.latest_finish_pretty@</b>
             }
         }
-        actual_hours_worked {
-            label "Hours completed"
-            display_template "@tasks.actual_hours_worked@/@tasks.estimated_hours_work@ <br />(@tasks.percent_complete@\%)"
+        hours_remaining {
+            label "Hours remaining"
         }
         project_item_id {
             label "Project"
@@ -222,12 +221,6 @@
             orderby_asc "t.latest_finish, p.first_names, p.last_name"
             default_direction asc
         }
-        actual_hours_worked {
-            label "Hours completed"
-            orderby_desc "t.actual_hours_worked desc"
-            orderby_asc "t.actual_hours_worked"
-            default_direction asc
-        }
     } \
     -orderby_name orderby \
     -html {
@@ -237,7 +230,7 @@
 
 
 
-db_multirow -extend { item_url latest_start_pretty latest_finish_pretty slack_time log_url} tasks tasks {
+db_multirow -extend { item_url latest_start_pretty latest_finish_pretty slack_time log_url hours_remaining} tasks tasks {
 } {
     set item_url [export_vars -base "task-one" {task_id}]
 
@@ -255,6 +248,12 @@
         set slack_time "n/a"
     }
 
+    set hours_remaining \
+        [pm::task::hours_remaining \
+             -hours_work $estimated_hours_work \
+             -hours_work_min $estimated_hours_work_min \
+             -hours_work_max $estimated_hours_work_max \
+             -percent_complete $percent_complete]
 
 }