Index: openacs-4/contrib/packages/project-manager/tcl/calendar-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/calendar-procs-postgresql.xql,v diff -u -r1.1.2.7 -r1.1.2.8 --- openacs-4/contrib/packages/project-manager/tcl/calendar-procs-postgresql.xql 26 Oct 2004 01:22:27 -0000 1.1.2.7 +++ openacs-4/contrib/packages/project-manager/tcl/calendar-procs-postgresql.xql 3 Nov 2004 20:37:12 -0000 1.1.2.8 @@ -34,10 +34,11 @@ to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, p.first_names || ' ' || p.last_name || ' (' || - substring(r.one_line from 1 for 1) || ')' as full_name, + substring(r.one_line from 1 for 1) || ')' as full_name, p.person_id, s.status_type as status, - r.is_lead_p + r.is_lead_p, + projectr.title as project_name FROM pm_tasks_active ts, pm_task_status s, @@ -48,14 +49,18 @@ LEFT JOIN persons p ON ta.party_id = p.person_id LEFT JOIN pm_roles r - ON ta.role_id = r.role_id + ON ta.role_id = r.role_id, + cr_items projecti, + cr_revisions projectr WHERE ts.status = s.status_id and ts.task_id = t.item_id and i.item_id = t.item_id and t.task_revision_id = i.live_revision and t.latest_start >= :first_of_month_date and - t.latest_start <= :last_of_month_date + t.latest_start <= :last_of_month_date and + t.parent_id = projecti.item_id and + projecti.live_revision = projectr.revision_id $hide_closed_clause $selected_users_clause ORDER BY