Index: openacs-4/contrib/packages/project-manager/project-manager.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/Attic/project-manager.info,v diff -u -r1.16.2.5 -r1.16.2.6 --- openacs-4/contrib/packages/project-manager/project-manager.info 15 Jul 2004 20:31:46 -0000 1.16.2.5 +++ openacs-4/contrib/packages/project-manager/project-manager.info 16 Jul 2004 20:59:39 -0000 1.16.2.6 @@ -7,14 +7,14 @@ f f - + Jade Rubick Project management tool for OpenACS - 2004-07-15 + 2004-07-16 Integrated Bakery Resources Track tasks, estimates and actual progress for a project. See the <a href="http://openacs.org/projects/dotwrk/project_management/">project page</a> for more information. - + @@ -24,8 +24,8 @@ - + - select - item_id, - content_type - from - cr_items - where parent_id = :project_item_id + SELECT + i.item_id, + i.content_type + FROM + cr_items i, + pm_tasks_active t + WHERE + i.item_id = t.task_id and + i.parent_id = :project_item_id @@ -88,8 +91,11 @@ sum(t.estimated_hours_work) as estimated_hours_total, to_char(current_timestamp,'J') as today_j from - pm_tasks_revisionsx t, cr_items i + pm_tasks_revisionsx t, + cr_items i, + pm_tasks_active a where + i.item_id = a.task_id and t.item_id in ([join $task_list ", "]) and i.live_revision = t.revision_id @@ -112,7 +118,7 @@ from pm_tasks_revisionsx t, cr_items i, - pm_tasks ti, + pm_tasks_active ti, pm_task_status s where t.item_id in ([join $task_list ", "]) and 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.8 -r1.4.2.9 --- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl 15 Jul 2004 20:31:47 -0000 1.4.2.8 +++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl 16 Jul 2004 20:59:40 -0000 1.4.2.9 @@ -84,7 +84,7 @@ FROM pm_tasks_revisionsx r, cr_items i, - pm_tasks t + pm_tasks_active t WHERE r.parent_id = :project_item_id and r.revision_id = i.live_revision and @@ -577,7 +577,7 @@ ad_proc -public pm::task::delete { -task_item_id:required } { - Deletes a given task + Marks a task deleted @author Jade Rubick (jader@bread.com) @creation-date 2004-03-10 @@ -588,12 +588,33 @@ @error No error thrown if there is no such task. } { - db_exec_plsql delete_task "select pm_task__delete_task_item(:task_item_id)" + db_dml mark_delete "update pm_tasks set deleted_p = 't' where task_id = :task_item_id" + pm::project::compute_status [pm::task::project_item_id -task_item_id $task_item_id] + return 1 } +ad_proc -public pm::task::project_item_id { + -task_item_id:required +} { + Returns the project item id for a given task + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-07-16 + + @param task_item_id + + @return -1 if there is an error. + + @error +} { + return [db_string get_project_id "select parent_id from cr_items where item_id = :task_item_id" -default -1] +} + + + ad_proc -public pm::task::get_url { object_id } { @@ -1185,7 +1206,7 @@ p.party_id, (select one_line from pm_roles r where ta.role_id = r.role_id) as role FROM - pm_tasks ts, + pm_tasks_active ts, pm_tasks_revisionsx t, pm_task_assignment ta, acs_users_all p, @@ -1790,7 +1811,7 @@ FROM persons u, pm_task_assignment a, - pm_tasks ts + pm_tasks_active ts WHERE u.person_id = a.party_id and ts.task_id = a.task_id and Index: openacs-4/contrib/packages/project-manager/www/one-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one-postgresql.xql,v diff -u -r1.23.2.3 -r1.23.2.4 --- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 15 Jul 2004 22:13:10 -0000 1.23.2.3 +++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 16 Jul 2004 20:59:41 -0000 1.23.2.4 @@ -72,7 +72,7 @@ pm_task_dependency d ON i.item_id = d.task_id, - pm_tasks ti, + pm_tasks_active ti, pm_task_status s WHERE t.parent_id = :project_item_id and Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/task-delete-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/contrib/packages/project-manager/www/task-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-delete.adp,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/contrib/packages/project-manager/www/task-delete.adp 2 Jul 2004 23:13:49 -0000 1.1.2.1 +++ openacs-4/contrib/packages/project-manager/www/task-delete.adp 16 Jul 2004 20:59:41 -0000 1.1.2.2 @@ -1,5 +1,5 @@ @title@ @context@ - -Currently, deletion of a task is not working. + + Index: openacs-4/contrib/packages/project-manager/www/task-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-delete.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/contrib/packages/project-manager/www/task-delete.tcl 2 Jul 2004 23:13:49 -0000 1.1.2.1 +++ openacs-4/contrib/packages/project-manager/www/task-delete.tcl 16 Jul 2004 20:59:41 -0000 1.1.2.2 @@ -4,6 +4,7 @@ Deletes a task + @author Chris Davis (mcd@daviesinc.com) @author Jade Rubick (jader@bread.com) @creation-date 2004-03-31 @arch-tag: af0efc2f-cf78-4f80-a484-1f52f3db6a48 @@ -15,5 +16,71 @@ } -errors { } +set package_id [ad_conn package_id] + +permission::require_permission -privilege "delete" -object_id $package_id + set title "Delete task" set context [list "Delete task"] + + +set action [template::form get_action delete_task] + +if {[string equal $action delete]} { + + pm::task::delete -task_item_id $task_item_id + ad_returnredirect -message "Task $task_item_id Deleted" "index" + +} else { + + set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"] + + if {[string is true $use_uncertain_completion_times_p]} { + set hours_work { + {estimated_hours_work_min:text + {label "Estimated Hours (Min)"} + } + {estimated_hours_work_max:text + {label "Estimated Hours (Max)"} + } + } + } else { + set hours_work { + {estimated_hours_work:text + {label "Estimated Hours"} + } + } + } + + + set form " + task_item_id:key + {task_title:text + {label \"Title\"} + } + {description:richtext + {label \"Description\"} + } + $hours_work + {percent_complete:text + {label \"Percent Complete\"} + } + " + + ad_form -name delete_task \ + -edit_request { + + db_1row task_query { } + + set description [list $description $mime_type] + + } \ + -mode display \ + -has_submit 1 \ + -has_edit 1 \ + -actions {{"Delete this task?" delete} {"Cancel" cancel}} \ + -cancel_url "task-one?task_id=$task_item_id" \ + -form $form + +} + Index: openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks-postgresql.xql,v diff -u -r1.5.2.2 -r1.5.2.3 --- openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql 2 Jul 2004 23:13:49 -0000 1.5.2.2 +++ openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql 16 Jul 2004 20:59:41 -0000 1.5.2.3 @@ -32,7 +32,7 @@ p.first_names || ' ' || p.last_name as full_name, (select one_line from pm_roles r where ta.role_id = r.role_id) as role FROM - pm_tasks ts, + pm_tasks_active ts, cr_items i, pm_tasks_revisionsx t LEFT JOIN pm_task_assignment ta