Index: openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-print-postgresql.xql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql	5 Feb 2004 21:15:54 -0000	1.1.2.1
+++ openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql	6 Mar 2004 00:29:24 -0000	1.1.2.2
@@ -3,48 +3,50 @@
 
   <fullquery name="get_revision_id">
     <querytext>
-	SELECT
+        SELECT
         t.revision_id as task_revision_id
-	FROM
-	pm_tasks_revisionsx t, cr_items i
-	WHERE
+        FROM
+        pm_tasks_revisionsx t, cr_items i
+        WHERE
         t.item_id = :task_id and
         i.live_revision = t.revision_id
     </querytext>
   </fullquery>
 
   <fullquery name="get_project_ids">
     <querytext>
-	SELECT
+        SELECT
         t.parent_id as project_item_id
-	FROM
-	pm_tasks_revisionsx t, cr_items i
-	WHERE
+        FROM
+        pm_tasks_revisionsx t, cr_items i
+        WHERE
         i.item_id = t.item_id and
         t.revision_id = :task_revision_id
     </querytext>
   </fullquery>
 
   <fullquery name="task_query">
     <querytext>
-	SELECT
+        SELECT
         t.item_id,
         t.title as task_title,
         t.description,
-	to_char(t.end_date,'Mon DD ''YY') as end_date,
-	to_char(t.earliest_start,'Mon DD ''YY') as earliest_start,
-	to_char(t.earliest_finish,'Mon DD ''YY') as earliest_finish,
-	to_char(t.latest_start,'Mon DD ''YY') as latest_start,
-	to_char(t.latest_finish,'Mon DD ''YY') as latest_finish,
-        to_char(t.latest_start-t.earliest_start,'DD') || ' days' as slack_time,
+        to_char(t.end_date,'Mon DD ''YY') as end_date,
+        to_char(t.earliest_start,'Mon DD ''YY') as earliest_start,
+        to_char(t.earliest_start,'J') as earliest_start_j,
+        to_char(t.earliest_finish,'Mon DD ''YY') as earliest_finish,
+        to_char(t.latest_start,'Mon DD ''YY') as latest_start,
+        to_char(t.latest_start,'J') as latest_start_j,
+        to_char(t.latest_finish,'Mon DD ''YY') as latest_finish,
+        to_char(current_date,'J') as today_j,
         t.estimated_hours_work,
         t.estimated_hours_work_min,
         t.estimated_hours_work_max,
         t.percent_complete,
         i.live_revision
-	FROM
-	pm_tasks_revisionsx t, cr_items i
-	WHERE
+        FROM
+        pm_tasks_revisionsx t, cr_items i
+        WHERE
         t.item_id = :task_id and
         t.revision_id = :task_revision_id and
         t.item_id = i.item_id
@@ -54,16 +56,16 @@
 
   <fullquery name="dependency_query">
     <querytext>
-	SELECT
+        SELECT
         t.title as task_title,
-	to_char(t.end_date,'MM/DD/YYYY') as end_date,
+        to_char(t.end_date,'MM/DD/YYYY') as end_date,
         t.percent_complete,
         i.live_revision,
         d.parent_task_id,
         d.dependency_type
-	FROM
-	pm_tasks_revisionsx t, cr_items i, pm_task_dependency d
-	WHERE
+        FROM
+        pm_tasks_revisionsx t, cr_items i, pm_task_dependency d
+        WHERE
         d.task_id        = :task_id and
         d.parent_task_id = t.item_id and 
         t.revision_id    = i.live_revision and
@@ -74,17 +76,17 @@
 
   <fullquery name="dependency2_query">
     <querytext>
-	SELECT
+        SELECT
         t.title as task_title,
-	to_char(t.end_date,'MM/DD/YYYY') as end_date,
+        to_char(t.end_date,'MM/DD/YYYY') as end_date,
         t.percent_complete,
         i.live_revision,
         d.parent_task_id,
         d.dependency_type,
         d.task_id
-	FROM
-	pm_tasks_revisionsx t, cr_items i, pm_task_dependency d
-	WHERE
+        FROM
+        pm_tasks_revisionsx t, cr_items i, pm_task_dependency d
+        WHERE
         d.task_id        = t.item_id and
         d.parent_task_id = :task_id and 
         t.revision_id    = i.live_revision and