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.1 -r1.23.2.2
--- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	20 May 2004 17:30:05 -0000	1.23.2.1
+++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	2 Jul 2004 23:13:49 -0000	1.23.2.2
@@ -31,33 +31,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="project_versions">
-    <querytext>
-	SELECT
-        p.item_id,
-	p.project_id,
-	p.title as project_name,
-	p.project_code,
-	p.goal,
-	p.description,
-	to_char(p.planned_start_date,'Mon DD') as planned_start_date,
-	to_char(p.planned_end_date,'Mon DD') as planned_end_date,
-	p.ongoing_p,
-        i.live_revision,
-        to_char(p.estimated_finish_date,'Mon DD') as estimated_finish_date,
-        to_char(p.earliest_finish_date,'Mon DD') as earliest_finish_date,
-        to_char(p.latest_finish_date,'Mon DD') as latest_finish_date,
-        p.estimated_hours_total
-	FROM
-	pm_projectsx p, cr_items i
-	WHERE
-	p.item_id = :project_item_id and 
-        p.item_id = i.item_id
-        ORDER BY
-        p.project_id desc
-    </querytext>
-  </fullquery>
-
   <fullquery name="project_tasks_query">
     <querytext>
 	SELECT
@@ -138,12 +111,20 @@
 
   <fullquery name="project_people_query">
     <querytext>
-        select
-        project_id,
-        role_id,
-        party_id
-        from pm_project_assignment
-        where project_id = :project_item_id
+        SELECT
+        a.project_id,
+        r.one_line as role_name,
+        p.first_names || ' ' || p.last_name as user_name
+        FROM 
+        pm_project_assignment a,
+        pm_roles r,
+        persons p
+        WHERE
+        a.role_id = r.role_id and
+        a.party_id = p.person_id and
+        project_id = :project_item_id
+        ORDER BY
+        r.role_id, p.first_names, p.last_name
     </querytext>
   </fullquery>