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.5 -r1.23.2.6
--- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	8 Oct 2004 21:25:05 -0000	1.23.2.5
+++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	26 Oct 2004 01:21:11 -0000	1.23.2.6
@@ -21,20 +21,25 @@
         to_char(p.latest_finish_date,'YYYY-MM-DD HH24:MI') as latest_finish_date,
         p.actual_hours_completed,
         p.estimated_hours_total,
-        p.parent_id
+        p.parent_id,
+        s.status_type
 	FROM
-	pm_projectsx p, cr_items i
+	pm_projectsx p, 
+        cr_items i,
+        pm_project_status s
 	WHERE
-	p.item_id = :project_item_id and
+	p.item_id    = :project_item_id and
         p.project_id = :project_id and
-        p.item_id = i.item_id
+        p.item_id    =  i.item_id and
+        p.status_id  =  s.status_id
     </querytext>
   </fullquery>
 
   <fullquery name="project_tasks_query">
     <querytext>
 	SELECT
-        t.item_id as task_id,
+        t.item_id as task_item_id,
+        t.parent_id as project_item_id,
         t.title,
 	to_char(t.end_date,'YYYY-MM-DD HH24:MI') as end_date,
 	to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start,
@@ -48,6 +53,7 @@
 	to_char(current_date,'J') as today_j,
 	to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish,
 	t.latest_finish - current_date as days_to_latest_finish,
+        u.person_id,
         u.first_names,
         u.last_name,
         t.percent_complete,
@@ -61,9 +67,25 @@
         s.description as status_description,
         r.is_lead_p
 	FROM
-	(select * from pm_tasks_revisionsx 
+	(select tr.item_id,
+                ta.party_id,
+                ta.role_id,
+                tr.title,
+                tr.end_date,
+                tr.earliest_start,
+                tr.earliest_finish,
+                tr.latest_start,
+                tr.latest_finish,
+                tr.percent_complete,
+                tr.estimated_hours_work,
+                tr.estimated_hours_work_min,
+                tr.estimated_hours_work_max,
+                tr.actual_hours_worked,
+                tr.parent_id,
+                tr.revision_id
+         from pm_tasks_revisionsx tr
          LEFT JOIN
-         pm_task_assignment ON item_id = task_id) t 
+         pm_task_assignment ta ON tr.item_id = ta.task_id) t 
            LEFT JOIN 
            persons u 
            ON 
@@ -83,6 +105,7 @@
         t.revision_id   = i.live_revision and
         t.item_id       = ti.task_id and
         ti.status       = s.status_id
+        [template::list::filter_where_clauses -and -name tasks]
         [template::list::orderby_clause -name tasks -orderby]
     </querytext>
   </fullquery>
@@ -119,7 +142,8 @@
         SELECT
         a.project_id,
         r.one_line as role_name,
-        p.first_names || ' ' || p.last_name as user_name
+        p.first_names || ' ' || p.last_name as user_name,
+        r.is_lead_p
         FROM 
         pm_project_assignment a,
         pm_roles r,