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.12 -r1.13
--- openacs-4/contrib/packages/project-manager/www/process-task-add-edit.tcl	25 Jun 2004 23:33:18 -0000	1.12
+++ openacs-4/contrib/packages/project-manager/www/process-task-add-edit.tcl	13 Jan 2005 13:54:36 -0000	1.13
@@ -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
 
@@ -61,20 +62,10 @@
 set package_id [ad_conn package_id]
 set user_id    [ad_maybe_redirect_for_registration]
 
-set subsite_id [ad_conn subsite_id]
-set user_group_id [application_group::group_id_from_package_id \
-                       -package_id $subsite_id]
-
-# -----------
-# permissions
-# -----------
-permission::require_permission -party_id $user_id -object_id $package_id -privilege read
-
 # ------------------------------------------------------------
 # if process_task_id is set, then we are editing process tasks
 # ------------------------------------------------------------
 
-
 if {[exists_and_not_null process_task_id]} {
 
     set edit_p 1
@@ -93,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]
@@ -122,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)                  ""
     }
@@ -132,27 +133,11 @@
 
 set roles_list_of_lists [pm::role::select_list_filter]
 
-set assignee_list_of_lists [db_list_of_lists get_assignees {
-    select
-    p.first_names || ' ' || p.last_name as name,
-    p.person_id
-    FROM
-    persons p,
-    acs_rels r,
-    membership_rels mr
-    WHERE
-    r.object_id_one = :user_group_id and
-    mr.rel_id = r.rel_id and
-    p.person_id = r.object_id_two and
-    member_state = 'approved'
-    ORDER BY
-    p.first_names, p.last_name
-}]
+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 work_days work_days_min work_days_max ordering checked assignee_html
 
-template::multirow create num process_task_id one_line description work work_min work_max ordering checked assignee_html
-
 for {set i 1} {$i <= $number} {incr i} {
 
     if {[string is false $edit_p]} {
@@ -213,7 +198,7 @@
 
     append html "</table>"
 
-    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
 
 }