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.1 -r1.2
--- openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml	10 Jun 2004 21:15:04 -0000	1.1
+++ openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml	15 Jun 2004 23:20:28 -0000	1.2
@@ -11,7 +11,9 @@
   <msg key="Addedit_answer_">Add/edit answer </msg>
   <msg key="Addedit_solution_">Add/edit solution </msg>
   <msg key="again_">again </msg>
+  <msg key="Already_answered_">Already answered </msg>
   <msg key="Answer_">Answer </msg>
+  <msg key="Assignment_Group_">Assignment Group </msg>
   <msg key="Assignment_Groups_">Assignment Groups </msg>
   <msg key="Assignment_Type_">Assignment Type </msg>
   <msg key="Assignment_Types">Assignment Types</msg>
@@ -52,12 +54,16 @@
   <msg key="Edit_Reason_">Edit Reason </msg>
   <msg key="Edit_Task_">Edit Task </msg>
   <msg key="Edit_task_">Edit task </msg>
+  <msg key="Email">Email:</msg>
+  <msg key="Evaluated_">Evaluated </msg>
   <msg key="Evaluation_Index_">Evaluation Index </msg>
   <msg key="Evaluation_Modified_">Evaluation Modified </msg>
   <msg key="Evaluations">Evaluations</msg>
   <msg key="Evaluations_">Evaluations </msg>
   <msg key="Evaluations_Admin">Evaluations Admin</msg>
   <msg key="Evaluations_List_">Evaluations List </msg>
+  <msg key="Exams_">Exams </msg>
+  <msg key="Exams_for_students_">Exams for students </msg>
   <msg key="File_">File </msg>
   <msg key="Fileurl_associated">File/url associated</msg>
   <msg key="Generate_file">Generate file</msg>
@@ -66,8 +72,10 @@
   <msg key="Grade_">Grade </msg>
   <msg key="Grade_1">Students </msg>
   <msg key="Grade_Distribution_">Grade Distribution </msg>
+  <msg key="Grade_in_Net_value_">Grade in Net value </msg>
   <msg key="Grade_over_">Grade over </msg>
   <msg key="Grade_over_100_">Grade over 100 </msg>
+  <msg key="Grader_">Grader </msg>
   <msg key="Grades_">Grades </msg>
   <msg key="Grades_Category">Grades Category</msg>
   <msg key="Grades_Report_">Grades Report </msg>
@@ -99,6 +107,7 @@
   <msg key="here">here</msg>
   <msg key="How_does_this_work">How does this work?</msg>
   <msg key="Id_">Id </msg>
+  <msg key="Individual_">Individual </msg>
   <msg key="Insert_Failed_">Insert Failed </msg>
   <msg key="Is_live_">Is live? </msg>
   <msg key="Last_Modified_">Last Modified </msg>
@@ -108,7 +117,7 @@
   <msg key="lt_able_to_see_the_grade">able to see the grade?</msg>
   <msg key="lt_Add_a_member_to_a_gro">Add a member to a group </msg>
   <msg key="lt_Add_Assignment_to_Com">Add Assignment to Communities </msg>
-  <msg key="lt_Add_this_assignment_t">Add this assignment to other class(es) </msg>
+  <msg key="lt_Add_this_assignment_t">Add this %grade_name% to other class(es) </msg>
   <msg key="lt_Admin_Assignment_Type">Admin Assignment Types </msg>
   <msg key="lt_Admin_my_Assignment_T">Admin my Assignment Types</msg>
   <msg key="lt_Allow_the_students_br">Allow the students &lt;br&gt; to see the grade? </msg>
@@ -119,11 +128,12 @@
   <msg key="lt_Are_you_sure_you_want">Are you sure you want to remove the assignment type &quot;%grade_plural_name%&quot;? (If your answer is yes, all the evaluations, tasks, tasks solutions and answers associated with this assignment type will be deleted too)</msg>
   <msg key="lt_Are_you_sure_you_want_1">Are you sure you want to remove the group &quot;%group_name%&quot;? (If the group has an evaluation/answer associated, it will be deleted too)</msg>
   <msg key="lt_Are_you_sure_you_want_2">Are you sure you want to delete the task &quot;%task_name%&quot;? (If you delete the task, all the information associated with the task, such as answers, task solutions, etc, will be deleted too)</msg>
+  <msg key="lt_Assignment_Attachment">Assignment Attachment </msg>
   <msg key="lt_Assignment_Plural_Typ">Assignment Plural Type Name </msg>
   <msg key="lt_Assignment_Type_Name_">Assignment Type Name </msg>
   <msg key="lt_Assignment_Types_Comm">Assignment Type's Comments </msg>
   <msg key="lt_Assignment_Types_Dist">Assignment Types Distribution </msg>
-  <msg key="lt_Assignments_Descripti">Assignment's Description </msg>
+  <msg key="lt_Assignments_Descripti">%grade_name%'s Description </msg>
   <msg key="lt_Associate_to_this_gro">Associate to this group </msg>
   <msg key="lt_Audit_info_for_task_t">Audit info for task &quot;%task_name%&quot;</msg>
   <msg key="lt_Can_the_student_submi">Can the student submit the answer &lt;br&gt; after the due date? </msg>
@@ -157,23 +167,34 @@
   <msg key="lt_First_you_will_see_th">First, you will see the list of students without group (if there are students without group) and you can create a group by selecting the members of the group and then clicking on the &quot;Create Group&quot; botton.</msg>
   <msg key="lt_Generate_the_csv_file">Generate the csv file from the system. This file has the proper structure so the system can parse it and obtain the information about the grades. This file is generated by clicking on the &quot;Generate File&quot; link.</msg>
   <msg key="lt_Grade_grade_does_not_">Grade %grade% does not seem to be a real number. </msg>
+  <msg key="lt_Grade_over_100_points">Grade over 100 points</msg>
+  <msg key="lt_grade_plural_name_rep">%grade_plural_name% represents the %grade_weight%% of the 100% of the class</msg>
   <msg key="lt_Grade_students_using_">Grade students using generated file:</msg>
   <msg key="lt_Grade_students_using_file">Grade students using generated file:</msg>
   <msg key="lt_Grade_students_with_0">Grade students with 0</msg>
+  <msg key="lt_Grades_Report_for_stu">Grades Report for $student_name </msg>
+  <msg key="lt_Grades_report_of_stud">Grades report of &quot;%student_name%&quot;</msg>
   <msg key="lt_Grades_Sheet_Explanat">Grades Sheet Explanation </msg>
   <msg key="lt_Group_administration_">Group administration </msg>
   <msg key="lt_Groups_administration">Groups administration </msg>
   <msg key="lt_Groups_for_task_task_">Groups for task %task_name% </msg>
   <msg key="lt_If_you_administer_mor">If you administer more than one community and you want to upload an assigment in more than one community, you must set the same name for each of the assignment types in each community so the system can identify where to store the assignment.</msg>
+  <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_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>
   <msg key="lt_In_this_page_you_can_">In this page you can administer the groups for the assignment.</msg>
   <msg key="lt_Input_Will_the_studen">Input \&quot;Will the student be able to see the grade\&quot; must be 1 (one) for YES or 0 (zero) for NO, please don't leave it blank. </msg>
+  <msg key="lt_Is_the_task_submitted">Is the task submitted online?</msg>
   <msg key="lt_Max_Grade_does_not_se">Max Grade does not seem to be a real number. Please don't leave it in blank. </msg>
   <msg key="lt_No_fileurl_associated">No file/url associated with this task </msg>
   <msg key="lt_No_fileurl_associated_1">No file/url associated with this task solution </msg>
+  <msg key="lt_No_group_for_student_">No group for student </msg>
   <msg key="lt_No_I_want_to_cancel_m">No, I want to cancel my request </msg>
+  <msg key="lt_No_portrait_for_party">No portrait for $party_name </msg>
+  <msg key="lt_No_portrait_for_stude">No portrait for $student_name </msg>
   <msg key="lt_Notification_for_assi">Notification for assignments </msg>
   <msg key="lt_Notification_for_eval">Notification for evaluations </msg>
   <msg key="lt_Number_of_members_for">Number of members for this task:</msg>
@@ -184,10 +205,13 @@
   <msg key="lt_Please_enter_the_grou">Please enter the group name</msg>
   <msg key="lt_Please_enter_the_new_">Please enter the new group name</msg>
   <msg key="lt_Please_select_the_gro">Please select the group</msg>
+  <msg key="lt_Projects_for_students">Projects for students </msg>
   <msg key="lt_Reuse_groups_from_ano">Reuse groups from another assignment </msg>
   <msg key="lt_Save_the_csv_file_and">Save the csv file and KEEP THE CSV FORMAT. The CSV file can be edited with any text editor (and MS Excell) but you have to save it keeping the CSV format. If you do not keep the format, the system will not be able to parse the file.</msg>
   <msg key="lt_See_grades_sheets_ass">See grades sheets associated with this task</msg>
   <msg key="lt_Send_the_file_using_t">Send the file using the &quot;Send file&quot; botton. The system will parse the file and you will be asked for a confirmation (if everything is ok with the file) for the grades.</msg>
+  <msg key="lt_smallTotal_points_in_">&lt;small&gt;Total points in this category: ${total_grade}/${max_grade} &lt;br /&gt;
+    $grade_plural_name represents the ${grade_weight}% of the 100% of the class&lt;/small&gt; </msg>
   <msg key="lt_Students_who_have_not">Students who have not submitted answers and have not been evaluated (%not_evaluated_with_no_answer%)</msg>
   <msg key="lt_Students_with_answers">Students with answers that have not been evaluated (%not_evaluated_with_answer%)</msg>
   <msg key="lt_submission_date_prett">%submission_date_pretty% (late) </msg>
@@ -201,6 +225,7 @@
 }  
 
 set page_title &quot;&lt;#_ Confirm Evaluation </msg>
+  <msg key="lt_The_file_extension_of_1">The file extension of the file is \&quot;$file_extension\&quot; and it should be .CSV, we can't process it </msg>
   <msg key="lt_The_file_is_too_large">The file is too large. (The maximun file size is %pretty_maxnbytes% bytes)&quot; 
         return 0 
     }
@@ -231,6 +256,7 @@
 			set max_grade [string trim [lindex $evaluation 1]] 
 			if { ![ad_var_type_check_number_p $max_grade] } {
 				ad_return_error &quot;&lt;#_ Invalid Max Grade </msg>
+  <msg key="lt_The_file_is_too_large_1">The file is too large. (The maximun file size is %pretty_maxnbytes% bytes) </msg>
   <msg key="lt_The_file_should_have_">The file should have a pre-defined format so the system can parse it and obtain the information. If you want to use this functionallity you must follow the following steps:</msg>
   <msg key="lt_The_grade_most_be_a_v">The grade most be a valid number: %wrong_grade% </msg>
   <msg key="lt_The_grade_must_be_a_R">The grade must be a REAL NUMBER.</msg>
@@ -255,7 +281,9 @@
   <msg key="lt_There_is_a_comment_la_1">There is a comment larger than we can handle: %wrong_comments%  </msg>
   <msg key="lt_There_is_an_edit_reas">There is an edit reason for a grade not realized: %wrong_comments% </msg>
   <msg key="lt_There_is_an_edit_reas_1">There is an edit reason larger than we can handle: %wrong_comments% </msg>
+  <msg key="lt_There_is_no_audit_inf">There is no audit info for this task because there are no students evaluated.</msg>
   <msg key="lt_There_is_no_info_">There are no grades in the csv file or there are no modifications in the csv file.</msg>
+  <msg key="lt_There_is_no_info_for_">There is no info for this student</msg>
   <msg key="lt_There_is_no_informati">There is no information about this task. </msg>
   <msg key="lt_There_must_be_an_edit">There must be an edit reason if you want to edit the grade on party_id %party_id%. </msg>
   <msg key="lt_There_must_be_at_leas">There must be at least one grade to work with </msg>
@@ -265,6 +293,8 @@
         &lt;p&gt;This was the error: &lt;pre&gt;%errmsg%&lt;/pre&gt;&lt;/li&gt; </msg>
   <msg key="lt_There_was_an_error_cr">There was an error creating the groups </msg>
   <msg key="lt_These_are_the_grades_">These are the grades sheets used to evaluate students for this task</msg>
+  <msg key="lt_These_are_the_student">These are the students that have already answered but have not been evaluated yet.</msg>
+  <msg key="lt_These_are_the_student_1">These are the students that have not answered yet (if the task is online) and have not been evaluated yet.</msg>
   <msg key="lt_This_funcionallity_al">This funcionallity allows you to upload a CSV (Comma Separated Value) file with the grades of the students. This CSV file can be edited with MS Excell and many other text editors.</msg>
   <msg key="lt_This_is_the_grades_re">This is the grades report of the students acording to the assignments/evaluations that you have made.</msg>
   <msg key="lt_This_is_the_grades_re_1">This is the grades report of the students acording to one assignment type and the evaluations that you have made in this assignment type.</msg>
@@ -279,15 +309,18 @@
   <msg key="lt_To_delete_the_group_c">To delete the group, click on the &quot;Delete Group&quot; botton.</msg>
   <msg key="lt_to_submit_their_answe">to submit their answers after due date?</msg>
   <msg key="lt_To_unassociate_a_memb">To unassociate a member of the group, click on the &quot;Unassociate member&quot; link.</msg>
+  <msg key="lt_TOTAL_GRADE_total_cla">TOTAL GRADE: %total_class_grade%</msg>
   <msg key="lt_Total_points_in_this_">Total points in this category: %total_grade% / $max_grade&lt;br /&gt;
                      This grade category represents the ${grade_weight}% of the 100% of the class </msg>
   <msg key="lt_Total_points_in_this__1">Total points in this category: %total_grade% / %max_grade%&lt;br /&gt;
                      This grade category represents the %grade_weight%% of the 100% of the class </msg>
+  <msg key="lt_Total_points_in_this__2">Total points in this category: %total_grade%/%max_grade%</msg>
   <msg key="lt_Unassociate_student_f">Unassociate student for this group </msg>
   <msg key="lt_Unrecognized_value_fo">Unrecognized value for notif type: $notif_type. Possible values are one_assignment_notif and one_evaluation_notif. </msg>
   <msg key="lt_Upload_a_file_OR_a_ur">Upload a file OR a url, and not both </msg>
   <msg key="lt_Upload_a_file_OR_a_ur_1">Upload a file OR a url, not both </msg>
   <msg key="lt_Upload_a_file_OR_a_va">Upload a file OR a valid url, and not both </msg>
+  <msg key="lt_Upload_a_solution_for">Upload a solution for this assignment so the students can see it and learn from it.</msg>
   <msg key="lt_user_name_has_modifie">$user_name has modified the grade of %party_name%. \n The edit reason given by %user_name% was: %edit_reason% \n The current grade is: %current_grade% \n\n Click on this link to see the evaluation details: %url_link% \n </msg>
   <msg key="lt_ViewEdit_Task_Solutio">View/Edit Task Solution </msg>
   <msg key="lt_We_got_the_following_">We got the following error while trying to remove the evaluation: &lt;pre&gt;%errmsg%&lt;/pre&gt; </msg>
@@ -303,9 +336,9 @@
   <msg key="lt_Will_the_student_be_a">Will the student be able to see the grade? (1 = Yes / 0 = No): </msg>
   <msg key="lt_Will_the_student_be_a_1">Will the student be able to see the grade? </msg>
   <msg key="lt_Will_the_students_be_">Will the students be able</msg>
-  <msg key="lt_Will_the_task_be_subm">Will the task be submitted online? </msg>
+  <msg key="lt_Will_the_task_be_subm">Will the %grade_name% be submitted online? </msg>
   <msg key="lt_Will_this_task_be_sub">Will this task be submitted on line?</msg>
-  <msg key="lt_Will_this_task_requir">Will this task require a grade on the course? </msg>
+  <msg key="lt_Will_this_task_requir">Will this %grade_name% require a grade on the course? </msg>
   <msg key="lt_Yes_I_really_want_to_">Yes, I really want to remove this evaluation </msg>
   <msg key="lt_Yes_I_really_want_to__1">Yes, I really want to remove this grade </msg>
   <msg key="lt_Yes_I_really_want_to__2">Yes, I really want to remove this group </msg>
@@ -323,19 +356,23 @@
   <msg key="Maximun_Grade_">Maximun Grade: </msg>
   <msg key="Members_">Members </msg>
   <msg key="Modifying_User_">Modifying User </msg>
+  <msg key="na_">n/a </msg>
   <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="NEW_answer_">(NEW answer) </msg>
   <msg key="New_Assignment_">New Assignment </msg>
   <msg key="New_Group_">New Group </msg>
+  <msg key="No">No</msg>
   <msg key="No_">No </msg>
   <msg key="No_data_">(No data) </msg>
   <msg key="No_group_for_task_">No group for task </msg>
   <msg key="No_of_Members_">No. of Members </msg>
   <msg key="No_of_members_">No. of members </msg>
   <msg key="No_parties_to_grade_">No parties to grade </msg>
   <msg key="No_response_">No response </msg>
+  <msg key="Not_answered_">Not answered </msg>
   <msg key="Not_available_">Not available </msg>
   <msg key="Not_evaluated_">Not evaluated </msg>
   <msg key="Number_of_Integrants">Number of Integrants</msg>
@@ -344,15 +381,19 @@
   <msg key="One_Evaluation_">One Evaluation </msg>
   <msg key="One_Grade_Type_">One Grade Type </msg>
   <msg key="One_Group_">One Group </msg>
+  <msg key="Online_Submit_">Online Submit </msg>
   <msg key="pero">y entonces </msg>
+  <msg key="Projects_">Projects </msg>
   <msg key="Remove_Grade">Remove Grade</msg>
   <msg key="Rename">Group </msg>
   <msg key="Requires_Grade_">Requires Grade? </msg>
   <msg key="Reuse_Groups_">Reuse Groups </msg>
+  <msg key="Solution_Attachment_">Solution Attachment </msg>
   <msg key="Studen_List_">Studen List </msg>
   <msg key="Student_List_">Student List </msg>
   <msg key="Student_Name_">Student Name </msg>
   <msg key="Students_List_">Students List </msg>
+  <msg key="Students_Portrait_">Student's Portrait </msg>
   <msg key="Submission_Date_">Submission Date </msg>
   <msg key="submit_answer_">submit answer </msg>
   <msg key="submit_answer_again_">submit answer again </msg>
@@ -362,6 +403,9 @@
   <msg key="Task_Name_">Task Name </msg>
   <msg key="Task_Name_1">Task Name</msg>
   <msg key="Task_Solution">Task Solution</msg>
+  <msg key="Task_Status_">Task Status </msg>
+  <msg key="Tasks_">Tasks </msg>
+  <msg key="Tasks_for_students_">Tasks for students </msg>
   <msg key="Tasks_List_">Tasks List </msg>
   <msg key="Total_">Total </msg>
   <msg key="Total_current_grade_">Total current grade: </msg>
@@ -391,5 +435,6 @@
   <msg key="Weight_">Weight </msg>
   <msg key="Will_the_studens_be">Will the studen(s) be</msg>
   <msg key="Y">upi , pero no yupin</msg>
+  <msg key="Yes">Yes</msg>
   <msg key="Yes_">Yes </msg>
 </message_catalog>
Index: openacs-4/packages/evaluation/catalog/evaluation.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.es_ES.ISO-8859-1.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/catalog/evaluation.es_ES.ISO-8859-1.xml	15 Jun 2004 23:20:28 -0000	1.1
@@ -0,0 +1,484 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="evaluation" package_version="0.1d" locale="es_ES" charset="ISO-8859-1">
+
+  <msg key="1__Individual_">Individual = 1 </msg>
+  <msg key="Add_Assignment_">Agregar Asignaci�n </msg>
+  <msg key="Add_Assignment_Type_">Agregar Tipo de Asignaci�n</msg>
+  <msg key="Add_assignment_type_">Agregar tipo de asignaci�n </msg>
+  <msg key="Add_Member_to_group_">Agregar Miembro al grupo </msg>
+  <msg key="Add_Task_">Agregar Tarea</msg>
+  <msg key="Add_Task_Solution_">Agregar Soluci�n de la Tarea </msg>
+  <msg key="Addedit_answer_">Agregar/Editar respuesta </msg>
+  <msg key="Addedit_solution_">Agregar/Editar soluci�n</msg>
+  <msg key="again_">otra vez </msg>
+  <msg key="Already_answered_">Ya respondido</msg>
+  <msg key="Answer_">Respuesta</msg>
+  <msg key="Assignment_Group_">Grupo de Asignaci�n</msg>
+  <msg key="Assignment_Groups_">Grupos de Asignaciones</msg>
+  <msg key="Assignment_Type_">Tipo de Asignaci�n </msg>
+  <msg key="Assignment_Types">Tipos de Asignaciones</msg>
+  <msg key="Assignment_Types_">Tipos de Asignaciones </msg>
+  <msg key="Assignments">Asignaciones</msg>
+  <msg key="Assignments_">Asignaciones </msg>
+  <msg key="Associate_">Asociar</msg>
+  <msg key="Associate_to_group_">Asociar a grupo... </msg>
+  <msg key="Audit_Info_">Historial de Notas</msg>
+  <msg key="Audit_info_">Historial de notas </msg>
+  <msg key="Audit_Info__1">Historial de Notas </msg>
+  <msg key="Audit_info_for_task_">Historial de notas para tareas </msg>
+  <msg key="Bad_input_">Datos no validos</msg>
+  <msg key="Change_Answer_">Cambiar Respuesta </msg>
+  <msg key="Click">Click</msg>
+  <msg key="click_on_this_link_">haga click en este link: </msg>
+  <msg key="Comments">Comentarios:</msg>
+  <msg key="Comments_">Comentarios</msg>
+  <msg key="CommentsEdit_reason">Cometar/Editar raz�n:</msg>
+  <msg key="CommentsEdit_reason_">Cometar/Editar raz�n: </msg>
+  <msg key="Confirm_Evaluation_">Confirmar Evaluaci�n </msg>
+  <msg key="Create">Grupo </msg>
+  <msg key="Create_Group_">Crear Grupo  </msg>
+  <msg key="Delete_Evaluation_">Eliminar Evaluaci�n </msg>
+  <msg key="Delete_evaluation_">Eliminar evaluaci�n  </msg>
+  <msg key="Delete_Group_">Eliminar Grupo </msg>
+  <msg key="Delete_Task_">Eliminar Tarea  </msg>
+  <msg key="Delete_task_">Eliminar tarea </msg>
+  <msg key="Description">Descripci�n </msg>
+  <msg key="Description_">Descripci�n </msg>
+  <msg key="Due_Date">Fecha:</msg>
+  <msg key="Due_Date_">Fecha:</msg>
+  <msg key="Due_date_">Fecha:</msg>
+  <msg key="Due_Date_1">Fecha:</msg>
+  <msg key="Edit_evaluation_">Editar evaluaci�n</msg>
+  <msg key="Edit_Evaluations_">Editar Evaluaciones </msg>
+  <msg key="Edit_Reason">Raz�n de Modificaci�n:</msg>
+  <msg key="Edit_Reason_">Raz�n de Modificaci�n</msg>
+  <msg key="Edit_Task_">Editar Tarea </msg>
+  <msg key="Edit_task_">Editar tarea </msg>
+  <msg key="Email">Correo Electr�nico</msg>
+  <msg key="Evaluated_">Evaluado</msg>
+  <msg key="Evaluation_Index_">Indice de Evaluaciones</msg>
+  <msg key="Evaluation_Modified_">Evaluaci�n Modificada </msg>
+  <msg key="Evaluations">Evaluaciones</msg>
+  <msg key="Evaluations_">Evaluaciones </msg>
+  <msg key="Evaluations_Admin">Administraci�n de Evaluaciones</msg>
+  <msg key="Evaluations_List_">Lista de Evaluaciones</msg>
+  <msg key="Exams_">Ex�menes</msg>
+  <msg key="Exams_for_students_">Ex�menes para estudiantes</msg>
+  <msg key="File_">Nombre del archivo:</msg>
+  <msg key="Fileurl_associated">Archivo/url asociado</msg>
+  <msg key="Generate_file">Generar Archivo</msg>
+  <msg key="Go_Back">Regresar</msg>
+  <msg key="Grade">Nota:</msg>
+  <msg key="Grade_">Nota </msg>
+  <msg key="Grade_1">Estudiantes</msg>
+  <msg key="Grade_Distribution_">Distribuci�n de Notas</msg>
+  <msg key="Grade_in_Net_value_">Valor Neto de la Nota</msg>
+  <msg key="Grade_over_">Nota sobre </msg>
+  <msg key="Grade_over_100_">Nota sobre 100 </msg>
+  <msg key="Grader_">Calificado por</msg>
+  <msg key="Grades_">Notas </msg>
+  <msg key="Grades_Category">Categor�a de Notas</msg>
+  <msg key="Grades_Report_">Reporte de Notas </msg>
+  <msg key="Grades_Reports">Reportes de Notas</msg>
+  <msg key="Grades_Sheet_Name_">Nombre del Cuadro de Notas </msg>
+  <msg key="Grades_Sheets_">Cuadro de Notas</msg>
+  <msg key="Group_name">Nombre del grupo</msg>
+  <msg key="Group_Name_">Nombre del Grupo</msg>
+  <msg key="Groups_Admin_">Administraci�n de Groupos. </msg>
+  <msg key="here">aqu�</msg>
+  <msg key="How_does_this_work">�C�mo funciona esto?</msg>
+  <msg key="Id_">Id </msg>
+  <msg key="Individual_">Individual</msg>
+  <msg key="Insert_Failed_">No se pudo insertar </msg>
+  <msg key="Is_live_">�Esta disponible? </msg>
+  <msg key="Last_Modified_">Ultima Modificaci�n</msg>
+  <msg key="late_">tarde</msg>
+  <msg key="late__1">(tarde) </msg>
+  <msg key="lt_A_new_assignment_was_">Una nueva asignaci�n se ha subido, si usted desea ver mas detalles
+ </msg>
+  <msg key="lt_able_to_see_the_grade">�podr�n ver sus notas?</msg>
+  <msg key="lt_Add_a_member_to_a_gro">Agregar miembro al grupo </msg>
+  <msg key="lt_Add_Assignment_to_Com">Agregar Asignaci�n a Comunidades 
+ </msg>
+  <msg key="lt_Add_this_assignment_t">Agregar asignaci�n %grade_name% en varias clases o secciones</msg>
+  <msg key="lt_Admin_Assignment_Type">Administraci�n de Tipos de Asignaciones</msg>
+  <msg key="lt_Admin_my_Assignment_T">Administrar mis Tipos de Asignaciones</msg>
+  <msg key="lt_Allow_the_students_br">�Permitir a los estudiantes &lt;br&gt; ver sus notas? </msg>
+  <msg key="lt_Already_created_group">Grupos ya creados</msg>
+  <msg key="lt_Also_you_will_see_the">Tambi�n, vera la lista de los grupos ya creados (si hubiera alg�n grupo creado). Haga click en el link de &quot;Administraci�n del Grupo&quot; para administrar el grupo. En estas paginas de administraci�n usted ser� capaz de desasociar miembros de un grupo dado, renombrar el grupo y/o eliminar el grupo.</msg>
+  <msg key="lt_An_assignment_was_mod">Una asignaci�n ha sido modificada, si desea ver mas detalles</msg>
+  <msg key="lt_Are_you_sure_remove">�Esta seguro de querer eliminar la evaluaci�n en  &quot;%party_name%&quot;?
+</msg>
+  <msg key="lt_Are_you_sure_you_want">�Esta seguro de querer eliminar la asignaci�n de tipo &quot;%grade_plural_name%&quot;?
+(Si su respuesta es si, todas las evaluaciones, tareas, soluciones y respuestas asociadas a este tipo de asignaci�n ser�n eliminados tambi�n)
+</msg>
+  <msg key="lt_Are_you_sure_you_want_1">�Esta seguro de querer eliminar el grupo &quot;%group_name%&quot;? (Si el grupo tiene una evaluaci�n/respuesta asociada, esta ser� eliminada tambi�n)</msg>
+  <msg key="lt_Are_you_sure_you_want_2">�Esta seguro de querer eliminar la tarea &quot;%task_name%&quot;? (Si usted elimina esta tarea, toda la informaci�n asociada a la tarea, como respuestas, soluciones, entre otros, ser�n eliminados tambi�n) </msg>
+  <msg key="lt_Assignment_Attachment">Adjunto de la Asignaci�n </msg>
+  <msg key="lt_Assignment_Plural_Typ">Plural del Nombre del Tipo de Asignaci�n
+ </msg>
+  <msg key="lt_Assignment_Type_Name_">Nombre del Tipo de Asignaci�n
+ </msg>
+  <msg key="lt_Assignment_Types_Comm">Comentarios de los Tipos de Asignaci�n
+ </msg>
+  <msg key="lt_Assignment_Types_Dist">Distribuci�n de los Tipos de Asignaci�n
+
+
+
+ </msg>
+  <msg key="lt_Assignments_Descripti">Descripci�n: 	 </msg>
+  <msg key="lt_Associate_to_this_gro">Asociar a este grupo
+</msg>
+  <msg key="lt_Audit_info_for_task_t">Historial de notas de la tarea &quot;%task_name%&quot;</msg>
+  <msg key="lt_Can_the_student_submi">�Podr� entregarse tarde esta tarea?</msg>
+  <msg key="lt_Check_the_rest_of_com">Verificar el resto de las comunidades donde usted desea subir la asignaci�n tambi�n</msg>
+  <msg key="lt_Check_this_if_you_wan">Haga click aqu� para desadjuntar el archivo  
+</msg>
+  <msg key="lt_Check_this_if_you_wan_1">Haga click aqu� si desea ir a la pagina de administraci�n de grupos despu�s de subir la tarea</msg>
+  <msg key="lt_Check_this_if_you_wan_2">Haga click aqu� si desea agregar esta asignaci�n a varias clases o secciones </msg>
+  <msg key="lt_Click_on_the_task_tha">Haga click en la tarea que desea ser copiada por los grupos 
+</msg>
+  <msg key="lt_Commentedit_reason_on">El numero de caracteres en la raz�n del comentario/edici�n en %party_id% es mayor a  4,000, nuestra longitud m�xima. Por favor haga la raz�n del comentario / edici�n mas corta.
+</msg>
+  <msg key="lt_Confirm_Your_Evaluati">Confirmar su Evaluaci�n </msg>
+  <msg key="lt_Confirm_your_evaluati">Confirmar su(s) evaluacion(es) en &quot;%task_name%&quot; 
+</msg>
+  <msg key="lt_Currently_content_is_">Actualmente este $content esta asociado a esta soluci�n, pero puede asociarlo a un url/archivo diferente solo con agregarlo aqu�
+</msg>
+  <msg key="lt_Currently_content_is__1">Actualmente este $content esta asociado a esta tarea, pero puede asociarlo a un url/archivo diferente solo con agregarlo aqu� </msg>
+  <msg key="lt_Currently_title_is_at">Actualmente este $content esta asociado a esta soluci�n, pero puede adjuntar un url/archivo diferente solo con agregarlo aqu�</msg>
+  <msg key="lt_Currently_title_is_at_1">Actualmente este $content esta asociado a esta tarea, pero puede adjuntar un url/archivo diferente solo con agregarlo aqu�</msg>
+  <msg key="lt_Delete_Assignment_Typ">Eliminar el Tipo de Asignaci�n  
+ </msg>
+  <msg key="lt_Delete_assignment_typ">Eliminar el tipo de asignaci�n </msg>
+  <msg key="lt_Distribution_for_grad">Distribuci�n de Notas 
+%grade_plural_name%</msg>
+  <msg key="lt_Do_NOT_change_the_par">No cambie el campo &quot;id&quot; porque con este archivo se asocia la nota con el estudiante o grupo.
+</msg>
+  <msg key="lt_Due_date_must_be_in_t">La fecha de entrega debe de estar en el futuro</msg>
+  <msg key="lt_Edit_Assignment_Type_">Editar Tipo de Asignaci�n  
+ </msg>
+  <msg key="lt_Edit_assignment_type_">Editar tipo de asignaci�n </msg>
+  <msg key="lt_Edit_grades_distribut">Editar distribuci�n de notas de $grade_plural_name
+</msg>
+  <msg key="lt_Enter_the_grades_for_">Ingrese las notas de los estudiantes/grupos y CONSERVE LA ESTRUCTURA del archivo. Si usted esta editando una nota, usted DEBE de dar una raz�n en el campo de &quot;raz�n de Comentario/Edici�n&quot;.  </msg>
+  <msg key="lt_Error_deleting_the_ev">Error al eliminar la evaluaci�n
+ </msg>
+  <msg key="lt_Error_deleting_the_gr">Error al eliminar la nota </msg>
+  <msg key="lt_Error_deleting_the_ta">Error al eliminar la tarea</msg>
+  <msg key="lt_Error_while_storing_f">Error al guardar el archivo </msg>
+  <msg key="lt_Evaluated_Students_to">Evaluar Estudiantes (%total_evaluated%)</msg>
+  <msg key="lt_First_unattach_the_fi">Primero debe de quitar el archio/url adjunto, luego subir otro o solo subir un nuevo archivo/url y dejar este en blanco  
+</msg>
+  <msg key="lt_First_you_will_see_th">Primero, usted encontrara una lista de estudiantes sin grupo (si hubieran estudiantes sin grupo) y puede crear un grupo seleccionando los miembros del grupo y haciendo click en el bot�n &quot;Crear Grupo&quot;.</msg>
+  <msg key="lt_Generate_the_csv_file">Genere el archivo csv del sistema. Este archivo tiene la estructura apropiada para que el sistema pueda reconocerlo y obtener la informaci�n acerca de las notas. Este archivo puede ser generado haciendo click en el link &quot;Generar Archivo&quot;
+
+
+</msg>
+  <msg key="lt_Grade_grade_does_not_">La nota %grade% parece no ser un numero valido.
+ 
+</msg>
+  <msg key="lt_Grade_over_100_points">Nota sobre 100 puntos</msg>
+  <msg key="lt_grade_plural_name_rep">%grade_plural_name% representa el %grade_weight%% del 100% de la clase</msg>
+  <msg key="lt_Grade_students_using_">Ingresar notas usando el archivo generado:
+</msg>
+  <msg key="lt_Grade_students_using_file">Ingresar notas usando el archivo generado:</msg>
+  <msg key="lt_Grade_students_with_0">Calificar con 0 (cero)</msg>
+  <msg key="lt_Grades_Report_for_stu">Reporte de Notas para $student_name</msg>
+  <msg key="lt_Grades_report_of_stud">Reporte de notas para &quot;%student_name%&quot;</msg>
+  <msg key="lt_Grades_Sheet_Explanat">Hoja de Explicaci�n de Notas
+ </msg>
+  <msg key="lt_Group_administration_">Administraci�n de grupo</msg>
+  <msg key="lt_Groups_administration">Administraci�n de grupos</msg>
+  <msg key="lt_Groups_for_task_task_">Grupos para la tarea %task_name% </msg>
+  <msg key="lt_If_you_administer_mor">Si usted administra mas de una comunidad y usted quiere subir una asignaci�n en mas de una comunidad, usted debe colocar el mismo nombre para cada uno de los tipos de asignaci�n en cada comunidad para que el sistema pueda identificar en donde guardar la asignaci�n.</msg>
+  <msg key="lt_If_you_click_on_the_s">Si usted hace click sobre el nombre del estudiante, usted vera el reporte de notas del estudiante.</msg>
+  <msg key="lt_If_you_do_not_want_to">Si usted no quiere evaluar o editar la nota de un estudiante o grupo, solo deje intacto los campos de esa fila, o puede eliminar la fila entera.</msg>
+  <msg key="lt_if_you_do_not_want_to">si usted no quiere ver las fotos de los estudiantes</msg>
+  <msg key="lt_if_you_want_to_downlo">si usted quiere bajar todas las respuestas en un solo archivo </msg>
+  <msg key="lt_if_you_want_to_see_th">si usted quiere ver las fotos de los estudiantes</msg>
+  <msg key="lt_In_order_to_generate_">Para generar este archivo deben de haber varios grupos\usuarios asignados a esta tarea. </msg>
+  <msg key="lt_In_this_page_you_can_">En esta pagina usted puede administrar los grupos para la asignaci�n. </msg>
+  <msg key="lt_Input_Will_the_studen">La entrada \&quot;�Podr�n los estudiantes ver su nota?\&quot; debe de ser 1 (uno) para SI o 0 (cero) para NO, por favor no lo deje en blanco.
+
+</msg>
+  <msg key="lt_Is_the_task_submitted">�Van los estudiantes a enviar
+las respuestas electr�nicamente?</msg>
+  <msg key="lt_Max_Grade_does_not_se">La Nota M�xima parece no ser un numero valido. Por favor no la deje en blanco.
+</msg>
+  <msg key="lt_No_fileurl_associated">No hay ning�n archivo/URL asociado a esta tarea</msg>
+  <msg key="lt_No_fileurl_associated_1">No hay ning�n archivo/URL asociado a la soluci�n de esta tarea
+</msg>
+  <msg key="lt_No_group_for_student_">No hay ning�n grupo para estudiante</msg>
+  <msg key="lt_No_I_want_to_cancel_m">No, quiero cancelar mi solicitud
+</msg>
+  <msg key="lt_No_portrait_for_party">No hay foto para $party_name</msg>
+  <msg key="lt_No_portrait_for_stude">No hay foto para $student_name</msg>
+  <msg key="lt_Notification_for_assi">Notificaci�n para asignaciones </msg>
+  <msg key="lt_Notification_for_eval">Notificaci�n para evaluaciones   </msg>
+  <msg key="lt_Number_of_members_for">Numero de miembros para esta tarea:
+</msg>
+  <msg key="lt_Number_of_members_of_">N�mero de personas en el grupo:</msg>
+  <msg key="lt_over_grade_weight_of_">sobre %grade_weight%% de %grade_plural_name% </msg>
+  <msg key="lt_Party_id_party_id_doe">El Id del usuario/grupo %party_id% no parece ser un numero entero. Por favor no modifique este campo.
+</msg>
+  <msg key="lt_please_check_the_last">en la parte inferior de la p�gina
+y haga click en OK.</msg>
+  <msg key="lt_Please_enter_the_grou">Por favor ingrese el nombre del grupo
+</msg>
+  <msg key="lt_Please_enter_the_new_">Por favor ingrese el nuevo nombre del grupo</msg>
+  <msg key="lt_Please_select_the_gro">Por favor seleccione el grupo
+</msg>
+  <msg key="lt_Projects_for_students">Proyectos para los estudiantes</msg>
+  <msg key="lt_Reuse_groups_from_ano">No admitir grupos de otra asignaci�n </msg>
+  <msg key="lt_Save_the_csv_file_and">Guarde el archivo csv y MANTENGA EL FORMATO CSV. El archivo CSV puede ser editado con cualquier editor de texto (y MS Excell) pero tiene que mantener el formato CSV. Si usted no mantiene el formato, el sistema no ser� capaz de leer el archivo.
+</msg>
+  <msg key="lt_See_grades_sheets_ass">Ver los cuadros de notas asociados a esta tarea
+</msg>
+  <msg key="lt_Send_the_file_using_t">Env�e el archivo utilizando el bot�n &quot;Enviar archivo&quot;. El sistema leer� el archivo y preguntara por una confirmaci�n (si todo esta bien con el archivo) para las notas.
+
+</msg>
+  <msg key="lt_smallTotal_points_in_">&lt;small&gt;Total de puntos en esta categoria: ${total_grade}/${max_grade} &lt;br /&gt;  $grade_plural_name representan el ${grade_weight}% del 100% de la clase&lt;/small&gt;</msg>
+  <msg key="lt_Students_who_have_not">Estudiantes que NO han respondido: (%not_evaluated_with_no_answer%) 
+</msg>
+  <msg key="lt_Students_with_answers">Estudiantes No Evaluados: (%not_evaluated_with_answer%)</msg>
+  <msg key="lt_submission_date_prett">%submission_date_pretty% (tarde) </msg>
+  <msg key="lt_submission_date_prett_1">$submission_date_pretty &lt;span style=\&quot;color:red;\&quot;&gt;(entregar tarde)&lt;/span&gt; </msg>
+  <msg key="lt_The_assignment_task_n">La asignaci�n &quot;%task_name%&quot; ha sido subida en esta comunidad.
+</msg>
+  <msg key="lt_The_commentsedit_reas">La raz�n de comentarios/edici�n es una cadena de caracteres de no mas de 4,000 caracteres. </msg>
+  <msg key="lt_The_edit_reason_must_">La raz�n de edici�n debe de ser menor a los 4,000 caracteres de largo
+</msg>
+  <msg key="lt_The_file_extension_of_1">La extensi�n del archivo \&quot;$file_extension\&quot; debe de ser .CSV, lo sentimos, no podemos procesarlo </msg>
+  <msg key="lt_The_file_is_too_large_1">El archivo es muy grande. (El tama�o m�ximo es de %pretty_maxnbytes% bytes)</msg>
+  <msg key="lt_The_file_should_have_">El archivo debe de tener un formato predefinido para que el sistema pueda leerlo y obtener la informaci�n. Si usted desea utilizar esta herramienta debe de seguir los siguientes pasos:</msg>
+  <msg key="lt_The_grade_most_be_a_v">La nota debe de ser un NUMERO VALIDO: %wrong_grade% </msg>
+  <msg key="lt_The_grade_must_be_a_R">La nota debe de ser un NUMERO REAL.</msg>
+  <msg key="lt_The_grade_must_be_a_v">La nota debe de ser un NUMERO VALIDO: %wrong_grade% </msg>
+  <msg key="lt_The_grade_must_be_a_v_1">La nota debe de ser un numero valido </msg>
+  <msg key="lt_The_sum_of_the_weight">La suma de todos las asignaciones es %total_weight% y deber�a de ser 100 al final del curso (generalmente).
+
+</msg>
+  <msg key="lt_The_system_assumes_th">El sistema asume que las notas empiezan en la s�ptima fila del archivo.</msg>
+  <msg key="lt_There_are_no_edit">No hay notas que editar
+</msg>
+  <msg key="lt_There_are_no_files_as">No hay archivos asociados a esta tarea
+</msg>
+  <msg key="lt_There_are_no_grades_f">No hay notas para este grupo.</msg>
+  <msg key="lt_There_are_no_groups_f">Todav�a no hay grupos para esta tarea.</msg>
+  <msg key="lt_There_are_no_more_com">No hay mas comunidades donde pueda agregar la tarea.
+</msg>
+  <msg key="lt_There_are_no_studens_">No hay estudiantes asociados a este grupo. 
+</msg>
+  <msg key="lt_There_are_no_students">No hay estudiantes para evaluar que ya hayan respondido 
+
+</msg>
+  <msg key="lt_There_are_no_students_1">No hay estudiantes para evaluar sin respuesta 
+
+</msg>
+  <msg key="lt_There_are_no_tasks_as">No hay tareas asignados(as)</msg>
+  <msg key="lt_There_are_no_tasks_fo">No hay tareas para este paquete.
+</msg>
+  <msg key="lt_There_are_no_tasks_fo_1">No hay tareas para este tipo de nota.
+
+</msg>
+  <msg key="lt_There_are_no_tasks_to">No hay tareas que evaluar para este paquete.
+</msg>
+  <msg key="lt_There_is_a_comment_fo">Existe un comentario para una nota que no se ha tomado en cuenta:
+%wrong_comments% </msg>
+  <msg key="lt_There_is_a_comment_la">Existe un comentario mas grande del que podemos manejar:
+%wrong_comments% </msg>
+  <msg key="lt_There_is_a_comment_la_1">Existe un comentario mas grande del que podemos manejar: %wrong_comments%  </msg>
+  <msg key="lt_There_is_an_edit_reas">Existe una raz�n de edici�n para una nota que no ha sido tomada en cuenta:
+%wrong_comments% </msg>
+  <msg key="lt_There_is_an_edit_reas_1">Existe una raz�n de edici�n mas grande de la que podemos manejar:
+%wrong_comments% </msg>
+  <msg key="lt_There_is_no_audit_inf">No hay historial de notas para esta tarea porque no hay estudiantes evaluados.</msg>
+  <msg key="lt_There_is_no_info_">No hay notas en el archivo csv o no hay modificaciones en el archivo csv.
+</msg>
+  <msg key="lt_There_is_no_info_for_">No hay historial de notas para este estudiante.</msg>
+  <msg key="lt_There_is_no_informati">No hay informaci�n para esta tarea.
+</msg>
+  <msg key="lt_There_must_be_an_edit">Debe de haber una raz�n de edici�n si desea editar la nota del usuario/grupo %party_id%. 
+</msg>
+  <msg key="lt_There_must_be_at_leas">Debe de haber al menos una nota para poder trabajar</msg>
+  <msg key="lt_There_must_be_no_grou">No deben de haber grupos en esta tarea para poder copiar los grupos de otra tarea. Usted puede regresar y borrar los grupos de esta tarea.
+</msg>
+  <msg key="lt_There_must_be_some_st">Deben de haber algunos estudiantes seleccionados para poder crear el grupo.
+</msg>
+  <msg key="lt_There_was_a_problem_s">Hubo un problema al guardar el archivo. Por favor contacte al administrador.
+        &lt;p&gt;El error fue el siguiente: &lt;pre&gt;%errmsg%&lt;/pre&gt;&lt;/li&gt; </msg>
+  <msg key="lt_There_was_an_error_cr">Hubo un error al crear los grupos
+</msg>
+  <msg key="lt_These_are_the_grades_">Estos son los cuadros de notas utilizados para evaluar los estudiantes de esta tarea.
+</msg>
+  <msg key="lt_These_are_the_student">Estos son los estudiantes que ya respondieron pero que no han sido evaluados.</msg>
+  <msg key="lt_These_are_the_student_1">Estos son los estudiantes que no han respondido (si la tarea se puede entregar electr�nicamente) y no han sido evaluados.</msg>
+  <msg key="lt_This_funcionallity_al">Esta funcionalidad le permite subir un archivo CSV (Comm Separated Value) con las notas de los estudiantes. Este archivo CSV puede ser editado con MS Excell y con otros editores de texto.
+</msg>
+  <msg key="lt_This_is_the_grades_re">Este es el reporte de notas de los estudiantes de acuerdo a las asignaciones/evaluaciones que usted hizo.</msg>
+  <msg key="lt_This_is_the_grades_re_1">Este es el reporte de notas de los estudiantes de acuerdo a un tipo de asignaci�n y a las evaluaciones que usted hizo en este tipo de asignaci�n.
+
+</msg>
+  <msg key="lt_This_task_can_not_be_">Esta tarea no se puede entregar tarde
+</msg>
+  <msg key="lt_This_task_is_not_in_g">Esta tarea no es grupos
+</msg>
+  <msg key="lt_This_was_the_error___">Este fue un error:
+               &lt;blockquote&gt; 
+                &lt;pre&gt;%errmsg%&lt;/pre&gt; 
+                &lt;/blockquote&gt; </msg>
+  <msg key="lt_To_add_this_assignmen">Si desea agregar asignaciones en varias clases o secciones seleccione la opci�n que se encuentra</msg>
+  <msg key="lt_To_chanche_the_name_e">Para cambiar el nombre, edite el nombre en la entrada del texto y luego haga click en el bot�n &quot;Renombrar Grupo&quot;.
+</msg>
+  <msg key="lt_To_delete_the_group_c">Para eliminar el grupo, haga click en el bot�n &quot;Borrar Grupo&quot;</msg>
+  <msg key="lt_to_submit_their_answe">�para entregar las respuestas despu�s de la fecha de entrega?</msg>
+  <msg key="lt_To_unassociate_a_memb">Para desasociar a un miembro del grupo, haga click en el link de &quot;Desasociar miembro&quot;
+</msg>
+  <msg key="lt_TOTAL_GRADE_total_cla">NOTA TOTAL: %total_class_grade%</msg>
+  <msg key="lt_Total_points_in_this_">Total de puntos en esta categor�a: %total_grade% / $max_grade&lt;br /&gt;
+                        Esta categor�a de nota representa el ${grade_weight}% del 100% de la clase</msg>
+  <msg key="lt_Total_points_in_this__1">Total de puntos en esta categor�a: %total_grade% / $max_grade&lt;br /&gt;
+                        Esta categor�a de nota representa el %grade_weight%% del 100% de la clase</msg>
+  <msg key="lt_Total_points_in_this__2">Total de puntos en esta categor�a:  %total_grade%/%max_grade%</msg>
+  <msg key="lt_Unassociate_student_f">Desasociar estudiante de este grupo
+</msg>
+  <msg key="lt_Unrecognized_value_fo">Valor no reconocido para notif type: %$notif_type%. Los valores posibles son  
+one_assignment_notif and one_evaluation_notif. 
+
+</msg>
+  <msg key="lt_Upload_a_file_OR_a_ur">Subir un archivo O un URL, pero no ambos
+</msg>
+  <msg key="lt_Upload_a_file_OR_a_ur_1">Subir un archivo O un URL, pero no ambos</msg>
+  <msg key="lt_Upload_a_file_OR_a_va">Subir un archivo O un URL, pero no ambos</msg>
+  <msg key="lt_Upload_a_solution_for">Subir una soluci�n para esta asignaci�n para que los estudiantes puedan verla y aprender de ella.</msg>
+  <msg key="lt_user_name_has_modifie">user_name ha modificado el %party_name%. \n La raz�n de edici�n dada por %user_name% fue: %edit_reason% \n La nota actual es: %current_grade% \n\n Haga click en este link para ver los detalles de la evaluaci�n: %url_link% \n 
+</msg>
+  <msg key="lt_ViewEdit_Task_Solutio">Ver/Editar Soluci�n de la Tarea</msg>
+  <msg key="lt_We_got_the_following_">Hubo un error al tratar de eliminar la evaluaci�n: 
+&lt;pre&gt;%errmsg%&lt;/pre&gt;</msg>
+  <msg key="lt_We_got_the_following__1">Hubo un error al tratar de eliminar la nota: 
+&lt;pre&gt;%errmsg%&lt;/pre&gt;</msg>
+  <msg key="lt_We_got_the_following__2">Hubo un error al tratar de eliminar la tarea: 
+&lt;pre&gt;%errmsg%&lt;/pre&gt;</msg>
+  <msg key="lt_Weight_must_be_a_real">La ponderaci�n debe de ser un numero real entre 0 y 100</msg>
+  <msg key="lt_Weight_used_in_grade_">La ponderaci�n utilizada en $grade_plural_name es: ${category_weight}% (del 100% de $grade_plural_name) &lt;br /&gt;
+                       $grade_plural_name representan el ${grade_weight}% del 100% de la clase</msg>
+  <msg key="lt_Weight_used_in_grade__1">La ponderaci�n utilizada en $grade_plural_name es: ${category_weight}% (del 100% de $grade_plural_name) &lt;br /&gt;
+                       $grade_plural_name representan el ${grade_weight}% del 100% de la clase</msg>
+  <msg key="lt_Weight_used_in_grade__2">La ponderaci�n utilizada en $grade_plural_name es: ${category_weight}% (del 100% de $grade_plural_name) &lt;br /&gt;
+                       $grade_plural_name representan el ${grade_weight}% del 100% de la clase</msg>
+  <msg key="lt_Will_the_student_be_a">�Podr� el estudiante ver su nota? (1 = Si / 0 = No): </msg>
+  <msg key="lt_Will_the_student_be_a_1">�Podr� el estudiante ver su nota? </msg>
+  <msg key="lt_Will_the_students_be_">Podr�n los estudiantes</msg>
+  <msg key="lt_Will_the_task_be_subm">�Ser� %grade_name% enviada electr�nicamente?</msg>
+  <msg key="lt_Will_this_task_be_sub">�Van los estudiantes a enviar
+las respuestas electr�nicamente?</msg>
+  <msg key="lt_Will_this_task_requir">�Tendr� nota
+esta tarea?</msg>
+  <msg key="lt_Yes_I_really_want_to_">Si, realmente deseo eliminar esta evaluaci�n
+</msg>
+  <msg key="lt_Yes_I_really_want_to__1">Si, realmente deseo eliminar esta nota </msg>
+  <msg key="lt_Yes_I_really_want_to__2">Si, realmente deseo eliminar este grupo</msg>
+  <msg key="lt_Yes_I_really_want_to__3">Si, realmente deseo eliminar esta tarea</msg>
+  <msg key="lt_You_can_also_add_a_st">Usted tambi�n puede agregar un estudiante a un grupo haciendo click en el link  &quot;Asociar a grupo...&quot;. Ah� se le preguntara el grupo al que desea agregar el usuario.
+</msg>
+  <msg key="lt_You_can_associate_a_l">Usted puede asociar un link a esta asignaci�n introduciendo el url aqu� (opcional)</msg>
+  <msg key="lt_You_can_order_the_gra">Usted puede ordenar el reporte de notas por el nombre del estudiante, por el total de la nota, o por el tipo de asignaci�n, o ver los detalles del tipo de asignaci�n haciendo click en el icono a la izquierda del nombre del tipo de asignaci�n. 
+
+</msg>
+  <msg key="lt_You_can_order_the_gra_1">Usted puede ordenar el reporte de notas por el nombre del estudiante, por el total de la nota, o por el tipo de asignaci�n.</msg>
+  <msg key="lt_You_can_see_the_csv_f">Usted puede ver los archivos csv asociados a esta tarea haciendo click en el bot�n &quot;Ver cuadros de notas asociados a esta tarea&quot;.
+
+</msg>
+  <msg key="lt_You_can_upload_a_file">Usted puede subir un archivo asociado a esta tarea utilizando el bot�n browse (opcional)</msg>
+  <msg key="lt_You_can_upload_a_file_1">Utilice el bot�n &quot;Browse...&quot; para localizar su archivo explorando, luego haga click en &quot;Abrir&quot;. (opcional)</msg>
+  <msg key="lt_You_must_give_an_edit">Usted debe de dar una raz�n de edici�n (%old_grade% --&gt; %grade_wo_reason%  
+</msg>
+  <msg key="lt_Your_total_grade_in_t">El total de su nota es de:
+</msg>
+  <msg key="Max_Grade_">Nota M�xima: </msg>
+  <msg key="Maximun_Grade_">Nota M�xima: </msg>
+  <msg key="Members_">Miembros</msg>
+  <msg key="Modifying_User_">Por</msg>
+  <msg key="na_">n/a</msg>
+  <msg key="Name">Nombre:</msg>
+  <msg key="Name_">T�tulo </msg>
+  <msg key="Name_student_name">Nombre: %student_name%</msg>
+  <msg key="Net_value_">Valor neto</msg>
+  <msg key="NEW_answer_">(NUEVA respuesta) </msg>
+  <msg key="New_Assignment_">Nueva Asignaci�n</msg>
+  <msg key="New_Group_">Nuevo Grupo </msg>
+  <msg key="No">No</msg>
+  <msg key="No_">No </msg>
+  <msg key="No_data_">(No hay datos) </msg>
+  <msg key="No_group_for_task_">No hay grupo para la tarea</msg>
+  <msg key="No_of_Members_">Numero de Miembros</msg>
+  <msg key="No_of_members_">Numero de Miembros</msg>
+  <msg key="No_parties_to_grade_">No hay ususarios/grupos para evaluar</msg>
+  <msg key="No_response_">Sin responder</msg>
+  <msg key="Not_answered_">Sin responder</msg>
+  <msg key="Not_available_">No disponible</msg>
+  <msg key="Not_evaluated_">Sin evaluar</msg>
+  <msg key="Number_of_Integrants">Numero de Integrantes</msg>
+  <msg key="Number_of_Members_">N�mero de personas en el grupo: </msg>
+  <msg key="One_Assignment_">Una asignaci�n</msg>
+  <msg key="One_Evaluation_">Una evaluaci�n</msg>
+  <msg key="One_Grade_Type_">Un Tipo de Nota</msg>
+  <msg key="One_Group_">Un Grupo</msg>
+  <msg key="Online_Submit_">Enviar Electr�nicamente</msg>
+  <msg key="pero">y entonces </msg>
+  <msg key="Projects_">Proyectos</msg>
+  <msg key="Remove_Grade">Eliminar Nota</msg>
+  <msg key="Rename">Grupo</msg>
+  <msg key="Requires_Grade_">Hacer &quot;sin punteo&quot;</msg>
+  <msg key="Reuse_Groups_">Bloquear Grupos</msg>
+  <msg key="Solution_Attachment_">Adjunto de la Soluci�n</msg>
+  <msg key="Studen_List_">Lista de Estudiantes  </msg>
+  <msg key="Student_List_">Lista de Estudiantes </msg>
+  <msg key="Student_Name_">Nombre del Estudiante</msg>
+  <msg key="Students_List_">Lista de Estudiantes</msg>
+  <msg key="Students_Portrait_">Foto del Estudiante</msg>
+  <msg key="Submission_Date_">Fecha de Entrega </msg>
+  <msg key="submit_answer_">entregar</msg>
+  <msg key="submit_answer_again_">re-entregar</msg>
+  <msg key="Sumission_Date_">Fecha de Entrega  </msg>
+  <msg key="Task_Groups_">Lista de Grupos</msg>
+  <msg key="Task_Name">T�tulo:</msg>
+  <msg key="Task_Name_">T�tulo:</msg>
+  <msg key="Task_Name_1">T�tulo:</msg>
+  <msg key="Task_Solution">Soluci�n</msg>
+  <msg key="Task_Status_">Estado de la Tarea</msg>
+  <msg key="Tasks_">Tareas</msg>
+  <msg key="Tasks_for_students_">Tareas para los estudiantes</msg>
+  <msg key="Tasks_List_">Lista de Tareas</msg>
+  <msg key="Total_">Total </msg>
+  <msg key="Total_current_grade_">Nota total actual: </msg>
+  <msg key="Total_Grade_">Nota Total</msg>
+  <msg key="Total_of_Members_">Total de Miembros</msg>
+  <msg key="Unassociate_member_">Desasociar miembro </msg>
+  <msg key="Unassociate_url_">�Desasociar url? </msg>
+  <msg key="Unattach_file_">�Remover el archivo adjunto? </msg>
+  <msg key="Upload_Answer_">Enviar Respuesta</msg>
+  <msg key="Upload_Date_">Fecha de Env�o</msg>
+  <msg key="Upload_Solution_">Enviar Soluci�n
+</msg>
+  <msg key="Uploaded_by_">Subido por</msg>
+  <msg key="URL_">(URL) </msg>
+  <msg key="URL__1">o URL: </msg>
+  <msg key="View_answer_">Ver respuesta</msg>
+  <msg key="View_comments_">Ver comentarios</msg>
+  <msg key="View_evaluation_">Ver evaluaci�n </msg>
+  <msg key="View_grades_sheet_">Ver cuadro de notas</msg>
+  <msg key="View_my_answer_">Ver mi respuesta </msg>
+  <msg key="View_NEW_answer_">Ver NUEVA respuesta</msg>
+  <msg key="View_Task_">Ver Tarea </msg>
+  <msg key="View_task_">Ver tarea</msg>
+  <msg key="ViewEdit_Evaluation_">Ver/Editar Evaluaci�n</msg>
+  <msg key="ViewEdit_Solution_">Ver/Editar Soluci�n </msg>
+  <msg key="Weight">Fracci�n de nota:</msg>
+  <msg key="Weight_">Fracci�n de nota: </msg>
+  <msg key="Will_the_studens_be">Podr�(n) el estudiante(s)</msg>
+  <msg key="Yes">S�</msg>
+  <msg key="Yes_">S�</msg>
+</message_catalog>
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.4 -r1.5
--- openacs-4/packages/evaluation/lib/evaluations-chunk.tcl	10 Jun 2004 21:08:52 -0000	1.4
+++ openacs-4/packages/evaluation/lib/evaluations-chunk.tcl	15 Jun 2004 23:20:29 -0000	1.5
@@ -97,11 +97,12 @@
 		set grade "[_ evaluation.Not_evaluated_]"
 	    }
 	    
+	    set task_weight "${over_weight}[format %.2f [lc_numeric $task_weight]]"
 	    set max_grade [expr $task_weight + $max_grade] 
 	} else {
 	    set grade "[_ evaluation.Not_available_]"
+	    set task_weight "[_ evaluation.Not_available_]"
 	}
-	set task_weight "${over_weight}[format %.2f [lc_numeric $task_weight]]"
 	
 	# working with answer stuff (if it has a file/url attached)
 	if { [empty_string_p $answer_data] } {
@@ -129,6 +130,6 @@
 if { $admin_p } {
     set bottom_line "<small>[_ evaluation.lt_Weight_used_in_grade__2]</small>"
 } else {
-    set bottom_line "<small>[_ evaluation.lt_Total_points_in_this__1]</small>"
+    set bottom_line "[_ evaluation.lt_smallTotal_points_in_]"
 }
 
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.1
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+
+<fullquery name="get_tasks_admin">      
+      <querytext>
+
+	select et.task_name, et.number_of_members, et.task_id,
+		to_char(et.due_date, 'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, 
+		et.online_p, 
+		et.late_submit_p, 
+		et.item_id,
+		et.requires_grade_p, et.description, et.grade_id,
+		cr.content_length,
+		et.data as task_data,
+		et.title as task_title,
+   		et.task_id as revision_id,
+		ets.solution_id as solution_id
+	from cr_revisions cr, 
+		 evaluation_tasksi et left outer join evaluation_tasks_solsi ets on (ets.task_id = et.task_id and content_revision__is_live(ets.solution_id) = true)
+	where cr.revision_id = et.revision_id
+	  and grade_id = :grade_id	
+	  and content_revision__is_live(et.task_id) = true 
+	$assignments_orderby
+
+      </querytext>
+</fullquery>
+
+<fullquery name="get_tasks">      
+      <querytext>
+
+	select et.task_name, et.number_of_members, et.task_id,
+		to_char(et.due_date, 'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, 
+`		et.online_p, 
+		et.late_submit_p, 
+		et.item_id,
+		et.due_date,
+		et.requires_grade_p, 
+		et.description, 
+		et.grade_id,
+		et.title as task_title,
+		et.data as task_data,
+	   	et.task_id as revision_id,
+		cr.content_length,
+		ea.answer_id as answer_id
+	from cr_revisions cr, 
+		 evaluation_tasksi et left outer join evaluation_answersi ea on (ea.task_id = et.task_id and content_revision__is_live(ea.answer_id) = true
+                                                                    and ea.party_id = evaluation__party_id(:user_id,et.task_id))
+	where cr.revision_id = et.revision_id
+	  and grade_id = :grade_id
+	  and content_revision__is_live(et.task_id) = true 
+    $assignments_orderby
+	
+      </querytext>
+</fullquery>
+
+<fullquery name="get_group_id">      
+      <querytext>
+
+		select evaluation__party_id(:student_id,:task_id)
+	
+      </querytext>
+</fullquery>
+
+
+<fullquery name="get_student_grades">      
+      <querytext>
+
+    select et.task_name, 
+    ese.grade,
+    ese.description as comments,
+    (et.weight*eg.weight)/100 as task_weight,
+    (ese.grade*et.weight*eg.weight)/10000 as net_grade,
+    et.number_of_members,
+    to_char(et.due_date, 'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, 
+    et.task_id,
+    et.online_p,
+    ea.answer_id,
+    person__name(ese.creation_user) as grader_name
+    from evaluation_grades eg,
+    evaluation_tasks et2 left outer join evaluation_student_evalsi ese on (ese.task_id = et2.task_id and content_revision__is_live(ese.evaluation_id) = true
+									   and ese.party_id = evaluation__party_id(:student_id,et2.task_id)),
+    evaluation_tasks et left outer join evaluation_answersi ea on (ea.task_id = et.task_id and content_revision__is_live(ea.answer_id) = true
+								   and ea.party_id = evaluation__party_id(:student_id,et.task_id))
+    where eg.grade_id = :grade_id
+    and eg.grade_id = et.grade_id
+    and et.task_id = et2.task_id
+    and content_revision__is_live(et.task_id) = true 
+    and content_revision__is_live(eg.grade_id) = true
+
+      </querytext>
+</fullquery>
+
+<fullquery name="group_name">      
+      <querytext>
+
+	select acs_group__name(:group_id)
+
+      </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/evaluation/lib/student-grades-report-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/student-grades-report-chunk.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/lib/student-grades-report-chunk.adp	15 Jun 2004 23:20:29 -0000	1.1
@@ -0,0 +1,7 @@
+
+<blockquote>
+  <listtemplate name="student_grades"></listtemplate>
+  <p>#evaluation.lt_Total_points_in_this__2# <br />
+   #evaluation.lt_grade_plural_name_rep#</p>
+</blockquote>
+
Index: openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl	15 Jun 2004 23:20:29 -0000	1.1
@@ -0,0 +1,128 @@
+ad_page_contract {
+
+    task chunk to be displayed in the index page
+
+}
+
+db_1row grade_names { *SQL* }
+set package_id [ad_conn package_id]
+set base_url [ad_conn package_url]
+
+set mode display
+set return_url "[ad_conn url]?[export_vars { grade_id }]"
+
+db_1row grade_info { *SQL* }
+
+set elements [list task_name \
+		  [list label "[_ evaluation.Task_Name_]" \
+		       orderby_asc {task_name asc} \
+		       orderby_desc {task_name desc}] \
+		  task_status \
+		  [list label "[_ evaluation.Task_Status_]" \
+		      ] \
+		  due_date_pretty \
+		  [list label "[_ evaluation.Due_date_]" \
+		       orderby_asc {due_date_ansi asc} \
+		       orderby_desc {due_date_ansi desc}] \
+		  grade \
+		  [list label "[_ evaluation.lt_Grade_over_100_points]" \
+		       orderby_asc {grade asc} \
+		       orderby_desc {grade desc}] \
+		  net_grade \
+		  [list label "[_ evaluation.Grade_in_Net_value_]" \
+		       orderby_asc {net_grade asc} \
+		       orderby_desc {net_grade desc}] \
+		  online_p \
+		  [list label "[_ evaluation.Online_Submit_]" \
+		       orderby_asc {online_p asc} \
+		       orderby_desc {online_p desc}] \
+		  assignment_group \
+		  [list label "[_ evaluation.Assignment_Group_]" \
+		       orderby_asc {assignment_group asc} \
+		       orderby_desc {assignment_group desc}] \
+		  grader_name \
+		  [list label "[_ evaluation.Grader_]" \
+		       orderby_asc {grader_name asc} \
+		       orderby_desc {grader_name desc}] \
+		  comments \
+		  [list label "[_ evaluation.Comments_]" \
+		       orderby_asc {comments asc} \
+		       orderby_desc {comments desc}] \
+		 ]
+
+template::list::create \
+    -name student_grades \
+    -multirow student_grades \
+    -pass_properties { return_url base_url } \
+    -filters { grade_id {} student_id {} } \
+    -elements $elements \
+    -orderby_name orderby \
+    -orderby { default_value task_name }
+
+set orderby [template::list::orderby_clause -orderby -name student_grades]
+
+if {[string equal $orderby ""]} {
+    set assignments_orderby " order by task_name asc"
+}
+
+set max_weight 0.00
+set max_grade 0.00
+set total_grade 0.00
+
+db_multirow -extend { task_status due_date_pretty assignment_group } student_grades get_student_grades { *SQL* } {
+
+    set due_date_pretty  [lc_time_fmt $due_date_ansi "%q"]
+
+    if { $online_p } {
+	set online_p "[_ evaluation.Yes_]"
+    } else {
+	set online_p "[_ evaluation.No_]"
+    }
+
+    if { [empty_string_p $comments] } {
+	set comments "[_ evaluation.na_]"
+    }
+    
+    set over_weight ""
+    set task_status ""
+	
+    # working with answer stuff (if it has a file/url attached)
+    if { [empty_string_p $answer_id] } {
+	append task_status " [_ evaluation.Not_answered_] "
+    } else {
+	append task_status " [_ evaluation.Already_answered_] "
+    }
+
+    if { ![empty_string_p $grade] } {
+	set grade [format %.2f [lc_numeric $grade]]
+	set over_weight "[format %.2f [lc_numeric $net_grade]]/"
+	set total_grade [expr $total_grade + $net_grade] 
+	set net_grade [format %.2f [lc_numeric $net_grade]]
+	set task_status "[_ evaluation.Evaluated_]"
+    } else {
+	set neg_grade "[_ evaluation.na_]"
+	set grade "[_ evaluation.na_]"
+	set grader "[_ evaluation.na_]"
+	append task_status " [_ evaluation.Not_evaluated_] "
+    }
+	    
+    set max_grade [expr $task_weight + $max_grade] 
+
+    set task_weight "${over_weight}[format %.2f [lc_numeric $task_weight]]"
+    
+    set group_id [db_string get_group_id { *SQL* }]
+    if { $number_of_members > 1 } {
+	if { [string eq $group_id 0] } {
+	    set task_status "[_ evaluation.lt_No_group_for_student_]"
+	    set assignment_group " [_ evaluation.na_] "
+	} else {
+	    set assignment_group [db_string group_name { *SQL* }] 
+	}
+    } else {
+	set assignment_group "[_ evaluation.Individual_]"
+    }
+    
+}
+
+set max_grade [format %.2f [lc_numeric $max_grade]]
+set grade_weight [format %.2f [lc_numeric $grade_weight]]
\ No newline at end of file
Index: openacs-4/packages/evaluation/lib/student-grades-report-chunk.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/student-grades-report-chunk.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/lib/student-grades-report-chunk.xql	15 Jun 2004 23:20:29 -0000	1.1
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+<fullquery name="grade_info">      
+      <querytext>
+
+    select eg.weight as grade_weight,
+    eg.grade_plural_name
+    from evaluation_grades eg
+    where eg.grade_id = :grade_id
+
+      </querytext>
+</fullquery>
+
+<fullquery name="grade_names">      
+      <querytext>
+
+		select grade_name, grade_plural_name from evaluation_grades where grade_id = :grade_id
+	
+      </querytext>
+</fullquery>
+
+</queryset>
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.4 -r1.5
--- openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql	10 Jun 2004 21:08:52 -0000	1.4
+++ openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.5
@@ -66,7 +66,7 @@
 <fullquery name="grade_names">      
       <querytext>
 
-		select grade_name, grade_plural_name, grade_name from evaluation_grades where grade_id = :grade_id
+		select grade_plural_name, grade_name from evaluation_grades where grade_id = :grade_id
 	
       </querytext>
 </fullquery>
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.6 -r1.7
--- openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql	10 Jun 2004 21:08:53 -0000	1.6
+++ openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.7
@@ -570,8 +570,8 @@
 					 :creation_user,
 					 :package_id,
 					 :creation_ip,
-					 'Exams',
-					 'Exams for students',
+					 :exams_name,
+					 :exams_desc,
 					 'text/plain',
 					 null,
 					 null,
@@ -597,7 +597,7 @@
 					  :creation_user, 
 					  :creation_ip,	
 					  :exams_revision_name,			
-					  'Exams for students',	
+					  :exams_desc,	
 					  now(),  --publish date
 					  null, --nls_language
 					  'text/plain' --mime_type
@@ -625,8 +625,8 @@
 					 :creation_user,
 					 :package_id,
 					 :creation_ip,
-					 'Projects',
-					 'Projects for students',
+					 :projects_name,
+					 :projects_desc,
 					 'text/plain',
 					 null,
 					 null,
@@ -652,7 +652,7 @@
 					  :creation_user, 
 					  :creation_ip,	
 					  :projects_revision_name,			
-					  'Projects for students',	
+					  :projects_desc,	
 					  now(),  --publish date
 					  null, --nls_language
 					  'text/plain' --mime_type
@@ -681,8 +681,8 @@
 					 :creation_user,
 					 :package_id,
 					 :creation_ip,
-					 'Tasks',
-					 'Tasks for students',
+					 :tasks_name,
+					 :tasks_desc,
 					 'text/plain',
 					 null,
 					 null,
@@ -708,7 +708,7 @@
 					  :creation_user, 
 					  :creation_ip,	
 					  :tasks_revision_name,			
-					  'Tasks for students',	
+					  :tasks_desc,	
 					  now(),  --publish date
 					  null, --nls_language
 					  'text/plain' --mime_type
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.7 -r1.8
--- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	10 Jun 2004 21:08:53 -0000	1.7
+++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	15 Jun 2004 23:20:29 -0000	1.8
@@ -42,6 +42,31 @@
     }
 } 
 
+ad_proc -public evaluation::get_user_portrait { 
+    -user_id:required
+    {tag_attributes ""}
+} { 
+	returns the portrait for the given user or a default portrait if not found.
+} {  
+        
+    if { [db_0or1row user_portrait { *SQL* }] } {
+	set output "<img src=\"/shared/portrait-bits.tcl?user_id=$user_id\" "
+    } else {
+	set output "<img src=\"[lindex [site_node::get_url_from_object_id -object_id [ad_conn package_id]] 0]resources/photo_na.gif\" "
+    }
+
+    foreach attribute_name [array names tag_attributes] {
+	if { [string equal $tag_attributes($attribute_name) {}] } {
+        append output " $attribute_name"
+	} else {
+        append output " $attribute_name=\"$attributes($attribute_name)\""
+	}
+    }
+
+    append output ">"
+    return $output
+} 
+
 ad_proc -public evaluation::notification::do_notification { 
     -task_id:required
     -package_id:required
@@ -668,6 +693,12 @@
     Helper for the apm_proc
 } {
     db_transaction {
+	set exams_name "[_ evaluation.Exams_]"
+	set exams_desc "[_ evaluation.Exams_for_students_]"
+	set tasks_name "[_ evaluation.Tasks_]"
+	set tasks_desc "[_ evaluation.Tasks_for_students_]"
+	set projects_name "[_ evaluation.Projects_]"
+	set projects_desc "[_ evaluation.lt_Projects_for_students]"
 	db_exec_plsql create_evaluation_folders { *SQL* }
 
 	set creation_user [ad_verify_and_get_user_id]
Index: openacs-4/packages/evaluation/tcl/evaluation-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/tcl/evaluation-procs.xql	15 Jun 2004 23:20:29 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+<fullquery name="evaluation::get_user_portrait.user_portrait">      
+      <querytext>
+
+	select c.item_id
+         from acs_rels a, cr_items c
+         where a.object_id_two = c.item_id
+           and a.object_id_one = :user_id
+           and a.rel_type = 'user_portrait_rel'
+
+      </querytext>
+</fullquery>
+ 
+</queryset>
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.2 -r1.3
--- openacs-4/packages/evaluation/www/index-postgresql.xql	7 Jun 2004 16:05:07 -0000	1.2
+++ openacs-4/packages/evaluation/www/index-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.3
@@ -17,4 +17,13 @@
       </querytext>
 </fullquery>
 
+<fullquery name="get_total_grade">      
+      <querytext>
+
+	select evaluation__class_total_grade(:user_id,:package_id)
+	
+      </querytext>
+</fullquery>
+
 </queryset>
+
Index: openacs-4/packages/evaluation/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/index.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/index.tcl	10 Jun 2004 21:08:53 -0000	1.5
+++ openacs-4/packages/evaluation/www/index.tcl	15 Jun 2004 23:20:29 -0000	1.6
@@ -20,13 +20,11 @@
 
 set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin]
 
-set package_id [ad_conn package_id]
-
 db_multirow grades get_grades { *SQL* } {
 	
 }
 
-set total_class_grade [format %.2f [lc_numeric [db_string get_total_grade "select evaluation__class_total_grade(:user_id,:package_id)"]]]
+set total_class_grade [format %.2f [lc_numeric [db_string get_total_grade { *SQL* }]]]
 
 set notification_chunk [notification::display::request_widget \
 							-type one_assignment_notif \
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.3 -r1.4
--- openacs-4/packages/evaluation/www/task-view-postgresql.xql	7 Jun 2004 16:05:07 -0000	1.3
+++ openacs-4/packages/evaluation/www/task-view-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.4
@@ -12,16 +12,28 @@
                et.description,
                et.title as task_title,
                et.data as task_data,
+	       et.revision_id as task_revision_id,
                ets.title as solution_title,
                ets.data as solution_data,
                eg.grade_plural_name, eg.weight as grade_weight,
-	       ets.revision_id
-        from evaluation_grades eg, evaluation_tasksi et 
-               left outer join evaluation_tasks_solsi ets on (ets.task_id = et.task_id and content_revision__is_live(ets.solution_id) = true) 
+	       ets.revision_id as solution_revision_id
+        from evaluation_grades eg,
+	evaluation_tasksi et left outer join evaluation_tasks_solsi ets on (ets.task_id = et.task_id and content_revision__is_live(ets.solution_id) = true) 
         where et.task_id = :task_id
           and et.grade_id = eg.grade_id
 	
       </querytext>
 </fullquery>
 
+<fullquery name="task_info">      
+      <querytext>
+
+		select et.task_name, et.description, to_char(et.due_date,'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, 
+		       et.weight, et.number_of_members, et.online_p, et.late_submit_p, et.requires_grade_p
+		from evaluation_tasksi et
+		where task_id = :task_id
+	
+      </querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/evaluation/www/task-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/task-view.adp	10 Jun 2004 21:08:53 -0000	1.4
+++ openacs-4/packages/evaluation/www/task-view.adp	15 Jun 2004 23:20:29 -0000	1.5
@@ -2,51 +2,8 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<table>
-<tr>
-  <th align=right>#evaluation.Task_Name_1#<th>
-  <td>@task_name@</td>
-</tr>
-<tr>
-  <th align=right>#evaluation.Description#<th>
-  <td>@description;noquote@</td>
-</tr>
-<tr>
-  <th align=right>#evaluation.Due_Date_1#<th>
-  <td>@due_date@</td>
-</tr>
-<tr>
-  <th align=right>#evaluation.Fileurl_associated#<th>
-  <td>@task_url@</td>
-</tr>
-<tr>
-  <th align=right>#evaluation.Number_of_Integrants#<th>
-  <td>@number_of_members@</td>
-</tr>
-<tr>
-  <th align=right>#evaluation.Weight#<th>
-  <td>@weight@%</td>
-</tr>
-<tr>
-  <th align=right>#evaluation.Grades_Category#<th>
-  <td>@grade_plural_name@ - @grade_weight@%</td>
-</tr>
-<tr>
-  <th align=right>#evaluation.lt_Will_this_task_be_sub#<th>
-  <td>@online_p@</td>
-</tr>
-<tr>
-  <th align=right>#evaluation.lt_Will_the_students_be_# <br> #evaluation.lt_to_submit_their_answe#<th>
-  <td>@late_submit_p@</td>
-</tr>
-<tr>
-  <th align=right>#evaluation.Task_Solution#<th>
-  <td>@solution_url;noquote@</td>
-</tr>
+<p><formtemplate id="task"></formtemplate></p>
 
-
-</table>
-
 <if @return_url@ ne "">
   <p><a href=@return_url@>#evaluation.Go_Back#</a></p>
 </if>
Index: openacs-4/packages/evaluation/www/task-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/task-view.tcl	10 Jun 2004 21:08:53 -0000	1.4
+++ openacs-4/packages/evaluation/www/task-view.tcl	15 Jun 2004 23:20:29 -0000	1.5
@@ -8,8 +8,7 @@
     @cvs-id $Id$
 } {
     grade_id:integer,notnull
-    task_id:integer,notnull,optional
-    item_id:integer,notnull,optional
+    task_id:integer,notnull
     {return_url ""}
 }
 
@@ -22,39 +21,108 @@
 
 db_1row get_task_info { *SQL* }
 
-set weight [format %.2f [lc_numeric $weight]]
+ad_form -name task -has_submit 1 -has_edit 1 -export { return_url item_id storage_type grade_id attached_p } -mode display -form {
 
-if { [string eq $online_p "1"] || [string eq $online_p "t"] } {
-	set online_p "[_ evaluation.Yes_]"
-} else {
-	set online_p "[_ evaluation.No_]"
-}
+    task_id:key
 
-if { [string eq $late_submit_p "1"] || [string eq $late_submit_p "t"]} {
-	set late_submit_p "[_ evaluation.Yes_]"
-} else {
-	set late_submit_p "[_ evaluation.No_]"
+    {task_name:text  
+	{label "[_ evaluation.Task_Name_]"}
+	{html {size 30}}
+    }
+    
 }
+db_1row get_task_info { *SQL* }
 
-#set description [template::util::richtext::get_property contents $description]
-# working with task stuff (if it has a file/url attached)
-if { [empty_string_p $task_data] } {
-	set task_url "[_ evaluation.lt_No_fileurl_associated]"
-} elseif { [regexp "http://" $task_data] } {
-	set task_url "<a href=\"$task_data\">$task_data</a>"
-} else {
+if { ![empty_string_p $task_data] } {
+
+    if { [regexp "http://" $task_data] } {
+ 	set task_url "<a href=\"$task_data\">$task_data</a>"
+    } else {
 	# we assume it's a file
-	set task_url "<a href=\"../view/$task_title\">$task_title</a>"
+ 	set task_url "<a href=\"[export_vars -base "view/$task_title" -url { {revision_id $task_revision_id} }]\">$task_title</a>"
+    }
+    
+    ad_form -extend -name task -form {			
+	{task_file:text,optional
+	    {label "[_ evaluation.lt_Assignment_Attachment]"} 
+	    {html "size 30"}
+	    {after_html "$task_url"}
+	}
+    }
 }
 
-# working with task soluiton stuff (if it has a file/url attached)
-if { [empty_string_p $solution_data] } {
-	set solution_url "[_ evaluation.lt_No_fileurl_associated_1]"
-} elseif { [regexp "http://" $solution_data] } {
-	set solution_url "<a href=\"$solution_data\">$solution_data</a>"
-} else {
+if { ![empty_string_p $solution_data] } {
+
+    if { [regexp "http://" $solution_data] } {
+ 	set solution_url "<a href=\"$solution_data\">$solution_data</a>"
+    } else {
 	# we assume it's a file
-    set solution_url "<a href=\"[export_vars -base "view/$solution_title" { revision_id }]\">$solution_title</a>"
+ 	set solution_url "<a href=\"[export_vars -base "view/$solution_title" -url { {revision_id $solution_revision_id} }]\">$solution_title</a>"
+    }
+    
+    ad_form -extend -name task -form {			
+	{solution_file:text,optional
+	    {label "[_ evaluation.Solution_Attachment_]"} 
+	    {html "size 30"}
+	    {after_html "$solution_url"}
+	}
+    }
 }
 
+ad_form -extend -name task -form {
+
+    {description:richtext,optional  
+	{label "[_ evaluation.lt_Assignments_Descripti]"}
+	{html {rows 4 cols 40 wrap soft}}
+    }
+
+    {due_date:date,to_sql(linear_date),from_sql(sql_date)
+	{label "[_ evaluation.Due_Date_]"}
+	{format "MONTH DD YYYY"}
+	{today}
+	{help}
+	{value {[evaluation::now_plus_days -ndays 15]}}
+    }
+
+    {number_of_members:naturalnum
+	{label "[_ evaluation.Number_of_Members_]"}
+	{value "1"}
+	{html {size 5 onChange TaskInGroups()}}
+	{help_text "[_ evaluation.1__Individual_]"}
+    }
+
+    {weight:float  
+	{label "[_ evaluation.Weight_]"}
+	{html {size 5}}
+	{help_text "[_ evaluation.lt_over_grade_weight_of_]"}
+    }
+    
+    {online_p:text(radio)     
+	{label "[_ evaluation.lt_Will_the_task_be_subm]"} 
+	{options {{"[_ evaluation.Yes_]" t} {"[_ evaluation.No_]" f}}}
+	{value t}
+    }
+
+    {late_submit_p:text(radio)     
+	{label "[_ evaluation.lt_Can_the_student_submi]"} 
+	{options {{"[_ evaluation.Yes_]" t} {"[_ evaluation.No_]" f}}}
+	{value t}
+    }
+
+    {requires_grade_p:text(radio)     
+	{label "[_ evaluation.lt_Will_this_task_requir]"} 
+	{options {{"[_ evaluation.Yes_]" t} {"[_ evaluation.No_]" f}}}
+	{value t}
+    }
+} -edit_request {
+    
+    db_1row task_info { *SQL* }
+
+    set due_date [template::util::date::from_ansi $due_date_ansi]
+    set weight [format %.2f [lc_numeric $weight]]
+
+}
+
 ad_return_template
+
+
Index: openacs-4/packages/evaluation/www/task-view.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/task-view.xql	7 Jun 2004 16:05:07 -0000	1.2
+++ openacs-4/packages/evaluation/www/task-view.xql	15 Jun 2004 23:20:29 -0000	1.3
@@ -5,7 +5,7 @@
 <fullquery name="get_grade_info">      
       <querytext>
 
-	select grade_plural_name, weight as grade_weight from evaluation_grades where grade_id = :grade_id
+	select grade_name, grade_plural_name, weight as grade_weight from evaluation_grades where grade_id = :grade_id
 	
       </querytext>
 </fullquery>
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.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp	10 Jun 2004 21:08:53 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp	15 Jun 2004 23:20:29 -0000	1.3
@@ -13,8 +13,9 @@
 </multiple>
 </ul>
 </if><else>
-There is no audit info for this task because there are no students evaluated.
+#evaluation.lt_There_is_no_audit_inf#
 </else>
 
 
 
+
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp	10 Jun 2004 21:08:53 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp	15 Jun 2004 23:20:29 -0000	1.3
@@ -13,4 +13,3 @@
 </p>
 
 
-[_ evaluation.lt_No_I_want_to_cancel_m]
Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl	10 Jun 2004 21:08:53 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl	15 Jun 2004 23:20:29 -0000	1.5
@@ -16,142 +16,178 @@
     csv_type_p {
 	set file_extension [file extension $upload_file]
 	if { [string compare [string tolower $file_extension] ".csv"] } { 
-	    ad_complain "[_ evaluation.lt_The_file_extension_of]"
+	    ad_complain "[_ evaluation.lt_The_file_extension_of_1]"
+        } 
+    } 
+}  
+
+set page_title "[_ evaluation.Confirm_Evaluation_]"
+
 set context [list [list "[export_vars -base student-list { task_id }]" "[_ evaluation.Studen_List_]"] "[_ evaluation.Confirm_Evaluation_]"]
 
 # Getting some info from the db about the task
 if ![db_0or1row get_task_info { *SQL* }] { 
-				# This should never happen. 
-				ad_return_complaint 1 "<li>[_ evaluation.lt_There_is_no_informati]</li>" 
-				return 
-			} 
+    # This should never happen. 
+    ad_return_complaint 1 "<li>[_ evaluation.lt_There_is_no_informati]</li>" 
+    return 
+} 
 
 set evaluations_gs:rowcount 0
 
 # Double-click protection 
 if { ![db_string file_exists { *SQL* }] } { 
-	
+    
     set max_n_bytes [parameter::get -parameter MaxNumberOfBytes]
     
     set tmp_filename [ns_queryget upload_file.tmpfile] 
     
     if { ![empty_string_p $max_n_bytes] && ([file size "$tmp_filename"] > $max_n_bytes) } { 
 	set pretty_maxnbytes [lc_numeric $max_n_bytes]
-        ad_return_complaint 1 "[_ evaluation.lt_The_file_is_too_large]" "[_ evaluation.lt_Max_Grade_does_not_se]"
-				return 
-			}
-			continue
-		} elseif { $line_number == 4 } {
-			set see_comments_p [string trim [string tolower [lindex $evaluation 1]]] 			
-			# removing the first and last " that comes from the csv format
-			regsub  ^\" $see_comments_p "" see_comments_p
-			regsub  \"\$ $see_comments_p "" see_comments_p
-			if { ![string eq $see_comments_p 1] && ![string eq $see_comments_p 0] } {
-				ad_return_error "[_ evaluation.Bad_input_]" "[_ evaluation.lt_Input_Will_the_studen]"
-				return 
-			} elseif { [string eq $see_comments_p 1] } {
-				set comments_p "t"
-			} else {
-				set comments_p "f"
-			}
-			continue
-		} elseif { $line_number <= 6 } {
-			continue
-		}
-		
-		set party_id [string trim [lindex $evaluation 0]] 
-		set party_name [db_string get_party_name { *SQL* }]
-		set grade [string trim [lindex $evaluation 2]] 
-		set comments [string trim [lindex $evaluation 3]]
-		
-		# removing the first and last " that comes from the csv format
-		regsub  ^\" $comments "" comments
-		regsub  \"\$ $comments "" comments
-		
-		if { [empty_string_p $party_id] && [empty_string_p $grade] && [empty_string_p $comments] } { 
-			# "blank" line, skip it
-			continue 
-		} 
-		
-		if { ![empty_string_p $grade] } { 
-			# start validations
-			if { ![ad_var_type_check_integer_p $party_id] } { 
-				incr errors 
-				append errors_text "<li> [_ evaluation.lt_Party_id_party_id_doe]</li>" 
-			} 
-			
-			if { ![ad_var_type_check_number_p $grade] } { 
-				incr errors 
-				append errors_text "<li> [_ evaluation.lt_Grade_grade_does_not_]</li>" 
-			} 
-			
-			if { [string length $comments] > 4000 } { 
-				incr errors 
-				append errors_text "<li> [_ evaluation.lt_Commentedit_reason_on]</li>" 
-			} 
+	ad_return_complaint 1 "[_ evaluation.lt_The_file_is_too_large_1]"
+	return 0 
+    } 
 
-			# editing without reason
-			if { ![string eq [format %.2f [db_string check_evaluated { *SQL* } -default $grade]] [format %.2f $grade]] && [empty_string_p $comments] } { 
-				incr errors
-			    append errors_text "<li> [_ evaluation.lt_There_must_be_an_edit]</li>"
-			} 
-			
-			if { $errors } { 
-				ad_return_complaint $errors $errors_text 
-				ad_script_abort
-				return 
-			} 
-									
-			if { ![empty_string_p $comments] } {
-				if { [db_string verify_grade_change { *SQL* } -default 0] } { 
-					# there is no change, skip it
-					continue 
-				} 
-			} else {
-				if { [db_string verify_grade_change_wcomments { *SQL* } -default 0] } { 
-					# there is no change, skip it
-					continue 
-				} 
-			}
-			
-			# validation checked, prepare data structures for next page
-			incr counter 
+    set errors 0 
+    set errors_text "" 
+    set counter 0 
 
-			set grades_gs($party_id) $grade
-			set comments_gs($party_id) $comments
-			set show_student_gs($party_id) $comments_p
+    set line_number 0 
+    
+    set file_handler [open $tmp_filename {RDWR}] 
+    
+    while { ![eof $file_handler] } { 
+	incr line_number 
+	set one_line [gets $file_handler] 
+	
+	# jump first two lines 
+	if { $line_number <= 2 } { 
+	    continue 
+	} 
+	
+	# replace enters (<-|) with semicolons (;)
+	regsub -all {(,[\r\n])} $one_line "" clean_line 
+	regsub -all {[\r\n]} $clean_line "" clean_line 
+	
+	set evaluation [split $clean_line ","] 
+	
+	if { $line_number == 3 } {
+	    set max_grade [string trim [lindex $evaluation 1]] 
+	    if { ![ad_var_type_check_number_p $max_grade] } {
+		ad_return_error "Invalid Max Grade" "Max Grade does not seem to be a real number. Please don't leave it blank."
+		return 
+	    }
+	    continue
+	} elseif { $line_number == 4 } {
+	    set see_comments_p [string trim [string tolower [lindex $evaluation 1]]] 			
+	    # removing the first and last " that comes from the csv format
+	    regsub  ^\" $see_comments_p "" see_comments_p
+	    regsub  \"\$ $see_comments_p "" see_comments_p
+	    if { ![string eq $see_comments_p 1] && ![string eq $see_comments_p 0] } {
+		ad_return_error "[_ evaluation.Bad_input_]" "[_ evaluation.lt_Input_Will_the_studen]"
+		return 
+	    } elseif { [string eq $see_comments_p 1] } {
+		set comments_p "t"
+	    } else {
+		set comments_p "f"
+	    }
+	    continue
+	} elseif { $line_number <= 6 } {
+	    continue
+	}
+	
+	set party_id [string trim [lindex $evaluation 0]] 
+	set party_name [db_string get_party_name { *SQL* }]
+	set grade [string trim [lindex $evaluation 2]] 
+	set comments [string trim [lindex $evaluation 3]]
+	
+	# removing the first and last " that comes from the csv format
+	regsub  ^\" $comments "" comments
+	regsub  \"\$ $comments "" comments
+	
+	if { [empty_string_p $party_id] && [empty_string_p $grade] && [empty_string_p $comments] } { 
+	    # "blank" line, skip it
+	    continue 
+	} 
+	
+	if { ![empty_string_p $grade] } { 
+	    # start validations
+	    if { ![ad_var_type_check_integer_p $party_id] } { 
+		incr errors 
+		append errors_text "<li> [_ evaluation.lt_Party_id_party_id_doe]</li>" 
+	    } 
+	    
+	    if { ![ad_var_type_check_number_p $grade] } { 
+		incr errors 
+		append errors_text "<li> [_ evaluation.lt_Grade_grade_does_not_]</li>" 
+	    } 
+	    
+	    if { [string length $comments] > 4000 } { 
+		incr errors 
+		append errors_text "<li> [_ evaluation.lt_Commentedit_reason_on]</li>" 
+	    } 
 
-			set evaluations_gs:${counter}(rownum) $counter
-			set evaluations_gs:${counter}(party_name) $party_name
-			set evaluations_gs:${counter}(grade) $grade
-			set evaluations_gs:${counter}(comment) $comments
-			if { [string eq $comments_p "t"] } {
-				set evaluations_gs:${counter}(show_student) "[_ evaluation.Yes_]"
-			} else {
-				set evaluations_gs:${counter}(show_student) "[_ evaluation.No_]"
-			}
+	    # editing without reason
+	    if { ![string eq [format %.2f [db_string check_evaluated { *SQL* } -default $grade]] [format %.2f $grade]] && [empty_string_p $comments] } { 
+		incr errors
+		append errors_text "<li> [_ evaluation.lt_There_must_be_an_edit]</li>"
+	    } 
+	    
+	    if { $errors } { 
+		ad_return_complaint $errors $errors_text 
+		ad_script_abort
+		return 
+	    } 
+	    
+	    if { ![empty_string_p $comments] } {
+		if { [db_string verify_grade_change { *SQL* } -default 0] } { 
+		    # there is no change, skip it
+		    continue 
+		} 
+	    } else {
+		if { [db_string verify_grade_change_wcomments { *SQL* } -default 0] } { 
+		    # there is no change, skip it
+		    continue 
+		} 
+	    }
+	    
+	    # validation checked, prepare data structures for next page
+	    incr counter 
 
-			set evaluation_id [db_string editing_p { *SQL* } -default 0]
-			if { $evaluation_id } {
-				set item_ids($party_id) [db_string get_item_id { *SQL* }]
-				set new_p_gs($party_id) 0
-			} else {
-				set item_ids($party_id) [db_nextval acs_object_id_seq]
-				set new_p_gs($party_id) 1
-			}
+	    set grades_gs($party_id) $grade
+	    set comments_gs($party_id) $comments
+	    set show_student_gs($party_id) $comments_p
 
-		}
+	    set evaluations_gs:${counter}(rownum) $counter
+	    set evaluations_gs:${counter}(party_name) $party_name
+	    set evaluations_gs:${counter}(grade) $grade
+	    set evaluations_gs:${counter}(comment) $comments
+	    if { [string eq $comments_p "t"] } {
+		set evaluations_gs:${counter}(show_student) "[_ evaluation.Yes_]"
+	    } else {
+		set evaluations_gs:${counter}(show_student) "[_ evaluation.No_]"
+	    }
+
+	    set evaluation_id [db_string editing_p { *SQL* } -default 0]
+	    if { $evaluation_id } {
+		set item_ids($party_id) [db_string get_item_id { *SQL* }]
+		set new_p_gs($party_id) 0
+	    } else {
+		set item_ids($party_id) [db_nextval acs_object_id_seq]
+		set new_p_gs($party_id) 1
+	    }
+
 	}
-	set evaluations_gs:rowcount $counter
-	set export_vars [export_vars -form { task_id max_grade grades_gs comments_gs show_student_gs item_ids new_p_gs grades_sheet_item_id tmp_filename upload_file }]
+    }
+    set evaluations_gs:rowcount $counter
+    set export_vars [export_vars -form { task_id max_grade grades_gs comments_gs show_student_gs item_ids new_p_gs grades_sheet_item_id tmp_filename upload_file }]
 
-	# writing the file in the file system so we can work with it later
-	flush $file_handler
-	close $file_handler
+    # writing the file in the file system so we can work with it later
+    flush $file_handler
+    close $file_handler
 
     if [catch {exec mv $tmp_filename "${tmp_filename}_grades_sheet"} errmsg] { 
-        ad_return_error "[_ evaluation.lt_Error_while_storing_f]" "[_ evaluation.lt_There_was_a_problem_s]" 
-		ad_script_abort
+	ad_return_error "[_ evaluation.lt_Error_while_storing_f]" "[_ evaluation.lt_There_was_a_problem_s]" 
+	ad_script_abort
     } 
 }
 
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.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp	10 Jun 2004 21:08:53 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp	15 Jun 2004 23:20:29 -0000	1.5
@@ -12,13 +12,13 @@
 	<td>@due_date_pretty@</td>
 </tr>
 <tr>
-	<th>Is the task submitted online?</th>
+	<th>#evaluation.lt_Is_the_task_submitted#</th>
 	<td>
 
 <if @online_p@ gt 0 >
-	<h2> Yes </h2>
+	<h2> #evaluation.Yes# </h2>
 </if><else>
-	<h2> No </h2>
+	<h2> #evaluation.No# </h2>
 </else>
 
 </td>
@@ -30,13 +30,21 @@
 </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><_ 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>
 <blockquote><listtemplate name="evaluated_students"></listtemplate></blockquote>
 <br />
 <h2>#evaluation.lt_Students_with_answers#</h2>
+<p>#evaluation.lt_These_are_the_student#</p>
 
 <if @not_evaluated_wa:rowcount@ gt 0>
 <p>#evaluation.Click# <a href=download-archive/?task_id=@task_id@>#evaluation.here#</a> #evaluation.lt_if_you_want_to_downlo#</p>
+<if @number_of_members@ eq "1">
+ <if @show_portrait_p@ eq "t">
+	<p>#evaluation.Click# <a href=@this_url@> #evaluation.here# </a> #evaluation.lt_if_you_do_not_want_to#</p>
+ </if><else>
+	<p>#evaluation.Click# <a href=@this_url@> #evaluation.here# </a> #evaluation.lt_if_you_want_to_see_th#</p>
+ </else>
+</if>
 <form action="evaluate-students" method="post">
     <input type=hidden name=task_id value="@task_id@">
     <input type=hidden name=grade_id value="@grade_id@">
@@ -69,6 +77,14 @@
 
 <br />
 <h2>#evaluation.lt_Students_who_have_not#</h2>
+<p>#evaluation.lt_These_are_the_student_1#</p>
+<if @number_of_members@ eq "1">
+ <if @show_portrait_p@ eq "t">
+	<p>#evaluation.Click# <a href=@this_url@> #evaluation.here# </a> #evaluation.lt_if_you_do_not_want_to#</p>
+ </if><else>
+	<p>#evaluation.Click# <a href=@this_url@> #evaluation.here# </a> #evaluation.lt_if_you_want_to_see_th#</p>
+ </else>
+</if>
 
 <if @not_evaluated_na:rowcount@ gt 0>
 <form action="evaluate-students" method="post">
@@ -105,3 +121,4 @@
 <p>#evaluation.lt_There_are_no_students_1#</p>
 </else>
 
+
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.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	10 Jun 2004 21:08:53 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	15 Jun 2004 23:20:29 -0000	1.6
@@ -1,15 +1,16 @@
 # /packages/evaluaiton/www/admin/evaluaitons/student-list.tcl
 
 ad_page_contract {
-	Displays the evaluations of students that have already been evaluated,
-	lists the ones that have not been evaluated yet (in order to evaluate them)
+    Displays the evaluations of students that have already been evaluated,
+    lists the ones that have not been evaluated yet (in order to evaluate them)
     and deals with tasks in groups and individual.
 
     @author jopez@galileo.edu
     @creation-date Mar 2004
     @cvs-id $Id$
 } {
     task_id:integer,notnull
+    {show_portrait_p ""}
     {return_url "student-list?[export_vars -url { task_id }]"}
     {orderby_wa:optional}
     {orderby_na:optional}
@@ -21,13 +22,19 @@
 set page_title "[_ evaluation.Student_List_]"
 set context { "[_ evaluation.Student_List_]" }
 
+if { [string eq $show_portrait_p "t"] } {
+    set this_url "student-list?[export_vars -entire_form -url { { show_portrait_p f } }]"
+} else {
+    set this_url "student-list?[export_vars -entire_form -url { { show_portrait_p t } }]"
+}
+
 db_1row get_task_info { *SQL* }
 set due_date_pretty  [lc_time_fmt $due_date_ansi "%q"]
 
 if { $number_of_members > 1 } {
-	set groups_admin "<a href=[export_vars -base ../groups/one-task { task_id }]>[_ evaluation.lt_Groups_administration]</a>"
+    set groups_admin "<a href=[export_vars -base ../groups/one-task { task_id }]>[_ evaluation.lt_Groups_administration]</a>"
 } else {
-	set groups_admin ""
+    set groups_admin ""
 }
 
 set done_students [list]
@@ -148,28 +155,36 @@
 set elements [list party_name \
 		  [list label "[_ evaluation.Name_]" \
 		       orderby_asc {party_name asc} \
-		       orderby_desc {party_name desc}] \
-		  submission_date_pretty \
-		  [list label "[_ evaluation.Submission_Date_]" \
-		       orderby_asc {submission_date_ansi asc} \
-		       orderby_desc {submission_date_ansi desc}] \
-		  answer \
-		  [list label "[_ evaluation.Answer_]" \
-		       link_url_col answer_url \
-		       link_html { title "[_ evaluation.View_answer_]" }] \
-		  grade \
-		  [list label "[_ evaluation.Maximun_Grade_] <input type=text name=\"max_grade\" maxlength=\"6\" size=\"3\" value=\"100\">" \
-		       display_template { <input type=text name=grades_wa.@not_evaluated_wa.party_id@ maxlength=\"6\" size=\"3\"> } ] \
-		  comments \
-		  [list label "[_ evaluation.Comments_]" \
-		       display_template { <textarea rows="3" cols="15" wrap name=comments_wa.@not_evaluated_wa.party_id@></textarea> } \
-		      ] \
-		  show_answer \
-		  [list label "[_ evaluation.lt_Allow_the_students_br]" \
-		       display_template { [_ evaluation.Yes_] <input checked type=radio name="show_student_wa.@not_evaluated_wa.party_id@" value=t> [_ evaluation.No_] <input type=radio name="show_student_wa.@not_evaluated_wa.party_id@" value=f> } \
-		      ] \
-		 ]
+		       orderby_desc {party_name desc}]
+	     ]
 
+if { [string eq $show_portrait_p "t"] && [string eq $number_of_members "1"] } {
+    lappend elements portrait \
+	[list label "[_ evaluation.Students_Portrait_]" \
+	     display_template { @not_evaluated_wa.portrait;noquote@ }
+	]
+} 
+
+lappend elements submission_date_pretty \
+    [list label "[_ evaluation.Submission_Date_]" \
+	 orderby_asc {submission_date_ansi asc} \
+	 orderby_desc {submission_date_ansi desc}]
+lappend elements answer \
+    [list label "[_ evaluation.Answer_]" \
+	 link_url_col answer_url \
+	 link_html { title "[_ evaluation.View_answer_]" }] 
+lappend elements grade \
+    [list label "[_ evaluation.Maximun_Grade_] <input type=text name=\"max_grade\" maxlength=\"6\" size=\"3\" value=\"100\">" \
+	 display_template { <input type=text name=grades_wa.@not_evaluated_wa.party_id@ maxlength=\"6\" size=\"3\"> } ] 
+lappend elements comments \
+    [list label "[_ evaluation.Comments_]" \
+	 display_template { <textarea rows="3" cols="15" wrap name=comments_wa.@not_evaluated_wa.party_id@></textarea> } \
+	] 
+lappend elements show_answer \
+    [list label "[_ evaluation.lt_Allow_the_students_br]" \
+	 display_template { <pre>[_ evaluation.Yes_]<input checked type=radio name="show_student_wa.@not_evaluated_wa.party_id@" value=t> [_ evaluation.No_]<input type=radio name="show_student_wa.@not_evaluated_wa.party_id@" value=f></pre> } \
+	] 
+
 template::list::create \
     -name not_evaluated_wa \
     -multirow not_evaluated_wa \
@@ -186,8 +201,12 @@
     set orderby_wa " order by party_name asc"
 }
 
-db_multirow -extend { answer answer_url submission_date_pretty } not_evaluated_wa get_not_evaluated_wa_students { *SQL* } {
+db_multirow -extend { 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>"
+    }
+
     lappend done_students $party_id
     if { [string eq $online_p "t"] } {
 	set submission_date_pretty  "[lc_time_fmt $submission_date_ansi "%Q"] [lc_time_fmt $submission_date_ansi "%X"]"
@@ -214,19 +233,27 @@
 		  [list label "[_ evaluation.Name_]" \
 		       orderby_asc {party_name asc} \
 		       orderby_desc {party_name desc}] \
-		  grade \
-		  [list label "[_ evaluation.Grade_over_] <input type=text name=\"max_grade\" maxlength=\"6\" size=\"3\" value=\"100\">" \
-		       display_template { <input type=text name=grades_na.@not_evaluated_na.party_id@ maxlength=\"6\" size=\"3\"> } ] \
-		  comments \
-		  [list label "[_ evaluation.Comments_]" \
-		       display_template { <textarea rows="3" cols="15" wrap name=comments_na.@not_evaluated_na.party_id@></textarea> } \
-		      ] \
-		  show_answer \
-		  [list label "[_ evaluation.lt_Allow_the_students_br]" \
-		       display_template { [_ evaluation.Yes_] <input checked type=radio name="show_student_na.@not_evaluated_na.party_id@" value=t> [_ evaluation.No_] <input type=radio name="show_student_na.@not_evaluated_na.party_id@" value=f> } \
-		      ] \
 		 ]
 
+if { [string eq $show_portrait_p "t"] && [string eq $number_of_members "1"] } {
+    lappend elements portrait \
+	[list label "[_ evaluation.Students_Portrait_]" \
+	     display_template { @not_evaluated_na.portrait;noquote@ }
+	]
+} 
+
+lappend elements grade \
+    [list label "[_ evaluation.Grade_over_] <input type=text name=\"max_grade\" maxlength=\"6\" size=\"3\" value=\"100\">" \
+	 display_template { <input type=text name=grades_na.@not_evaluated_na.party_id@ maxlength=\"6\" size=\"3\"> } ]
+lappend elements comments \
+    [list label "[_ evaluation.Comments_]" \
+	 display_template { <textarea rows="3" cols="15" wrap name=comments_na.@not_evaluated_na.party_id@></textarea> } \
+	]
+lappend elements show_answer \
+    [list label "[_ evaluation.lt_Allow_the_students_br]" \
+	 display_template { <pre>[_ evaluation.Yes_]<input checked type=radio name="show_student_na.@not_evaluated_na.party_id@" value=t> [_ evaluation.No_]<input type=radio name="show_student_na.@not_evaluated_na.party_id@" value=f></pre> } \
+	]
+
 template::list::create \
     -name not_evaluated_na \
     -multirow not_evaluated_na \
@@ -271,12 +298,16 @@
 
 }
 
-db_multirow not_evaluated_na get_not_evaluated_na_students { *SQL* } {
+db_multirow -extend { 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>"
+    }
+    
 }
 
 set grades_sheet_item_id [db_nextval acs_object_id_seq]
 
- 
 
 
+
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.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql	10 Jun 2004 21:08:54 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.6
@@ -49,7 +49,8 @@
 <fullquery name="grades_report">      
       <querytext>
 
-	select cu.first_names||', '||cu.last_name as student_name
+	select cu.first_names||', '||cu.last_name as student_name,
+	cu.user_id
 	$sql_query
     from cc_users cu
     $orderby
@@ -60,7 +61,8 @@
 <fullquery name="community_grades_report">      
       <querytext>
 
-	select cu.first_names||', '||cu.last_name as student_name
+	select cu.first_names||', '||cu.last_name as student_name,
+	cu.user_id
 	$sql_query
     from cc_users cu,
 	registered_users ru,
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.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp	10 Jun 2004 21:08:54 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp	15 Jun 2004 23:20:29 -0000	1.3
@@ -3,6 +3,7 @@
 <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.
 </p>
 <blockquote><listtemplate name="grades_report"></listtemplate></blockquote>
 
Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl	10 Jun 2004 21:08:54 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl	15 Jun 2004 23:20:29 -0000	1.6
@@ -77,6 +77,6 @@
 
 
 
-db_multirow grades_report $query_name { *SQL* } {
-
+db_multirow -extend { student_url } grades_report $query_name { *SQL* } {
+    set student_url [export_vars -base "student-grades-report" -url { {student_id $user_id} }]
 }
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.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports-postgresql.xql	10 Jun 2004 21:08:54 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.5
@@ -18,7 +18,8 @@
 <fullquery name="get_grades">      
       <querytext>
 
-		select cu.first_names||', '||cu.last_name as student_name
+		select cu.first_names||', '||cu.last_name as student_name,
+		cu.user_id
 		$sql_query
    	 	from cc_users cu 
 		$orderby
@@ -29,7 +30,8 @@
 <fullquery name="community_get_grades">      
       <querytext>
 
-		select cu.first_names||', '||cu.last_name as student_name
+		select cu.first_names||', '||cu.last_name as student_name,
+		cu.user_id
 		$sql_query
    	 	from cc_users cu,
 		registered_users ru,
Index: openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp	10 Jun 2004 21:08:54 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp	15 Jun 2004 23:20:29 -0000	1.3
@@ -3,8 +3,10 @@
 <property name="context">@context;noquote@</property>
 <p>#evaluation.lt_This_is_the_grades_re_1#<br />
 #evaluation.lt_You_can_order_the_gra_1# <br />
+#evaluation.lt_If_you_click_on_the_s#
 </p>
 
 
 <blockquote><listtemplate name="grade_tasks"></listtemplate></blockquote>
 
+
Index: openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl	10 Jun 2004 21:08:54 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl	15 Jun 2004 23:20:29 -0000	1.5
@@ -37,6 +37,7 @@
 
 set elements [list student_name \
 		  [list label "[_ evaluation.Name_]" \
+		       link_url_col student_url \
 		       orderby_asc {student_name asc} \
 		       orderby_desc {student_name desc} \
 		      ]\
@@ -74,6 +75,6 @@
     set task_order " order by student_name asc"
 }
 
-db_multirow grade_tasks $query_name { *SQL* } {
-	
+db_multirow -extend { student_url } grade_tasks $query_name { *SQL* } {
+    set student_url [export_vars -base "student-grades-report" -url { {student_id $user_id} }]
 }
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql	15 Jun 2004 23:20:29 -0000	1.1
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+
+<fullquery name="get_grades">      
+      <querytext>
+
+		select eg.grade_plural_name,
+		eg.grade_id
+   	 	from evaluation_gradesx eg, acs_objects ao
+		where content_revision__is_live(eg.grade_id) = true
+          and eg.item_id = ao.object_id
+   		  and ao.context_id = :package_id
+		order by grade_plural_name desc
+	
+      </querytext>
+</fullquery>
+
+
+<fullquery name="student_info">      
+      <querytext>
+
+	select person__name(:student_id) as student_name,
+                      p.email
+                      from parties p
+                      where p.party_id = :student_id
+
+      </querytext>
+</fullquery>
+
+<fullquery name="get_total_grade">      
+      <querytext>
+
+	select evaluation__class_total_grade(:student_id,:package_id)
+
+      </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp	15 Jun 2004 23:20:29 -0000	1.1
@@ -0,0 +1,29 @@
+<master>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+
+<h2>#evaluation.lt_Grades_report_of_stud#</h2><br />
+
+<table>
+<tr>
+ <td>@portrait;noquote@ </td>
+ <td>#evaluation.Name_student_name#<br>#evaluation.Email# <a href="mailto:@email@">@email@</a></td>
+</tr>
+</table>
+<br />
+<ul>
+<if @grades:rowcount@ eq 0>
+<li>#evaluation.lt_There_is_no_info_for_#</li>
+</if><else>
+<multiple name="grades">
+	<li><strong>@grades.grade_plural_name@</strong> <br />
+	<include src="../../../lib/student-grades-report-chunk" grade_id=@grades.grade_id@ orderby=@orderby@ student_id=@student_id@>
+	</li>
+</multiple>
+<h2>#evaluation.lt_TOTAL_GRADE_total_cla#</h2>
+</else>
+</ul>
+
+
+
+
Index: openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl	15 Jun 2004 23:20:29 -0000	1.1
@@ -0,0 +1,31 @@
+# /package/evaluation/www/admin/grades/student-grades-reportindex.tcl
+
+ad_page_contract {
+    
+    Grades report for one student
+
+    @author jopez@galileo.edu
+    @creation-date Jun 2004
+    @cvs-id $Id: student-grades-report.tcl,v 1.1 2004/06/15 23:20:29 josee Exp $
+    
+} {
+    student_id:integer,notnull
+    {orderby:optional ""}
+}
+
+db_1row student_info { *SQL* } 
+
+set portrait [evaluation::get_user_portrait -user_id $student_id { {alt "[_ evaluation.lt_No_portrait_for_stude]"} }]
+
+set page_title "[_ evaluation.lt_Grades_Report_for_stu]"
+set context {}
+set package_id [ad_conn package_id]
+set user_id [ad_conn user_id]
+
+db_multirow grades get_grades { *SQL* } {
+	
+}
+
+set total_class_grade [format %.2f [lc_numeric [db_string get_total_grade { *SQL* }]]]
+
+ad_return_template
Index: openacs-4/packages/evaluation/www/admin/groups/group-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/groups/group-new.adp	10 Jun 2004 21:08:54 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/groups/group-new.adp	15 Jun 2004 23:20:29 -0000	1.3
@@ -8,10 +8,29 @@
 
 <table>
 <tr><th>#evaluation.lt_Please_enter_the_grou#</th>
-	<td><input type="text" name="group_name" value="#evaluation.Group#"></td>
+	<td><input type="text" name="group_name" value="Group @current_groups_plus_one@" size=20></td>
+</tr>
+<tr>
+      <input type=hidden name=task_id value="@task_id@">
+      <input type=hidden name=evaluation_group_id value="@evaluation_group_id@">
+		<blockquote>
+	 	<td></td>
+		<td>
+        <table>
+          <multiple name="students">
+                <if @students.rownum@ odd><tr class="list-odd"></if><else><tr class="list-even"></else>
+						<td>@students.rownum@.</td><td>@students.student_name@</td></tr>
+                    </tr>
+          </multiple>
+        </table>
+		</td>
+		</tr>
+		<tr>
+        <td><input type=submit value="#evaluation.Create#"></td>
 		<td></td>
 		</tr>
 </table>
 </form>
 </if>
 
+
Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.adp	10 Jun 2004 21:08:54 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.adp	15 Jun 2004 23:20:30 -0000	1.3
@@ -2,5 +2,6 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-Upload a solution for this assignment so the students can see it and learn from it.
+#evaluation.lt_Upload_a_solution_for#
 <p><formtemplate id="solution"></formtemplate></p>
+
Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl	10 Jun 2004 21:08:54 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl	15 Jun 2004 23:20:30 -0000	1.5
@@ -14,7 +14,7 @@
     upload_file.tmpfile:tmpfile,optional
     {solution_mode "edit"}
     grade_id:integer,notnull
-    {return_url "/"}
+    return_url
 }
 
 set package_id [ad_conn package_id]
@@ -28,7 +28,7 @@
 set context [list [list [export_vars -base ../grades/grades { }] "[_ evaluation.Grades_]"] $page_title]
 
 set attached_p "f"
-ad_form -html { enctype multipart/form-data } -name solution -cancel_url $return_url -export { grade_id item_id storage_type task_id attached_p } -mode $solution_mode -form {
+ad_form -html { enctype multipart/form-data } -name solution -cancel_url $return_url -export { return_url grade_id item_id storage_type task_id attached_p } -mode $solution_mode -form {
 
 	solution_id:key
 
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.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql	10 Jun 2004 21:08:54 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql	15 Jun 2004 23:20:30 -0000	1.4
@@ -6,7 +6,7 @@
 <fullquery name="get_grade_info">      
       <querytext>
 
-		select grade_plural_name, weight as grade_weight from evaluation_grades where grade_id = :grade_id
+		select grade_plural_name, grade_name, weight as grade_weight from evaluation_grades where grade_id = :grade_id
 	
       </querytext>
 </fullquery>
Index: openacs-4/packages/evaluation/www/resources/photo_na.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/resources/photo_na.gif,v
diff -u
Binary files differ