|
- |
-
+
#tasks.Assign_Process#
++ +
+
![[_ tasks.Not_Done]](/resources/acs-subsite/checkboxchecked.gif){kind=small}
}
@@ -186,17 +365,17 @@
}
}
- contact_name {
+ object_name {
label "[_ tasks.Contact]"
- link_url_eval $contact_url
+ link_url_eval $object_url
}
date {
label "[_ tasks.Date]"
display_template {
$limitations_clause" + +ad_return_template Index: openacs-4/packages/tasks/sql/postgresql/tasks-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/sql/postgresql/tasks-create.sql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/tasks/sql/postgresql/tasks-create.sql 26 Oct 2005 18:54:29 -0000 1.6 +++ openacs-4/packages/tasks/sql/postgresql/tasks-create.sql 1 Mar 2006 13:49:15 -0000 1.7 @@ -18,6 +18,8 @@ workflow_id integer constraint t_process_workflow_fk references workflows + -- the user assigned to this process + assignee_id integer ); create table t_process_instances ( @@ -30,9 +32,6 @@ constraint t_process_instances_process_fk references t_processes, case_id integer, - party_id integer - constraint t_process_instances_party_fk - references parties, object_id integer constraint t_process_instances_tasks_object_fk references acs_objects @@ -76,9 +75,6 @@ closing_action_id integer constraint t_process_tasks_close_action_fk references workflow_actions, - party_id integer - constraint t_process_tasks_party_fk - references parties, object_id integer constraint t_process_tasks_object_fk references acs_objects, @@ -110,16 +106,7 @@ process_task_id integer constraint t_tasks_process_task_fk references t_process_tasks, - -- The party_id is the party whom this task is associated with (e.g. the contact) - party_id integer - constraint t_tasks_party_fk - references parties, - -- The object_id of the Object that triggered this task. If you created an offer - -- and want to have a reminder to phone, the party_id would be the recipient of the offer - -- the object_id would be the offer_id and the creation_user (assignee who is doing the job) - -- would be yourself. - -- As we are very bad in design we realized too late that it might make sense to change the - -- assignee at a later stage, we now modify the creation_user for this. + -- the object_id this tasks is applied to (such as a person, organization, page, etc.) object_id integer constraint t_tasks_object_fk references acs_objects, @@ -135,6 +122,7 @@ start_date timestamptz, due_date timestamptz, completed_date timestamptz, + -- the user assigned to this task assignee_id integer ); @@ -233,111 +221,33 @@ ELSE to_char(p_date,''Mon DD (Dy)'') END ELSE to_char(p_date,''Mon DD, YYYY'') END; - return v_date; end;' language 'plpgsql'; -create or replace function tasks__completion_date ( - integer -) returns timestamptz -as ' -declare - p_task_id alias for $1; - v_complete_p boolean; - v_date varchar; - v_previous_p boolean; - revision record; -begin - v_complete_p := ''1'' from pm_tasks where task_id = p_task_id and status = ''2''; - v_date := NULL; - - IF v_complete_p THEN - v_previous_p := ''t''; - FOR revision IN - select ptr.percent_complete, ao.creation_date - from cr_revisions cr, pm_tasks_revisions ptr, acs_objects ao - where cr.item_id = p_task_id - and cr.revision_id = ao.object_id - and cr.revision_id = ptr.task_revision_id - order by ao.creation_date desc - LOOP - IF revision.percent_complete = ''100'' AND v_previous_p THEN - v_date := revision.creation_date; - ELSE - v_previous_p := ''f''; - EXIT; - END IF; - END LOOP; - - END IF; - - return v_date; -end;' language 'plpgsql'; - - -create or replace function tasks__completion_user ( - integer -) returns integer -as ' -declare - p_task_id alias for $1; - v_complete_p boolean; - v_user varchar; - v_previous_p boolean; - revision record; -begin - v_complete_p := ''1'' from pm_tasks where task_id = p_task_id and status = ''2''; - v_user := NULL; - - IF v_complete_p THEN - v_previous_p := ''t''; - FOR revision IN - select ptr.percent_complete, ao.creation_user - from cr_revisions cr, pm_tasks_revisions ptr, acs_objects ao - where cr.item_id = p_task_id - and cr.revision_id = ao.object_id - and cr.revision_id = ptr.task_revision_id - order by ao.creation_date desc - LOOP - IF revision.percent_complete = ''100'' AND v_previous_p THEN - v_user := revision.creation_user; - ELSE - v_previous_p := ''f''; - EXIT; - END IF; - END LOOP; - - END IF; - - return v_user; -end;' language 'plpgsql'; - - ----------------------------- -select define_function_args('tasks_task__new','task_id,process_instance_id,process_task_id,party_id,object_id,title,description,mime_type,comment,status_id,priority,start_date,due_date,package_id,creation_user,creation_ip,context_id,assignee_id'); +select define_function_args('tasks_task__new','task_id,process_instance_id,process_task_id,object_id,title,description,mime_type,comment,status_id,priority,start_date,due_date,package_id,creation_user,creation_ip,context_id,assignee_id'); -create or replace function tasks_task__new (integer,integer,integer,integer,integer,varchar,text,varchar,text,integer,integer,timestamptz,timestamptz,integer,integer,varchar,integer,integer) +create or replace function tasks_task__new (integer,integer,integer,integer,varchar,text,varchar,text,integer,integer,timestamptz,timestamptz,integer,integer,varchar,integer,integer) returns integer as ' declare p_task_id alias for $1; p_process_instance_id alias for $2; p_process_task_id alias for $3; - p_party_id alias for $4; - p_object_id alias for $5; - p_title alias for $6; - p_description alias for $7; - p_mime_type alias for $8; - p_comment alias for $9; - p_status_id alias for $10; - p_priority alias for $11; - p_start_date alias for $12; - p_due_date alias for $13; - p_package_id alias for $14; - p_creation_user alias for $15; - p_creation_ip alias for $16; - p_context_id alias for $17; - p_assignee_id alias for $18; + p_object_id alias for $4; + p_title alias for $5; + p_description alias for $6; + p_mime_type alias for $7; + p_comment alias for $8; + p_status_id alias for $9; + p_priority alias for $10; + p_start_date alias for $11; + p_due_date alias for $12; + p_package_id alias for $13; + p_creation_user alias for $14; + p_creation_ip alias for $15; + p_context_id alias for $16; + p_assignee_id alias for $17; v_task_id integer; v_start_date timestamptz; begin @@ -360,11 +270,11 @@ end if; insert into t_tasks - (task_id, process_instance_id, process_task_id, party_id, object_id, + (task_id, process_instance_id, process_task_id, object_id, title, description, mime_type, comment, status_id, priority, start_date, due_date, assignee_id) values - (v_task_id, p_process_instance_id, p_process_task_id, p_party_id, + (v_task_id, p_process_instance_id, p_process_task_id, p_object_id, p_title, p_description, p_mime_type, p_comment, p_status_id, p_priority, v_start_date, p_due_date, p_assignee_id); @@ -373,30 +283,29 @@ ' language 'plpgsql'; -select define_function_args('tasks_process_task__new','task_id,process_id,open_action_id,closing_action_id,party_id,object_id,title,description,mime_type,comment,status_id,priority,start,due,package_id,creation_user,creation_ip,context_id,assignee_id'); +select define_function_args('tasks_process_task__new','task_id,process_id,open_action_id,closing_action_id,object_id,title,description,mime_type,comment,status_id,priority,start,due,package_id,creation_user,creation_ip,context_id,assignee_id'); -create or replace function tasks_process_task__new (integer,integer,integer,integer,integer,integer,varchar,text,varchar,text,integer,integer,numeric,numeric,integer,integer,varchar,integer,integer) +create or replace function tasks_process_task__new (integer,integer,integer,integer,integer,varchar,text,varchar,text,integer,integer,numeric,numeric,integer,integer,varchar,integer,integer) returns integer as ' declare p_task_id alias for $1; p_process_id alias for $2; p_open_action_id alias for $3; p_closing_action_id alias for $4; - p_party_id alias for $5; - p_object_id alias for $6; - p_title alias for $7; - p_description alias for $8; - p_mime_type alias for $9; - p_comment alias for $10; - p_status_id alias for $11; - p_priority alias for $12; - p_start alias for $13; - p_due alias for $14; - p_package_id alias for $15; - p_creation_user alias for $16; - p_creation_ip alias for $17; - p_context_id alias for $18; - p_assignee_id alias for $19; + p_object_id alias for $5; + p_title alias for $6; + p_description alias for $7; + p_mime_type alias for $8; + p_comment alias for $9; + p_status_id alias for $10; + p_priority alias for $11; + p_start alias for $12; + p_due alias for $13; + p_package_id alias for $14; + p_creation_user alias for $15; + p_creation_ip alias for $16; + p_context_id alias for $17; + p_assignee_id alias for $18; v_task_id integer; begin v_task_id:= acs_object__new( @@ -412,33 +321,34 @@ ); insert into t_process_tasks - (task_id, process_id, open_action_id, closing_action_id, party_id, + (task_id, process_id, open_action_id, closing_action_id, object_id, title, description, mime_type, comment, status_id, priority, start, due, assignee_id) values (v_task_id, p_process_id, p_open_action_id, p_closing_action_id, - p_party_id, p_object_id, p_title, p_description, p_mime_type, + p_object_id, p_title, p_description, p_mime_type, p_comment, p_status_id, p_priority, p_start, p_due, p_assignee_id); return v_task_id; end; ' language 'plpgsql'; -select define_function_args('tasks_process__new','process_id,title,description,mime_type,workflow_id,package_id,creation_user,creation_ip,context_id'); +select define_function_args('tasks_process__new','process_id,title,description,mime_type,workflow_id,assignee_id,package_id,creation_user,creation_ip,context_id'); -create or replace function tasks_process__new (integer,varchar,text,varchar,integer,integer,integer,varchar,integer) +create or replace function tasks_process__new (integer,varchar,text,varchar,integer,integer,integer,integer,varchar,integer) returns integer as ' declare p_process_id alias for $1; p_title alias for $2; p_description alias for $3; p_mime_type alias for $4; p_workflow_id alias for $5; - p_package_id alias for $6; - p_creation_user alias for $7; - p_creation_ip alias for $8; - p_context_id alias for $9; + p_assignee_id alias for $6; + p_package_id alias for $7; + p_creation_user alias for $8; + p_creation_ip alias for $9; + p_context_id alias for $10; v_process_id integer; begin v_process_id:= acs_object__new( @@ -454,29 +364,28 @@ ); insert into t_processes - (process_id, title, description, mime_type, workflow_id) + (process_id, title, description, mime_type, workflow_id, assignee_id) values - (v_process_id, p_title, p_description, p_mime_type, p_workflow_id); + (v_process_id, p_title, p_description, p_mime_type, p_workflow_id, p_assignee_id); return v_process_id; end; ' language 'plpgsql'; -select define_function_args('tasks_process_instance__new','process_instance_id,process_id,case_id,party_id,object_id,package_id,creation_user,creation_ip,context_id'); +select define_function_args('tasks_process_instance__new','process_instance_id,process_id,case_id,object_id,package_id,creation_user,creation_ip,context_id'); -create or replace function tasks_process_instance__new (integer,integer,integer,integer,integer,integer,integer,varchar,integer) +create or replace function tasks_process_instance__new (integer,integer,integer,integer,integer,integer,varchar,integer) returns integer as ' declare p_process_instance_id alias for $1; p_process_id alias for $2; p_case_id alias for $3; - p_party_id alias for $4; - p_object_id alias for $5; - p_package_id alias for $6; - p_creation_user alias for $7; - p_creation_ip alias for $8; - p_context_id alias for $9; + p_object_id alias for $4; + p_package_id alias for $5; + p_creation_user alias for $6; + p_creation_ip alias for $7; + p_context_id alias for $8; v_process_instance_id integer; begin v_process_instance_id:= acs_object__new( @@ -492,9 +401,9 @@ ); insert into t_process_instances - (process_instance_id, process_id, case_id, party_id, object_id) + (process_instance_id, process_id, case_id, object_id) values - (v_process_instance_id, p_process_id, p_case_id, p_party_id, p_object_id); + (v_process_instance_id, p_process_id, p_case_id, p_object_id); return v_process_instance_id; end; Index: openacs-4/packages/tasks/sql/postgresql/tasks-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/sql/postgresql/tasks-drop.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/tasks/sql/postgresql/tasks-drop.sql 25 Sep 2005 23:49:23 -0000 1.1 +++ openacs-4/packages/tasks/sql/postgresql/tasks-drop.sql 1 Mar 2006 13:49:15 -0000 1.2 @@ -1,7 +1,18 @@ -drop table t_process_tasks; drop table t_tasks; +drop table t_process_tasks; drop table t_task_status; drop table t_process_instances; drop table t_processes; +select acs_object_type__drop_type('tasks_task','t'); +select acs_object_type__drop_type('tasks_process','t'); +select acs_object_type__drop_type('tasks_process_instance','t'); +select acs_object_type__drop_type('tasks_process_task','t'); + +select drop_package('tasks'); +select drop_package('tasks_task'); +select drop_package('tasks_process'); +select drop_package('tasks_process_instance'); +select drop_package('tasks_process_task'); + drop sequence t_task_status_seq; Index: openacs-4/packages/tasks/tcl/tasks-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/tcl/tasks-callback-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/tasks/tcl/tasks-callback-procs.tcl 14 Oct 2005 15:55:29 -0000 1.4 +++ openacs-4/packages/tasks/tcl/tasks-callback-procs.tcl 1 Mar 2006 13:49:15 -0000 1.5 @@ -75,9 +75,14 @@ ns_log notice "\#\#\# entering tasks-action-callback: $case_id, $object_id, $action_id" db_1row process_id { - select process_instance_id, process_id, party_id, object_id - from t_process_instances - where case_id = :case_id + select tp.process_instance_id, + tp.process_id, + tp.object_id, + o.package_id + from t_process_instances tp, + acs_objects o + where tp.process_instance_id = o.object_id + and tp.case_id = :case_id } set tasks [db_list_of_lists process_tasks { @@ -95,7 +100,6 @@ set new_task_id [tasks::task::new \ -process_instance_id $process_instance_id \ -process_task_id $process_task_id \ - -party_id $party_id \ -object_id $object_id \ -title $title \ -description $description \ @@ -104,7 +108,8 @@ -status_id $status_id \ -priority $priority \ -start_date $start_date \ - -due_date $due_date] + -due_date $due_date \ + -package_id $package_id] } } @@ -119,3 +124,75 @@ } { return "tasks" } + + +ad_proc -public -callback contacts::redirect -impl tasks { + {-party_id ""} + {-action ""} +} { + redirect the contact to the correct tasks stuff +} { + + if { [exists_and_not_null party_id] } { + + switch $action { + tasks { set file "/packages/tasks/www/contact" } + tasks-mark-completed { set file "/packages/tasks/www/mark-completed" } + tasks-change-assignee { set file "/packages/tasks/www/change-assignee" } + tasks-delete { set file "/packages/tasks/www/delete" } + } + + if { [exists_and_not_null file] } { + if { [ns_queryget object_id] eq "" } { + rp_form_put object_id $party_id + } + rp_internal_redirect ${file} + } + + } + if { [regexp "^[ad_conn package_url](.*)$" [ad_conn url] match url_request] } { + ns_log notice "tasks implementation of contact::redirecturl_request $url_request" + switch $url_request { + processes { set file "/packages/tasks/www/processes" } + process { set file "/packages/tasks/www/process" } + process-add-edit { set file "/packages/tasks/www/process-add-edit" } + process-delete { set file "/packages/tasks/www/process-delete" } + process-task { set file "/packages/tasks/www/process-task" } + process-task-delete { set file "/packages/tasks/www/process-task-delete" } + tasks { set file "/packages/tasks/www/index" } + tasks-change-assignee { set file "/packages/tasks/www/change-assignee" } + } + if { [exists_and_not_null file] } { + rp_internal_redirect $file + } + } + +} + + +ad_proc -public -callback subsite::url -impl tasks_task { + {-package_id:required} + {-object_id:required} + {-type ""} +} { + return the page_url for an object of type tasks_task +} { +# +# I NEED TO FIX THIS, THIS COMES FROM PROJECT MANAGER +# + if { [apm_package_key_from_id $package_id] eq "contacts" } { + set party_id [db_string get_it { select party_id from t_tasks where task_id = :object_id } -default {}] + if { [exists_and_not_null party_id] } { + if {$type=="edit"} { + return "[contact::url -party_id $party_id -package_id $package_id]task/$object_id" + } else { + return "[contact::url -party_id $party_id -package_id $package_id]task/$object_id" + } + } + } else { + + } + + + +} Index: openacs-4/packages/tasks/tcl/tasks-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/tcl/tasks-install-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/tasks/tcl/tasks-install-procs.tcl 25 Sep 2005 23:54:16 -0000 1.2 +++ openacs-4/packages/tasks/tcl/tasks-install-procs.tcl 1 Mar 2006 13:49:15 -0000 1.3 @@ -55,5 +55,79 @@ acs_sc::impl::new_from_spec -spec $spec } + 0.1d8 0.1d9 { + + ns_log notice "Attempting to upgrade from 0.1d8 to 0.1d9 if this fails please look at the proc tasks::install::after_upgrade for details..." + + # Tasks is being converted from an application to a service with this release. + # this means that it can only deal with being mounted once and currently its + # assumed that tasks is only used in conjunction with contacts. The service + # tasks from this version forward allows inclusion of tasks in any other package + # much like the way general-comments, ams or categories works. + + # this switch is being made because version 1.2b4 of contacts is no longer + # singleton and this is the cleanest way of providing tasks to contacts + # instances site wide and tasks will be used in other packages for tasks + # relations. + + # this will fail if more than one instance exists + set tasks_package_id [apm_package_id_from_key "tasks"] + + + # now we make sure that all the associated parties are + # a part of the '-2' group. This was the default group + # for contacts until version 1.2b4 which is when contacts + # was no longer singleton and allowed users to use groups + # other than '-2'. We are assuming that this upgrade + # is taking place at the same time as the contacts upgrade + # which was released a few days ago. I know its bad to assume + # and sorry if this hurts you ... but this is necessary for + # the move to make tasks a service package that cannot be + # mounted numerous times. + + set count_of_non_parties [db_string get_it { + select count(*) + from t_tasks + where object_id not in ( select member_id from group_distinct_member_map where group_id = '-2' ) + }] + + if { $count_of_non_parties > 0 } { + error "Cannot upgrade from 0.1d8 to 0.1d9 because tasks is becoming a service and the upgrade scripts do not know how to deal with your setup. look at the tasks::install::after_upgrade for details" + ad_script_abort + } + + + + # if we only have one or zero we are happy. + if { $tasks_package_id == "0" } { + ns_log notice "No upgrade of task objects necessary because none exist and any newly created ones will be properly taken care of" + } else { + # there is one package_id we can likely do the upgrade. All parties related + # to tasks are in the '-2' group so we can assume that contacts was used + # in the 1.2b3 or before setup. Thus we get the package_id of the contacts + # instance. + + set contacts_package_id [site_node::get_from_object_id -object_id [site_node::get_from_url -url "/contacts/" -exact]] + if { ![exists_and_not_null contacts_package_id] } { + error "Cannot upgrade from 0.1d9 because there are tasks assigned to this package, but there is no contacts instance mounted at /contacts/" + } else { + db_dml update_objects { + update acs_objects + set package_id = :contacts_package_id + where object_type in ( 'tasks_task', 'tasks_process', 'tasks_process_instance', 'tasks_process_task' ) + } + db_dml update_objects { + update acs_objects + set context_id = :contacts_package_id + where object_type in ( 'tasks_task', 'tasks_process', 'tasks_process_instance', 'tasks_process_task' ) + } + } + + # now we unmount the tasks instance (since this is now a service that does not need to be mounted) + site_node_delete_package_instance -node_id [site_node::get_from_object_id -object_id $tasks_package_id] + + } + + } } } Index: openacs-4/packages/tasks/tcl/tasks-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/tcl/tasks-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/tasks/tcl/tasks-procs.tcl 17 Nov 2005 16:04:39 -0000 1.8 +++ openacs-4/packages/tasks/tcl/tasks-procs.tcl 1 Mar 2006 13:49:15 -0000 1.9 @@ -14,12 +14,97 @@ namespace eval tasks::process::task {} namespace eval tasks::process::instance {} +ad_proc -public tasks::require_belong_to_package { + {-objects ""} + {-package_id ""} +} { + if { $package_id eq "" } { + set package_id [ad_conn package_id] + } + if { ![tasks::belong_to_package -objects $objects -package_id $package_id] } { + ad_return_complain 1 [_ tasks.Your_submission_is_not_valid] + } + +} + +ad_proc -public tasks::belong_to_package { + {-objects ""} + {-package_id ""} +} { + if { $package_id eq "" } { + set package_id [ad_conn package_id] + } + if { [llength $objects] == 0 } { + return 1 + } else { + return [db_0or1row objects_belong_to_package_p {}] + } +} + +ad_proc -public tasks::get_submitted_as_list { +} { + set form_variables [list] + set form [ns_getform] + if { $form eq "" } { + set form_size 0 + } else { + set form_size [ns_set size $form] + } + for { set form_counter_i 0 } { $form_counter_i < $form_size } { incr form_counter_i } { + set key [ns_set key $form $form_counter_i] + set value [ns_set value $form $form_counter_i] + if { $value ne "" } { + lappend form_variables $key $value + } + } + return $form_variables +} + + +ad_proc -public tasks::relative_date { + {-date:required} +} { + if { [regexp {^[0-9]{4}-[0-9]{2}-[0-9]{2}} $date match] } { + + # get year, month, day + set date_list [dt_ansi_to_list [lindex $date 0]] + set date_julian [dt_ansi_to_julian [lindex $date_list 0] [lindex $date_list 1] [lindex $date_list 2]] + + set today_date [dt_sysdate] + set today_list [dt_ansi_to_list $today_date] + set today_julian [dt_ansi_to_julian [lindex $today_list 0] [lindex $today_list 1] [lindex $today_list 2]] + + set days [expr $date_julian - $today_julian] + + if { $days == 0 } { + set date [_ acs-datetime.Today] + } elseif { $days == -1 } { + set date [_ tasks.Yesterday] + } elseif { $days == 1 } { + set date [_ tasks.Tomorrow] + } elseif { 1 < $days && $days <= 5 } { + set weekday [lc_time_fmt $date "%f"] + set todays_weekday [lc_time_fmt $today_date "%f"] + if { $todays_weekday <= 5 && $weekday <= 5 } { + set date [lindex [_ acs-datetime.days_of_week] $weekday] + } else { + set date [lc_time_fmt $date [_ tasks.localization-d_near_fmt]] + } + } elseif { ( -30 < $days && $days < -1 ) || ( 5 < $days && $days <= 180 ) } { + set date [lc_time_fmt $date [_ tasks.localization-d_near_fmt]] + } else { + set date [lc_time_fmt $date [_ tasks.localization-d_far_fmt]] + } + + } + return $date +} + ad_proc -public tasks::task::new { {-task_id ""} {-process_instance_id ""} {-process_task_id ""} - {-party_id ""} - {-object_id ""} + -object_id:required -title:required {-description ""} {-mime_type "text/plain"} @@ -33,7 +118,7 @@ {-assignee_id ""} } { if { [empty_string_p $package_id] } { - set package_id [apm_package_id_from_key "tasks"] + set package_id [ad_conn package_id] } set extra_vars [ns_set create] @@ -45,13 +130,25 @@ set assignee_id [ad_conn user_id] } - oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {task_id process_instance_id process_task_id party_id object_id title description mime_type comment status_id priority start_date due_date package_id context_id assignee_id} + oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {task_id process_instance_id process_task_id object_id title description mime_type comment status_id priority start_date due_date package_id context_id assignee_id} set task_id [package_instantiate_object -extra_vars $extra_vars tasks_task] return $task_id } +ad_proc -public tasks::task::title { + -task_id +} { + return [db_string get_task_title {} -default {}] +} + +ad_proc -public tasks::task::delete { + -task_id +} { + db_dml delete_task {} +} + ad_proc -public tasks::task::edit { -task_id:required -title:required @@ -66,6 +163,19 @@ set modifying_user [ad_conn user_id] set modifying_ip [ad_conn peeraddr] + set previous_status_id [db_string get_status_id {}] + + if { $status_id == $previous_status_id } { + # there is no need to updated the completed_date + set completed_clause "" + } elseif { $status_id == "2" } { + # the edit is completing the task for the first time + set completed_clause ", completed_date = now()" + } else { + # the edit is no longer completed + set completed_clause ", completed_date = NULL" + } + db_dml update_task {} db_dml update_object {} } @@ -82,13 +192,49 @@ } } +ad_proc -public tasks::task::modify_interval { + -task_id:required + -method:required + {-days "7"} +} { + increase or decrease a task interval +} { + if { $method == "increase" } { + set operand "+" + } elseif { $method == "decrease" } { + set operand "-" + } else { + error "an invalid method was supplied to tasks::task::modify_interval, you specified ${method}, but it must be 'increase' or 'decrease'" + } + + db_1row get_task_info " + select t.title as task, t.description, t.mime_type, t.priority, + to_char((t.due_date $operand '$days days'::interval),'YYYY-MM-DD') as due_date, + t.status_id as status, t.comment, t.assignee_id + from t_tasks t + where t.task_id = :task_id + " + + set task_id [tasks::task::edit \ + -task_id ${task_id} \ + -title ${task} \ + -description ${description} \ + -mime_type $mime_type \ + -comment ${comment} \ + -due_date ${due_date} \ + -status_id ${status} \ + -assignee_id ${assignee_id} \ + -priority ${priority}] + +} + + ad_proc -public tasks::process::task::new { {-task_id ""} -process_id:required -open_action_id:required -closing_action_id:required - {-party_id ""} {-object_id ""} -title:required {-description ""} @@ -112,7 +258,7 @@ set extra_vars [ns_set create] set context_id $package_id - oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {task_id process_id open_action_id closing_action_id party_id object_id title description mime_type comment status_id priority start due package_id context_id assignee_id} + oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {task_id process_id open_action_id closing_action_id object_id title description mime_type comment status_id priority start due package_id context_id assignee_id} set task_id [package_instantiate_object -extra_vars $extra_vars tasks_process_task] @@ -122,7 +268,6 @@ ad_proc -public tasks::process::task::edit { -task_id:required -open_action_id:required - {-party_id ""} {-object_id ""} -title:required {-description ""} @@ -142,6 +287,47 @@ } +ad_proc -public tasks::process::assign { + -process_id:required + -object_id:required + {-package_id ""} +} { + if { [empty_string_p $package_id] } { + set package_id [ad_conn package_id] + } + ns_log notice "the process_id is $process_id and the object_id is $object_id" + + set workflow_id [db_string get_workflow_id {}] + + db_transaction { + set case_id [db_nextval acs_object_id_seq] + + set instance_id [tasks::process::instance::new \ + -process_id $process_id \ + -case_id $case_id \ + -package_id $package_id \ + -object_id $object_id] + + workflow::case::new -no_notification \ + -workflow_id $workflow_id \ + -case_id $case_id \ + -object_id $instance_id + + } + + # ideally in the future we could specify the case_id + # that workflow::case::new would use, and thus we + # could create an object_id before creating + # the process instance but for now we + # need this hack + +# set case_id [db_string get_case {} -default {}] + +# db_dml update_instance_case {} + + return $instance_id +} + ad_proc -public tasks::process::new { {-process_id ""} -title:required @@ -168,6 +354,7 @@ -title:required {-description ""} {-mime_type "text/plain"} + {-assignee_id ""} } { set modifying_user [ad_conn user_id] set modifying_ip [ad_conn peeraddr] @@ -181,8 +368,7 @@ {-process_instance_id ""} -process_id:required -case_id:required - {-party_id ""} - {-object_id ""} + -object_id:required {-package_id ""} } { if { [empty_string_p $package_id] } { @@ -191,111 +377,9 @@ set extra_vars [ns_set create] set context_id $package_id - oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {process_instance_id process_id case_id party_id object_id package_id context_id} + oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {process_instance_id process_id case_id object_id package_id context_id} set task_id [package_instantiate_object -extra_vars $extra_vars tasks_process_instance] return $task_id } - - - -ad_proc -public tasks::new { - -party_id:required - {-object_id ""} - {-process_id ""} - -title:required - {-description ""} - {-mime_type "text/plain"} - {-comment ""} - -due_date:required - {-priority 0} - {-status "o"} - {-user_id ""} - {-ip_addr ""} - {-package_id ""} -} { - insert new task -} { - if {[empty_string_p $package_id]} { - set package_id [ad_conn package_id] - } - if {[empty_string_p $user_id]} { - set user_id [ad_conn user_id] - } - if {[empty_string_p $ip_addr]} { - set ip_addr [ad_conn peeraddr] - } - - set task_id [db_exec_plsql create_task {}] - - return $task_id -} - -ad_proc -public tasks::edit { - -task_id:required - -title:required - {-description ""} - {-mime_type "text/plain"} - {-comment ""} - -due_date:required - {-priority 0} - {-status "o"} - {-user_id ""} - {-ip_addr ""} -} { - update task -} { - if {[empty_string_p $user_id]} { - set user_id [ad_conn user_id] - } - if {[empty_string_p $ip_addr]} { - set ip_addr [ad_conn peeraddr] - } - - db_dml update_task {} - db_dml update_object {} -} - - -ad_proc -public tasks::project_id { - {-package_id ""} -} { - Returns this tasks instance project_id -} { - if { [string is false [exists_and_not_null package_id]] } { - set package_id [ad_conn package_id] - } - set project_id [db_string get_project_id { - select pm_projectsx.item_id - from pm_projectsx, - cr_folders cf - where pm_projectsx.parent_id = cf.folder_id - and cf.package_id = :package_id - } -default {}] - if { [string is false [exists_and_not_null project_id]] } { - tasks::initialize -package_id $package_id - set project_id [tasks::project_id -package_id $package_id] - } - return $project_id -} - -ad_proc -public tasks::initialize { - {-package_id ""} -} { - Returns this tasks instance project_id -} { - if { [string is false [exists_and_not_null package_id]] } { - set package_id [ad_conn package_id] - } - if { [string is false [db_0or1row project_exists_p { select 1 from cr_folders where package_id = :package_id and label = 'Projects' }]] } { - pm::project::new -project_name "[_ tasks.Tasks_Instance]" \ - -status_id "1" \ - -organization_id "" \ - -creation_user [ad_conn user_id] \ - -creation_ip [ad_conn peeraddr] \ - -ongoing_p "t" \ - -package_id $package_id - } -} - Index: openacs-4/packages/tasks/tcl/tasks-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/tcl/tasks-procs.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/tasks/tcl/tasks-procs.xql 26 Oct 2005 18:54:29 -0000 1.2 +++ openacs-4/packages/tasks/tcl/tasks-procs.xql 1 Mar 2006 13:49:15 -0000 1.3 @@ -1,6 +1,35 @@
|
|