Index: openacs-4/contrib/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/Attic/project-manager.info,v
diff -u -r1.16.2.4 -r1.16.2.5
--- openacs-4/contrib/packages/project-manager/project-manager.info	12 Jul 2004 17:34:21 -0000	1.16.2.4
+++ openacs-4/contrib/packages/project-manager/project-manager.info	15 Jul 2004 20:31:46 -0000	1.16.2.5
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.11" url="http://openacs.org/repository/download/apm/project-manager-2.11.apm">
+    <version name="2.12" url="http://openacs.org/repository/download/apm/project-manager-2.12.apm">
         <owner url="mailto:jader@bread.com">Jade Rubick</owner>
         <summary>Project management tool for OpenACS</summary>
-        <release-date>2004-07-12</release-date>
+        <release-date>2004-07-15</release-date>
         <vendor url="mailto:jader@bread.com">Integrated Bakery Resources</vendor>
         <description format="text/plain">Track tasks, estimates and actual progress for a project.  See the &lt;a href=&quot;http://openacs.org/projects/dotwrk/project_management/&quot;&gt;project page&lt;/a&gt; for more information.</description>
 
-        <provides url="project-manager" version="2.11"/>
+        <provides url="project-manager" version="2.12"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="acs-templating" version="4.6.4"/>
         <requires url="categories" version="1.0d3"/>
@@ -24,8 +24,8 @@
         <requires url="organizations" version="0.3d"/>
 
         <callbacks>
-            <callback type="after-instantiate"  proc="pm::install::package_instantiate"/>
             <callback type="before-uninstantiate"  proc="pm::install::package_uninstantiate"/>
+            <callback type="after-instantiate"  proc="pm::install::package_instantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="LoggerPrimaryURL"  description="This is the primary logger instance that is linked in to this project-manager instance. Links to this instance are added to 
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.4.2.7 -r1.4.2.8
--- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	13 Jul 2004 00:01:02 -0000	1.4.2.7
+++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	15 Jul 2004 20:31:47 -0000	1.4.2.8
@@ -1663,19 +1663,19 @@
                     -hours_work_min $hours_work_min \
                     -hours_work_max $hours_work_max]
     }
-    
-    if {[string equal $use_uncertain_completion_times_p 1]} {
 
-        set display_value1 [expr round($hours_work_min * $percent_complete / 100)]
-        set display_value2 [expr round($hours_work_max * $percent_complete / 100)]
+    if {[string is true $use_uncertain_completion_times_p]} {
 
+        set display_value1 [expr round($hours_work_min * [expr 100 - $percent_complete] / double(100))]
+        set display_value2 [expr round($hours_work_max * [expr 100 - $percent_complete] / double(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 [expr round($hours_work * $percent_complete / 100)]
+        set display_value [expr round($hours_work * [expr 100 - $percent_complete] / double(100))]
     }
 
     return $display_value
Index: openacs-4/contrib/packages/project-manager/www/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.adp,v
diff -u -r1.23.2.4 -r1.23.2.5
--- openacs-4/contrib/packages/project-manager/www/task-one.adp	9 Jul 2004 17:38:28 -0000	1.23.2.4
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp	15 Jul 2004 20:31:47 -0000	1.23.2.5
@@ -163,8 +163,10 @@
               <else>
                 Slack: @task_info.slack_time@<br />
               </else>
+
+              Complete: @task_info.percent_complete@%
             </td>
-            
+
           </tr>
           
           <tr class="list-filter-header">