Index: openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-procs.tcl,v
diff -u -r1.6.2.5 -r1.6.2.6
--- openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl	8 Jul 2004 21:31:41 -0000	1.6.2.5
+++ openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl	8 Sep 2004 22:36:59 -0000	1.6.2.6
@@ -1732,10 +1732,11 @@
         
         set to_addr [cc_email_from_party $party_id]
         set from_addr [cc_email_from_party [ad_conn user_id]]
-        
+        set role [pm::role::name -role_id $role_id]
+
         set subject "Assigned to project: $project_name"
         
-        set content "You have been assigned to a project: $project_name
+        set content "You have been assigned to a project: $project_name (as $role)
 
 Link: $project_url"
 
Index: openacs-4/contrib/packages/project-manager/tcl/role-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/role-procs.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/contrib/packages/project-manager/tcl/role-procs.tcl	2 Jul 2004 23:13:49 -0000	1.2.2.1
+++ openacs-4/contrib/packages/project-manager/tcl/role-procs.tcl	8 Sep 2004 22:36:59 -0000	1.2.2.2
@@ -91,3 +91,46 @@
 
     return $select_list
 }
+
+
+ad_proc -public pm::role::name {
+    -role_id:required
+} {
+    Returns the one_line for the role from the role_id
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-09-08
+    
+    @param role_id
+
+    @return one_line
+    
+    @error 
+} {
+    return [util_memoize [list pm::role::name_not_cached -role_id $role_id]]
+}
+
+
+ad_proc -public pm::role::name_not_cached {
+    -role_id:required
+} {
+    Returns the one_line for the role from the role_id
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-09-08
+    
+    @param role_id
+
+    @return one_line
+    
+    @error 
+} {
+    return [db_string get_one_line {
+        SELECT
+        one_line
+        FROM
+        pm_roles
+        WHERE
+        role_id = :role_id
+    } -default "error"]
+}
Index: openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs.tcl,v
diff -u -r1.4.2.12 -r1.4.2.13
--- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	31 Aug 2004 17:10:18 -0000	1.4.2.12
+++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	8 Sep 2004 22:36:59 -0000	1.4.2.13
@@ -941,45 +941,32 @@
 
         set task_url "[parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][ad_conn package_url]task-one?task_id=$task_item_id"
 
-        set subject "Task reopened (was $status_description): $task_title"
+        set subject "Task Reopened (was $status_description): $task_title"
 
-        if {[string is true [parameter::get_from_package_key -package_key project-manager -parameter UseUncertainCompletionTimesP]]} {
-            set estimated_work "\nHrs work (min):  $estimated_hours_work_min\nHrs work (max):  $estimated_hours_work_max"
-        } else {
-            set estimated_work "\nHrs work:        $estimated_hours_work"
-
-        }
-
         set notification_text "Task reopened, was $status_description\n\n"
 
         set task_description [ad_html_text_convert -from $mime_type -to "text/plain" -- $task_description]
 
         append notification_text "
 -------------
-Task ID:         \#$task_item_id
-Subject:         $task_title
+Subject:         $task_title (\#$task_item_id)
 Project:         $project_name
 
 Link:            $task_url
 
----------------
-Estimated work:
----------------$estimated_work
+-----------
+Description
+-----------
+$task_description
 
 ------
 Dates:
 ------
-Earliest start:  $earliest_start
-Earliest finish: $earliest_finish
 Latest start:    $latest_start
 Latest finish    $latest_finish
+"
 
------------
-Description
------------
-$task_description"
 
-
         append notification_text "\n"
         
         pm::util::email \
@@ -1136,8 +1123,7 @@
         append notification_text "
 $comment
 -------------
-Task ID:         \#$task_item_id
-Description:     $task_title
+Subject:         $task_title (\#$task_item_id)
 Project:         $project_name
 
 Link:            $task_url
@@ -1149,19 +1135,18 @@
 Estimated work:
 ---------------$estimated_work
 
+-----------
+Description
+-----------
+$task_description
+
 ------
 Dates:
 ------
-Earliest start:  $earliest_start
-Earliest finish: $earliest_finish
 Latest start:    $latest_start
 Latest finish    $latest_finish
+"
 
------------
-Description
------------
-$task_description"
-
         
         pm::util::email \
             -to_addr  $to_address \
@@ -1586,29 +1571,18 @@
         set description_out $description
     }
 
-    if {[string equal $use_uncertain_completion_times_p 1]} {
-        set estimated_work "\nHrs work (min):  $work_min"
-        append estimated_work "\nHrs work (max):  $work_max"
-    } else {
-        set estimated_work "\nHrs work:        $work"
-    }
-
     set notification_text "$intro_text\n\n$comment_text-------------"
     append notification_text "\nTask overview\n-------------"
-    append notification_text "\nTask ID:         \#$task_item_id"
-    append notification_text "\nSubject:         $subject"
+    append notification_text "\nSubject:         $subject (\#$task_item_id)"
     append notification_text "\nProject:         $project_name"
     append notification_text "\nYour role:       $assignee_role_name"
     append notification_text "\nLink:            $task_url"
-    append notification_text "\n\n\n\n---------------"
-    append notification_text "\nEstimated work:\n---------------$estimated_work"
+    append notification_text "\n\n-----------\nDescription\n-----------"
+    append notification_text "\n$description_out"
     append notification_text "\n\n------\nDates:"
-    append notification_text "\n------\nEarliest start:  $earliest_start"
-    append notification_text "\nEarliest finish: $earliest_finish"
+    append notification_text "\n------"
     append notification_text "\nLatest start:    $latest_start"
     append notification_text "\nLatest finish   *$latest_finish"
-    append notification_text "\n\n-----------\nDescription\n-----------"
-    append notification_text "\n$description_out"
 
     pm::util::email \
         -to_addr  $to_address \