Index: openacs-4/packages/cms/www/modules/workflow/user-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/user-tasks.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/workflow/user-tasks.tcl	24 May 2001 23:57:17 -0000	1.2
+++ openacs-4/packages/cms/www/modules/workflow/user-tasks.tcl	22 Aug 2002 03:04:32 -0000	1.3
@@ -6,91 +6,12 @@
 
 set date_format "'Mon. DD, YYYY HH24:MI:SS'"
 
-template::query get_party_name party_name onevalue "
-  select nvl(party.name(:party_id),person.name(:party_id)) from dual
-" 
+set party_name [db_string get_party_name ""]
 
 set date_format "'Mon., DD, YYYY HH24:MI:SS'"
 
-template::query get_active active_tasks multirow  "
-  select
-    trans.transition_key, transition_name, 
-    item_id, content_item.get_title(item_id) as title,
-    t.state,
-    to_char(deadline,'Mon. DD, YYYY') as deadline_pretty,
-    to_char(enabled_date,$date_format) as enabled_date_pretty,
-    to_char(started_date,$date_format) as started_date_pretty,
-    to_char(hold_timeout,'Mon. DD, YYYY') as hold_timeout_pretty,
-    holding_user, person.name(holding_user) as holding_user_name,
-    content_workflow.is_overdue(c.case_id, ca.transition_key) as is_overdue
-  from
-    wf_transitions trans, wf_tasks t, cr_items i,
-    wf_cases c, wf_case_assignments ca
-  where
-    c.workflow_key = 'publishing_wf'
-  and
-    c.workflow_key = trans.workflow_key
-  and
-    c.case_id = ca.case_id
-  and
-    c.case_id = t.case_id
-  and
-    c.object_id = i.item_id
-  and
-    t.transition_key = trans.transition_key
-  and
-    ca.transition_key = trans.transition_key
-  and
-    c.state = 'active'
-  and
-    t.state in ('enabled','started')
-  and
-    ca.party_id = :party_id
-  order by
-    trans.sort_order, title"
+db_multirow active_tasks get_active ""
 
+db_multirow awaiting_tasks get_waiting ""
 
-
-template::query get_waiting awaiting_tasks multirow "
-  select
-    ca.transition_key, transition_name, 
-    item_id, content_item.get_title(item_id) as title,
-    to_char(deadline,'Mon. DD, YYYY') as deadline_pretty,
-    content_workflow.is_overdue(c.case_id, ca.transition_key) as is_overdue
-  from
-    wf_case_assignments ca, wf_case_deadlines dead, wf_cases c,
-    cr_items i, wf_transitions trans
-  where
-    c.workflow_key = 'publishing_wf'
-  and
-    c.workflow_key = trans.workflow_key
-  and
-    c.case_id = ca.case_id
-  and
-    c.case_id = dead.case_id
-  and
-    ca.transition_key = trans.transition_key
-  and
-    dead.transition_key = trans.transition_key
-  and
-    c.object_id = i.item_id
-  and
-    c.state = 'active'
-  and
-    content_workflow.is_finished(c.case_id, ca.transition_key) = 'f'
-  and
-    not exists ( select 1
-                 from
-                   wf_tasks
-                 where
-                   case_id = c.case_id
-                 and
-                   transition_key = ca.transition_key
-                 and
-                   state in ('enabled','started') )
-  and
-    ca.party_id = :party_id
-  order by
-    trans.sort_order, title"
-
 set page_title "Workflow Tasks Assigned to $party_name"