Index: openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit-postgresql.xql,v diff -u -r1.10 -r1.11 --- openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 6 Oct 2003 22:57:28 -0000 1.10 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 10 Oct 2003 22:51:04 -0000 1.11 @@ -3,18 +3,19 @@ SELECT - process_task_id, - one_line, - description, - estimated_hours_work, - estimated_hours_work_min, - estimated_hours_work_max + t.process_task_id as process_tid, + t.one_line, + t.description, + t.estimated_hours_work, + t.estimated_hours_work_min, + t.estimated_hours_work_max, + d.dependency_id FROM - pm_process_task + pm_process_task t LEFT JOIN pm_process_task_dependency d ON t.process_task_id = d.process_task_id WHERE - process_id = :process_id + t.process_id = :process_id ORDER BY - process_task_id + t.process_task_id @@ -23,13 +24,13 @@ select pm_task__new_task_item ( null, :project_item_id, - '$task_title($i)', - '$description($i)', + :p_task_title, + :p_description, [project_manager::project::util::datenvl -value [set end_date_$i] -value_if_null "null," -value_if_not_null "to_timestamp('[set end_date_$i]','YYYY MM DD HH24 MI SS'),"] '0', - '$estimated_hours_work($i)', - '$estimated_hours_work_min($i)', - '$estimated_hours_work_max($i)', + :p_work, + :p_work_min, + :p_work_max, current_timestamp, :user_id, :peeraddr, @@ -41,16 +42,16 @@ select pm_task__new_task_revision ( - '$task_item_id($i)', + :p_task_item_id, :project_item_id, - '$task_title($i)', - '$description($i)', + :p_task_title, + :p_description, [project_manager::project::util::datenvl -value [set end_date_$i] -value_if_null "null," -value_if_not_null "to_timestamp('[set end_date_$i]','YYYY MM DD HH24 MI SS'),"] - '$percent_complete($i)', - '$estimated_hours_work($i)', - '$estimated_hours_work_min($i)', - '$estimated_hours_work_max($i)', - '$actual_hours_worked($i)', + :p_percent, + :p_work, + :p_work_min, + :p_work_max, + :p_hours, current_timestamp, :user_id, :peeraddr,