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.33 -r1.4.2.34 --- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl 25 Nov 2004 01:16:07 -0000 1.4.2.33 +++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl 29 Nov 2004 23:52:30 -0000 1.4.2.34 @@ -2338,26 +2338,29 @@ set old_estimated_hours_work_min [ad_get_client_property -- project-manager old_estimated_hours_work_min($tid)] set old_estimated_hours_work_max [ad_get_client_property -- project-manager old_estimated_hours_work_max($tid)] - # estimated_hours_work + # estimated_hours_work or days work if {[string is true $use_days_p]} { if {[string is true $use_uncertain_completion_times_p]} { - if {![string equal $old_estimated_hours_work_min $estimated_hours_work_min_array($tid)]} { - set old [pm::util::days_work -hours_work $old_estimated_hours_work_min] - set new [pm::util::days_work -hours_work $estimated_hours_work_min_array($tid)] + set old [pm::util::days_work -hours_work $old_estimated_hours_work_min] + set new [pm::util::days_work -hours_work $estimated_hours_work_min_array($tid)] + + if {![string equal $old $new]} { lappend changes "Work estimate (min) changed from $old to $new days" } - if {![string equal $old_estimated_hours_work_max $estimated_hours_work_max_array($tid)]} { - set old [pm::util::days_work -hours_work $old_estimated_hours_work_max] - set new [pm::util::days_work -hours_work $estimated_hours_work_max_array($tid)] + set old [pm::util::days_work -hours_work $old_estimated_hours_work_max] + set new [pm::util::days_work -hours_work $estimated_hours_work_max_array($tid)] + if {![string equal $old $new]} { lappend changes "Work estimate (max) changed from $old to $new days" } + } else { - - if {![string equal $old_estimated_hours_work $estimated_hours_work_array($tid)]} { - set old [pm::util::days_work -hours_work $old_estimated_hours_work] - set new [pm::util::days_work -hours_work $estimated_hours_work_array($tid)] + + set old [pm::util::days_work -hours_work $old_estimated_hours_work] + set new [pm::util::days_work -hours_work $estimated_hours_work_array($tid)] + + if {![string equal $old $new]} { lappend changes "Work estimate changed from $old to $new days" }