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 -N -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/tcl/calendar-procs-postgresql.xql	13 Jan 2005 13:54:35 -0000	1.2
+++ openacs-4/contrib/packages/project-manager/tcl/calendar-procs-postgresql.xql	21 Jul 2005 16:28:08 -0000	1.3
@@ -61,12 +61,110 @@
       t.latest_start <= :last_of_month_date and
       t.parent_id = projecti.item_id and
       projecti.live_revision = projectr.revision_id
+      $instance_clause
       $hide_closed_clause
       $selected_users_clause
       ORDER BY
       t.latest_start, ts.task_id, r.role_id, p.first_names, p.last_name
 </querytext>
 </fullquery>
 
+<fullquery name="pm::calendar::one_month_display.project_folders">
+    <querytext>
 
+        SELECT
+        p.item_id as project_item_id
+        FROM pm_projectsx p 
+             LEFT JOIN pm_project_assignment pa 
+                ON p.item_id = pa.project_id
+             LEFT JOIN organizations o ON p.customer_id =
+                o.organization_id 
+             LEFT JOIN (
+                        select 
+                        om.category_id, 
+                        om.object_id, 
+                        t.name as category_name 
+                        from 
+                        category_object_map om, 
+                        category_translations t, 
+                        categories ctg 
+                        where 
+                        om.category_id = t.category_id and 
+                        ctg.category_id = t.category_id and 
+                        ctg.deprecated_p = 'f')
+                 c ON p.item_id = c.object_id, 
+        cr_items i, 
+	cr_folders f,
+        pm_project_status s
+        WHERE 
+        p.project_id = i.live_revision and
+        s.status_id           = p.status_id
+	and i.parent_id = f.folder_id
+        and f.package_id = :package_id 
+        [template::list::filter_where_clauses -and -name projects]
+        [template::list::orderby_clause -orderby -name projects]
+    </querytext>
+</fullquery>
+
+<fullquery name="pm::calendar::one_month_display.select_monthly_tasks_by_deadline">
+<querytext>
+      SELECT
+      ts.task_id,
+      ts.task_id as item_id,
+      ts.task_number,
+      t.task_revision_id,
+      t.title,
+      t.parent_id as project_item_id,
+      to_char(t.earliest_start,'J') as earliest_start_j,
+      to_char(current_timestamp,'J') as today_j,
+      to_char(t.latest_start,'J') as latest_start_j,
+      to_char(t.latest_finish,'J') as latest_finish_j,
+      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,
+      t.percent_complete,
+      t.estimated_hours_work,
+      t.estimated_hours_work_min,
+      t.estimated_hours_work_max,
+      case when t.actual_hours_worked is null then 0
+              else t.actual_hours_worked end as actual_hours_worked,
+      to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start,
+      to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish,
+      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,
+      p.person_id,
+      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 
+        LEFT JOIN pm_task_assignment ta
+        ON t.item_id = ta.task_id
+          LEFT JOIN persons p 
+          ON ta.party_id = p.person_id
+          LEFT JOIN pm_roles r
+          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 and
+      t.parent_id = projecti.item_id and
+      (select context_id from acs_objects where object_id=(select context_id from acs_objects where object_id=(select context_id from acs_objects where object_id=t.parent_id))) = :package_id and
+      projecti.live_revision = projectr.revision_id
+      $hide_closed_clause
+      $selected_users_clause
+      ORDER BY
+      t.latest_start, ts.task_id, r.role_id, p.first_names, p.last_name
+</querytext>
+</fullquery>
+
 </queryset>