Index: openacs-4/packages/project-manager/lib/projects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/projects.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/project-manager/lib/projects.tcl	10 Aug 2005 22:22:26 -0000	1.13
+++ openacs-4/packages/project-manager/lib/projects.tcl	11 Aug 2005 17:07:24 -0000	1.14
@@ -226,6 +226,9 @@
             label "[_ project-manager.Latest_Finish]"
             display_template "<if @projects_${package_id}.days_to_latest_finish@ gt 1>@projects_${package_id}.latest_finish_date@</if><else><font color=\"red\">@projects_${package_id}.latest_finish_date@</font></else>"
         }
+        planned_end_date {
+            label "[_ project-manager.Latest_Finish]"
+        }
         actual_hours_completed {
             label "[_ project-manager.Hours_completed]"
             display_template "@projects_${package_id}.actual_hours_completed@/@projects_${package_id}.estimated_hours_total@"
Index: openacs-4/packages/project-manager/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/project-manager/lib/tasks.tcl	10 Aug 2005 22:38:26 -0000	1.12
+++ openacs-4/packages/project-manager/lib/tasks.tcl	11 Aug 2005 17:07:24 -0000	1.13
@@ -3,7 +3,7 @@
 # role_id
 
 set required_param_list [list]
-set optional_param_list [list orderby searchterm status_id page bulk_p actions_p base_url]
+set optional_param_list [list orderby searchterm status_id page bulk_p actions_p base_url watcher_p page_num]
 set optional_unset_list [list party_id role_id project_item_id instance_id]
 
 foreach required_param $required_param_list {
@@ -175,9 +175,16 @@
 	set party_where_clause "and t.party_id = :party_id"
 
 	# Do we want to show observer tasks as well?
-	if {[parameter::get -parameter "ShowObserverTasksP"] == 0} {
-	    append party_where_clause "\n and r.is_observer_p = 'f' "
+	if {$watcher_p == 1} {
+	    append party_where_clause "\n and r.is_observer_p = 't' "
+	    set actions [list "[_ project-manager.View_Active]" [export_vars -base "[ad_conn url]" {{watcher_p 0} page_num}] "[_ project-manager.View_only_Active]"]
+	} else {
+	    if {[parameter::get -parameter "ShowObserverTasksP" -default 0] == 0} {
+		append party_where_clause "\n and r.is_observer_p = 'f' "
+	    }
+	    set actions [list "[_ project-manager.View_Watcher]" [export_vars -base "[ad_conn url]" {{watcher_p 1} page_num}] "[_ project-manager.View_only_Observer]"]
 	}
+       
     } else {
 	set party_where_clause ""
     }
@@ -219,10 +226,10 @@
 }
 
 if {$actions_p == 1} {
-    set actions [list "[_ project-manager.Add_task]" [export_vars \
+#    set actions [list "[_ project-manager.Add_task]" [export_vars \
 							  -base "${base_url}task-select-project" {return_url}] "[_ project-manager.Add_a_task]"]
 } else {
-    set actions [list]
+#    set actions [list "[_ project-manager.Watcher]" [export_vars -base "[ad_conn url]" {{watcher_p 1} page_num}] "[_ project_manager.Watcher]"]
 }
 
 template::list::create \