Index: openacs-4/packages/simulation/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/tasks.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/lib/tasks.tcl	16 Dec 2003 14:16:28 -0000	1.1
+++ openacs-4/packages/simulation/lib/tasks.tcl	19 Dec 2003 14:00:38 -0000	1.2
@@ -8,40 +8,61 @@
     user_id {
         default_value ""
     }
+    case_id {
+        default_value ""
+    }
 }
 
 set package_id [ad_conn package_id]
 
 set elements {
-    case_name {
-        label "Case"
-    }
     name {
         link_url_col task_url
         label "Task"
     }
+    sim_name {
+        label "Simulation"
+    }
+    case_label {
+        label "Case"
+    }
 }
 
 template::list::create \
     -name tasks \
     -multirow tasks \
     -no_data "You don't have any tasks." \
-    -elements $elements 
+    -elements $elements \
+    -filters {
+        case_id {
+            where_clause "wc.case_id = :case_id"
+        }
+    }
 
 # TODO: make case_name be a combo of simulation name and case #
 db_multirow -extend { task_url } tasks select_tasks "
     select wcea.enabled_action_id,
            wa.pretty_name as name,
-           wcea.case_id
+           wcea.case_id,
+           sc.label as case_label,
+           w.pretty_name as sim_name
       from workflow_case_enabled_actions wcea,
            workflow_case_role_party_map wcrmp,
            workflow_actions wa,
-           party_approved_member_map pamm
-     where pamm.member_id = :user_id
+           party_approved_member_map pamm,
+           workflow_cases wc,
+           sim_cases sc,
+           workflows w
+     where wcea.enabled_state = 'enabled'
+       and pamm.member_id = :user_id
        and wcrmp.party_id = pamm.party_id
        and wcrmp.case_id = wcea.case_id
        and wcrmp.role_id = wa.assigned_role
        and wa.action_id = wcea.action_id
+       and wc.case_id = wcea.case_id
+       and sc.sim_case_id = wc.object_id
+       and w.workflow_id = wc.workflow_id
+    [template::list::filter_where_clauses -and -name "tasks"]
 " {
     set task_url [export_vars -base "[apm_package_url_from_id $package_id]simplay/task-detail" { enabled_action_id }]
-}
\ No newline at end of file
+}