Index: openacs-4/contrib/packages/project-manager/www/process-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-one.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/contrib/packages/project-manager/www/process-one.tcl	25 Jun 2004 00:04:42 -0000	1.11
+++ openacs-4/contrib/packages/project-manager/www/process-one.tcl	13 Jan 2005 13:54:36 -0000	1.12
@@ -13,17 +13,20 @@
 
 } {
 
-    process_id:integer
+    process_id:integer,notnull
     orderby:optional
+    {project_item_id ""}
     
 } -properties {
     process_id:onevalue
     context_bar:onevalue
     use_link:onevalue
 } -validate {
+} -errors {
+    process_id:notnull {You must specify a process to use. Please back up and select a process}
 }
 
-# --------------------------------------------------------------- #
+# --------------------------------------------------------------- 
 
 # the unique identifier for this package
 set package_id [ad_conn package_id]
@@ -41,74 +44,41 @@
 
 set context_bar [ad_context_bar [list "processes?process_id=$process_id" "Processes"] "One"]
 
-set use_link "<a href=\"task-select-project?process_id=$process_id\"><img border=\"0\" src=\"/shared/images/go.gif\"></a>"
+set use_link "<a href=\"[export_vars -base task-select-project {process_id project_item_id}]\"><img border=\"0\" src=\"/shared/images/go.gif\"></a>"
 
 
-if {[string is true $use_uncertain_completion_times_p]} {
-    set elements [list \
-                      one_line {
-                          label "Subject"
-                          display_template {<a href="process-task-add-edit?process_id=[set process_id]&process_task_id=@tasks.process_task_id@">@tasks.one_line@</a>
-                              <if @tasks.dependency_type@ eq start_before_start>
-                              <img border="0" src="resources/start_before_start.png">
-                              </if>
-                              <if @tasks.dependency_type@ eq start_before_finish>
-                              <img border="0" src="resources/start_before_finish.png">
-                              </if>
-                              <if @tasks.dependency_type@ eq finish_before_start>
-                              <img border="0" src="resources/finish_before_start.png">
-                              </if>
-                              <if @tasks.dependency_type@ eq finish_before_finish>
-                              <img border="0" src="resources/finish_before_finish.png">
-                              </if>
-                          }
-                      } \
-                      description {
-                          label "Description"
-                      } \
-                      estimated_hours_work_min {
-                          label "Work estimate min"
-                      } \
-                      estimated_hours_work_max {
-                          label "Work estimate max"
-                      } \
-                      ordering {
-                          label "Order"
-                      } ]
-    
-} else {
-    
-    set elements [list \
-                      one_line {
-                          label "Subject"
-                          display_template {<a href="process-task-add-edit?process_id=[set process_id]&process_task_id=@tasks.process_task_id@">@tasks.one_line@</a>
-                              <if @tasks.dependency_type@ eq start_before_start>
-                              <img border="0" src="resources/start_before_start.png">
-                              </if>
-                              <if @tasks.dependency_type@ eq start_before_finish>
-                              <img border="0" src="resources/start_before_finish.png">
-                              </if>
-                              <if @tasks.dependency_type@ eq finish_before_start>
-                              <img border="0" src="resources/finish_before_start.png">
-                              </if>
-                              <if @tasks.dependency_type@ eq finish_before_finish>
-                              <img border="0" src="resources/finish_before_finish.png">
-                              </if>
-                          }
-                      } \
-                      description {
-                          label "Description"
-                      } \
-                      estimated_hours_work {
-                          label "Work estimate"
-                      } \
-                      ordering {
-                          label "Order"
-                      } ]
-}
+set elements \
+    [list \
+         one_line {
+             label "Subject"
+             display_template {<a href="process-task-add-edit?process_id=[set process_id]&process_task_id=@tasks.process_task_id@">@tasks.one_line@</a>
+                 <if @tasks.dependency_type@ eq start_before_start>
+                 <img border="0" src="resources/start_before_start.png">
+                 </if>
+                 <if @tasks.dependency_type@ eq start_before_finish>
+                 <img border="0" src="resources/start_before_finish.png">
+                 </if>
+                 <if @tasks.dependency_type@ eq finish_before_start>
+                 <img border="0" src="resources/finish_before_start.png">
+                 </if>
+                 <if @tasks.dependency_type@ eq finish_before_finish>
+                 <img border="0" src="resources/finish_before_finish.png">
+                 </if>
+             }
+         } \
+         description {
+             label "Description"
+         } \
+         person_id {
+             label "Lead"
+             display_template {
+                 <group column="process_task_id">
+                 <i>@tasks.first_names@ @tasks.last_name@</i><br />
+                 </group>
+             }
+         }]    
 
 
-
 # Process tasks, using list-builder ---------------------------------
 
 template::list::create \
@@ -120,27 +90,19 @@
         default_value ordering,asc
         ordering {
             label "Order"
-            orderby_asc "t.ordering, t.process_task_id"
-            orderby_desc "t.ordering desc, t.process_task_id desc"
+            orderby_asc "t.ordering, t.process_task_id, p.first_names, p.last_name"
+            orderby_desc "t.ordering desc, t.process_task_id desc, p.first_names, p.last_name"
             default_direction asc
         }
-        one_line {
-            orderby_asc "t.one_line, t.ordering"
-            orderby_desc "t.one_line desc, t.ordering desc"
-            default_direction asc
-        }
-        estimated_hours_work {orderby estimated_hours_work}
-        estimated_hours_work_min {orderby estimated_hours_work_min}
-        estimated_hours_work_max {orderby estimated_hours_work_max}
-
     } \
     -bulk_actions {
+        "Use" "task-select-project" "Use process"
         "Edit" "process-task-add-edit" "Edit tasks"
         "Delete" "process-task-delete" "Delete tasks"
     } \
     -bulk_action_export_vars {
         process_id
-        project_id
+        project_item_id
     } \
     -sub_class {
         narrow
@@ -157,7 +119,3 @@
 } {
 }
 
-
-ad_return_template
-
-# ------------------------- END OF FILE ------------------------- #