Index: openacs-4/packages/tasks/www/contact.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/contact.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/tasks/www/contact.tcl 25 Sep 2005 23:49:23 -0000 1.2 +++ openacs-4/packages/tasks/www/contact.tcl 26 Sep 2005 08:20:06 -0000 1.3 @@ -32,193 +32,6 @@ } set user_id [ad_conn user_id] - -if { ![contact::exists_p -party_id $party_id] } { - set party_id $user_id -} -if { ![exists_and_not_null orderby] } { - set orderby "priority,desc" -} -if { ![exists_and_not_null status_id] } { - set status_id "1" -} -set done_url [export_vars -url -base "contact" {orderby {status_id 2} party_id}] -set not_done_url [export_vars -url -base "contact" {orderby {status_id 1} party_id}] -set return_url [export_vars -base [ad_conn url] -url {orderby status_id party_id}] -set add_url [export_vars -base task {return_url orderby status_id party_id}] -set add_event_url [export_vars -base "/calendar/cal-item-new" -url {return_url party_id}] - set package_id [ad_conn package_id] set admin_p [permission::permission_p -object_id $package_id -privilege admin] set context {} - - -template::list::create \ - -name tasks \ - -multirow tasks \ - -key task_id \ - -elements { - deleted_p { - label {[_ tasks.Not_Done]} - display_template { - [_ tasks.Done] - [_ tasks.Not_Done] - } - } - priority { - label "[_ tasks.Priority]" - display_template { - @tasks.priority@@tasks.priority@ - } - } - title { - label "[_ tasks.Task]" - display_template { - class="done">@tasks.title@ - -
-

- @tasks.description_html;noquote@ -

-
- - } - } - process_title { - label "[_ tasks.Process]" - display_template { - @tasks.process_title@ - - @tasks.process_title@ - - } - } - contact { - label "[_ tasks.Contact]" - display_template { - @tasks.contact@ - } - } - date { - label "[_ tasks.Date]" - display_template { - @tasks.completed_date;noquote@ - - - « @tasks.due_date;noquote@ » - - - } - } - creation_user { - label "[_ tasks.Created_By]" - display_template { - class="done">@tasks.creation_name@ - } - } - } \ - -sub_class { - narrow - } \ - -filters { - party_id {} - } -orderby { - default_value "priority,desc" - date { - label "[_ tasks.Due]" - orderby_desc "CASE WHEN t.status_id = 1 THEN t.due_date ELSE t.completed_date END desc, t.priority, lower(t.title)" - orderby_asc "CASE WHEN t.status_id = 1 THEN t.due_date ELSE t.completed_date END asc, t.priority, lower(t.title)" - default_direction desc - } - priority { - label "[_ tasks.Priority]" - orderby_desc "t.status_id, t.priority desc, CASE WHEN t.status_id = 1 THEN t.due_date ELSE t.completed_date END desc, lower(t.title)" - orderby_asc "t.status_id, t.priority asc, CASE WHEN t.status_id = 1 THEN t.due_date ELSE t.completed_date END asc, lower(t.title)" - default_direction desc - } - title { - label "[_ tasks.Task]" - orderby_desc "lower(t.title) desc, t.priority desc, t.due_date asc" - orderby_asc "lower(t.title) asc, t.priority desc, t.due_date asc" - default_direction asc - } - process_title { - label "[_ tasks.Process]" - orderby_desc "lower(p.title) desc, t.priority desc, t.due_date asc" - orderby_asc "lower(p.title) asc, t.priority desc, t.due_date asc" - default_direction asc - } - contact { - label "[_ tasks.Contact]" - orderby_desc "lower(contact__name(t.object_id)) desc, t.due_date asc, t.priority, lower(t.title)" - orderby_asc "lower(contact__name(t.object_id)) asc, t.due_date asc, t.priority, lower(t.title)" - default_direction asc - } - creation_user { - label "[_ tasks.Created_By]" - orderby_desc "lower(contact__name(ao.creation_user)) desc, t.due_date asc, t.priority, lower(t.title)" - orderby_asc "lower(contact__name(ao.creation_user)) asc, t.due_date asc, t.priority, lower(t.title)" - default_direction asc - } - } - - -db_multirow -extend {creation_user_url contact_url complete_url done_p process_plus_url process_minus_url task_plus_url task_minus_url description_html task_url} -unclobber tasks get_tasks " - select t.task_id, t.title, t.description, t.mime_type, t.priority, - t.party_id, p.title as process_title, p.process_id, - tasks__relative_date(t.due_date) as due_date, - tasks__relative_date(t.completed_date) as completed_date, - ao.creation_user, t.status_id, t.process_instance_id, - contact__name(ao.creation_user) as creation_name, - CASE WHEN t.due_date < now() THEN 't' ELSE 'f' END as due_date_passed_p, - s.title as status, t.object_id, - contact__name(t.object_id) as contact - from t_task_status s, acs_objects ao, t_tasks t - left outer join t_process_instances pi - on (pi.process_instance_id = t.process_instance_id) - left outer join t_processes p - on (p.process_id = pi.process_id) - where s.status_id = t.status_id - and ao.object_id = t.task_id - and ao.package_id = :package_id - and t.party_id = :party_id - and t.start_date < now() - [template::list::orderby_clause -orderby -name tasks] -" { - set creation_user_url [contact::url -party_id $creation_user] - if {![empty_string_p $object_id]} { - set contact_url [contact::url -party_id $object_id] - } - regsub -all "/tasks/" $creation_user_url "/contacts/" creation_user_url - set complete_url [export_vars -base "mark-completed" -url {task_id orderby party_id return_url}] - if { $status_id == "2" } { - set done_p 1 - } else { - set done_p 0 - } - set task_url [export_vars -base task -url {party_id orderby status_id task_id}] - set task_plus_url [export_vars -base task-interval -url {{action plus} {days 7} party_id task_id status_id orderby return_url}] - set task_minus_url [export_vars -base task-interval -url {{action minus} {days 7} party_id task_id status_id orderby return_url}] - set process_plus_url [export_vars -base process-interval -url {{action plus} {days 7} party_id process_instance status_id orderby return_url}] - set process_minus_url [export_vars -base process-interval -url {{action minus} {days 7} party_id process_instance status_id orderby return_url}] - - regsub -all "\r|\n" $description {LiNeBrEaK} description - - set description_html [ad_html_text_convert \ - -from $mime_type \ - -to "text/html" \ - -truncate_len "400" \ - -more "[_ tasks.more]" \ - -- $description] - regsub -all {LiNeBrEaKLiNeBrEaK} $description_html {LiNeBrEaK} description_html -# regsub -all {LiNeBrEaKLiNeBrEaK} $description_html {LiNeBrEaK} description_html -# regsub -all {LiNeBrEaKLiNeBrEaK} $description_html {LiNeBrEaK} description_html -# 167 is the actual paragraph standard internationally but 182 is more common in the US - regsub -all {LiNeBrEaK} $description_html {\ \ \¶\ } description_html - - regsub -all " " $due_date {\ } due_date - regsub -all " " $completed_date {\ } completed_date -} - -# [template::list::filter_where_clauses -and -name tasks] -#set fred [template::list::orderby_clause -orderby -name tasks]