Index: openacs-4/packages/evaluation/evaluation.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/evaluation.info,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/evaluation.info	7 Jun 2004 16:04:48 -0000	1.8
+++ openacs-4/packages/evaluation/evaluation.info	7 Jul 2004 17:26:43 -0000	1.9
@@ -23,7 +23,13 @@
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ArchiveCommand"  default="tar -czf {out_file} {in_file}" description="Program (and program options) to use for archiving file storage objects. Use the special tags {in_file} and {out_file} (including the curly braces) to denote the locations of the input and output files on the command line."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ArchiveExtension"  default="tgz" description="The extension that the programmer should add to the output file. This depends on the value of ArchiveCommand"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AssignmentsPortletRegion"  default="1" description="Use this parameter to indicate the possition of the assignments portlet (if applicable) in the page. Set this parameter to null if you want to use the default possition."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EvaluationPageName"  default="#evaluation.evaluationpagename#" description="Use this parameter to add the portlets (if you are using them evaluation_assignments and evaluation_evaluations) in a new page. If you do not want the portlets to be set in a new page, set this parameter to null."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EvaluationsPortletRegion"  default="2" description="Use this parameter to indicate the possition of the evaluations portlet (if applicable) in the page. Set this parameter to null if you want to use the default possition. "/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MaxNumberOfBytes"  default="5000" description="Maximun number of bytes allowed for the files in this package. (tasks, tasks sols, student answers, grades sheets, ect)"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="urlProtocols"  default="http://,ftp://,https://" description="Alowed protocols to use for the url field when submitting a task, task solution or an answer.
+
+Add values separated by comma."/>
         </parameters>
 
     </version>
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 -r1.2 -r1.3
--- openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml	15 Jun 2004 23:20:28 -0000	1.2
+++ openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml	7 Jul 2004 17:26:43 -0000	1.3
@@ -5,6 +5,7 @@
   <msg key="Add_Assignment_">Add Assignment </msg>
   <msg key="Add_Assignment_Type_">Add Assignment Type </msg>
   <msg key="Add_assignment_type_">Add assignment type </msg>
+  <msg key="Add_grade_name_">Add %grade_name% </msg>
   <msg key="Add_Member_to_group_">Add Member to group </msg>
   <msg key="Add_Task_">Add Task </msg>
   <msg key="Add_Task_Solution_">Add Task Solution </msg>
@@ -26,6 +27,51 @@
   <msg key="Audit_info_">Audit info </msg>
   <msg key="Audit_Info__1">Audit Info </msg>
   <msg key="Audit_info_for_task_">Audit info for task </msg>
+  <msg key="Back">#&gt;&quot; onClick=&quot;history.go(-1)&quot;&gt;
+    &lt;/form&gt;
+&lt;/if&gt;
+
+&lt;if %evaluations_na:rowcount% gt 0&gt;
+   &lt;form action=&quot;evaluate-students-2&quot; method+&quot;post&quot;&gt;
+	@export_vars;noquote@
+      &lt;input type=hidden name=task_id value=&quot;%task_id%&quot;&gt;
+      &lt;input type=hidden name=max_grade value=&quot;%max_grade%&quot;&gt;
+		&lt;blockquote&gt;
+        &lt;table&gt;
+          &lt;multiple name=&quot;evaluations_na&quot;&gt;
+                &lt;if %evaluations_na.rownum% odd&gt;&lt;table bgcolor=&quot;#EAF2FF&quot;&gt;&lt;/if&gt;&lt;else&gt;&lt;table bgcolor=&quot;white&quot;&gt;&lt;/else&gt;
+						&lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Name#&lt;/th&gt;&lt;td&gt;%evaluations_na.party_name%&lt;/td&gt;&lt;/tr&gt;
+					 	&lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Grade#&lt;/th&gt;&lt;td&gt;%evaluations_na.grade% / %max_grade%&lt;/td&gt;&lt;/tr&gt;
+                     	&lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Comments#&lt;/th&gt;&lt;td&gt;%evaluations_na.comment%&lt;/td&gt;&lt;/tr&gt;
+                     	&lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Will_the_studens_be# &lt;br /&gt; #evaluation.lt_able_to_see_the_grade#&lt;/th&gt;&lt;td&gt;%evaluations_na.show_student%&lt;/td&gt;&lt;/tr&gt;
+                    &lt;/tr&gt;
+					&lt;/table&gt;
+          &lt;/multiple&gt;
+        &lt;/table&gt;
+		&lt;/blockquote&gt;
+        &lt;input type=submit value=&quot;&lt;# Grade Students </msg>
+  <msg key="Back_1">#&gt;&quot; onClick=&quot;history.go(-1)&quot;&gt; 
+    &lt;/form&gt; 
+&lt;/if&gt; 
+&lt;if %evaluations_na:rowcount% gt 0&gt; 
+  &lt;form action=&quot;evaluate-students-2&quot; method+&quot;post&quot;&gt; 
+  @export_vars;noquote@ 
+  &lt;input type=hidden name=task_id value=&quot;%task_id%&quot;&gt; 
+  &lt;input type=hidden name=max_grade value=&quot;%max_grade%&quot;&gt; 
+  &lt;blockquote&gt; 
+  &lt;table&gt; 
+    &lt;multiple name=&quot;evaluations_na&quot;&gt; 
+    &lt;if %evaluations_na.rownum% odd&gt; &lt;table bgcolor=&quot;#EAF2FF&quot;&gt; &lt;/if&gt;
+    &lt;else&gt;&lt;table bgcolor=&quot;white&quot;&gt;&lt;/else&gt; 
+      &lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Name#&lt;/th&gt;&lt;td&gt;%evaluations_na.party_name%&lt;/td&gt;&lt;/tr&gt; 
+      &lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Grade#&lt;/th&gt;&lt;td&gt;%evaluations_na.grade% / %max_grade%&lt;/td&gt;&lt;/tr&gt; 
+      &lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Comments#&lt;/th&gt;&lt;td&gt;%evaluations_na.comment%&lt;/td&gt;&lt;/tr&gt; 
+      &lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Will_the_studens_be# &lt;br /&gt; #evaluation.lt_able_to_see_the_grade#&lt;/th&gt;&lt;td&gt;%evaluations_na.show_student%&lt;/td&gt;&lt;/tr&gt; &lt;/tr&gt; 
+    &lt;/table&gt; 
+    &lt;/multiple&gt; 
+  &lt;/table&gt; 
+  &lt;/blockquote&gt; 
+  &lt;input type=submit value=&quot;&lt;# Grade Students </msg>
   <msg key="Bad_input_">Bad input </msg>
   <msg key="Change_Answer_">Change Answer </msg>
   <msg key="Click">Click</msg>
@@ -50,6 +96,7 @@
   <msg key="Due_Date_1">Due Date</msg>
   <msg key="Edit_evaluation_">Edit evaluation </msg>
   <msg key="Edit_Evaluations_">Edit Evaluations </msg>
+  <msg key="Edit_grade_name_">Edit %grade_name% </msg>
   <msg key="Edit_Reason">Edit Reason:</msg>
   <msg key="Edit_Reason_">Edit Reason </msg>
   <msg key="Edit_Task_">Edit Task </msg>
@@ -67,6 +114,7 @@
   <msg key="File_">File </msg>
   <msg key="Fileurl_associated">File/url associated</msg>
   <msg key="Generate_file">Generate file</msg>
+  <msg key="Go">Back </msg>
   <msg key="Go_Back">Go Back</msg>
   <msg key="Grade">Grade:</msg>
   <msg key="Grade_">Grade </msg>
@@ -107,6 +155,7 @@
   <msg key="here">here</msg>
   <msg key="How_does_this_work">How does this work?</msg>
   <msg key="Id_">Id </msg>
+  <msg key="If">you want to see the group members, click on the name of the group </msg>
   <msg key="Individual_">Individual </msg>
   <msg key="Insert_Failed_">Insert Failed </msg>
   <msg key="Is_live_">Is live? </msg>
@@ -182,6 +231,7 @@
   <msg key="lt_If_you_click_on_the_s">If you click on the student name, you will see the grades report for that student.</msg>
   <msg key="lt_If_you_do_not_want_to">If you do not want to grade or edit the grade of a student/group, just leave intact the fields of that row, or you can delete the whole row.</msg>
   <msg key="lt_if_you_do_not_want_to">if you do not want to see the portraits of the students</msg>
+  <msg key="lt_If_you_enter_the_net_">If you enter the net value, it must be less than %grade_weight%, which is the net value of %grade_plural_name% over the 100 points of the class. &lt;br /&gt; After uploading the %grade_name%, the system will do the convertion and the net value will be represented as a percentage. </msg>
   <msg key="lt_if_you_want_to_downlo">if you want to download all the answers in one file</msg>
   <msg key="lt_if_you_want_to_see_th">if you want to see the portraits of the students</msg>
   <msg key="lt_In_order_to_generate_">In order to generate this file there must be some parties assigned to this task. </msg>
@@ -262,8 +312,10 @@
   <msg key="lt_The_grade_must_be_a_R">The grade must be a REAL NUMBER.</msg>
   <msg key="lt_The_grade_must_be_a_v">The grade must be a valid number: %wrong_grade% </msg>
   <msg key="lt_The_grade_must_be_a_v_1">The grade must be a valid number </msg>
+  <msg key="lt_The_net_value_must_be">The net value must be grather than 0 and less than $grade_weight, and you can not enter Net Value AND Weight. </msg>
   <msg key="lt_The_sum_of_the_weight">The sum of the weight of all the assignment types is %total_weight% and it should be 100 by the end of the term(supposedly). </msg>
   <msg key="lt_The_system_assumes_th">The system assumes that the grades start at the 7th line of the file.</msg>
+  <msg key="lt_The_weight_must_be_gr">The weight must be grather than 0, and you can not enter Net Value AND Weight. </msg>
   <msg key="lt_There_are_no_edit">There are no grades to edit</msg>
   <msg key="lt_There_are_no_files_as">There are no files associated with this task </msg>
   <msg key="lt_There_are_no_grades_f">There are no grades for this group. </msg>
@@ -327,6 +379,12 @@
   <msg key="lt_We_got_the_following__1">We got the following error while trying to remove the grade: &lt;pre&gt;%errmsg%&lt;/pre&gt; </msg>
   <msg key="lt_We_got_the_following__2">We got the following error while trying to remove the task: &lt;pre&gt;%errmsg%&lt;/pre&gt; </msg>
   <msg key="lt_Weight_must_be_a_real">Weight must be a real number and between 0 and 100 </msg>
+  <msg key="lt_Weight_over_100_br__o">Weight over 100% &lt;br /&gt; of the Course </msg>
+  <msg key="lt_Weight_over_grade_wei">Weight over %grade_weight%% &lt;br /&gt; of %grade_plural_name% </msg>
+  <msg key="lt_Weight_over_grade_wei_1">Weight over %grade_weight%% of %grade_plural_name%&quot;}
+	{html {size 5}}
+	{help_text &quot;&lt;#_ You can enter the weight over %grade_weight%% of %grade_plural_name% or you can enter the net value of it in the field below. </msg>
+  <msg key="lt_Weight_over_grade_wei_2">Weight over %grade_weight%% of %grade_plural_name% </msg>
   <msg key="lt_Weight_used_in_grade_">Weight used in $grade_plural_name: ${category_weight}% (of 100% of $grade_plural_name) &lt;br /&gt;
                     $grade_plural_name represents ${grade_weight}% of the 100% of the class </msg>
   <msg key="lt_Weight_used_in_grade__1">Weight used in %grade_plural_name%: ${category_weight}% (of 100% of $grade_plural_name) &lt;br /&gt;
@@ -345,6 +403,7 @@
   <msg key="lt_Yes_I_really_want_to__3">Yes, I really want to remove this task </msg>
   <msg key="lt_You_can_also_add_a_st">You can also add a student to an existing group by clicking on the &quot;Associate to group...&quot; link. Here you will be asked to select the group to wich you want to add the user.</msg>
   <msg key="lt_You_can_associate_a_l">You can associate a link to this task by entering the absolute url here (also optional) </msg>
+  <msg key="lt_You_can_enter_the_wei">You can enter the weight over %grade_weight%% of %grade_plural_name% or you can enter the net value of it in the field below. </msg>
   <msg key="lt_You_can_order_the_gra">You can order the grade report by the name of the student, by the total grade, or by any of the assignment types, or see the assignment type details by clicking on the view icon at the left of the assignment type name.</msg>
   <msg key="lt_You_can_order_the_gra_1">You can order the grade report by the name of the student, by the total grade, or by any of the assignments of this assignment type.</msg>
   <msg key="lt_You_can_see_the_csv_f">You can see the csv files associated with the task by clicking on the &quot;See grades sheets associated with this task&quot; botton.</msg>
@@ -360,6 +419,7 @@
   <msg key="Name">Name:</msg>
   <msg key="Name_">Name </msg>
   <msg key="Name_student_name">Name: %student_name%</msg>
+  <msg key="Net_Value_">Net Value </msg>
   <msg key="Net_value_">Net value </msg>
   <msg key="NEW_answer_">(NEW answer) </msg>
   <msg key="New_Assignment_">New Assignment </msg>
@@ -375,6 +435,7 @@
   <msg key="Not_answered_">Not answered </msg>
   <msg key="Not_available_">Not available </msg>
   <msg key="Not_evaluated_">Not evaluated </msg>
+  <msg key="Note">that if you unassociate ALL the members or the group, THE GROUP WILL BE DELETED. </msg>
   <msg key="Number_of_Integrants">Number of Integrants</msg>
   <msg key="Number_of_Members_">Number of Members </msg>
   <msg key="One_Assignment_">One Assignment </msg>
@@ -388,6 +449,7 @@
   <msg key="Rename">Group </msg>
   <msg key="Requires_Grade_">Requires Grade? </msg>
   <msg key="Reuse_Groups_">Reuse Groups </msg>
+  <msg key="Send">file </msg>
   <msg key="Solution_Attachment_">Solution Attachment </msg>
   <msg key="Studen_List_">Studen List </msg>
   <msg key="Student_List_">Student List </msg>
@@ -407,6 +469,8 @@
   <msg key="Tasks_">Tasks </msg>
   <msg key="Tasks_for_students_">Tasks for students </msg>
   <msg key="Tasks_List_">Tasks List </msg>
+  <msg key="Theese">are the evaluated students. Note that if you evaluated them over a grad different from 100, the system automatically did the conversion so the grade will be shown over 100 points. </msg>
+  <msg key="There">are no groups for this assignment yet. </msg>
   <msg key="Total_">Total </msg>
   <msg key="Total_current_grade_">Total current grade: </msg>
   <msg key="Total_Grade_">Total Grade </msg>
@@ -437,4 +501,5 @@
   <msg key="Y">upi , pero no yupin</msg>
   <msg key="Yes">Yes</msg>
   <msg key="Yes_">Yes </msg>
+  <msg key="evaluationpagename">Class Material </msg>
 </message_catalog>
Index: openacs-4/packages/evaluation/lib/audit-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/audit-chunk-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/lib/audit-chunk-postgresql.xql	10 Jun 2004 21:08:52 -0000	1.2
+++ openacs-4/packages/evaluation/lib/audit-chunk-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.3
@@ -1,17 +1,19 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_task_audit_info">      
       <querytext>
 
 	select to_char(ese.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,
-	ese.modifying_user,
+	coalesce(person__name(ese.modifying_user),person__name(ese.creation_user)) as modifying_user,
 	ese.modifying_ip,
 	ese.description as comments,
 	ese.grade as task_grade,
-	content_revision__is_live(evaluation_id) as is_live
+	case when content_revision__is_live(evaluation_id) = true then 1
+	  else 0 
+      	end as is_live
 	from evaluation_student_evalsx ese
 	where ese.task_id = :task_id
       and ese.party_id = :party_id
Index: openacs-4/packages/evaluation/lib/audit-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/audit-chunk.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/lib/audit-chunk.tcl	10 Jun 2004 21:08:52 -0000	1.2
+++ openacs-4/packages/evaluation/lib/audit-chunk.tcl	7 Jul 2004 17:26:44 -0000	1.3
@@ -10,10 +10,12 @@
     -name grade_tasks \
     -multirow grade_tasks \
     -key task_name \
+    -filters { task_id {} } \
     -pass_properties { return_url } \
+    -orderby { default_value last_modified } \
     -elements {
         task_grade {
-            label "[_ evaluation.Name_]"
+            label "[_ evaluation.Grade_]"
 	    orderby_asc {task_grade asc}
 	    orderby_desc {task_grade desc}
         }
@@ -44,5 +46,12 @@
 
 db_multirow -extend { last_modified_pretty } grade_tasks get_task_audit_info { *SQL* } {
     set last_modified_pretty [lc_time_fmt $last_modified_ansi "%q"]
+
+    if { $is_live } {
+	set is_live "[_ evaluation.Yes_]"
+    } else {
+	set is_live "[_ evaluation.No_]"
+    }
+
 }
 
Index: openacs-4/packages/evaluation/lib/evaluations-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/Attic/evaluations-chunk-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/lib/evaluations-chunk-postgresql.xql	31 May 2004 17:04:57 -0000	1.2
+++ openacs-4/packages/evaluation/lib/evaluations-chunk-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_tasks_admin">      
       <querytext>
Index: openacs-4/packages/evaluation/lib/evaluations-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/evaluations-chunk.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/lib/evaluations-chunk.tcl	15 Jun 2004 23:20:29 -0000	1.5
+++ openacs-4/packages/evaluation/lib/evaluations-chunk.tcl	7 Jul 2004 17:26:44 -0000	1.6
@@ -108,7 +108,13 @@
 	if { [empty_string_p $answer_data] } {
 	    set answer_url ""
 	    set answer ""
-	} elseif { [regexp "http://" $answer_data] } {
+	} elseif { [empty_string_p [db_string content_length "select content_length from cr_revisions where revision_id = :answer_id"]] } {
+	    # there is a bug in the template::list, if the url does not has a http://, ftp://, the url is not absolute,
+	    # so we have to deal with this case
+	    array set community_info [site_node::get -url "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]][evaluation::package_key]"]
+	    if { ![regexp ([join [split [parameter::get -parameter urlProtocols -package_id $community_info(package_id)] ","] "|"]) "$answer_data"] } {
+		set answer_data "http://$answer_data"
+	    } 
 	    set answer_url "[export_vars -base "$answer_data" { }]"
 	    set answer "[_ evaluation.View_my_answer_]"
 	} else {
Index: openacs-4/packages/evaluation/lib/evaluations-chunk.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/evaluations-chunk.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/lib/evaluations-chunk.xql	7 Jun 2004 16:04:53 -0000	1.2
+++ openacs-4/packages/evaluation/lib/evaluations-chunk.xql	7 Jul 2004 17:26:44 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_grade_info">      
       <querytext>
Index: openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.1
+++ openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_tasks_admin">      
       <querytext>
Index: openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/Attic/tasks-chunk-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.5
+++ openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.6
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_tasks_admin">      
       <querytext>
Index: openacs-4/packages/evaluation/lib/tasks-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/tasks-chunk.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/lib/tasks-chunk.tcl	10 Jun 2004 21:08:52 -0000	1.4
+++ openacs-4/packages/evaluation/lib/tasks-chunk.tcl	7 Jul 2004 17:26:44 -0000	1.5
@@ -102,7 +102,14 @@
 	if { [empty_string_p $task_data] } {
 	    set task_url "[export_vars -base "${base_url}task-view" { grade_id task_id return_url }]"
 	    set task_name "$task_name (No data)"
-	} elseif { [regexp "http://" $task_data] } {
+	} elseif { [empty_string_p $content_length] } {
+
+	    # there is a bug in the template::list, if the url does not has a http://, ftp://, the url is not absolute,
+	    # so we have to deal with this case
+	    array set community_info [site_node::get -url "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]][evaluation::package_key]"]
+	    if { ![regexp ([join [split [parameter::get -parameter urlProtocols -package_id $community_info(package_id)] ","] "|"]) "$task_data"] } {
+		set task_data "http://$task_data"
+	    } 
 	    set task_url "[export_vars -base "$task_data" { }]"
 	    set task_name "$task_name (URL)"
 	} else {
@@ -139,7 +146,14 @@
 	if { [empty_string_p $task_data] } {
 	    set task_url "[export_vars -base "${base_url}task-view" { grade_id task_id return_url }]"
 	    set task_name "$task_name [_ evaluation.No_data_]"
-	} elseif { [regexp "http://" $task_data] } {
+	} elseif { [empty_string_p $content_length] } {
+
+	    # there is a bug in the template::list, if the url does not has a http://, ftp://, the url is not absolute,
+	    # so we have to deal with this case
+	    array set community_info [site_node::get -url "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]][evaluation::package_key]"]
+	    if { ![regexp ([join [split [parameter::get -parameter urlProtocols -package_id $community_info(package_id)] ","] "|"]) "$task_data"] } {
+		set task_data "http://$task_data"
+	    } 
 	    set task_url "[export_vars -base "$task_data" { }]"
 	    set task_name "$task_name [_ evaluation.URL_]"
 	} else {
Index: openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql	7 Jun 2004 16:04:53 -0000	1.5
+++ openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql	7 Jul 2004 17:26:44 -0000	1.6
@@ -1171,10 +1171,7 @@
 
     template_id := content_template__new( 
       ''evaluation-tasks-default'', -- name
-      ''<master>
-<property name="title">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
-@text;noquote@'',               -- text
+      ''@text;noquote@'',               -- text
       true                      -- is_live
     );
 
@@ -1191,10 +1188,7 @@
 
     template_id := content_template__new( 
       ''evaluation-tasks-sols-default'', -- name
-      ''<master>
-<property name="title">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
-@text;noquote@'',               -- text
+      ''@text;noquote@'',               -- text
       true                      -- is_live
     );
 
@@ -1211,10 +1205,7 @@
 
     template_id := content_template__new( 
       ''evaluation-answers-default'', -- name
-      ''<master>
-<property name="title">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
-@text;noquote@'',               -- text
+      ''@text;noquote@'',               -- text
       true                      -- is_live
     );
 
@@ -1231,10 +1222,7 @@
 
     template_id := content_template__new( 
       ''evaluation-grades-sheets-default'', -- name
-      ''<master>
-<property name="title">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
-@text;noquote@'',               -- text
+      ''@text;noquote@'',               -- text
       true                      -- is_live
     );
 
Index: openacs-4/packages/evaluation/sql/postgresql/evaluation-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/sql/postgresql/evaluation-drop.sql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/sql/postgresql/evaluation-drop.sql	7 Jun 2004 16:04:54 -0000	1.5
+++ openacs-4/packages/evaluation/sql/postgresql/evaluation-drop.sql	7 Jul 2004 17:26:44 -0000	1.6
@@ -203,7 +203,7 @@
 
 drop function evaluation__new_student_eval (integer, integer, integer, integer, numeric, char, text, varchar, timestamptz, integer, varchar, varchar, timestamptz, varchar, varchar);
 
-drop function evaluation__delete_student_eval (integer)
+drop function evaluation__delete_student_eval (integer);
 
 ---------------------------------------
 -- STUDENT EVALUATIONS
Index: openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.7
+++ openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.8
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="evaluation::new_grade.content_item_new">      
       <querytext>
@@ -456,12 +456,22 @@
       </querytext>
 </partialquery>
 
+<fullquery name="evaluation::generate_grades_sheet.get_task_info">      
+      <querytext>
+
+	select et.task_name, et.number_of_members
+               from evaluation_tasks et
+               where et.task_id = :task_id
+
+      </querytext>
+</fullquery>
+
 <partialquery name="evaluation::generate_grades_sheet.sql_query_groups">      
       <querytext>
 
-	"select etg.group_id as party_id, 
+	select etg.group_id as party_id, 
 		g.group_name as party_name,  
-                ese.grade,
+                grade,
                 ese.description as comments
          from groups g,
               evaluation_task_groups etg left outer join evaluation_student_evalsi ese on (ese.party_id = etg.group_id
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 -r1.8 -r1.9
--- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	15 Jun 2004 23:20:29 -0000	1.8
+++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	7 Jul 2004 17:26:44 -0000	1.9
@@ -194,27 +194,32 @@
     @author jopez@galileo.edu
     @creation-date Mar 2004
 } {
-	set now [list]
-	foreach v [clock format [clock seconds] -format "%Y %m %d %H %M %S"] {
-		lappend now [template::util::leadingTrim $v]
+    set now [list]
+    foreach v [clock format [clock seconds] -format "%Y %m %d %H %M %S"] {
+	lappend now [template::util::leadingTrim $v]
+    }
+    
+    set day [lindex $now 2]
+    set month [lindex $now 1]
+    set interval_def [template::util::date::defaultInterval day]
+    for { set i [lindex $interval_def 0] }  { $i <= 15 }  { incr i 1 } {
+	incr day
+	if { [expr $day + $i] >= [lindex $interval_def 1] } {
+	    incr month 1
+	    set day 1
 	}
-
-	set day [lindex $now 2]
-	set month [lindex $now 1]
-	set interval_def [template::util::date::defaultInterval day]
-	for { set i [lindex $interval_def 0] }  { $i <= 15 }  { incr i 1 } {
-		incr day
-		if { [expr $day + $i] >= [lindex $interval_def 1] } {
-			incr month 1
-			set day 1
-		}
-	}
+    }
     
-	# replace the hour and minute values in the now list with new values
-	set now [lreplace $now 2 2 $day]
-	set now [lreplace $now 1 1 $month]
-
-	return [eval template::util::date::create $now]
+    # replace the hour and minute values in the now list with new values
+    set now [lreplace $now 2 2 $day]
+    set now [lreplace $now 1 1 $month]
+ 
+    # set default time
+    set now [lreplace $now 3 3 23]    
+    set now [lreplace $now 4 4 59]    
+    set now [lreplace $now 5 5 59]    
+    
+    return [eval template::util::date::create $now]
 }
 
 ad_proc -public evaluation::clone_task {
@@ -544,9 +549,7 @@
 	
     regexp {/grades-sheet-csv-([^.]+).csv$} $url match task_id  
 	
-    if { ![db_0or1row get_task_info "select et.task_name, et.number_of_members
-                                 from evaluation_tasks et
-                                 where et.task_id = :task_id"] } { 
+    if { ![db_0or1row get_task_info { *SQL* }] } { 
 		# this should never happen
         ad_return_error "No information" "There has been an error, there is no infomraiton about the task $task_id"
         return 
@@ -576,9 +579,12 @@
 	}
 	
     db_foreach parties_with_to_grade { *SQL* } {
+	if { ![empty_string_p $grade] } {
+	    set grade [format %.2f [lc_numeric $grade]]
+	}
 	    lappend csv_content "\n$party_id" 
 	    lappend csv_content "$party_name" 
-	    lappend csv_content "[format %.2f [lc_numeric $grade]]" 
+	    lappend csv_content "$grade" 
 	    lappend csv_content "$comments" 
 	} if_no_rows { 
 		ad_return_error "[_ evaluation.No_parties_to_grade_]" "[_ evaluation.lt_In_order_to_generate_]"
Index: openacs-4/packages/evaluation/www/answer-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/answer-add-edit-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/answer-add-edit-postgresql.xql	10 Jun 2004 21:08:53 -0000	1.2
+++ openacs-4/packages/evaluation/www/answer-add-edit-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_party_id">      
       <querytext>
Index: openacs-4/packages/evaluation/www/evaluation-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/evaluation-list-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/evaluation-list-postgresql.xql	7 Jun 2004 16:05:07 -0000	1.2
+++ openacs-4/packages/evaluation/www/evaluation-list-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_grades">      
       <querytext>
Index: openacs-4/packages/evaluation/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/index-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/index-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.3
+++ openacs-4/packages/evaluation/www/index-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.4
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_grades">      
       <querytext>
Index: openacs-4/packages/evaluation/www/task-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-list-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/task-list-postgresql.xql	7 Jun 2004 16:05:07 -0000	1.2
+++ openacs-4/packages/evaluation/www/task-list-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_grades">      
       <querytext>
Index: openacs-4/packages/evaluation/www/task-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/task-view-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.4
+++ openacs-4/packages/evaluation/www/task-view-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.5
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_task_info">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/index-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/index-postgresql.xql	7 Jun 2004 16:05:08 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/index-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_grades">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/admin/index.adp	10 Jun 2004 21:08:53 -0000	1.6
+++ openacs-4/packages/evaluation/www/admin/index.adp	7 Jul 2004 17:26:44 -0000	1.7
@@ -2,6 +2,8 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
+@portal_id@ - @page_id@ - @layout_id@ - @ds_id@
+
 <h2>#evaluation.Assignment_Types#</h2>
 <ul>
 <li><a href="grades/grades">#evaluation.lt_Admin_my_Assignment_T#</a></li>
Index: openacs-4/packages/evaluation/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/index.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/index.tcl	10 Jun 2004 21:08:53 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/index.tcl	7 Jul 2004 17:26:44 -0000	1.6
@@ -17,6 +17,11 @@
 set page_title "[_ evaluation.Evaluation_Index_]"
 set context {}
 
+set portal_id [dotlrn_community::get_portal_id -community_id [dotlrn_community::get_community_id]]
+set page_id [portal::get_page_id -create -portal_id $portal_id -page_name ""]
+set layout_id [portal::get_layout_id -page_id $page_id $portal_id]
+set ds_id [portal::get_datasource_id evaluation_assignments_portlet]
+
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin]
Index: openacs-4/packages/evaluation/www/admin/evaluations/audit-info-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/audit-info-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/evaluations/audit-info-postgresql.xql	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/audit-info-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_parties">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp	15 Jun 2004 23:20:29 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp	7 Jul 2004 17:26:44 -0000	1.4
@@ -8,7 +8,7 @@
 <ul>
 <multiple name="parties">
  		<li><strong>@parties.party_name@</strong>
-		<include src="../../../lib/audit-chunk" task_id=@task_id@ party_id=@parties.party_id@>
+		<include src="../../../lib/audit-chunk" task_id=@task_id@ party_id=@parties.party_id@ orderby=@orderby@>
 		</li>
 </multiple>
 </ul>
Index: openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl	10 Jun 2004 21:08:53 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl	7 Jul 2004 17:26:44 -0000	1.3
@@ -9,7 +9,8 @@
 	@cvs-id $Id$
 
 } {
-	task_id:integer,notnull
+    task_id:integer,notnull
+    {orderby:optional ""}
 }
 
 db_1row get_task_info { *SQL* }
Index: openacs-4/packages/evaluation/www/admin/evaluations/audit-info.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/audit-info.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/evaluations/audit-info.xql	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/audit-info.xql	7 Jul 2004 17:26:44 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_task_info">      
       <querytext>
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 -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl	10 Jun 2004 21:08:53 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl	7 Jul 2004 17:26:44 -0000	1.6
@@ -193,8 +193,14 @@
 	}
 	
 	if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } {
+	    # new file?
+	    if { [db_string grades_wa_new "select count(*) from evaluation_student_evals where party_id = :party_id and task_id = :task_id and content_revision__is_live(evaluation_id) = true"] } {
+		set new_item_p 0
+	    } else {
+		set new_item_p 1
+	    }
 	    set grades_wa($party_id) [expr ($grades_wa($party_id)*100)/$max_grade.0]
-	    set revision_id [evaluation::new_evaluation -new_item_p 1 -item_id $item_ids($party_id) -content_type evaluation_student_evals \
+	    set revision_id [evaluation::new_evaluation -new_item_p $new_item_p -item_id $item_ids($party_id) -content_type evaluation_student_evals \
 				 -content_table evaluation_student_evals -content_id evaluation_id -description $comments_wa($party_id) \
 				 -show_student_p $show_student_wa($party_id) -grade $grades_wa($party_id) -task_id $task_id -party_id $party_id]
 	    
@@ -211,8 +217,14 @@
 	    set comments_na($party_id) [DoubleApos $comments_na($party_id)]
 	}
 	if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)] } {
+	    # new file?
+	    if { [db_string grades_na_new "select count(*) from evaluation_student_evals where party_id = :party_id and task_id = :task_id and content_revision__is_live(evaluation_id) = true"] } {
+		set new_item_p 0
+	    } else {
+		set new_item_p 1
+	    }
 	    set grades_na($party_id) [expr ($grades_na($party_id)*100)/$max_grade.0]
-	    set revision_id [evaluation::new_evaluation -new_item_p 1 -item_id $item_ids($party_id) -content_type evaluation_student_evals \
+	    set revision_id [evaluation::new_evaluation -new_item_p $new_item_p -item_id $item_ids($party_id) -content_type evaluation_student_evals \
 				 -content_table evaluation_student_evals -content_id evaluation_id -description $comments_na($party_id) \
 				 -show_student_p $show_student_na($party_id) -grade $grades_na($party_id) -task_id $task_id -party_id $party_id]
 	    
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-postgresql.xql	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_party_name">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp	10 Jun 2004 21:08:53 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp	7 Jul 2004 17:26:44 -0000	1.4
@@ -22,32 +22,33 @@
           </multiple>
         </table>
 		</blockquote>
-        <input type=submit value="Grade Students">
-    </form>
+        <input type=submit value="#evaluation.Grade_1#" > <input type=button value="#evaluation.Go#" onClick="history.go(-1)"> 
+   </form> 
+</if> 
+<if %evaluations_na:rowcount% gt 0> 
+  <form action="evaluate-students-2" method="post"> 
+  @export_vars;noquote@ 
+  <input type=hidden name=task_id value="%task_id%"> 
+  <input type=hidden name=max_grade value="%max_grade%"> 
+  <blockquote> 
+    <table> 
+	<multiple name="evaluations_na"> 
+	<if %evaluations_na.rownum% odd> <table bgcolor="#EAF2FF"> </if> 
+	<else><table bgcolor="white"></else> 
+	 <tr><th align="right">#evaluation.Name#</th><td>%evaluations_na.party_name%</td></tr>
+	 <tr><th align="right">#evaluation.Grade#</th><td>%evaluations_na.grade% / %max_grade%</td></tr>
+	 <tr><th align="right">#evaluation.Comments#</th><td>%evaluations_na.comment%</td></tr>
+	 <tr><th align="right">#evaluation.Will_the_studens_be# <br /> #evaluation.lt_able_to_see_the_grade#</th><td>%evaluations_na.show_student%</td></tr>
+	 </tr> 
+        </table> 
+       </multiple> 
+    </table> 
+  </blockquote> 
+  <input type=submit value="#evaluation.Grade_1#" >
+  <input type=button value="#evaluation.Go#" onClick="history.go(-1)">
+  </form>
 </if>
 
-<if @evaluations_na:rowcount@ gt 0>
-   <form action="evaluate-students-2" method+"post">
-	@export_vars;noquote@
-      <input type=hidden name=task_id value="@task_id@">
-      <input type=hidden name=max_grade value="@max_grade@">
-		<blockquote>
-        <table>
-          <multiple name="evaluations_na">
-                <if @evaluations_na.rownum@ odd><table bgcolor="#EAF2FF"></if><else><table bgcolor="white"></else>
-						<tr><th align="right">#evaluation.Name#</th><td>@evaluations_na.party_name@</td></tr>
-					 	<tr><th align="right">#evaluation.Grade#</th><td>@evaluations_na.grade@ / @max_grade@</td></tr>
-                     	<tr><th align="right">#evaluation.Comments#</th><td>@evaluations_na.comment@</td></tr>
-                     	<tr><th align="right">#evaluation.Will_the_studens_be# <br /> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations_na.show_student@</td></tr>
-                    </tr>
-					</table>
-          </multiple>
-        </table>
-		</blockquote>
-        <input type=submit value="Grade Students">
-    </form>
-</if>
-
 <if @evaluations:rowcount@ gt 0>
    <form action="evaluate-students-2" method="post">
 	@export_vars;noquote@
@@ -66,7 +67,7 @@
           </multiple>
         </table>
 		</blockquote>
-        <input type=submit value="Confirm">
+        <input type=submit value="<# Confirm #>">
     </form>
 </if>
 
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.xql	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.xql	7 Jul 2004 17:26:44 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_old_grade">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2-postgresql.xql	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="delete_evaluation">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-postgresql.xql	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_evaluation_info">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit-postgresql.xql	10 Jun 2004 21:08:53 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_evaluated_students">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl	10 Jun 2004 21:08:53 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl	7 Jul 2004 17:26:44 -0000	1.6
@@ -55,7 +55,7 @@
 db_multirow -extend { answer answer_url radio_yes_checked radio_no_checked submission_date_pretty } evaluated_students get_evaluated_students { *SQL* } {
 
     set submission_date_pretty [lc_time_fmt $submission_date_ansi "%q"]
-    set grade [format %.2f [lc_numeric [$grade]]
+    set grade [format %.2f [lc_numeric $grade]]
 	if { [string eq $online_p "t"] } {
 		# working with answer stuff (if it has a file/url attached)
 		if { [empty_string_p $answer_data] } {
Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse-postgresql.xql	12 May 2004 02:07:45 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_party_name">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp	10 Jun 2004 21:08:53 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp	7 Jul 2004 17:26:44 -0000	1.3
@@ -20,7 +20,7 @@
           </multiple>
         </table>
 		</blockquote>
-        <input type=submit value="Grade Students">
+        <input type=submit value="#evaluation.Grade_1#"> <input type=button value="<# Back #>" onClick="history.go(-1)">
     </form>
 </if><else>
 #evaluation.lt_There_is_no_info_#
Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.xql	12 May 2004 02:07:45 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.xql	7 Jul 2004 17:26:44 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_task_info">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets-postgresql.xql	10 Jun 2004 21:08:53 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="count_grades_sheets">      
       <querytext>
@@ -11,7 +11,7 @@
       </querytext>
 </fullquery>
 
-<fullquery name="grades_sheets">      
+<fullquery name="get_grades_sheets">      
       <querytext>
 
 	select egs.title as grades_sheet_name,
Index: openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit-postgresql.xql	19 May 2004 17:33:09 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="evaluation_info">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.xql	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.xql	7 Jul 2004 17:26:44 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_evaluation_info">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql	10 Jun 2004 21:08:53 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.4
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="evaluated_students">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp	15 Jun 2004 23:20:29 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp	7 Jul 2004 17:26:44 -0000	1.6
@@ -30,7 +30,7 @@
 </table>
 
 <h2>#evaluation.lt_Evaluated_Students_to#</h2>
-<p><_ Theese are the evaluated students. Note that if you evaluated them over a grad different from 100, the system automatically did the conversion so the grade will be shown over 100 points. ></p>
+<p>#evaluation.Theese#</p>
 <blockquote><listtemplate name="evaluated_students"></listtemplate></blockquote>
 <br />
 <h2>#evaluation.lt_Students_with_answers#</h2>
@@ -44,7 +44,9 @@
  </if><else>
 	<p>#evaluation.Click# <a href=@this_url@> #evaluation.here# </a> #evaluation.lt_if_you_want_to_see_th#</p>
  </else>
-</if>
+</if><else>
+<p>#evaluation.If#</p>
+</else>
 <form action="evaluate-students" method="post">
     <input type=hidden name=task_id value="@task_id@">
     <input type=hidden name=grade_id value="@grade_id@">
@@ -61,7 +63,7 @@
           <tr> 
           <th style="text-align:right;">#evaluation.lt_Grade_students_using_#</th> 
           <td><input type="file" name="upload_file"></td> 
-          <td colspan=2 style="text-align:right;"><input type="submit" value="Send file"></td> 
+          <td colspan=2 style="text-align:right;"><input type="submit" value="#evaluation.Send#"></td> 
           </tr> 
           <tr> 
           <td><a href="grades-sheet-csv-@task_id@.csv">#evaluation.Generate_file#</a></td> 
@@ -84,7 +86,9 @@
  </if><else>
 	<p>#evaluation.Click# <a href=@this_url@> #evaluation.here# </a> #evaluation.lt_if_you_want_to_see_th#</p>
  </else>
-</if>
+</if><else>
+<p>#evaluation.If#</p>
+</else>
 
 <if @not_evaluated_na:rowcount@ gt 0>
 <form action="evaluate-students" method="post">
@@ -107,7 +111,7 @@
           <tr> 
           <th style="text-align:right;">#evaluation.lt_Grade_students_using_#</th> 
           <td><input type="file" name="upload_file"></td> 
-          <td colspan=2 style="text-align:right;"><input type="submit" value="Send file"></td> 
+          <td colspan=2 style="text-align:right;"><input type="submit" value="#evaluation.Send#"></td> 
           </tr> 
           <tr> 
           <td><a href="grades-sheet-csv-@task_id@.csv">#evaluation.Generate_file#</a></td> 
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	15 Jun 2004 23:20:29 -0000	1.6
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	7 Jul 2004 17:26:44 -0000	1.7
@@ -11,16 +11,15 @@
 } {
     task_id:integer,notnull
     {show_portrait_p ""}
-    {return_url "student-list?[export_vars -url { task_id }]"}
+    {return_url "[ad_conn url]?[export_vars -url { task_id }]"}
     {orderby_wa:optional}
     {orderby_na:optional}
     {orderby:optional}
 } 
 
 set user_id [ad_conn user_id]
-
 set page_title "[_ evaluation.Student_List_]"
-set context { "[_ evaluation.Student_List_]" }
+set context [list "[_ evaluation.Student_List_]"]
 
 if { [string eq $show_portrait_p "t"] } {
     set this_url "student-list?[export_vars -entire_form -url { { show_portrait_p f } }]"
@@ -155,7 +154,9 @@
 set elements [list party_name \
 		  [list label "[_ evaluation.Name_]" \
 		       orderby_asc {party_name asc} \
-		       orderby_desc {party_name desc}]
+		       orderby_desc {party_name desc} \
+		       link_url_col party_url \
+		  ] \
 	     ]
 
 if { [string eq $show_portrait_p "t"] && [string eq $number_of_members "1"] } {
@@ -201,10 +202,12 @@
     set orderby_wa " order by party_name asc"
 }
 
-db_multirow -extend { answer answer_url submission_date_pretty portrait } not_evaluated_wa get_not_evaluated_wa_students { *SQL* } {
+db_multirow -extend { party_url answer answer_url submission_date_pretty portrait } not_evaluated_wa get_not_evaluated_wa_students { *SQL* } {
     
     if { $number_of_members == 1 } {
 	set portrait "<a href=\"../grades/student-grades-report?[export_vars -url { { student_id $party_id } }]\">[evaluation::get_user_portrait -user_id $party_id { {alt "[_ evaluation.lt_No_portrait_for_party]"} }]</a>"
+    } else {
+	set party_url "../groups/one-task?[export_vars -url { task_id return_url }]#groups"
     }
 
     lappend done_students $party_id
@@ -232,7 +235,9 @@
 set elements [list party_name \
 		  [list label "[_ evaluation.Name_]" \
 		       orderby_asc {party_name asc} \
-		       orderby_desc {party_name desc}] \
+		       orderby_desc {party_name desc} \
+		       link_url_col party_url \
+		  ] \
 		 ]
 
 if { [string eq $show_portrait_p "t"] && [string eq $number_of_members "1"] } {
@@ -298,12 +303,13 @@
 
 }
 
-db_multirow -extend { portrait } not_evaluated_na get_not_evaluated_na_students { *SQL* } {
+db_multirow -extend { party_url portrait } not_evaluated_na get_not_evaluated_na_students { *SQL* } {
     
     if { $number_of_members == 1 } {
 	set portrait "<a href=\"../grades/student-grades-report?[export_vars -url { { student_id $party_id } }]\">[evaluation::get_user_portrait -user_id $party_id { {alt "[_ evaluation.lt_No_portrait_for_party]"} }]</a>"
+    } else {
+	set party_url "../groups/one-task?[export_vars -url { task_id return_url }]#groups"
     }
-    
 }
 
 set grades_sheet_item_id [db_nextval acs_object_id_seq]
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql	10 Jun 2004 21:08:53 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql	7 Jul 2004 17:26:44 -0000	1.5
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_task_info">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.xql	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="update_task">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/Attic/distribution-edit-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit-postgresql.xql	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_grade_tasks">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp	10 Jun 2004 21:08:54 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp	7 Jul 2004 17:26:45 -0000	1.4
@@ -8,6 +8,7 @@
 </if>
 
 <if @grades:rowcount@ gt 0>
+<p><# @grade_plural_name@ represents the @grade_weight@% of the 100% of the grade of the class. #></p>
    <form action="distribution-edit-2">
       <input type=hidden name=grade_id value="@grade_id@">
 		<blockquote>
Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	10 Jun 2004 21:08:54 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	7 Jul 2004 17:26:45 -0000	1.4
@@ -22,8 +22,10 @@
 		       orderby_asc {task_name asc} \
 		       orderby_desc {task_name desc}] \
 		  task_weight \
-		  [list label "[_ evaluation.Weight_]" \
-		       display_template { <input size=3 maxlength=6 type=text name=weights.@grades.task_id@ value=@grades.task_weight@> } \
+		  [list label "[_ evaluation.lt_Weight_over_grade_wei]" \
+		       display_template { <input size=3 maxlength=6 type=text name=weights.@grades.task_id@ value=@grades.task_weight@>% } \
+		       aggregate sum \
+		       aggregate_label { Total }
 		      ] \
 		  requires_grade \
 		  [list label "[_ evaluation.Requires_Grade_]" \
Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.xql	7 Jun 2004 16:05:11 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.xql	7 Jul 2004 17:26:45 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="grade_info">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl	10 Jun 2004 21:08:54 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl	7 Jul 2004 17:26:45 -0000	1.4
@@ -37,7 +37,7 @@
 	}
 	
 	{weight:float
-		{label "[_ evaluation.Weight_]"}
+		{label "[_ evaluation.lt_Weight_over_100_br__o]"}
 		{html {size 5}}
 	}
 
Index: openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.xql	7 Jun 2004 16:05:11 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.xql	7 Jul 2004 17:26:45 -0000	1.4
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_grade_info">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/grades/grades-delete-2-postgresql.xql	28 Apr 2004 11:06:42 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/grades/grades-delete-2-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="delete_grade">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/grades/grades-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/grades/grades-postgresql.xql	7 Jun 2004 16:05:11 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/grades/grades-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.4
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_class_grades">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.6
+++ openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.7
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="package_grades">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp	15 Jun 2004 23:20:29 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp	7 Jul 2004 17:26:45 -0000	1.4
@@ -3,8 +3,9 @@
 <property name="context">@context;noquote@</property>
 <p>#evaluation.lt_This_is_the_grades_re#<br />
 #evaluation.lt_You_can_order_the_gra# <br />
-If you click on the student name, you will see the grades report for that student.
+#evaluation.lt_If_you_click_on_the_s#
 </p>
 <blockquote><listtemplate name="grades_report"></listtemplate></blockquote>
 
 
+
Index: openacs-4/packages/evaluation/www/admin/grades/grades-type-reports-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-type-reports-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.6
@@ -1,5 +1,5 @@
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="grade_task">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/grades/grades.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/grades/grades.tcl	10 Jun 2004 21:08:54 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/grades/grades.tcl	7 Jul 2004 17:26:45 -0000	1.5
@@ -41,7 +41,7 @@
             link_html { title "View assignment type distribution" }
         }
         weight {
-            label "[_ evaluation.Weight_]"
+            label "[_ evaluation.lt_Weight_over_100_br__o]"
 	    orderby_asc {weight asc}
 	    orderby_desc {weight desc}
 	    display_template { @grades.weight@% }
Index: openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_grades">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/groups/group-delete-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/group-delete-2-postgresql.xql	28 Apr 2004 11:06:42 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/group-delete-2-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="delete_group">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/groups/group-delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/group-delete-postgresql.xql	28 Apr 2004 11:06:42 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/group-delete-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_group_info">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/groups/group-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/groups/group-delete.adp	10 Jun 2004 21:08:54 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/groups/group-delete.adp	7 Jul 2004 17:26:45 -0000	1.3
@@ -7,7 +7,7 @@
 <p>
 
 <center>
-<include src="../../../lib/confirm-delete-form" action="group-delete-2" export_vars="@export_vars;noquote@" no_button=""#evaluation.lt_No_I_want_to_cancel_m#" yes_button="#evaluation.lt_Yes_I_really_want_to__2#">
+<include src="../../../lib/confirm-delete-form" action="group-delete-2" export_vars="@export_vars;noquote@" no_button="#evaluation.lt_No_I_want_to_cancel_m#" yes_button="#evaluation.lt_Yes_I_really_want_to__2#">
 </center>
 
 </p>
Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/group-member-add-2-postgresql.xql	28 Apr 2004 11:06:42 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/group-member-add-2-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="associate_student">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/groups/group-member-add.adp	10 Jun 2004 21:08:54 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/groups/group-member-add.adp	7 Jul 2004 17:26:45 -0000	1.4
@@ -8,7 +8,9 @@
 <listtemplate name="evaluation_groups"></listtemplate>
 </blockquote>
 </form>
-</if>
+</if><else>
+<p>#evaluation.There#</p>
+</else>
 
 
 
Index: openacs-4/packages/evaluation/www/admin/groups/group-new-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/group-new-2-postgresql.xql	28 Apr 2004 11:06:42 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/group-new-2-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="evaluation_relationship_new">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/groups/group-new.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/group-new.xql	28 Apr 2004 11:06:42 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/group-new.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_student_name">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/groups/group-remove-member-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-remove-member-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/group-remove-member-postgresql.xql	28 Apr 2004 11:06:42 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/group-remove-member-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="delete_relationship">      
       <querytext>
@@ -13,4 +13,22 @@
       </querytext>
 </fullquery>
 
+<fullquery name="get_members">      
+      <querytext>
+
+	select count(*) from acs_rels where object_id_one = :evaluation_group_id
+
+      </querytext>
+</fullquery>
+
+<fullquery name="delete_group">      
+      <querytext>
+
+ 	select evaluation__delete_evaluation_task_group (
+							 :evaluation_group_id
+							 );
+    
+      </querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/evaluation/www/admin/groups/group-remove-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-remove-member.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/group-remove-member.tcl	28 Apr 2004 11:06:42 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/group-remove-member.tcl	7 Jul 2004 17:26:45 -0000	1.2
@@ -14,4 +14,9 @@
 
 db_exec_plsql delete_relationship { *SQL* }		
 
+if { [string eq [db_string get_members { *SQL* }] 0] } {
+    db_exec_plsql delete_group { *SQL* }
+    ad_returnredirect "one-task?[export_vars -url { task_id }]"
+}
+
 ad_returnredirect "one-group?[export_vars -url { evaluation_group_id task_id }]"
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/groups/group-rename-2-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/groups/group-rename-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/evaluation/www/admin/groups/group-rename.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-rename.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/www/admin/groups/group-rename.xql	7 Jul 2004 17:26:45 -0000	1.1
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+<fullquery name="rename_group">      
+      <querytext>
+
+		update groups set group_name = :group_name
+		where group_id = :evaluation_group_id
+
+      </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-postgresql.xql	28 Apr 2004 11:09:54 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="evaluation_group">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/groups/group-reuse-postgresql.xql	7 Jun 2004 16:05:12 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/groups/group-reuse-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_groups">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/groups/one-group.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-group.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/groups/one-group.adp	10 Jun 2004 21:08:54 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/groups/one-group.adp	7 Jul 2004 17:26:45 -0000	1.5
@@ -5,9 +5,9 @@
 
 <if @one_group:rowcount@ gt 0>
 <ul>
-<li>#evaluation.lt_To_chanche_the_name_e#
-<li>#evaluation.lt_To_delete_the_group_c#
-<li>#evaluation.lt_To_unassociate_a_memb#
+<li>#evaluation.lt_To_chanche_the_name_e#</li>
+<li>#evaluation.lt_To_delete_the_group_c#</li>
+<li>#evaluation.lt_To_unassociate_a_memb# #evaluation.Note# </li>
 </ul>
 
    <form action="group-rename">
Index: openacs-4/packages/evaluation/www/admin/groups/one-group.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-group.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/one-group.xql	28 Apr 2004 11:09:54 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/one-group.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_no_of_members">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/groups/one-task.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/groups/one-task.adp	10 Jun 2004 21:08:54 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/groups/one-task.adp	7 Jul 2004 17:26:45 -0000	1.5
@@ -33,11 +33,14 @@
 </if>
 
 <if @task_groups:rowcount@ gt 0>
+	<a name="groups">
 	<h2>#evaluation.lt_Already_created_group#</h2>
 	<blockquote>
 	<listtemplate name="task_groups"></listtemplate>
 	</blockquote>
 </if>
 
+<if @return_url@ not nil>
+<a href="@return_url@">#evaluation.Go#</a>
+</if>
 
-
Index: openacs-4/packages/evaluation/www/admin/groups/one-task.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/groups/one-task.tcl	10 Jun 2004 21:08:54 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/groups/one-task.tcl	7 Jul 2004 17:26:45 -0000	1.5
@@ -10,7 +10,7 @@
 	task_id:integer,notnull
 	{orderby:optional}
 	{orderby_groups:optional}
-	{return_url "one-task?[export_vars -url { task_id }]"}
+	{return_url ""}
 } -validate {
 	group_task {
 		if { [string eq [db_string get_number_of_members { *SQL* }] 1] } {
@@ -53,8 +53,8 @@
     -name students_without_group \
     -multirow students_without_group \
     -key student_id \
-    -pass_properties { return_url student_id } \
-    -filters { task_id {} } \
+    -pass_properties { student_id } \
+    -filters { task_id {} return_url {} } \
     -elements $elements 
 
 
@@ -92,8 +92,8 @@
     -name task_groups \
     -multirow task_groups \
     -key evaluation_group_id \
-    -pass_properties { return_url evaluation_group_id } \
-    -filters { task_id {} } \
+    -pass_properties { evaluation_group_id } \
+    -filters { task_id {} return_url {} } \
     -orderby_name orderby_groups \
     -elements $elements 
 
Index: openacs-4/packages/evaluation/www/admin/groups/one-task.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/groups/one-task.xql	31 May 2004 17:04:58 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/groups/one-task.xql	7 Jul 2004 17:26:45 -0000	1.4
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_number_of_members">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit-postgresql.xql	22 May 2004 01:20:25 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_sol_info">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.xql	28 Apr 2004 11:09:54 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="solution_info">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql	15 Jun 2004 23:20:30 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.5
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_grade_info">      
       <querytext>
@@ -82,6 +82,22 @@
      </querytext>
 </fullquery>
 
+<fullquery name="get_user_comunities">      
+      <querytext>
+
+    	select count(*)
+    	from dotlrn_communities_all,
+    	dotlrn_member_rels_approved,
+    	dotlrn_classes
+    	where dotlrn_communities_all.community_id = dotlrn_member_rels_approved.community_id
+    	and dotlrn_communities_all.community_type = dotlrn_classes.class_key
+    	and dotlrn_member_rels_approved.user_id = :user_id
+    	and acs_permission__permission_p(dotlrn_communities_all.community_id, :user_id, 'admin') = true
+	and dotlrn_communities_all.community_id <> [dotlrn_community::get_community_id]
+	
+      </querytext>
+</fullquery>
+
 </queryset>
 
 
Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl	10 Jun 2004 21:08:54 -0000	1.7
+++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl	7 Jul 2004 17:26:45 -0000	1.8
@@ -19,13 +19,15 @@
 }
 
 set package_id [ad_conn package_id]
+set user_id [ad_conn user_id]
 
 set community_id [dotlrn_community::get_community_id]
 set new_p [ad_form_new_p -key task_id] 
+db_1row get_grade_info { *SQL* }
 if { $new_p } {
-    set page_title "[_ evaluation.Add_Task_]"
+    set page_title "[_ evaluation.Add_grade_name_]"
 } else {
-    set page_title "[_ evaluation.Edit_Task_]"
+    set page_title "[_ evaluation.Edit_grade_name_]"
 }
 
 if { [info exists admin_groups_p] } {
@@ -36,8 +38,6 @@
     set checked_p ""
 }
 
-db_1row get_grade_info { *SQL* }
-
 set context [list $page_title]
 
 set attached_p "f"
@@ -181,7 +181,7 @@
 
     {due_date:date,to_sql(linear_date),from_sql(sql_date)
 	{label "[_ evaluation.Due_Date_]"}
-	{format "MONTH DD YYYY"}
+	{format "MONTH DD YYYY HH24 MI SS"}
 	{today}
 	{help}
 	{value {[evaluation::now_plus_days -ndays 15]}}
@@ -195,10 +195,18 @@
 	{after_html {<div id="silentDiv" style="visibility:$div_visibility;"><div class="form-help-text"><input type="checkbox" name="admin_groups_p" $checked_p> [_ evaluation.lt_Check_this_if_you_wan_1] </div></div>}}
     }
 
-    {weight:float  
-	{label "[_ evaluation.Weight_]"}
+    {weight:float,optional
+	{label "[_ evaluation.lt_Weight_over_grade_wei_2]"}
+	{html {size 5}} 
+	{help_text "[_ evaluation.lt_You_can_enter_the_wei]"}
+	{value "0"}
+    }
+
+    {net_value:float,optional
+	{label "[_ evaluation.Net_Value_]"}
 	{html {size 5}}
-	{help_text "[_ evaluation.lt_over_grade_weight_of_]"}
+	{help_text "[_ evaluation.lt_If_you_enter_the_net_]"}
+	{value "0"}
     }
     
     {online_p:text(radio)     
@@ -220,7 +228,7 @@
     }
 }
 
-if { $new_p && ![empty_string_p $community_id] } {
+if { $new_p && ![empty_string_p $community_id] && [db_string get_user_comunities { *SQL* }] } {
     ad_form -extend -name task -form {
 	{add_to_more_classes_p:text(checkbox),optional 
 	    {label "[_ evaluation.lt_Add_this_assignment_t]"} 
@@ -256,6 +264,14 @@
 	{ ([string eq $unattach_p "t"] && [empty_string_p $upload_file] && [string eq $url "http://"]) || [empty_string_p $unattach_p] }
 	{ [_ evaluation.lt_First_unattach_the_fi] }
     }
+    {net_value 
+	{ [string eq [format %.2f $net_value] 0.00] || ([empty_string_p $net_value] && [string eq $requires_grade_p f]) || (($net_value > 0) && ($net_value <= $grade_weight) && ([string eq [format %.2f $weight] 0.00] || [empty_string_p $weight])) }
+	{ [_ evaluation.lt_The_net_value_must_be] }
+    }
+    {weight
+	{ [string eq [format %.2f $weight] 0.00] || ([empty_string_p $weight] && [string eq $requires_grade_p f]) || (($weight > 0) && ([string eq [format %.2f $net_value] 0.00] || [empty_string_p $net_value])) }
+	{ [_ evaluation.lt_The_weight_must_be_gr] }
+    }
 } -new_data {
     
     evaluation::notification::do_notification -task_id $revision_id -package_id [ad_conn package_id] -edit_p 0 -notif_type one_assignment_notif
@@ -266,6 +282,14 @@
 
 } -on_submit {
     
+    if { [string eq $requires_grade_p t] } {
+	if { [info exists net_value] && ($net_value > 0) } {
+	    set weight [expr $net_value*100.000/$grade_weight]
+	}
+    } else {
+	set weight 0
+    }
+
     db_transaction {
 	
 	set mime_type "text/plain"
Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities-postgresql.xql	7 Jun 2004 16:05:15 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_user_comunities">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.adp	10 Jun 2004 21:08:54 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.adp	7 Jul 2004 17:26:45 -0000	1.3
@@ -5,8 +5,5 @@
 <if @communities_count@ gt 0>
 <p>#evaluation.lt_The_assignment_task_n# <br />#evaluation.lt_Check_the_rest_of_com#</p>
 <blockquote><formtemplate id="communities"></formtemplate></blockquote>
-</if><else>
-#evaluation.lt_There_are_no_more_com# <br />
-#evaluation.lt_If_you_administer_mor#
-</else>
+</if>
 
Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl	10 Jun 2004 21:08:54 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl	7 Jul 2004 17:26:45 -0000	1.3
@@ -45,6 +45,9 @@
 				       ]
 	}
     }
+} if_no_rows {
+    ad_returnredirect $return_url
+    ad_script_abort    
 }
 
 ad_form -extend -name communities -form $form_elements
Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/tasks/task-delete-2-postgresql.xql	28 Apr 2004 11:09:54 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/tasks/task-delete-2-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="delete_task">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/tasks/task-delete-postgresql.xql	7 Jun 2004 16:05:16 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/tasks/task-delete-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_task_info">      
       <querytext>