Index: openacs-4/contrib/obsolete-packages/ticket-tracker/ticket-tracker.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/ticket-tracker.info,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/ticket-tracker/ticket-tracker.info 4 Jun 2001 16:53:27 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/ticket-tracker.info 12 Jun 2001 06:25:48 -0000 1.3 @@ -100,6 +100,8 @@ + + @@ -142,6 +144,8 @@ + + Index: openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-packages.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-packages.sql,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-packages.sql 4 Jun 2001 16:53:27 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-packages.sql 12 Jun 2001 06:25:48 -0000 1.3 @@ -523,7 +523,8 @@ apm_parameters ap where apv.package_id = notification_sender.package_id and ap.package_key = 'ticket-tracker' - and ap.parameter_name = 'NotificationSender'; + and ap.parameter_name = 'NotificationSender' + and ap.parameter_id = apv.parameter_id; value_rec value_cur%ROWTYPE; v_result parties.party_id%TYPE; begin Index: openacs-4/contrib/obsolete-packages/ticket-tracker/sql/postgresql/ticket-tracker-packages.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/sql/postgresql/ticket-tracker-packages.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/sql/postgresql/ticket-tracker-packages.sql 4 Jun 2001 16:53:27 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/sql/postgresql/ticket-tracker-packages.sql 12 Jun 2001 06:25:48 -0000 1.2 @@ -17,6 +17,7 @@ -- create or replace package body ttracker_ticket -- as +drop function ttracker_ticket__new (integer,varchar,integer,varchar,varchar,varchar,integer,integer,integer,timestamp,integer,varchar); create function ttracker_ticket__new (integer,varchar,integer,varchar,varchar,varchar,integer,integer,integer,timestamp,integer,varchar) returns integer as ' declare @@ -36,18 +37,26 @@ v_case_id wf_cases.case_id%TYPE; begin -- create a new acs-message to hold the contents of the ticket - - select acs_message__new ( +raise notice '' 1''; + v_ticket_id := acs_message__new ( p_ticket_id, -- message_id + null, -- reply_to + now(), -- sent_date + null, -- sender + null, -- rfc822_id p_subject, -- title - p_description, -- text + null, -- description p_mime_type, -- mime_type + p_description, -- text + null, -- data + 0, -- parent_id p_context_id, -- context_id - p_object_type, -- object_type - p_creation_date, -- creation_date p_creation_user, -- creation_user - p_creation_ip -- creation_ip - ) into v_ticket_id; + p_creation_ip, -- creation_ip + p_object_type, -- object_type + ''t'' -- is_live + ); +raise notice '' 2''; -- insert additional ticket info insert into ttracker_tickets @@ -67,17 +76,19 @@ p_severity, p_priority); +raise notice '' 3''; -- create a new case - select workflow_case__new ( + v_case_id := workflow_case__new ( null, -- case_id ''ttracker_wf'', -- workflow_key null, -- context_key v_ticket_id, -- object_id now(), -- creation_date p_creation_user, -- creation_user p_creation_ip -- creation_ip - ) into v_case_id; + ); +raise notice '' 4''; -- start the case perform workflow_case__start_case ( v_case_id, -- case_id @@ -86,6 +97,8 @@ null -- msg ); +raise notice '' 5''; + return v_ticket_id; end;' language 'plpgsql'; @@ -106,7 +119,7 @@ create function ttracker_ticket__name (integer) returns varchar as ' declare - p_ticker_id alias for $1; + p_ticket_id alias for $1; v_result ttracker_tickets.subject%TYPE; begin select subject into v_result @@ -338,6 +351,7 @@ -- create or replace package body ttracker_util -- as +drop function ttracker_util__notification_sender (integer); create function ttracker_util__notification_sender (integer) returns integer as ' declare @@ -349,12 +363,13 @@ from apm_parameter_values apv, apm_parameters ap where apv.package_id = p_package_id and ap.package_key = ''ticket-tracker'' - and ap.parameter_name = ''NotificationSender''; + and ap.parameter_name = ''NotificationSender'' + and ap.parameter_id = apv.parameter_id; if not found then v_result := -1; else - v_result := to_number(v_attr_value); + v_result := to_number(v_attr_value, ''999999999''); end if; return v_result; @@ -383,7 +398,7 @@ end if; -- if only relative url is needed - if absolute_p <> ''t'' then + if p_absolute_p <> ''t'' then return site_node__url(v_node_id); end if; @@ -612,7 +627,7 @@ begin select journal_entry__new ( null, -- journal_id - case_id, -- object_id + p_case_id, -- object_id ''modify'', -- action ''Attribute Change'', -- action_pretty now(), -- creation_date @@ -630,6 +645,7 @@ return 0; end;' language 'plpgsql'; +drop function ttracker_callback__notification (integer,varchar,integer,integer,varchar,varchar); create function ttracker_callback__notification (integer,varchar,integer,integer,varchar,varchar) returns integer as ' declare @@ -643,6 +659,8 @@ v_ticket_id ttracker_tickets.ticket_id%TYPE; v_subject ttracker_tickets.subject%TYPE; v_package_id ttracker_categories.package_id%TYPE; + v_party_from integer; -- FIXME (kludge for inout param) + v_body varchar; -- FIXME (kludge for inout param) begin select tt.ticket_id, tt.subject, tc.package_id into v_ticket_id, v_subject, v_package_id @@ -657,10 +675,10 @@ raise exception ''Invalid task id''; end if; - select ttracker_util__notification_sender(v_package_id) into p_party_from; + select ttracker_util__notification_sender(v_package_id) into v_party_from; v_subject := ''Ticket #'' || v_ticket_id || '' -- '' || p_custom_arg; - p_body := ''Subject: '' || v_subject || '' + v_body := ''Subject: '' || v_subject || '' '' || ''To do: '' || p_custom_arg || '' '' || ''Manage via: '' || ttracker_util__workflow_url(''t'') || ''task?task_id='' || p_task_id; Index: openacs-4/contrib/obsolete-packages/ticket-tracker/sql/postgresql/ttracker-workflow-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/sql/postgresql/ttracker-workflow-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/sql/postgresql/ttracker-workflow-create.sql 4 Jun 2001 16:53:27 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/sql/postgresql/ttracker-workflow-create.sql 12 Jun 2001 06:25:49 -0000 1.2 @@ -110,7 +110,7 @@ 'resolve', -- transition_key 'to_be_clarified', -- place_key 'out', -- direction - 'wf_callback.guard_attribute_true', -- guard_callback + 'wf_callback__guard_attribute_true', -- guard_callback 'need_clarification', -- guard_custom_arg 'Description needs clarification' -- guard_description ); @@ -143,7 +143,7 @@ 'verify', -- transition_key 'end', -- place_key 'out', -- direction - 'wf_callback.guard_attribute_true', -- guard_callback + 'wf_callback__guard_attribute_true', -- guard_callback 'verified', -- guard_custom_arg 'Result okay' -- guard_description ); Index: openacs-4/contrib/obsolete-packages/ticket-tracker/tcl/ttracker-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/tcl/ttracker-procs-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/tcl/ttracker-procs-oracle.xql 4 Jun 2001 16:53:27 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/tcl/ttracker-procs-oracle.xql 12 Jun 2001 06:25:49 -0000 1.2 @@ -3,12 +3,12 @@ oracle8.1.6 - - - - select decode(ttracker_ticket.id_valid_p(:value, :package_id), 't', 1, 0) as id_valid_p from dual - - + + + +select decode(ttracker_ticket.id_valid_p(:value, :package_id), 't', 1, 0) as id_valid_p from dual + + Index: openacs-4/contrib/obsolete-packages/ticket-tracker/tcl/ttracker-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/tcl/ttracker-procs-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/tcl/ttracker-procs-postgresql.xql 4 Jun 2001 16:53:27 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/tcl/ttracker-procs-postgresql.xql 12 Jun 2001 06:25:49 -0000 1.2 @@ -3,12 +3,12 @@ postgresql7.1 - + select case when ttracker_ticket__id_valid_p(:value, :package_id) = 't' then 1 else 0 end as id_valid_p - + Index: openacs-4/contrib/obsolete-packages/ticket-tracker/tcl/ttracker-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/tcl/ttracker-procs.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/tcl/ttracker-procs.xql 4 Jun 2001 16:53:27 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/tcl/ttracker-procs.xql 12 Jun 2001 06:25:49 -0000 1.2 @@ -1,34 +1,34 @@ - - - - select case when count(option_id) = 0 then 0 else 1 end as id_valid_p - from ttracker_options - where option_id = :value - and package_id = :package_id + + + +select count(option_id) as id_valid_p + from ttracker_options + where option_id = :value and + package_id = :package_id - + - - - + + + - select case when count(wt.task_id) = 0 then 0 else 1 end as id_valid_p - from wf_tasks wt - where exists (select wc.case_id - from wf_cases wc, - ttracker_tickets tt, - ttracker_categories tc - where wt.case_id = wc.case_id - and wc.object_id = tt.ticket_id - and tt.category_id = tc.category_id - and tc.package_id = :package_id) - and wt.task_id = :value +select count(wt.task_id) as id_valid_p + from wf_tasks wt + where exists (select wc.case_id + from wf_cases wc, + ttracker_tickets tt, + ttracker_categories tc + where wt.case_id = wc.case_id + and wc.object_id = tt.ticket_id + and tt.category_id = tc.category_id + and tc.package_id = :package_id) + and wt.task_id = :value - + Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-oracle.xql 4 Jun 2001 16:53:27 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-oracle.xql 12 Jun 2001 06:25:49 -0000 1.2 @@ -15,5 +15,60 @@ + + + + + +select 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.ticket_id, + tt.subject, + to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, + c.state, + tt.creation_user as creator_id, + acs_object.name(tt.creation_user) as creator_name + from wf_cases c, + ttracker_tickets tt + where tt.category_id = :category_id and + c.object_id = tt.ticket_id + [ad_dimensional_sql $dimensional] + [ad_order_by_from_sort_spec $orderby $table_def] + + + + + + + + +tt.creation_date + 1 > sysdate + + + + + + + + + +tt.creation_date + 7 > sysdate + + + + + + + + + +tt.creation_date + 30 > sysdate + + + + + Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-postgresql.xql 4 Jun 2001 16:53:27 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-postgresql.xql 12 Jun 2001 06:25:49 -0000 1.2 @@ -15,5 +15,60 @@ + + + + + +select 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.ticket_id, + tt.subject, + to_char(tt.creation_date, 'MM/DD/YYYY HH24:MI') as created, + c.state, + tt.creation_user as creator_id, + acs_object__name(tt.creation_user) as creator_name + from wf_cases c, + ttracker_tickets tt + where tt.category_id = :category_id and + c.object_id = tt.ticket_id + [ad_dimensional_sql $dimensional] + [ad_order_by_from_sort_spec $orderby $table_def] + + + + + + + + +tt.creation_date + '1 days'::interval > now() + + + + + + + + + +tt.creation_date + '7 days'::interval > now() + + + + + + + + + +tt.creation_date + '30 days'::interval > now() + + + + + Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-summary-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-summary-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-summary-oracle.xql 12 Jun 2001 06:25:49 -0000 1.1 @@ -0,0 +1,73 @@ + + + + oracle8.1.6 + + + + +select * from + (select tc.category_id, + tc.name as category, + count(tt.ticket_id) as total, + sum(decode(lower(state),'active',1,0)) as active, + sum(decode(lower(state),'suspended',1,0)) as suspended, + sum(decode(lower(state),'canceled',1,0)) as canceled, + sum(decode(lower(state),'finished',1,0)) as finished + from ttracker_categories tc, ttracker_tickets tt, wf_cases wfc + where tc.package_id = :package_id and + tt.category_id = tc.category_id and + tt.ticket_id = wfc.object_id + [ad_dimensional_sql $dimensional] + group by tc.category_id, tc.name + union all + select tc1.category_id, + tc1.name as category, + 0 as total, + 0 as active, + 0 as suspended, + 0 as canceled, + 0 as finished + from ttracker_categories tc1 + where tc1.package_id = :package_id and + not exists (select tt1.ticket_id + from ttracker_tickets tt1 + where tt1.category_id = tc1.category_id + [ad_dimensional_sql $dimensional])) +[ad_order_by_from_sort_spec $orderby $table_def] + + + + + + + + + +creation_date + 365 > sysdate + + + + + + + + + +creation_date + 90 > sysdate + + + + + + + + + +creation_date + 30 > sysdate + + + + + + Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-summary-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-summary-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-summary-postgresql.xql 12 Jun 2001 06:25:49 -0000 1.1 @@ -0,0 +1,73 @@ + + + + postgresql7.1 + + + + +select * from + (select tc.category_id, + tc.name as category, + count(tt.ticket_id) as total, + sum(case when lower(state)='active' then 1 else 0 end) as active, + sum(case when lower(state)='suspended' then 1 else 0 end) as suspended, + sum(case when lower(state)='canceled' then 1 else 0 end) as canceled, + sum(case when lower(state)='finished' then 1 else 0 end) as finished + from ttracker_categories tc, ttracker_tickets tt, wf_cases wfc + where tc.package_id = :package_id and + tt.category_id = tc.category_id and + tt.ticket_id = wfc.object_id + [ad_dimensional_sql $dimensional] + group by tc.category_id, tc.name + union all + select tc1.category_id, + tc1.name as category, + 0 as total, + 0 as active, + 0 as suspended, + 0 as canceled, + 0 as finished + from ttracker_categories tc1 + where tc1.package_id = :package_id and + not exists (select tt1.ticket_id + from ttracker_tickets tt1 + where tt1.category_id = tc1.category_id + [ad_dimensional_sql $dimensional])) as tasks +[ad_order_by_from_sort_spec $orderby $table_def] + + + + + + + + + +creation_date + '365 days'::interval > now() + + + + + + + + + +creation_date + '90 days'::interval > now() + + + + + + + + + +creation_date + '30 days'::interval > now() + + + + + + Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-summary.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-summary.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-summary.tcl 20 Apr 2001 20:51:25 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/category-summary.tcl 12 Jun 2001 06:25:49 -0000 1.2 @@ -23,9 +23,9 @@ # dimensional slider definition set dimensional { {posted "In the last" any { - {year "year" { where "creation_date + 365 > sysdate" }} - {3month "3 months" { where "creation_date + 90 > sysdate" }} - {month "month" { where "creation_date + 30 > sysdate" }} + {year "year" { where "[db_map last_1_year]" }} + {3month "3 months" { where "[db_map last_3_months]" }} + {month "month" { where "[db_map last_1_month]" }} {any "all" {}} }} } Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/category.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/category.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/category.tcl 20 Apr 2001 20:51:25 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/category.tcl 12 Jun 2001 06:25:49 -0000 1.2 @@ -41,9 +41,9 @@ # dimensional slider definition set dimensional { {created "Creation Time" any { - {1d "last 24hrs" {where "tt.creation_date + 1 > sysdate"}} - {1w "last week" {where "tt.creation_date + 7 > sysdate"}} - {1m "last month" {where "tt.creation_date + 30 > sysdate"}} + {1d "last 24hrs" {where "[db_map last_1_day]"}} + {1w "last week" {where "[db_map last_7_days]"}} + {1m "last month" {where "[db_map last_30_days]"}} {any "all" {}} }} } @@ -88,8 +88,3 @@ tasks_select $sql $table_def] ad_return_template - - - - - Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/index.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/index.tcl 20 Apr 2001 20:51:25 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/index.tcl 12 Jun 2001 06:25:49 -0000 1.2 @@ -61,7 +61,7 @@ lappend table_def [list pretty_severity "Severity" {severity $order} c ] lappend table_def [list subject "Subject" {} c ] lappend table_def [list created "Created" {creation_date $order} c ] -lappend table_def [list to_do "To do" {} \ +lappend table_def [list task_id "To do" {} \ {$to_do} ] Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-add-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-add-2-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-add-2-postgresql.xql 4 Jun 2001 16:53:27 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-add-2-postgresql.xql 12 Jun 2001 06:25:49 -0000 1.2 @@ -9,7 +9,7 @@ declare v_ticket_id acs_objects.object_id%TYPE; begin - select ttracker_ticket__new ( + v_ticket_id := ttracker_ticket__new ( null, -- ticket_id 'ttracker_ticket', -- object_type :package_id, -- context_id @@ -22,14 +22,15 @@ now(), -- creation_date :user_id, -- creation_user :creation_ip -- creation_ip - ) into v_ticket_id; + ); perform acs_permission__grant_permission( v_ticket_id, -- object_id :user_id, -- grantee_id 'write' -- privilege ); + return 0; end; Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-view.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-view.tcl 20 Apr 2001 20:51:25 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-view.tcl 12 Jun 2001 06:25:49 -0000 1.2 @@ -26,7 +26,10 @@ set package_id [ad_conn package_id] set category_name [ad_parameter CategoryName "ticket-tracker" "Category"] set context_bar [list "Ticket #$ticket_id"] -set option_bar [general_comments_create_link -object_name "Ticket #$ticket_id" \ +# get the comments from general comments +#FIXME need general-comments +set option_bar "Need General Comments" +#set option_bar [general_comments_create_link -object_name "Ticket #$ticket_id" \ "$ticket_id" "[ad_conn package_url]ticket-view?ticket_id=$ticket_id"] # get permission info @@ -97,7 +100,9 @@ } # get the comments from general comments -set comments [general_comments_get_comments "$ticket_id" "[ad_conn package_url]ticket-view?ticket_id=$ticket_id"] +#FIXME need general-comments +set comments "Need General Comments" +#set comments [general_comments_get_comments "$ticket_id" "[ad_conn package_url]ticket-view?ticket_id=$ticket_id"] ad_return_template 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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets-oracle.xql 12 Jun 2001 06:25:49 -0000 1.1 @@ -0,0 +1,201 @@ + + + + oracle8.1.6 + + + + +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 + 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 + 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] + + + + + + + + + +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] + [ad_order_by_from_sort_spec $orderby $table_def]" + + + + + + + + + +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] + 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 +[ad_order_by_from_sort_spec $orderby $table_def] + + + + + + + + + +tt.creation_date + 1 > sysdate + + + + + + + + + +tt.creation_date + 7 > sysdate + + + + + + + + + +tt.creation_date + 30 > sysdate + + + + + + + + +and cr.revision_id = content_item.get_live_revision(tt.ticket_id) + + + + + 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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets-postgresql.xql 12 Jun 2001 06:25:49 -0000 1.1 @@ -0,0 +1,201 @@ + + + + postgresql7.1 + + + + +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 + 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 + 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] + + + + + + + + + +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] + [ad_order_by_from_sort_spec $orderby $table_def] + + + + + + + + + +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] + 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')) as tasks + $view_where + [ad_dimensional_sql $dimensional]) results +[ad_order_by_from_sort_spec $orderby $table_def] + + + + + + + + + +tt.creation_date + '1 days'::interval > now() + + + + + + + + + +tt.creation_date + '7 days'::interval > now() + + + + + + + + + +tt.creation_date + '30 days'::interval > now() + + + + + + + + +and cr.revision_id = content_item__get_live_revision(tt.ticket_id) + + + + + Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.adp,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.adp 20 Apr 2001 20:51:25 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.adp 12 Jun 2001 06:25:49 -0000 1.2 @@ -50,7 +50,7 @@ @tickets.content@
    - <%= [general_comments_get_comments -print_content_p 1 "@tickets.ticket_id@" ""] %> + @tickets.comments@
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.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.tcl 20 Apr 2001 20:51:25 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.tcl 12 Jun 2001 06:25:49 -0000 1.2 @@ -31,7 +31,7 @@ # dimensional slider definition set dimensional { {submitby "Submitted by" any { - {me "me" {where "tt.creation_user = $user_id"}} + {me "me" {where "[db_map creation_user]"}} {any "anyone" {}} }} {assign "Assigned to" me { @@ -40,17 +40,17 @@ {noass "unassigned" {}} }} {state "Status" any { - {created "created" {where "wc.state = 'created'"}} - {active "active" {where "wc.state = 'active'"}} - {suspended "suspended" {where "wc.state = 'suspended'"}} - {canceled "canceled" {where "wc.state = 'canceled'"}} - {finished "finished" {where "wc.state = 'finished'"}} + {created "created" {where "[db_map status_created]"}} + {active "active" {where "[db_map status_active]"}} + {suspended "suspended" {where "[db_map status_suspended]"}} + {canceled "canceled" {where "[db_map status_canceled]"}} + {finished "finished" {where "[db_map status_finished]"}} {any "all" {}} }} {created "Creation Time" any { - {1d "last 24hrs" {where "tt.creation_date + 1 > sysdate"}} - {1w "last week" {where "tt.creation_date + 7 > sysdate"}} - {1m "last month" {where "tt.creation_date + 30 > sysdate"}} + {1d "last 24hrs" {where "[db_map last_1_day]"}} + {1w "last week" {where "[db_map last_7_days]"}} + {1m "last month" {where "[db_map last_30_days]"}} {any "all" {}} }} } @@ -73,7 +73,7 @@ # dynamically generating the dimensional list for severity options set severity_slider [list severity "Severity" any] set severity_list [list] -db_foreach get_priorities { +db_foreach get_severities { select name, value from ttracker_options @@ -101,15 +101,18 @@ lappend table_def [list ticket_id "ID#" {} \ {$ticket_id} ] lappend table_def [list category "$category_name" {} 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 pretty_priority "Priority" {pretty_priority $order} c ] +lappend table_def [list pretty_severity "Severity" {pretty_severity $order} c ] lappend table_def [list state "Status" {} c ] lappend table_def [list subject "Subject" {} c ] -lappend table_def [list creator_id "Submitted by" {upper(creator_name) $order} \ +# 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} \ {$creator_name} ] -lappend table_def [list assignee_id "Assigned to" {upper(assignee_name) $order} \ +# vinodk: kludge again +lappend table_def [list assignee_id "Assigned to" {upper(12) $order} \ {$assignee_name} ] -lappend table_def [list created "Created" {creation_date $order} c ] +lappend table_def [list created "Created" {created $order} c ] # sql to retrieve selected tickets @@ -120,150 +123,43 @@ if [string equal $view "full"] { set view_select ", cr.mime_type, cr.content" set view_from ", cr_revisions cr " - set view_where "and cr.revision_id = content_item.get_live_revision(tt.ticket_id) " + set view_where "[db_map live_revision]" } # this is the ugly part # 3 different queries for 3 different assignee types + +# openacs change - vinodk +# old code conditionally assigned huge query to var 'sql' +# and then ran the query sql (after the if statement) +# +# I've moved those queries to .xql files with different statement names +# I then conditionally assignthe var 'statement_name' to the +# appropriate statement name from the .xql file + +set sql "" set dimensional [lreplace $dimensional 1 1] if {[string equal $assign "me"]} { + set statement_name ticket_select_me + # this query is specifically for tickets assigned to the user # the "exists" clause asks if there's any 'resolved' tasks assigned to the user - set sql "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 - 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 - 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]" } elseif {[string equal $assign "noass"]} { + set statement_name ticket_select_noass + # the "not exists" clause specifies that there must be no assignees # assigned to the "resolve" task for this case # the reason to use "max" is that we want to find the most recent task # there might be many tasks associated with a case - set sql "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] - [ad_order_by_from_sort_spec $orderby $table_def]" } else { + set statement_name ticket_select_all + # the first query is for tickets with assignees # the second one is for tickets with no assignees # the reason to use "union all" is for performance issue - # tried to compress them into one query using outer join with a view, but it's too slow - set sql " - 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] - 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 - [ad_order_by_from_sort_spec $orderby $table_def]" + # tried to compress them into one query using outer join + # with a view, but it's too slow } # ad_table manipulating code @@ -276,7 +172,7 @@ [if {![ad_table_same creator_id]} { ad_table_span [subst {Submitted by: $creator_name}] {bgcolor=cccccc} }] - } + } } assignee_id { lappend remove_column assignee_id @@ -300,7 +196,8 @@ } # set which columns we really want to be displayed -set all_columns {line_number ticket_id category pretty_priority pretty_severity state subject creator_id assignee_id created} +set all_columns {line_number ticket_id category pretty_priority pretty_severity \ + state subject creator_id assignee_id created} set col [list] foreach acol $all_columns { if {[lsearch -exact $remove_column $acol] < 0} { @@ -320,7 +217,7 @@ -Tmissing_text {No tickets available.} \ -Ttable_extra_html "width=100%" \ -bind $bind_ns_set \ - ticket_select $sql $table_def] + $statement_name $sql $table_def] } else { set ticket_table [ad_table -Torderby $orderby \ -Taudit {ticket_id} \ @@ -329,7 +226,7 @@ -Tmissing_text {No tickets available.} \ -Ttable_extra_html "width=100%" \ -bind $bind_ns_set \ - ticket_select $sql $table_def] + $statement_name $sql $table_def] } } @@ -339,11 +236,11 @@ set assignees "" set i 1 # create a custom datasource for easier processing in the template page - template::multirow create tickets ticket_id pretty_severity pretty_priority subject created \ - category_id category creator_id creator_name state assignee_id assignee_name content \ - assignee_list + template::multirow create tickets ticket_id pretty_severity pretty_priority \ + subject created category_id category creator_id creator_name state \ + assignee_id assignee_name content assignee_list comments - db_foreach ticket $sql { + db_foreach $statement_name $sql { # add a row in the datasource for new tickets # if we sorted by assignee_id, then always create a new row if { $old_ticket_id != $ticket_id || [ad_sort_primary_key $orderby] == "assignee_id"} { @@ -355,26 +252,33 @@ incr i } - template::multirow append tickets $ticket_id $pretty_severity $pretty_priority $subject \ - $created $category_id $category $creator_id $creator_name $state $assignee_id \ - $assignee_name + template::multirow append tickets $ticket_id $pretty_severity \ + $pretty_priority $subject $created $category_id $category \ + $creator_id $creator_name $state $assignee_id $assignee_name - # quote the content if it's plain text - if [string equal $view "full"] { - if [string equal $mime_type "text/plain"] { - template::multirow set tickets $i content [ad_quotehtml $content] - } else { - template::multirow set tickets $i content $content - } - } + # quote the content if it's plain text + if [string equal $view "full"] { + if [string equal $mime_type "text/plain"] { + template::multirow set tickets $i content \ + [ad_quotehtml $content] + } else { + template::multirow set tickets $i content $content + } + + # full view also shows comments + # FIXME requires general-comments + #template::multirow set tickets $i comments \ + # [general_comments_get_comments -print_content_p 1 $ticket_id ""] + template::multirow set tickets $i comments "FIXME - general-comments" + } if { ![empty_string_p $assignee_name] } { set assignees "$assignee_name" } else { set assignees "" } - # accumulate the assignee_name otherwise + # accumulate the assignee_name otherwise } else { append assignees ", $assignee_name" } Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.xql 4 Jun 2001 16:53:27 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.xql 12 Jun 2001 06:25:49 -0000 1.2 @@ -1,30 +1,91 @@ - - + + - select name, - value - from ttracker_options - where package_id = :package_id - and function = 'priority' +select name, + value + from ttracker_options + where package_id = :package_id and + function = 'priority' - + - - + + + - select name, - value - from ttracker_options - where package_id = :package_id - and function = 'priority' +select name, + value + from ttracker_options + where package_id = :package_id and + function = 'severity' - + + + + + + +tt.creation_user = $user_id + + + + + + + + + +wc.state = 'created' + + + + + + + + + +wc.state = 'active' + + + + + + + + + +wc.state = 'suspended' + + + + + + + + + +wc.state = 'canceled' + + + + + + + + + +wc.state = 'finished' + + + + Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/user-assign-summary.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/user-assign-summary.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/user-assign-summary.tcl 4 Jun 2001 16:53:27 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/user-assign-summary.tcl 12 Jun 2001 06:25:49 -0000 1.3 @@ -34,7 +34,7 @@ # this is the table defn we'll feed to ad_table set table_def [list] -lappend table_def [list party_name "Party" {upper(party_name) $order} \ +lappend table_def [list party_name "Party" {upper(2) $order} \ {$party_name} ] lappend table_def [list total "Total" {} c ] lappend table_def [list active "Active" {} c ] Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/user-summary-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/user-summary-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/user-summary-postgresql.xql 4 Jun 2001 16:53:27 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/user-summary-postgresql.xql 12 Jun 2001 06:25:49 -0000 1.2 @@ -1,7 +1,7 @@ - oracle8.1.6 + postgresql7.1 Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/user-summary.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/user-summary.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/user-summary.tcl 4 Jun 2001 16:53:27 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/user-summary.tcl 12 Jun 2001 06:25:49 -0000 1.3 @@ -34,7 +34,7 @@ # this is the table defn we'll feed to ad_table set table_def [list] -lappend table_def [list user_id "User" {upper(user_name) $order} \ +lappend table_def [list user_id "User" {upper(2) $order} \ {$user_name} ] lappend table_def [list active "Active" {} c ] lappend table_def [list suspended "Suspended" {} c ]