Index: openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs.tcl,v diff -u -r1.4.2.30 -r1.4.2.31 --- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl 18 Nov 2004 01:44:27 -0000 1.4.2.30 +++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl 18 Nov 2004 21:04:20 -0000 1.4.2.31 @@ -978,11 +978,31 @@ @error } { - db_dml remove_assignment " - delete from pm_task_assignment where task_id = :task_item_id" + db_dml remove_assignment { } } +ad_proc -public pm::task::unassign { + -task_item_id:required + -party_id:required +} { + Removes an assignment for a task + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-11-18 + + @param task_item_id + + @param party_id + + @return + + @error +} { + db_dml remove_assignment { } +} + + ad_proc -public pm::task::assign { -task_item_id:required -party_id:required @@ -1032,6 +1052,27 @@ } +ad_proc -public pm::task::assigned_p { + -task_item_id:required + -party_id:required +} { + Returns 1 if assigned, 0 if not + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-11-18 + + @param task_item_id + + @param party_id + + @return + + @error +} { + return [db_string assigned_p { } -default 0] +} + + ad_proc -public pm::task::open { {-task_item_id:required} } { Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/tcl/task-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/task-assign-add-edit-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.2.6 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/task-assign-add-edit-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/task-assign-add.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/task-assign-remove.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/contrib/packages/project-manager/www/task-one-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one-oracle.xql,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/contrib/packages/project-manager/www/task-one-oracle.xql 5 Nov 2004 21:08:08 -0000 1.1.2.2 +++ openacs-4/contrib/packages/project-manager/www/task-one-oracle.xql 18 Nov 2004 21:04:25 -0000 1.1.2.3 @@ -89,6 +89,7 @@ where a.task_id = :task_id and u.person_id = a.party_id and a.role_id = r.role_id + [template::list::orderby_clause -name people -orderby] Index: openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one-postgresql.xql,v diff -u -r1.19.2.5 -r1.19.2.6 --- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 5 Nov 2004 21:08:08 -0000 1.19.2.5 +++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 18 Nov 2004 21:04:25 -0000 1.19.2.6 @@ -101,6 +101,7 @@ a.task_id = :task_id and u.person_id = a.party_id and a.role_id = r.role_id + [template::list::orderby_clause -name people -orderby] Index: openacs-4/contrib/packages/project-manager/www/task-one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.adp,v diff -u -r1.23.2.8 -r1.23.2.9 --- openacs-4/contrib/packages/project-manager/www/task-one.adp 5 Nov 2004 21:08:08 -0000 1.23.2.8 +++ openacs-4/contrib/packages/project-manager/www/task-one.adp 18 Nov 2004 21:04:25 -0000 1.23.2.9 @@ -194,6 +194,15 @@   + + + + +   +

Index: openacs-4/contrib/packages/project-manager/www/task-one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.tcl,v diff -u -r1.24.2.9 -r1.24.2.10 --- openacs-4/contrib/packages/project-manager/www/task-one.tcl 5 Nov 2004 21:08:08 -0000 1.24.2.9 +++ openacs-4/contrib/packages/project-manager/www/task-one.tcl 18 Nov 2004 21:04:25 -0000 1.24.2.10 @@ -24,6 +24,7 @@ task_revision_id:integer,optional orderby_dependency:optional orderby_dependency2:optional + orderby_people:optional {logger_variable_id:integer ""} {logger_days:integer "30"} } -properties { @@ -185,6 +186,11 @@ set log_url [export_vars -base "${logger_url}log" {{return_url $return_url} {project_id $logger_project} {pm_project_id $task_info(project_item_id)} {pm_task_id $task_id}}] +set assignee_add_self_widget "Add myself as

[export_vars -form {{task_item_id $task_id} user_id return_url}][pm::role::select_list -select_name "role_id"]
" + +set assignee_remove_self_url [export_vars -base task-assign-remove {{task_item_id $task_id} user_id return_url}] + + set today_ansi [clock format [clock scan today] -format "%Y-%m-%d"] set then_ansi [clock format [clock scan "-$logger_days days"] -format "%Y-%m-%d"] @@ -330,8 +336,6 @@ # People, using list-builder --------------------------------- -db_multirow people task_people_query { } - template::list::create \ -name people \ -multirow people \ @@ -361,21 +365,26 @@ orderby_tasks {} } \ -orderby { - role_id {orderby role_id} default_value role_id,desc + first_names { + orderby_asc "first_names asc, last_name asc" + orderby_desc "first_names desc, last_name desc" + default_direction asc + } + role_id { + orderby_asc "role_id asc, user_info asc" + orderby_desc "role_id desc, user_info asc" + default_direction asc + } + default_value role_id,asc } \ -orderby_name orderby_people \ -html { width 100% } +db_multirow people task_people_query { } -db_multirow -extend { item_url } subproject task_people_query { -} { - -} - - # Xrefs ------------------------------------------------ template::list::create \