Index: openacs-4/contrib/packages/project-manager/www/task-add-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit-2.tcl,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/contrib/packages/project-manager/www/task-add-edit-2.tcl 19 Nov 2004 22:43:22 -0000 1.1.2.4 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit-2.tcl 25 Nov 2004 01:16:07 -0000 1.1.2.5 @@ -22,6 +22,9 @@ {estimated_hours_work:array ""} {estimated_hours_work_min:array ""} {estimated_hours_work_max:array ""} + {estimated_days_work:array ""} + {estimated_days_work_min:array ""} + {estimated_days_work_max:array ""} {process_task_id:integer,multiple ""} {percent_complete:array ""} {dependency:array ""} @@ -45,7 +48,6 @@ } -errors { } - # --------------------------------------------------------------- # Set up # --------------------------------------------------------------- @@ -55,8 +57,12 @@ set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"] +set hours_day [pm::util::hours_day] +set use_days_p [parameter::get -parameter "UseDayInsteadOfHour" -default "t"] foreach i $number { + + # set the dates correctly set end_date_${i}(day) [lindex $end_date_day [expr $i -1]] set end_date_${i}(month) [lindex $end_date_month [expr $i -1]] set end_date_${i}(year) [lindex $end_date_year [expr $i - 1]] @@ -70,8 +76,27 @@ set log_date_${i}(format) "" ad_page_contract_filter_proc_date log_date_$i log_date_$i + + if {[string is true $use_days_p]} { + + # set the hours work + if {[string is true $use_uncertain_completion_times_p]} { + + set estimated_hours_work_min($i) \ + [expr $estimated_days_work_min($i) * $hours_day] + set estimated_hours_work_max($i) \ + [expr $estimated_days_work_max($i) * $hours_day] + + } else { + + set estimated_hours_work($i) \ + [expr $estimated_days_work($i) * $hours_day] + + } + } } + if {[string is true $edit_p]} { # -------