Index: openacs-4/contrib/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v
diff -u -r1.30.2.9 -r1.30.2.10
--- openacs-4/contrib/packages/project-manager/www/one.tcl	8 Oct 2004 21:25:05 -0000	1.30.2.9
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	26 Oct 2004 01:21:11 -0000	1.30.2.10
@@ -22,6 +22,7 @@
     @param use_project_code_p Specifies whether or not to show the user-specified project code 1 = yes
     @param use_uncertain_completion_times_p Specifies whether or not to use PERT style uncertainty times 1 = yes
     @param logger_days The number of days back to view logged entries
+    @param instance_id The process instance ID to show for tasks
 } {
 
     project_item_id:integer,optional
@@ -30,6 +31,7 @@
     {orderby_tasks ""}
     {logger_variable_id:integer ""}
     {logger_days:integer "30"}
+    {instance_id:integer ""}
 
 } -properties {
     categories:onelist
@@ -112,6 +114,32 @@
 set create_p [permission::permission_p -object_id $package_id -privilege create]
 
 
+set process_instance_options [pm::process::instance_options \
+                                  -project_item_id $project_item_id \
+                                  -process_instance_id $instance_id]
+
+
+if {[empty_string_p $process_instance_options]} {
+    set instance_html ""
+} else {
+
+    set instance_html "
+<form action=\"one\" method=\"get\">
+  [export_vars -form -entire_form -exclude {instance_id}]
+  <select name=\"instance_id\">
+    <option value=\"\">View all tasks</option>
+    $process_instance_options
+  </select>
+  <input type=\"submit\" name=\"submit\" value=\"Go\" />
+</form>"
+}
+
+# we do this so that the list builder templates don't add a where
+# clause when instance_id is set.
+if {[empty_string_p $instance_id]} {
+    unset instance_id
+}
+
 # categories
 
 set categories [list]
@@ -185,22 +213,25 @@
     set context [list [list "one?project_item_id=$project(parent_id)" "Parent"] "$project(project_name)"]
 }
 
+set processes_html [pm::process::select_html]
+
 # Tasks, using list-builder ---------------------------------
 
 set process_link "process-use?project_item_id=$project_item_id"
 
 template::list::create \
     -name tasks \
     -multirow tasks \
-    -key task_id \
+    -key task_item_id \
+    -html {width 100%} \
     -elements {
-        task_id {
+        task_item_id {
             label "ID"
         }
         status_type {
             label "Done"
             display_template {
-                <a href="task-add-edit?task_id=@tasks.task_id@"><if @tasks.status_type@ eq c><img border="0" src="/resources/checkboxchecked.gif" /></if><else><img border="0" src="/resources/checkbox.gif" /></else></a>
+                <a href="task-add-edit?task_item_id=@tasks.task_item_id@&project_item_id=@tasks.project_item_id@"><if @tasks.status_type@ eq c><img border="0" src="/resources/checkboxchecked.gif" /></if><else><img border="0" src="/resources/checkbox.gif" /></else></a>
             }
         }
         title {
@@ -241,7 +272,18 @@
         last_name {
             label "Who"
             display_template {
-                <group column="task_id"><if @tasks.is_lead_p@><i></if>@tasks.first_names@&nbsp;@tasks.last_name@<if @tasks.is_lead_p@></i></if><br></group>
+                <group column="task_item_id">
+                  <if @tasks.person_id@ eq @tasks.my_user_id@>
+                    <span class="selected">
+                  </if>
+                  <if @tasks.is_lead_p@><i></if>
+                  @tasks.first_names@&nbsp;@tasks.last_name@
+                  <if @tasks.is_lead_p@></i></if>
+                  <if @tasks.person_id@ eq @tasks.my_user_id@>
+                    </span>
+                  </if>
+                  <br>
+                </group>
             }
 
         }
@@ -251,8 +293,6 @@
     } \
     -bulk_action_export_vars {
         project_item_id
-        project_id
-        {my_key 1}
         {return_url}
     } \
     -sub_class {
@@ -262,6 +302,10 @@
         project_item_id {
             hide_p 1
         }
+        instance_id {
+            hide_p 1
+            where_clause {ti.process_instance = :instance_id}
+        }
         orderby_subproject {
             hide_p 1
         }
@@ -272,37 +316,37 @@
     -orderby {
         default_value latest_start,asc
         title {
-            orderby_asc "title asc, task_id asc"
-            orderby_desc "title desc, task_id desc"
+            orderby_asc "title asc, task_item_id asc"
+            orderby_desc "title desc, task_item_id desc"
             default_direction asc
         }
         earliest_start {
-            orderby_asc "earliest_start, task_id asc, u.first_names, u.last_name"
-            orderby_desc "earliest_start desc, task_id desc, u.first_names, u.last_name"
+            orderby_asc "earliest_start, task_item_id asc, u.first_names, u.last_name"
+            orderby_desc "earliest_start desc, task_item_id desc, u.first_names, u.last_name"
             default_direction asc
         }
         earliest_finish {
-            orderby_asc "earliest_finish, task_id asc, u.first_names, u.last_name"
-            orderby_desc "earliest_finish desc, task_id desc, u.first_names, u.last_name"
+            orderby_asc "earliest_finish, task_item_id asc, u.first_names, u.last_name"
+            orderby_desc "earliest_finish desc, task_item_id desc, u.first_names, u.last_name"
             default_direction asc
         }
         latest_start {
-            orderby_asc "latest_start, task_id asc, u.first_names, u.last_name"
-            orderby_desc "latest_start desc, task_id desc, u.first_names, u.last_name"
+            orderby_asc "latest_start, task_item_id asc, u.first_names, u.last_name"
+            orderby_desc "latest_start desc, task_item_id desc, u.first_names, u.last_name"
             default_direction asc
         }
         latest_finish {
-            orderby_asc "latest_finish, task_id asc, u.first_names, u.last_name"
-            orderby_desc "latest_finish desc, task_id desc, u.first_names, u.last_name"
+            orderby_asc "latest_finish, task_item_id asc, u.first_names, u.last_name"
+            orderby_desc "latest_finish desc, task_item_id desc, u.first_names, u.last_name"
             default_direction asc
         }
     } \
     -orderby_name orderby_tasks
 
 
-db_multirow -extend { item_url earliest_start_pretty earliest_finish_pretty latest_start_pretty latest_finish_pretty slack_time} tasks project_tasks_query {
+db_multirow -extend { item_url earliest_start_pretty earliest_finish_pretty latest_start_pretty latest_finish_pretty slack_time my_user_id} tasks project_tasks_query {
 } {
-    set item_url [export_vars -base "task-one" { revision_id task_id}]
+    set item_url [export_vars -base "task-one" { {task_id $task_item_id}}]
 
     set earliest_start_pretty [lc_time_fmt $earliest_start "%x"]
     set earliest_finish_pretty [lc_time_fmt $earliest_finish "%x"]
@@ -313,7 +357,8 @@
                         -earliest_start_j $earliest_start_j \
                         -today_j $today_j \
                         -latest_start_j $latest_start_j]
-                    
+
+    set my_user_id $user_id
 }
 
 
@@ -373,6 +418,11 @@
     -elements {
         user_name {
             label "Who"
+            display_template {
+                <if @people.is_lead_p@><i></if>
+                @people.user_name@
+                <if @people.is_lead_p@></i></if>
+            }
         }
         role_name {
             label "Role"