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.15 -r1.16
--- openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 12 Mar 2004 13:44:45 -0000 1.15
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 27 Apr 2004 00:49:29 -0000 1.16
@@ -20,27 +20,6 @@
-
-
- select pm_task__new_task_revision (
- :p_task_item_id,
- :project_item_id,
- :p_task_title,
- :p_description,
- [pm::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'),"]
- :p_percent,
- :p_work,
- :p_work_min,
- :p_work_max,
- :p_hours,
- current_timestamp,
- :user_id,
- :peeraddr,
- :package_id
- );
-
-
-
select
@@ -54,6 +33,7 @@
t.task_revision_id,
t.title as my_task_title,
t.description as my_description,
+ t.mime_type as my_mime_type,
to_char(t.end_date,'YYYY MM DD') as my_end_date,
t.percent_complete as my_percent_complete,
t.estimated_hours_work as my_estimated_work,
@@ -96,17 +76,35 @@
- select
+ SELECT
r.item_id,
r.title as task_title
FROM
pm_tasks_revisionsx r,
- cr_items i
+ cr_items i,
+ pm_tasks t,
+ pm_task_status s
WHERE
r.parent_id = :project_item_id and
- r.revision_id = i.live_revision
- ORDER BY
- upper(r.title)
+ r.revision_id = i.live_revision and
+ i.item_id = t.task_id and
+ t.status = s.status_id and
+ s.status_type = 'o'
+ UNION
+ SELECT
+ r.item_id,
+ r.title as task_title
+ FROM
+ pm_tasks_revisionsx r,
+ cr_items i,
+ pm_tasks t
+ WHERE
+ r.parent_id = :project_item_id and
+ r.revision_id = i.live_revision and
+ i.item_id = t.task_id and
+ t.task_id in ([join $my_dependencies ","])
+ ORDER BY
+ task_title