Index: openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml,v diff -u -N -r1.17.2.9 -r1.17.2.10 --- openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml 22 Sep 2006 16:36:22 -0000 1.17.2.9 +++ openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml 24 Oct 2006 10:38:45 -0000 1.17.2.10 @@ -486,7 +486,10 @@ Upload a file OR a valid url, and not both Upload a solution for this assignment so the students can see it and learn from it. Upload Answer for \"%task_name%\" - $user_name has modified the grade of %party_name%. \n The edit reason given by %user_name% was: %edit_reason% \n The current grade is: %current_grade% \n\n Click on this link to see the evaluation details: %url_link% \n + %user_name% has modified the grade of %party_name%. + The comments(edit reason) given by %user_name% was: %edit_reason% + The current grade is: %current_grade% + Click on this link to see the evaluation details: %url_link% View evaluation details \ View/Edit Task Solution We got the following error while trying to remove the evaluation: <pre>%errmsg%</pre> Index: openacs-4/packages/evaluation/tcl/evaluation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.tcl,v diff -u -N -r1.31.2.8 -r1.31.2.9 --- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 22 Sep 2006 16:36:23 -0000 1.31.2.8 +++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 24 Oct 2006 10:38:46 -0000 1.31.2.9 @@ -194,6 +194,7 @@ -notif_type:required {-evaluation_id ""} {-edit_p 0} + {-subset {}} } { db_1row select_names { *SQL* } @@ -234,12 +235,13 @@ # Notifies the users that requested notification for the specific object notification::new \ - -type_id [notification::type::get_type_id -short_name $notif_type] \ - -object_id $package_id \ - -response_id $response_id \ - -notif_subject $notif_subject \ - -notif_text $notif_text - + -type_id [notification::type::get_type_id -short_name $notif_type] \ + -object_id $package_id \ + -response_id $response_id \ + -notif_subject $notif_subject \ + -notif_text $notif_text \ + -subset $subset \ + -action_id $response_id } ad_proc -public evaluation::package_key {} { Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl,v diff -u -N -r1.14.2.1 -r1.14.2.2 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 31 May 2005 23:13:11 -0000 1.14.2.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 24 Oct 2006 10:38:46 -0000 1.14.2.2 @@ -178,7 +178,6 @@ # Unfortunately, we can only calculate the file size after the lob is uploaded db_dml lob_size { *SQL* } } - foreach party_id [array names grades_gs] { if { ![info exists comments_gs($party_id)] } { set comments_gs($party_id) "" @@ -202,8 +201,8 @@ content::item::set_live_revision -revision_id $revision_id if { [string eq $new_p_gs($party_id) 0] } { - # if editing the grade, send the notification - evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif + # notify the user if suscribed + evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif -subset [list $party_id] } } @@ -232,6 +231,8 @@ -show_student_p $show_student_wa($party_id) -grade $grades_wa($party_id) -task_item_id $task_item_id -party_id $party_id] content::item::set_live_revision -revision_id $revision_id + # notify the user if suscribed + evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif -subset [list $party_id] } } } @@ -256,6 +257,8 @@ -show_student_p $show_student_na($party_id) -grade $grades_na($party_id) -task_item_id $task_item_id -party_id $party_id] content::item::set_live_revision -revision_id $revision_id + # notify the user if suscribed + evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif -subset [list $party_id] } } } @@ -270,8 +273,8 @@ content::item::set_live_revision -revision_id $revision_id - # send the notification to everyone suscribed - evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif + # notify the user (if suscribed) + evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif -subset [list $party_id] } } Index: openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl,v diff -u -N -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl 31 May 2005 23:13:11 -0000 1.8.2.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl 24 Oct 2006 10:38:46 -0000 1.8.2.2 @@ -80,7 +80,7 @@ } # send the notification to everyone suscribed - evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif + evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif -subset [list $party_id] ad_returnredirect "$return_url" ad_script_abort