Index: openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-procs-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql	26 Aug 2003 00:06:30 -0000	1.1
+++ openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql	4 Sep 2003 22:45:22 -0000	1.2
@@ -14,22 +14,27 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="project_manager::project::compute_status.projects_query">
+  <fullquery name="project_manager::project::compute_status.tasks_group_query">
     <querytext>
         select
-        sum(p.actual_hours_completed) as projects_total_hours_worked
+        sum(t.actual_hours_worked) as actual_hours_completed,
+        sum(t.estimated_hours_work) as estimated_hours_total,
+        to_char(current_timestamp,'J') as today_j
         from
-        pm_projectsx p, cr_items i
+        pm_tasks_revisionsx t, cr_items i
         where
-        p.item_id in ([join $project_list ", "]) and
-        i.live_revision = p.revision_id
+        t.item_id in ([join $task_list ", "]) and
+        i.live_revision = t.revision_id
     </querytext>
   </fullquery>
 
   <fullquery name="project_manager::project::compute_status.tasks_query">
     <querytext>
         select
-        sum(t.actual_hours_worked) as tasks_total_hours_worked
+        t.actual_hours_worked as worked,
+        t.estimated_hours_work as to_work,
+        t.item_id as my_iid,
+        to_char(end_date,'J') as task_deadline_j
         from
         pm_tasks_revisionsx t, cr_items i
         where
@@ -38,12 +43,41 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="project_manager::project::compute_status.dependency_query">
+    <querytext>
+        select
+        d.dependency_id,
+        d.task_id as task_item_id,
+        d.parent_task_id,
+        d.dependency_type
+        from
+        pm_task_dependency d
+        where
+        d.task_id in ([join $task_list ", "])
+    </querytext>
+  </fullquery>
+
+  <fullquery name="project_manager::project::compute_status.project_info">
+    <querytext>
+        select
+        to_char(planned_start_date,'J') as start_date_j,
+        to_char(planned_end_date,'J') as end_date_j
+        from         
+        pm_projects 
+        where
+        project_id = (select live_revision from cr_items where item_id = :project_item_id)
+    </querytext>
+  </fullquery>
+
   <fullquery name="project_manager::project::compute_status.update_project">
     <querytext>
         update
         pm_projects
         set 
-        actual_hours_completed = :total_hours_worked
+        actual_hours_completed = :actual_hours_completed,
+        estimated_hours_total  = :estimated_hours_total,
+        earliest_finish_date   = 'J[expr floor([set max_earliest_finish])]',
+        latest_finish_date     = 'J[expr  ceil([set min_latest_start])]'
         where
         project_id = (select live_revision from cr_items where item_id = :project_item_id)
     </querytext>
@@ -66,4 +100,18 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="project_manager::project::compute_status.update_task">
+    <querytext>
+        update
+        pm_tasks_revisions
+        set 
+        earliest_start  = 'J[expr ceil( [set earliest_start($task_item)])]',
+        earliest_finish = 'J[expr ceil( [set earliest_finish($task_item)])]',
+        latest_start    = 'J[expr floor([set latest_start($task_item)])]',
+        latest_finish   = 'J[expr floor([set latest_finish($task_item)])]'
+        where
+        task_revision_id = (select live_revision from cr_items where item_id = :task_item)
+    </querytext>
+  </fullquery>
+
 </queryset>