Index: openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	1 Jul 2004 18:37:13 -0000	1.16
+++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	14 Jul 2004 17:51:08 -0000	1.17
@@ -1628,32 +1628,43 @@
 }
 
 
-ad_proc -public pm::task::estimated_hours_work {
-    -estimated_hours_work
-    -estimated_hours_work_min
-    -estimated_hours_work_max
+ad_proc -public pm::task::hours_remaining {
+    -hours_work:required
+    -hours_work_min:required
+    -hours_work_max:required
+    -percent_complete:required
 } {
-    Displays the estimated hours work in a consistent format
+    Displays the estimated hours work remaining in a consistent format
     
     @author Jade Rubick (jader@bread.com)
     @creation-date 2004-06-02
     
-    @param estimated_hours_work
+    @param hours_work
 
-    @param estimated_hours_work_min
+    @param hours_work_min
 
-    @param estimated_hours_work_max
+    @param hours_work_max
 
+    @param percent_complete
+
     @return 
     
     @error 
 } {
     set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
 
     if {[string equal $use_uncertain_completion_times_p 1]} {
-        set display_value "$estimated_hours_work_min - $estimated_hours_work_max"
+
+        set display_value1 [expr round($hours_work_min * $percent_complete / 100)]
+        set display_value2 [expr round($hours_work_max * $percent_complete / 100)]
+
+        if {[string equal $display_value1 $display_value2]} {
+            set display_value "$display_value1"
+        } else {
+            set display_value "$display_value1 - $display_value2"
+        }
     } else {
-        set display_value "$estimated_hours_work"
+        set display_value [expr round($hours_work * $percent_complete / 100)]
     }
 
     return $display_value