Index: openacs-4/contrib/packages/project-manager/www/process-task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-add-edit.tcl,v diff -u -r1.8.2.3 -r1.8.2.4 --- openacs-4/contrib/packages/project-manager/www/process-task-add-edit.tcl 26 Oct 2004 01:21:11 -0000 1.8.2.3 +++ openacs-4/contrib/packages/project-manager/www/process-task-add-edit.tcl 25 Nov 2004 01:16:07 -0000 1.8.2.4 @@ -44,13 +44,14 @@ # --------------------------------------------------------------- # -# ----------- -# terminology -# ----------- +# -------------------------- +# terminology and parameters +# -------------------------- set task_term [parameter::get -parameter "TaskName" -default "Task"] set task_term_lower [parameter::get -parameter "taskname" -default "task"] set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"] +set use_day_p [parameter::get -parameter "UseDayInsteadOfHour" -default "t"] set DEFAULT_ORDERING_GAP 5 @@ -83,6 +84,13 @@ set estimated_hours_work_min_v($i) $estimated_hours_work_min set estimated_hours_work_max_v($i) $estimated_hours_work_max set ordering_v($i) $ordering + + set estimated_days_work_v($i) [pm::util::days_work \ + -hours_work $estimated_hours_work] + set estimated_days_work_min_v($i) [pm::util::days_work \ + -hours_work $estimated_hours_work_min] + set estimated_days_work_max_v($i) [pm::util::days_work \ + -hours_work $estimated_hours_work_max] if {[empty_string_p $ordering_v($i)]} { set ordering_v($i) [expr $i * $DEFAULT_ORDERING_GAP] @@ -112,6 +120,9 @@ set estimated_hours_work_v($i) "" set estimated_hours_work_min_v($i) "" set estimated_hours_work_max_v($i) "" + set estimated_days_work_v($i) "" + set estimated_days_work_min_v($i) "" + set estimated_days_work_max_v($i) "" set ordering_v($i) [expr $i * $DEFAULT_ORDERING_GAP] set checked_v($i) "" } @@ -125,7 +136,7 @@ set assignee_list_of_lists [pm::util::subsite_assignees_list_of_lists] -template::multirow create num process_task_id one_line description work work_min work_max ordering checked assignee_html +template::multirow create num process_task_id one_line description work work_min work_max work_days work_days_min work_days_max ordering checked assignee_html for {set i 1} {$i <= $number} {incr i} { @@ -187,7 +198,7 @@ append html "" - template::multirow append num $process_task_id_tmp $one_line_v($i) $description_v($i) $estimated_hours_work_v($i) $estimated_hours_work_min_v($i) $estimated_hours_work_max_v($i) $ordering_v($i) $checked_v($i) $html + template::multirow append num $process_task_id_tmp $one_line_v($i) $description_v($i) $estimated_hours_work_v($i) $estimated_hours_work_min_v($i) $estimated_hours_work_max_v($i) $estimated_days_work_v($i) $estimated_days_work_min_v($i) $estimated_days_work_max_v($i) $ordering_v($i) $checked_v($i) $html }