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.8 -r1.9
--- openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql	29 Aug 2003 00:35:35 -0000	1.8
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql	17 Sep 2003 22:20:59 -0000	1.9
@@ -12,33 +12,78 @@
                 '$estimated_hours_work($i)',
                 '$estimated_hours_work_min($i)',
                 '$estimated_hours_work_max($i)',
-		now(),
+		current_timestamp,
 		:user_id,
 		:peeraddr,
 		:package_id
 	);
     </querytext>
   </fullquery>
 
+  <fullquery name="new_task_revision">
+    <querytext>
+	select pm_task__new_task_revision (
+                '$task_item_id($i)',
+		:project_item_id,
+                '$task_title($i)',
+                '$description($i)',
+                [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)',
+		current_timestamp,
+		:user_id,
+		:peeraddr,
+		:package_id
+	);
+    </querytext>
+  </fullquery>
+
   <fullquery name="task_query">
     <querytext>
       select
+        current_timestamp
+	FROM
+	dual
+    </querytext>
+  </fullquery>
+
+  <fullquery name="get_old_tasks">
+    <querytext>
+        select
         t.task_revision_id,
         t.title as task_title,
         t.item_id,
         t.description,
         t.name,
-        t.parent_id,
 	to_char(t.end_date,'YYYY MM DD') as end_date,
         t.percent_complete,
         t.estimated_hours_work,
         t.estimated_hours_work_min,
-        t.estimated_hours_work_max
-	FROM
-	pm_tasks_revisionsx t, cr_items i
+        t.estimated_hours_work_max,
+        d.parent_task_id,
+        t.actual_hours_worked
+  	FROM
+	pm_tasks_revisionsx t, 
+        cr_items i LEFT JOIN pm_task_dependency d ON i.item_id = d.task_id
         WHERE
-        t.item_id = :task_id and
+        t.item_id in ([join $task_id ","]) and
         t.revision_id = i.live_revision
     </querytext>
   </fullquery>
+
+  <fullquery name="get_project_id">
+    <querytext>
+        SELECT
+        p.project_id
+        FROM
+        pm_projectsx p, cr_items i
+        WHERE
+        p.item_id = :project_item_id and 
+        p.revision_id = i.live_revision
+    </querytext>
+  </fullquery>
+
 </queryset>