Index: openacs-4/contrib/packages/project-manager/tcl/calendar-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/calendar-procs-oracle.xql,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/contrib/packages/project-manager/tcl/calendar-procs-oracle.xql	22 Oct 2004 04:28:35 -0000	1.1.2.1
+++ openacs-4/contrib/packages/project-manager/tcl/calendar-procs-oracle.xql	3 Nov 2004 20:37:12 -0000	1.1.2.2
@@ -33,16 +33,20 @@
              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 || ' (' ||
-             substr(r.one_line,1,1) || ')' as full_name,
+               substr(r.one_line,1,1) || ')' as full_name,
              p.person_id,
-             s.status_type as status
+             s.status_type as status,
+             r.is_lead_p,
+             projectr.title as project_name
       FROM  pm_tasks_active ts, 
             pm_task_status s,
             cr_items i,
             pm_tasks_revisionsx t, 
             pm_roles r, 
-            persons p , 
-            pm_task_assignment ta
+            persons p, 
+            pm_task_assignment ta,
+            cr_items projecti,
+            cr_revisions projectr
       WHERE ta.role_id = r.role_id (+) and
           t.item_id = ta.task_id (+)  and 
           ta.party_id = p.person_id (+) and 
@@ -52,7 +56,9 @@
           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