Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets-oracle.xql 12 Jun 2001 06:25:49 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets-oracle.xql 5 Jul 2002 04:44:49 -0000 1.2 @@ -5,44 +5,46 @@ <fullquery name="ticket_select_me"> <querytext> - + select tt.ticket_id, - ttracker_option.option_name(:package_id, 'severity', tt.severity) - as pretty_severity, - ttracker_option.option_name(:package_id, 'priority', tt.priority) - as pretty_priority, - tt.subject, - to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, - tc.category_id, - tc.name as category, - tt.creation_user as creator_id, - acs_object.name(tt.creation_user) as creator_name, - wc.state, - :user_id as assignee_id, - 'me' as assignee_name - $view_select + tt.severity, + ttracker_option.option_name(:package_id, 'severity', tt.severity) + as pretty_severity, + tt.priority, + ttracker_option.option_name(:package_id, 'priority', tt.priority) + as pretty_priority, + tt.subject, + to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, + tc.category_id, + tc.name as category, + tt.creation_user as creator_id, + acs_object.name(tt.creation_user) as creator_name, + wc.state, + :user_id as assignee_id, + 'me' as assignee_name + $view_select from ttracker_categories tc, - ttracker_tickets tt, - wf_cases wc - $view_from + ttracker_tickets tt, + wf_cases wc + $view_from where tc.package_id = :package_id and - tt.category_id = tc.category_id and - wc.object_id = tt.ticket_id and - exists (select wt.task_id - from wf_task_assignments wta, - wf_tasks wt, - party_approved_member_map m - where wt.transition_key = 'resolve' and - wt.task_id = wta.task_id and - wta.party_id = m.party_id and - m.member_id = :user_id and - wt.case_id = wc.case_id and - wt.task_id = (select max(wt1.task_id) - from wf_tasks wt1 - where wt1.case_id = wc.case_id and - wt1.transition_key = 'resolve')) - $view_where - [ad_dimensional_sql $dimensional] + tt.category_id = tc.category_id and + wc.object_id = tt.ticket_id and + exists (select wt.task_id + from wf_task_assignments wta, + wf_tasks wt, + party_approved_member_map m + where wt.transition_key = 'resolve' and + wt.task_id = wta.task_id and + wta.party_id = m.party_id and + m.member_id = :user_id and + wt.case_id = wc.case_id and + wt.task_id = (select max(wt1.task_id) + from wf_tasks wt1 + where wt1.case_id = wc.case_id and + wt1.transition_key = 'resolve')) + $view_where + [ad_dimensional_sql $dimensional] [ad_order_by_from_sort_spec $orderby $table_def] </querytext> @@ -52,37 +54,39 @@ <fullquery name="ticket_select_noass"> <querytext> - + select tt.ticket_id, - ttracker_option.option_name(:package_id, 'severity', tt.severity) - as pretty_severity, - ttracker_option.option_name(:package_id, 'priority', tt.priority) - as pretty_priority, - tt.subject, - to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, - tc.category_id, - tc.name as category, - tt.creation_user as creator_id, - acs_object.name(tt.creation_user) as creator_name, - wc.state, - 0 as assignee_id, - '' as assignee_name - $view_select + tt.severity, + ttracker_option.option_name(:package_id, 'severity', tt.severity) + as pretty_severity, + tt.priority, + ttracker_option.option_name(:package_id, 'priority', tt.priority) + as pretty_priority, + tt.subject, + to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, + tc.category_id, + tc.name as category, + tt.creation_user as creator_id, + acs_object.name(tt.creation_user) as creator_name, + wc.state, + 0 as assignee_id, + '' as assignee_name + $view_select from ttracker_categories tc, - ttracker_tickets tt, - wf_cases wc - $view_from + ttracker_tickets tt, + wf_cases wc + $view_from where tc.package_id = :package_id and - tt.category_id = tc.category_id and - wc.object_id = tt.ticket_id and - not exists (select wta1.task_id - from wf_task_assignments wta1 - where wta1.task_id = (select max(wt.task_id) - from wf_tasks wt - where wt.case_id = wc.case_id and - wt.transition_key = 'resolve')) - $view_where - [ad_dimensional_sql $dimensional] + tt.category_id = tc.category_id and + wc.object_id = tt.ticket_id and + not exists (select wta1.task_id + from wf_task_assignments wta1 + where wta1.task_id = (select max(wt.task_id) + from wf_tasks wt + where wt.case_id = wc.case_id and + wt.transition_key = 'resolve')) + $view_where + [ad_dimensional_sql $dimensional] [ad_order_by_from_sort_spec $orderby $table_def]" </querytext> @@ -95,65 +99,69 @@ select results.* from (select tt.ticket_id, - ttracker_option.option_name(:package_id, 'severity', tt.severity) - as pretty_severity, - ttracker_option.option_name(:package_id, 'priority', tt.priority) - as pretty_priority, - tt.subject, - to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, - tc.category_id, - tc.name as category, - tt.creation_user as creator_id, - acs_object.name(tt.creation_user) as creator_name, - wc.state, - wta.party_id as assignee_id, - acs_object.name(wta.party_id) as assignee_name - $view_select - from ttracker_categories tc, - ttracker_tickets tt, - wf_cases wc, - wf_task_assignments wta - $view_from - where tc.package_id = :package_id and - tt.category_id = tc.category_id and - wc.object_id = tt.ticket_id and - wta.task_id = (select max(wt.task_id) - from wf_tasks wt - where wt.case_id = wc.case_id and - wt.transition_key = 'resolve') - $view_where - [ad_dimensional_sql $dimensional] + tt.severity, + ttracker_option.option_name(:package_id, 'severity', tt.severity) + as pretty_severity, + tt.priority, + ttracker_option.option_name(:package_id, 'priority', tt.priority) + as pretty_priority, + tt.subject, + to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, + tc.category_id, + tc.name as category, + tt.creation_user as creator_id, + acs_object.name(tt.creation_user) as creator_name, + wc.state, + wta.party_id as assignee_id, + acs_object.name(wta.party_id) as assignee_name + $view_select + from ttracker_categories tc, + ttracker_tickets tt, + wf_cases wc, + wf_task_assignments wta + $view_from + where tc.package_id = :package_id and + tt.category_id = tc.category_id and + wc.object_id = tt.ticket_id and + wta.task_id = (select max(wt.task_id) + from wf_tasks wt + where wt.case_id = wc.case_id and + wt.transition_key = 'resolve') + $view_where + [ad_dimensional_sql $dimensional] union all select tt.ticket_id, - ttracker_option.option_name(:package_id, 'severity', tt.severity) - as pretty_severity, - ttracker_option.option_name(:package_id, 'priority', tt.priority) - as pretty_priority, - tt.subject, - to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, - tc.category_id, - tc.name as category, - tt.creation_user as creator_id, - acs_object.name(tt.creation_user) as creator_name, - wc.state, - 0 as assignee_id, - '' as assignee_name - $view_select - from ttracker_categories tc, - ttracker_tickets tt, - wf_cases wc - $view_from - where tc.package_id = :package_id and - tt.category_id = tc.category_id and - wc.object_id = tt.ticket_id and - not exists (select wta1.task_id - from wf_task_assignments wta1 - where wta1.task_id = (select max(wt.task_id) - from wf_tasks wt - where wt.case_id = wc.case_id and - wt.transition_key = 'resolve')) - $view_where - [ad_dimensional_sql $dimensional]) results + tt.severity, + ttracker_option.option_name(:package_id, 'severity', tt.severity) + as pretty_severity, + tt.priority, + ttracker_option.option_name(:package_id, 'priority', tt.priority) + as pretty_priority, + tt.subject, + to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, + tc.category_id, + tc.name as category, + tt.creation_user as creator_id, + acs_object.name(tt.creation_user) as creator_name, + wc.state, + 0 as assignee_id, + '' as assignee_name + $view_select + from ttracker_categories tc, + ttracker_tickets tt, + wf_cases wc + $view_from + where tc.package_id = :package_id and + tt.category_id = tc.category_id and + wc.object_id = tt.ticket_id and + not exists (select wta1.task_id + from wf_task_assignments wta1 + where wta1.task_id = (select max(wt.task_id) + from wf_tasks wt + where wt.case_id = wc.case_id and + wt.transition_key = 'resolve')) + $view_where + [ad_dimensional_sql $dimensional]) results [ad_order_by_from_sort_spec $orderby $table_def] </querytext> Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets-postgresql.xql 9 Jul 2001 15:42:52 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets-postgresql.xql 5 Jul 2002 04:44:49 -0000 1.3 @@ -5,44 +5,46 @@ <fullquery name="ticket_select_me"> <querytext> - + select tt.ticket_id, - ttracker_option__option_name(:package_id, 'severity', tt.severity) - as pretty_severity, - ttracker_option__option_name(:package_id, 'priority', tt.priority) - as pretty_priority, - tt.subject, - to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, - tc.category_id, - tc.name as category, - tt.creation_user as creator_id, - acs_object__name(tt.creation_user) as creator_name, - wc.state, - :user_id as assignee_id, - 'me' as assignee_name - $view_select + tt.severity, + ttracker_option__option_name(:package_id, 'severity', tt.severity) + as pretty_severity, + tt.priority, + ttracker_option__option_name(:package_id, 'priority', tt.priority) + as pretty_priority, + tt.subject, + to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, + tc.category_id, + tc.name as category, + tt.creation_user as creator_id, + acs_object__name(tt.creation_user) as creator_name, + wc.state, + :user_id as assignee_id, + 'me' as assignee_name + $view_select from ttracker_categories tc, - ttracker_tickets tt, - wf_cases wc - $view_from + ttracker_tickets tt, + wf_cases wc + $view_from where tc.package_id = :package_id and - tt.category_id = tc.category_id and - wc.object_id = tt.ticket_id and - exists (select wt.task_id - from wf_task_assignments wta, - wf_tasks wt, - party_approved_member_map m - where wt.transition_key = 'resolve' and - wt.task_id = wta.task_id and - wta.party_id = m.party_id and - m.member_id = :user_id and - wt.case_id = wc.case_id and - wt.task_id = (select max(wt1.task_id) - from wf_tasks wt1 - where wt1.case_id = wc.case_id and - wt1.transition_key = 'resolve')) - $view_where - [ad_dimensional_sql $dimensional] + tt.category_id = tc.category_id and + wc.object_id = tt.ticket_id and + exists (select wt.task_id + from wf_task_assignments wta, + wf_tasks wt, + party_approved_member_map m + where wt.transition_key = 'resolve' and + wt.task_id = wta.task_id and + wta.party_id = m.party_id and + m.member_id = :user_id and + wt.case_id = wc.case_id and + wt.task_id = (select max(wt1.task_id) + from wf_tasks wt1 + where wt1.case_id = wc.case_id and + wt1.transition_key = 'resolve')) + $view_where + [ad_dimensional_sql $dimensional] [ad_order_by_from_sort_spec $orderby $table_def] </querytext> @@ -52,37 +54,39 @@ <fullquery name="ticket_select_noass"> <querytext> - + select tt.ticket_id, - ttracker_option__option_name(:package_id, 'severity', tt.severity) - as pretty_severity, - ttracker_option__option_name(:package_id, 'priority', tt.priority) - as pretty_priority, - tt.subject, - to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, - tc.category_id, - tc.name as category, - tt.creation_user as creator_id, - acs_object__name(tt.creation_user) as creator_name, - wc.state, - 0 as assignee_id, - '' as assignee_name - $view_select + tt.severity, + ttracker_option__option_name(:package_id, 'severity', tt.severity) + as pretty_severity, + tt.priority, + ttracker_option__option_name(:package_id, 'priority', tt.priority) + as pretty_priority, + tt.subject, + to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, + tc.category_id, + tc.name as category, + tt.creation_user as creator_id, + acs_object__name(tt.creation_user) as creator_name, + wc.state, + 0 as assignee_id, + '' as assignee_name + $view_select from ttracker_categories tc, - ttracker_tickets tt, - wf_cases wc - $view_from + ttracker_tickets tt, + wf_cases wc + $view_from where tc.package_id = :package_id and - tt.category_id = tc.category_id and - wc.object_id = tt.ticket_id and - not exists (select wta1.task_id - from wf_task_assignments wta1 - where wta1.task_id = (select max(wt.task_id) - from wf_tasks wt - where wt.case_id = wc.case_id and - wt.transition_key = 'resolve')) - $view_where - [ad_dimensional_sql $dimensional] + tt.category_id = tc.category_id and + wc.object_id = tt.ticket_id and + not exists (select wta1.task_id + from wf_task_assignments wta1 + where wta1.task_id = (select max(wt.task_id) + from wf_tasks wt + where wt.case_id = wc.case_id and + wt.transition_key = 'resolve')) + $view_where + [ad_dimensional_sql $dimensional] [ad_order_by_from_sort_spec $orderby $table_def] </querytext> @@ -95,65 +99,69 @@ select results.* from (select tt.ticket_id, - ttracker_option__option_name(:package_id, 'severity', tt.severity) - as pretty_severity, - ttracker_option__option_name(:package_id, 'priority', tt.priority) - as pretty_priority, - tt.subject, - to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, - tc.category_id, - tc.name as category, - tt.creation_user as creator_id, - acs_object__name(tt.creation_user) as creator_name, - wc.state, - wta.party_id as assignee_id, - acs_object__name(wta.party_id) as assignee_name - $view_select - from ttracker_categories tc, - ttracker_tickets tt, - wf_cases wc, - wf_task_assignments wta - $view_from - where tc.package_id = :package_id and - tt.category_id = tc.category_id and - wc.object_id = tt.ticket_id and - wta.task_id = (select max(wt.task_id) - from wf_tasks wt - where wt.case_id = wc.case_id and - wt.transition_key = 'resolve') - $view_where - [ad_dimensional_sql $dimensional] + tt.severity, + ttracker_option__option_name(:package_id, 'severity', tt.severity) + as pretty_severity, + tt.priority, + ttracker_option__option_name(:package_id, 'priority', tt.priority) + as pretty_priority, + tt.subject, + to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, + tc.category_id, + tc.name as category, + tt.creation_user as creator_id, + acs_object__name(tt.creation_user) as creator_name, + wc.state, + wta.party_id as assignee_id, + acs_object__name(wta.party_id) as assignee_name + $view_select + from ttracker_categories tc, + ttracker_tickets tt, + wf_cases wc, + wf_task_assignments wta + $view_from + where tc.package_id = :package_id and + tt.category_id = tc.category_id and + wc.object_id = tt.ticket_id and + wta.task_id = (select max(wt.task_id) + from wf_tasks wt + where wt.case_id = wc.case_id and + wt.transition_key = 'resolve') + $view_where + [ad_dimensional_sql $dimensional] union all select tt.ticket_id, - ttracker_option__option_name(:package_id, 'severity', tt.severity) - as pretty_severity, - ttracker_option__option_name(:package_id, 'priority', tt.priority) - as pretty_priority, - tt.subject, - to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, - tc.category_id, - tc.name as category, - tt.creation_user as creator_id, - acs_object__name(tt.creation_user) as creator_name, - wc.state, - 0 as assignee_id, - '' as assignee_name - $view_select - from ttracker_categories tc, - ttracker_tickets tt, - wf_cases wc - $view_from - where tc.package_id = :package_id and - tt.category_id = tc.category_id and - wc.object_id = tt.ticket_id and - not exists (select wta1.task_id - from wf_task_assignments wta1 - where wta1.task_id = (select max(wt.task_id) - from wf_tasks wt - where wt.case_id = wc.case_id and - wt.transition_key = 'resolve')) - $view_where - [ad_dimensional_sql $dimensional]) results + tt.severity, + ttracker_option__option_name(:package_id, 'severity', tt.severity) + as pretty_severity, + tt.priority, + ttracker_option__option_name(:package_id, 'priority', tt.priority) + as pretty_priority, + tt.subject, + to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, + tc.category_id, + tc.name as category, + tt.creation_user as creator_id, + acs_object__name(tt.creation_user) as creator_name, + wc.state, + 0 as assignee_id, + '' as assignee_name + $view_select + from ttracker_categories tc, + ttracker_tickets tt, + wf_cases wc + $view_from + where tc.package_id = :package_id and + tt.category_id = tc.category_id and + wc.object_id = tt.ticket_id and + not exists (select wta1.task_id + from wf_task_assignments wta1 + where wta1.task_id = (select max(wt.task_id) + from wf_tasks wt + where wt.case_id = wc.case_id and + wt.transition_key = 'resolve')) + $view_where + [ad_dimensional_sql $dimensional]) results [ad_order_by_from_sort_spec $orderby $table_def] </querytext> Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.tcl 30 Aug 2001 19:34:39 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.tcl 5 Jul 2002 04:44:49 -0000 1.4 @@ -101,16 +101,16 @@ lappend table_def [list ticket_id "ID#" {} \ {<td align=center><a href="ticket-view?ticket_id=$ticket_id">$ticket_id</a></td>} ] lappend table_def [list category "$category_name" {} c ] -lappend table_def [list pretty_priority "Priority" {pretty_priority $order} c ] -lappend table_def [list pretty_severity "Severity" {pretty_severity $order} c ] +lappend table_def [list pretty_priority "Priority" {priority $order} c ] +lappend table_def [list pretty_severity "Severity" {severity $order} c ] lappend table_def [list state "Status" {} c ] lappend table_def [list subject "Subject" {} c ] # vinodk: kludge - since you can't order by alias names in postgres # have to order by item # -lappend table_def [list creator_id "Submitted by" {upper(9) $order} \ +lappend table_def [list creator_id "Submitted by" {upper(11) $order} \ {<td align=center><a href="/shared/community-member?user_id=$creator_id">$creator_name</a></td>} ] # vinodk: kludge again -lappend table_def [list assignee_id "Assigned to" {upper(12) $order} \ +lappend table_def [list assignee_id "Assigned to" {upper(14) $order} \ {<td align=center><a href="/shared/community-member?user_id=$assignee_id">$assignee_name</a></td>} ] lappend table_def [list created "Created" {created $order} c ]