Index: openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.tcl	24 Dec 2001 02:50:17 -0000	1.7
+++ openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.tcl	10 Jan 2002 01:56:39 -0000	1.8
@@ -165,8 +165,8 @@
 
     <p>
 
-    The values for the keys <code>journal, attributes_to_set and
-    assigned_users</code> are themselves Tcl lists of <code>[array
+    The values for the keys <code>journal, attributes_to_set and assigned_users</code>
+    are themselves Tcl lists of <code>[array
     get]</code> repesentations. For the journal entry, see <a
     href="/api-doc/proc-view?proc=wf_journal"><code>wf_journal</code></a>.
     
@@ -282,7 +282,6 @@
            and p.party_id = ut.user_id
     }
 
-
     set user_id [ad_get_user_id]
     if { [string equal $task(state) enabled] } {
         set task(this_user_is_assigned_p) [db_string this_user_is_assigned_p { 
@@ -299,7 +298,30 @@
     return [array get task]
 }
 
+ad_proc -public wf_task_panels {
+    -task_id:required
+    -action:boolean
+    {-user_id 0}
+} {
 
+    Get the panels for a task in <code>[array get]</code> format.  Action
+    panels follow non-action panels.  These could be returned by wf_task_info
+    in the future with a little rewriting of the workflow pages.
+
+    @param task_id The task in question
+    @param action Only return action panels
+    @param user_id Return "show only when task started" panels for this user
+
+    @author Don Baccus (dhogaza@pacifier.com)
+} {
+    if { $action_p } {
+        db_multirow panels action_panels ""
+    } else {
+        db_multirow panels all_panels ""
+    }
+    return [array get panels]
+}
+
 ad_proc -public wf_journal {
     {-date_format "Mon fmDDfm, YYYY HH24:MI:SS"}
     {-order latest_first}
Index: openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.xql	19 Nov 2001 18:25:09 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.xql	10 Jan 2002 01:56:39 -0000	1.3
@@ -15,8 +15,46 @@
     
       </querytext>
 </fullquery>
+ 
+<fullquery name="wf_task_panels.action_panels">      
+      <querytext>
+      
+    select tp.header, 
+           tp.template_url
+      from wf_context_task_panels tp, 
+           wf_cases c,
+           wf_tasks t
+     where t.task_id = :task_id
+       and c.case_id = t.case_id
+       and tp.context_key = c.context_key
+       and tp.workflow_key = c.workflow_key
+       and tp.transition_key = t.transition_key
+       and tp.overrides_action_p = 't'
+       and (tp.only_display_when_started_p = 'f' or (t.state = 'started' and t.holding_user = :user_id))
+    order by tp.overrides_action_p, tp.sort_order
 
+      </querytext>
+</fullquery>
  
+<fullquery name="wf_task_panels.all_panels">      
+      <querytext>
+      
+    select tp.header, 
+           tp.template_url
+      from wf_context_task_panels tp, 
+           wf_cases c,
+           wf_tasks t
+     where t.task_id = :task_id
+       and c.case_id = t.case_id
+       and tp.context_key = c.context_key
+       and tp.workflow_key = c.workflow_key
+       and tp.transition_key = t.transition_key
+       and (tp.only_display_when_started_p = 'f' or (t.state = 'started' and t.holding_user = :user_id))
+    order by tp.overrides_action_p, tp.sort_order
+
+      </querytext>
+</fullquery>
+ 
 <fullquery name="wf_task_info.this_user_is_assigned_p">      
       <querytext>
        
@@ -294,6 +332,5 @@
     
       </querytext>
 </fullquery>
-
  
 </queryset>