Index: openacs-4/contrib/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/Attic/project-manager.info,v
diff -u -r1.16.2.7 -r1.16.2.8
--- openacs-4/contrib/packages/project-manager/project-manager.info	19 Jul 2004 21:19:06 -0000	1.16.2.7
+++ openacs-4/contrib/packages/project-manager/project-manager.info	6 Aug 2004 18:28:18 -0000	1.16.2.8
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.13b3" url="http://openacs.org/repository/download/apm/project-manager-2.13b3.apm">
+    <version name="2.14" url="http://openacs.org/repository/download/apm/project-manager-2.14.apm">
         <owner url="mailto:jader@bread.com">Jade Rubick</owner>
         <summary>Project management tool for OpenACS</summary>
-        <release-date>2004-07-19</release-date>
+        <release-date>2004-08-06</release-date>
         <vendor url="mailto:jader@bread.com">Integrated Bakery Resources</vendor>
         <description format="text/plain">Track tasks, estimates and actual progress for a project.  See the &lt;a href=&quot;http://openacs.org/projects/dotwrk/project_management/&quot;&gt;project page&lt;/a&gt; for more information.</description>
 
-        <provides url="project-manager" version="2.13b3"/>
+        <provides url="project-manager" version="2.14"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="acs-templating" version="4.6.4"/>
         <requires url="categories" version="1.0d3"/>
@@ -24,8 +24,8 @@
         <requires url="organizations" version="0.3d"/>
 
         <callbacks>
-            <callback type="before-uninstantiate"  proc="pm::install::package_uninstantiate"/>
             <callback type="after-instantiate"  proc="pm::install::package_instantiate"/>
+            <callback type="before-uninstantiate"  proc="pm::install::package_uninstantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="LoggerPrimaryURL"  description="This is the primary logger instance that is linked in to this project-manager instance. Links to this instance are added to 
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.1 -r1.1.2.2
--- openacs-4/contrib/packages/project-manager/tcl/calendar-procs-postgresql.xql	5 Aug 2004 00:03:45 -0000	1.1.2.1
+++ openacs-4/contrib/packages/project-manager/tcl/calendar-procs-postgresql.xql	6 Aug 2004 18:28:18 -0000	1.1.2.2
@@ -32,19 +32,25 @@
         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
+        to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish,
+        p.first_names || ' ' || p.last_name as full_name,
+        p.person_id
         FROM
         pm_tasks_active ts, 
         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
         WHERE
         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
       ORDER BY
-      t.earliest_start
+      t.earliest_start, ts.task_id, p.first_names, p.last_name
 </querytext>
 </fullquery>
 
Index: openacs-4/contrib/packages/project-manager/tcl/calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/calendar-procs.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/contrib/packages/project-manager/tcl/calendar-procs.tcl	5 Aug 2004 00:03:45 -0000	1.1.2.1
+++ openacs-4/contrib/packages/project-manager/tcl/calendar-procs.tcl	6 Aug 2004 18:28:18 -0000	1.1.2.2
@@ -38,16 +38,41 @@
 
         set items [ns_set create]
         
+        set last_task_id ""
+        set assignee_list [list]
+
         db_foreach select_monthly_tasks {} {
-            set item "$title (status: status)"
-            set item "[subst $item_template]"
-            
-            append item "<p />"
-            
-            ns_set put $items $latest_start_j $item
+
+            if {[string equal $person_id $user_id]} {
+                set font_begin "<b><font size=-2>"
+                set font_end "</b></font>"
+            } else {
+                set font_begin "<font size=-2>"
+                set font_end "</font>"
+            }
+
+            if {[string equal $last_task_id $task_id]} {
+                append day_details "$font_begin<i>, $full_name</i>$font_end"
+            } else {
+
+                if {![empty_string_p $last_task_id]} {
+                    ns_set put $items $latest_start_j "$day_details<p />"
+                }
+
+                set day_details "<a href=\"task-one?task_id=$task_id\">$task_id</a> $title"
+
+                append day_details "<br />$font_begin<I>$full_name</i>$font_end"
+
+            }
+
+            set last_task_id $task_id
         }            
 
+        if {![empty_string_p $last_task_id ]} {
+            ns_set put $items $latest_start_j "$day_details<p />"
+        }
 
+
         # Display stuff
         if {[empty_string_p $item_add_template]} {
             set day_number_template "<font size=1>$day_template</font>"