Index: openacs-4/packages/evaluation/evaluation.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/evaluation.info,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/evaluation/evaluation.info	27 Aug 2004 17:42:33 -0000	1.13
+++ openacs-4/packages/evaluation/evaluation.info	10 Sep 2004 19:16:27 -0000	1.14
@@ -17,8 +17,8 @@
 
         <callbacks>
             <callback type="after-install"  proc="evaluation::apm::package_install"/>
-            <callback type="after-instantiate"  proc="evaluation::apm::package_instantiate"/>
             <callback type="before-uninstantiate"  proc="evaluation::apm::package_uninstantiate"/>
+            <callback type="after-instantiate"  proc="evaluation::apm::package_instantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ArchiveCommand"  default="tar -czf {out_file} {in_file}" description="Program (and program options) to use for archiving file storage objects. Use the special tags {in_file} and {out_file} (including the curly braces) to denote the locations of the input and output files on the command line."/>
@@ -27,8 +27,9 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EvaluationPageName"  default="#evaluation.evaluationpagename#" description="Use this parameter to add the portlets (if you are using them evaluation_assignments and evaluation_evaluations) in a new page. If you do not want the portlets to be set in a new page, set this parameter to null."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EvaluationsPortletRegion"  default="2" description="Use this parameter to indicate the possition of the evaluations portlet (if applicable) in the page. Set this parameter to null if you want to use the default possition. "/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MaxNumberOfBytes"  default="5000" description="Maximun number of bytes allowed for the files in this package. (tasks, tasks sols, student answers, grades sheets, ect)"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="urlProtocols"  default="http://,ftp://,https://" description="Alowed protocols to use for the url field when submitting a task, task solution or an answer.
-
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="StoreFilesInDatabaseP"  default="1" description="Flag to determine the storage type. A flag of 1 (true) will store the files in the database. If 0 (false) files are stored in the filesystem. ***This parameter should only be changed at package instance creation.***"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="urlProtocols"  default="http://,ftp://,https://" description="Alowed protocols to use for the url field when submitting a task, task solution or an answer.
+
 Add values separated by comma."/>
         </parameters>
 
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.11 -r1.12
--- openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml	24 Aug 2004 22:40:29 -0000	1.11
+++ openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml	10 Sep 2004 19:16:27 -0000	1.12
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="evaluation" package_version="0.1d" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="evaluation" package_version="0.2d" locale="en_US" charset="ISO-8859-1">
 
   <msg key="1__Individual_">1 = Individual </msg>
   <msg key="Add_Assignment_">Add Assignment </msg>
@@ -14,7 +14,9 @@
   <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="Answer_">Answer </msg>
+  <msg key="Answer_Date">Answer Date</msg>
   <msg key="Assignment_Group_">Assignment Group </msg>
   <msg key="Assignment_Groups_">Assignment Groups </msg>
   <msg key="Assignment_Type_">Assignment Type </msg>
@@ -79,6 +81,7 @@
   <msg key="click_on_this_link_">click on this link: </msg>
   <msg key="Comments">Comments:</msg>
   <msg key="Comments_">Comments </msg>
+  <msg key="Comments_1">Comments</msg>
   <msg key="CommentsEdit_reason">Comments/Edit reason:</msg>
   <msg key="CommentsEdit_reason_">Comments/Edit reason </msg>
   <msg key="Confirm">Confirm</msg>
@@ -96,6 +99,7 @@
   <msg key="Due_Date_">Due Date </msg>
   <msg key="Due_date_">Due date </msg>
   <msg key="Due_Date_1">Due Date</msg>
+  <msg key="Due_date_task_name">Due date: %task_name%</msg>
   <msg key="Edit">Edit Grades </msg>
   <msg key="Edit_evaluation_">Edit evaluation </msg>
   <msg key="Edit_Evaluations_">Edit Evaluations </msg>
@@ -106,6 +110,7 @@
   <msg key="Edit_task_">Edit task </msg>
   <msg key="Email">Email:</msg>
   <msg key="Evaluated_">Evaluated </msg>
+  <msg key="Evaluation_Date">Evaluation Date</msg>
   <msg key="Evaluation_Index_">Evaluation Index </msg>
   <msg key="Evaluation_Modified_">Evaluation Modified </msg>
   <msg key="evaluationpagename">Class Material </msg>
@@ -124,10 +129,12 @@
   <msg key="Grade">Grade:</msg>
   <msg key="Grade_">Grade </msg>
   <msg key="Grade_1">Students </msg>
+  <msg key="Grade_2">Grade</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="Grader_">Grader </msg>
   <msg key="Grades_">Grades </msg>
   <msg key="Grades_Category">Grades Category</msg>
@@ -154,6 +161,8 @@
 		&lt;/tr&gt;
 		&lt;tr&gt;
         &lt;td&gt;&lt;input type=submit value=&quot;&lt;# Create Group </msg>
+  <msg key="Group_Members">Group Members</msg>
+  <msg key="Group_Name">Group Name</msg>
   <msg key="Group_name">Group name</msg>
   <msg key="Group_Name_">Group Name </msg>
   <msg key="Groups_Admin_">Groups Admin. </msg>
@@ -193,10 +202,12 @@
   <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>
+  <msg key="lt_Change_Answer_for_tas">Change Answer for \&quot;%task_name%\&quot;</msg>
   <msg key="lt_Check_the_rest_of_com">Check the rest of communities where you want to upload the assignment too</msg>
   <msg key="lt_Check_this_if_you_wan">Check this if you want to unattach the file </msg>
   <msg key="lt_Check_this_if_you_wan_1">Check this if you want to go to the groups admin page after submitting the task </msg>
   <msg key="lt_Check_this_if_you_wan_2">Check this if you want to add the assignment to other class(es) that you administer </msg>
+  <msg key="lt_Click_here_to_go_to_t">Click here to go to the Assignments Page</msg>
   <msg key="lt_Click_on_the_task_tha">Click on the task that you want the groups to be copy from</msg>
   <msg key="lt_Commentedit_reason_on">Comment/edit reason on party_id %party_id% is larger than 4,000 characters long, which is our max lenght. Please make this comment/edit reason shorter. </msg>
   <msg key="lt_Confirm_Your_Evaluati">Confirm Your Evaluation </msg>
@@ -210,6 +221,7 @@
   <msg key="lt_Distribution_for_grad">Distribution for grade &quot;%grade_plural_name%&quot;</msg>
   <msg key="lt_Do_NOT_change_the_par">Do NOT change the &quot;party id&quot; field because with this file we associate the grade with the student or group.</msg>
   <msg key="lt_Due_date_must_be_in_t">Due date must be in the future </msg>
+  <msg key="lt_Due_Date_of_task_name">Due Date of \&quot;%task_name%\&quot;</msg>
   <msg key="lt_Edit_Assignment_Type_">Edit Assignment Type </msg>
   <msg key="lt_Edit_assignment_type_">Edit assignment type </msg>
   <msg key="lt_Edit_grades_distribut">Edit grades distribution of $grade_plural_name </msg>
@@ -234,6 +246,7 @@
   <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_Grades_sheet_for_assi">Grades sheet for assighment &quot;%task_name%&quot;</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>
@@ -273,10 +286,13 @@
   <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_List_for_tas">Students List for \&quot;%task_name%\&quot;</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>
   <msg key="lt_submission_date_prett_1">%submission_date_pretty% &lt;span style=\&quot;color:red;\&quot;&gt;(late answer)&lt;/span&gt; </msg>
+  <msg key="lt_task_name_administrat">%task_name% administration</msg>
+  <msg key="lt_task_name_is_in_group">&quot;%task_name%&quot; is in groups, may be there are no groups, click this link if you want to go to the Groups Admin page: %groups_admin;noquote%</msg>
   <msg key="lt_The_assignment_task_n">The assignment &quot;%task_name%&quot; has been uploaded in this community.</msg>
   <msg key="lt_The_commentsedit_reas">The comments/edit reason is a string with no more than 4,000 characters.</msg>
   <msg key="lt_The_edit_reason_must_">The edit reason must be less than 4000 characteras long </msg>
@@ -324,6 +340,7 @@
   <msg key="lt_The_grade_must_be_a_v">The grade must be a valid number: %wrong_grade% </msg>
   <msg key="lt_The_grade_must_be_a_v_1">The grade must be a valid number </msg>
   <msg key="lt_The_net_value_must_be">The net value must be grather than 0 and less than $grade_weight, and you can not enter Net Value AND Weight. </msg>
+  <msg key="lt_The_number_of_members">The number of members must be grather than 1.</msg>
   <msg key="lt_The_sum_of_the_weight">The sum of the weight of all the assignment types is %total_weight% and it should be 100 by the end of the term(supposedly). </msg>
   <msg key="lt_The_system_assumes_th">The system assumes that the grades start at the 7th line of the file.</msg>
   <msg key="lt_The_weight_must_be_gr">The weight must be grather than 0, and you can not enter Net Value AND Weight. </msg>
@@ -387,12 +404,16 @@
   <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_Upload_Answer_for_tas">Upload Answer for \&quot;%task_name%\&quot;</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_View_evaluation_detai">View evaluation details \</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>
   <msg key="lt_We_got_the_following__1">We got the following error while trying to remove the grade: &lt;pre&gt;%errmsg%&lt;/pre&gt; </msg>
   <msg key="lt_We_got_the_following__2">We got the following error while trying to remove the task: &lt;pre&gt;%errmsg%&lt;/pre&gt; </msg>
   <msg key="lt_Weight_must_be_a_real">Weight must be a real number and between 0 and 100 </msg>
+  <msg key="lt_Weight_of_grade_plura">Weight of %grade_plural_name% over 100% of the class</msg>
+  <msg key="lt_Weight_of_this_grade_">Weight of this %grade_name% over %grade_plural_name%</msg>
   <msg key="lt_Weight_over_100_br__o">Weight over 100% &lt;br /&gt; of the Course </msg>
   <msg key="lt_Weight_over_grade_wei">Weight over %grade_weight%% &lt;br /&gt; of %grade_plural_name% </msg>
   <msg key="lt_Weight_over_grade_wei_1">Weight over %grade_weight%% of %grade_plural_name%&quot;}
@@ -433,6 +454,7 @@
   <msg key="Name">Name:</msg>
   <msg key="Name_">Name </msg>
   <msg key="Name_student_name">Name: %student_name%</msg>
+  <msg key="Net_Grade">Net Grade</msg>
   <msg key="Net_Value_">Net Value </msg>
   <msg key="Net_value_">Net value </msg>
   <msg key="NEW_answer_">(NEW answer) </msg>
@@ -475,6 +497,7 @@
   <msg key="Submission_Date_">Submission Date </msg>
   <msg key="submit_answer_">submit answer </msg>
   <msg key="submit_answer_again_">submit answer again </msg>
+  <msg key="Submitted_by">Submitted by</msg>
   <msg key="Sumission_Date_">Sumission Date </msg>
   <msg key="Task">Task</msg>
   <msg key="Task_Groups_">Task Groups </msg>
@@ -504,6 +527,7 @@
   <msg key="veamos">pues, esto esta interesante </msg>
   <msg key="View_answer_">View answer </msg>
   <msg key="View_comments_">View comments </msg>
+  <msg key="View_Evaluation">View Evaluation</msg>
   <msg key="View_evaluation_">View evaluation </msg>
   <msg key="View_grades_sheet_">View grades sheet </msg>
   <msg key="View_my_answer_">View my answer </msg>
@@ -514,6 +538,7 @@
   <msg key="ViewEdit_Solution_">View/Edit Solution </msg>
   <msg key="Weight">Weight</msg>
   <msg key="Weight_">Weight </msg>
+  <msg key="Weight_change">Weight change</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>
Index: openacs-4/packages/evaluation/catalog/evaluation.es_GT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.es_GT.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/catalog/evaluation.es_GT.ISO-8859-1.xml	5 Aug 2004 00:32:55 -0000	1.3
+++ openacs-4/packages/evaluation/catalog/evaluation.es_GT.ISO-8859-1.xml	10 Sep 2004 19:16:27 -0000	1.4
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="evaluation" package_version="0.1d" locale="es_GT" charset="ISO-8859-1">
+<message_catalog package_key="evaluation" package_version="0.2d" locale="es_GT" 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_grade_name">Agregar %grade_name%</msg>
+  <msg key="Add_grade_name">Agregar $grade_name</msg>
   <msg key="Add_grade_name_">Agregar</msg>
   <msg key="Add_Member_to_group_">Agregar Miembro al grupo </msg>
   <msg key="Add_Task_">Agregar Tarea</msg>
@@ -14,7 +14,9 @@
   <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="Answer_">Respuesta</msg>
+  <msg key="Answer_Date">Fecha en que se subi&amp;oacute; la 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>
@@ -34,8 +36,10 @@
   <msg key="click_on_this_link_">haga click en este link: </msg>
   <msg key="Comments">Comentarios:</msg>
   <msg key="Comments_">Comentarios</msg>
+  <msg key="Comments_1">Commentarios</msg>
   <msg key="CommentsEdit_reason">Cometar/Editar raz�n:</msg>
   <msg key="CommentsEdit_reason_">Cometar/Editar raz�n: </msg>
+  <msg key="Confirm">Confirmar</msg>
   <msg key="Confirm_Evaluation_">Confirmar Evaluaci�n </msg>
   <msg key="Create">Grupo </msg>
   <msg key="Create_Group_">Crear Grupo  </msg>
@@ -50,6 +54,8 @@
   <msg key="Due_Date_">Fecha:</msg>
   <msg key="Due_date_">Fecha:</msg>
   <msg key="Due_Date_1">Fecha:</msg>
+  <msg key="Due_date_task_name">Entrega de asignaci�n: %task_name%</msg>
+  <msg key="Edit">Editar Notas</msg>
   <msg key="Edit_evaluation_">Editar evaluaci�n</msg>
   <msg key="Edit_Evaluations_">Editar Evaluaciones </msg>
   <msg key="Edit_grade_name_">Editar</msg>
@@ -59,6 +65,7 @@
   <msg key="Edit_task_">Editar tarea </msg>
   <msg key="Email">Correo Electr�nico</msg>
   <msg key="Evaluated_">Evaluado</msg>
+  <msg key="Evaluation_Date">Fecha de evaluaci&amp;oacute;n</msg>
   <msg key="Evaluation_Index_">Indice de Evaluaciones</msg>
   <msg key="Evaluation_Modified_">Evaluaci�n Modificada </msg>
   <msg key="evaluationpagename">Material de Clase</msg>
@@ -77,17 +84,21 @@
   <msg key="Grade">Nota:</msg>
   <msg key="Grade_">Nota </msg>
   <msg key="Grade_1">Evaluar Estudiantes</msg>
+  <msg key="Grade_2">Nota</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">Corrector</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_Members">Miembros del grupo</msg>
+  <msg key="Group_Name">Nombre del Grupo</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>
@@ -140,20 +151,21 @@
 </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_Change_Answer_for_tas">Re-enviar respuesta para &quot;%task_name%&quot;</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_here_to_go_to_t">Haga click aqu� para ir a la p�gina de asignaciones</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_">Actualmente $content est� asociado a esta soluci�n de la tarea, pero puedes asociar un archivo/url diferente solo agregandolo 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>
@@ -165,6 +177,7 @@
   <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_Due_Date_of_task_name">Fecha de entrega de &quot;%task_name%&quot;</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>
@@ -191,14 +204,16 @@
 </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_plural_name_rep_1">%grade_plural_name% representa el %grade_weight%% del 100% de la nota 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_for_stu">Reporte de Notas</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_Grades_sheet_for_assi">Hoja de notas para la asignaci�n &quot;%task_name%&quot;</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>
@@ -246,22 +261,26 @@
   <msg key="lt_Reuse_groups_from_ano">Reusar 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 archivos de notas asociados a esta tarea
+  <msg key="lt_See_grades_sheets_ass">Ver los archivos 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_List_for_tas">Lista de Estudiantes para &quot;%task_name%&quot;</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;(entreg&amp;oacute; tarde)&lt;/span&gt; </msg>
+  <msg key="lt_task_name_administrat">Administraci&amp;oacute;n de &quot;%task_name%&quot;</msg>
+  <msg key="lt_task_name_is_in_group">&quot;%task_name%&quot; es en grupos, progblemente no hay grupos creados para &quot;%task_name%&quot;; haga click en este link si desea ir a la p&amp;aacute;gina de administraci&amp;oacute;n de grupos: %groups_admin;noquote%</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">La extensi�n del archivo es &quot;%file_extension&quot; y deber�a ser .CSV. Lo siento, pero no podemos procesarlo&quot; } } } set page_title &quot;&lt;#_ Confirm Evaluation</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>
@@ -270,6 +289,7 @@
   <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_net_value_must_be">El valor neto debe de ser mayor a 0 o menor que $grade_weight, y no puede ingresar Valor Neto Y Ponderaci�n.</msg>
+  <msg key="lt_The_number_of_members">En n&amp;uacute;mero de miembors debe ser mayor que 0</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>
@@ -370,8 +390,10 @@
   <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_Upload_Answer_for_tas">Enviar respuesta para &quot;%task_name%&quot;</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_View_evaluation_detai">Ver detalles de la evaluaci�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>
@@ -380,6 +402,8 @@
   <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_of_grade_plura">Porcentaje de %grade_plural_name% sobre el 100% de la nota de la clase</msg>
+  <msg key="lt_Weight_of_this_grade_">Porcentaje de este(a) %grade_name% sobre %grade_plural_name% </msg>
   <msg key="lt_Weight_over_100_br__o">Ponderaci�n sobre el 100% &lt;br /&gt; del Curso</msg>
   <msg key="lt_Weight_over_grade_wei">Ponderaci�n sobre %grade_weight%% &lt;br /&gt; de %grade_plural_name%</msg>
   <msg key="lt_Weight_over_grade_wei_2">Nota sobre el %grade_weight%% de %grade_plural_name%</msg>
@@ -426,13 +450,15 @@
   <msg key="Name">Nombre:</msg>
   <msg key="Name_">T�tulo </msg>
   <msg key="Name_student_name">Nombre: %student_name%</msg>
+  <msg key="Net_Grade">Nota neta</msg>
   <msg key="Net_Value_">Valor Neto</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_assignments_">No hay asignaciones</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>
@@ -467,6 +493,7 @@
   <msg key="Submission_Date_">Fecha de Entrega </msg>
   <msg key="submit_answer_">entregar</msg>
   <msg key="submit_answer_again_">re-entregar</msg>
+  <msg key="Submitted_by">Subida por</msg>
   <msg key="Sumission_Date_">Fecha de Entrega  </msg>
   <msg key="Task">Tarea</msg>
   <msg key="Task_Groups_">Lista de Grupos</msg>
@@ -494,8 +521,10 @@
   <msg key="Uploaded_by_">Subido por</msg>
   <msg key="URL_">(URL) </msg>
   <msg key="URL__1">o URL: </msg>
+  <msg key="veamos">pues, esto esta interesante</msg>
   <msg key="View_answer_">Ver respuesta</msg>
   <msg key="View_comments_">Ver comentarios</msg>
+  <msg key="View_Evaluation">Ver evaluaci&amp;oacute;n</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>
@@ -506,7 +535,9 @@
   <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="Weight_change">Cambio en ponderaci�n</msg>
   <msg key="Will_the_studens_be">Podr�(n) el estudiante(s)</msg>
+  <msg key="Y">upi , pero no yupin</msg>
   <msg key="Yes">S�</msg>
   <msg key="Yes_">S�</msg>
 </message_catalog>
Index: openacs-4/packages/evaluation/lib/evaluations-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/Attic/evaluations-chunk-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/lib/evaluations-chunk-postgresql.xql	30 Aug 2004 13:04:31 -0000	1.5
+++ openacs-4/packages/evaluation/lib/evaluations-chunk-postgresql.xql	10 Sep 2004 19:16:28 -0000	1.6
@@ -6,7 +6,8 @@
 <fullquery name="get_tasks_admin">      
       <querytext>
 
-	select et.task_name, et.weight as task_weight,
+	select et.task_name, 
+	round(et.weight,2) as task_weight,
     et.task_id
 	from evaluation_tasksi et, cr_items cri
 	where grade_item_id = :grade_item_id
@@ -23,7 +24,7 @@
 	et.task_item_id,
 	et.weight as t_weight,
 	eg.weight as g_weight,
-	(et.weight*eg.weight)/100 as task_weight,
+	round((et.weight*eg.weight)/100,2) as task_weight,
 	et.number_of_members,
         et.task_id
 	from evaluation_grades eg,
@@ -40,23 +41,51 @@
 <fullquery name="get_group_id">      
       <querytext>
 
-		select evaluation__party_id(:user_id,:task_id)
+	select coalesce((select etg2.group_id from evaluation_task_groups etg2, 
+                                                      evaluation_tasks et2, 
+                                                      acs_rels map 
+                                                      where map.object_id_one = etg2.group_id 
+                                                        and map.object_id_two = :user_id 
+                                                        and etg2.task_item_id = et2.task_item_id 
+                                                        and et2.task_id = :task_id),0)
+               from evaluation_tasks et3 
+              where et3.task_id = :task_id 
+
+--		select evaluation__party_id(:user_id,:task_id)
 	
       </querytext>
 </fullquery>
 
-<fullquery name="get_evaluaiton_info">      
+<fullquery name="get_evaluation_info">      
       <querytext>
 
-	    select ese.grade,
+	    select round(ese.grade,2) as grade,
+	    ese.evaluation_id,
 	    ese.description as comments,
 	    ese.show_student_p,
-	    (ese.grade*:t_weight*:g_weight)/10000 as task_grade
+	    round((ese.grade*:t_weight*:g_weight)/10000,2) as task_grade
 	    from evaluation_student_evalsi ese, cr_items cri
 	    where ese.task_item_id = :task_item_id
 	    and cri.live_revision = ese.evaluation_id
-	    and ese.party_id = evaluation__party_id(:user_id,:task_id)
+	    and ese.party_id = 
+	( select 
+	CASE  
+	  WHEN et3.number_of_members = 1 THEN :user_id 
+	  ELSE  
+	(select etg2.group_id from evaluation_task_groups etg2, 
+                                                      evaluation_tasks et2, 
+                                                      acs_rels map 
+                                                      where map.object_id_one = etg2.group_id 
+                                                        and map.object_id_two = :user_id 
+                                                        and etg2.task_item_id = et2.task_item_id 
+                                                        and et2.task_id = :task_id) 
+	END as nom 
+               from evaluation_tasks et3 
+              where et3.task_id = :task_id 
+	) 
 
+-- evaluation__party_id(:user_id,:task_id)
+
       </querytext>
 </fullquery>
 
@@ -69,8 +98,25 @@
 	    from evaluation_answersi ea, cr_items cri
 	    where ea.task_item_id = :task_item_id 
 	    and cri.live_revision = ea.answer_id
-	    and ea.party_id = evaluation__party_id(:user_id,:task_id)
+	    and ea.party_id = 
+	( select 
+	CASE  
+	  WHEN et3.number_of_members = 1 THEN :user_id 
+	  ELSE  
+	(select etg2.group_id from evaluation_task_groups etg2, 
+                                                      evaluation_tasks et2, 
+                                                      acs_rels map 
+                                                      where map.object_id_one = etg2.group_id 
+                                                        and map.object_id_two = :user_id 
+                                                        and etg2.task_item_id = et2.task_item_id 
+                                                        and et2.task_id = :task_id) 
+	END as nom 
+               from evaluation_tasks et3 
+              where et3.task_id = :task_id 
+	) 
 
+-- evaluation__party_id(:user_id,:task_id)
+
       </querytext>
 </fullquery>
 
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.11 -r1.12
--- openacs-4/packages/evaluation/lib/evaluations-chunk.tcl	30 Aug 2004 13:04:32 -0000	1.11
+++ openacs-4/packages/evaluation/lib/evaluations-chunk.tcl	10 Sep 2004 19:16:28 -0000	1.12
@@ -35,22 +35,20 @@
 	#student
 	lappend elements grade \
 		[list label "[_ evaluation-portlet.Grade_over_100_]" \
-			 display_template { <center>@grade_tasks.grade@</center> } \
-			 orderby_asc {grade asc} \
-			 orderby_desc {grade desc}] 
+		     display_template { <center>@grade_tasks.grade@</center> }]
 	lappend elements comments \
 		[list label "[_ evaluation-portlet.Comments_]" \
-			 link_url_col comments_url \
-			 link_html { title "[_ evaluation-portlet.lt_View_evaluation_comme]" }]
+		     link_url_col comments_url \
+		     link_html { title "[_ evaluation-portlet.lt_View_evaluation_comme]" }]
 	lappend elements task_weight \
 		[list label "[_ evaluation-portlet.Net_Value_]" \
-			 display_template { <center>@grade_tasks.task_weight@</center> } \
-			 orderby_asc {task_weight asc} \
-			 orderby_desc {task_weight desc}] 
+		     display_template { <center>@grade_tasks.task_weight@</center> } \
+		     orderby_asc {task_weight asc} \
+		     orderby_desc {task_weight desc}] 
 	lappend elements answer \
 		[list label "" \
-			 link_url_col answer_url \
-			 link_html { title "[_ evaluation-portlet.View_my_answer_]" }]
+		     link_url_col answer_url \
+		     link_html { title "[_ evaluation-portlet.View_my_answer_]" }]
 	set multirow_name grade_tasks
 	set actions ""
 }
@@ -82,7 +80,7 @@
     db_multirow -extend { task_url audit_info audit_info_url } grade_tasks_admin get_tasks_admin { *SQL* } {
 	set task_url [export_vars -base "${base_url}admin/evaluations/student-list" { task_id grade_id }]
 	set category_weight [expr $category_weight + $task_weight]
-	set task_weight [format %.2f [lc_numeric $task_weight]]
+	set task_weight [lc_numeric $task_weight]
 
 	set audit_info_url "[export_vars -base "${base_url}admin/evaluations/audit-info" { grade_id task_id }]"
 	set audit_info "[_ evaluation-portlet.Audit_Info_]"
@@ -91,26 +89,29 @@
 
     db_multirow -extend { comments comments_url answer answer_url grade } grade_tasks get_grade_tasks { *SQL* } {
 	
-	if { [db_0or1row get_evaluaiton_info { *SQL* }] } {
+	if { [db_0or1row get_evaluation_info { *SQL* }] } {
 	    
 	    if { ![empty_string_p $comments] } {
 		set comments "[_ evaluation-portlet.View_comments_]"
-		set comments_url evaluation_view
+		set comments_url "[export_vars -base "evaluation-view" { evaluation_id { return_url ${base_url} }}]"
+	    } else {
+		set comments "[_ evaluation.lt_View_evaluation_detai]"
+		set comments_url "[export_vars -base "${base_url}evaluation-view" { evaluation_id return_url }]"	    
 	    }
 	    
 	    set over_weight ""
 	    if { ![empty_string_p $show_student_p] && $show_student_p } {
 	    
 		if { ![empty_string_p $grade] } {
-		    set grade [format %.2f [lc_numeric $grade]]
-		    set over_weight "[format %.2f [lc_numeric $task_grade]]/"
+		    set grade [lc_numeric $grade]
+		    set over_weight "[lc_numeric $task_grade]/"
 		    set total_grade [expr $total_grade + $task_grade] 
 		} else {
 		    set grade "[_ evaluation-portlet.Not_evaluated_]"
 		}
 		
 		set max_grade [expr $task_weight + $max_grade] 
-		set task_weight "${over_weight}[format %.2f [lc_numeric $task_weight]]"
+		set task_weight "${over_weight}[lc_numeric $task_weight]"
 		
 	    } else {
 		set grade "[_ evaluation-portlet.Not_available_]"
Index: openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql	13 Aug 2004 17:09:53 -0000	1.5
+++ openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql	10 Sep 2004 19:16:28 -0000	1.6
@@ -6,7 +6,17 @@
 <fullquery name="get_group_id">      
       <querytext>
 
-		select evaluation__party_id(:student_id,:task_id)
+	select coalesce((select etg2.group_id from evaluation_task_groups etg2, 
+                                                      evaluation_tasks et2, 
+                                                      acs_rels map 
+                                                      where map.object_id_one = etg2.group_id 
+                                                        and map.object_id_two = :student_id 
+                                                        and etg2.task_item_id = et2.task_item_id 
+                                                        and et2.task_id = :task_id),0)
+               from evaluation_tasks et3 
+              where et3.task_id = :task_id 
+
+--	select evaluation__party_id(:student_id,:task_id)
 	
       </querytext>
 </fullquery>
@@ -17,19 +27,19 @@
 
     select et.task_name, 
     et.task_item_id,
+    eg.weight as g_weight,
     eg.weight as grade_weight,
     et.task_id,
-    et.weight as task_weight,
+    et.weight as t_weight,
     (et.weight*eg.weight)/100 as task_weight,
     et.number_of_members,
     to_char(et.due_date, 'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, 
     et.online_p
     from evaluation_grades eg,
-    evaluation_tasks et
+    evaluation_tasks et, cr_items cri
     where eg.grade_id = :grade_id
     and eg.grade_item_id = et.grade_item_id
-    and content_revision__is_live(et.task_id) = true 
-    and content_revision__is_live(eg.grade_id) = true
+    and cri.live_revision = et.task_id
 
       </querytext>
 </fullquery>
@@ -46,12 +56,27 @@
       <querytext>
 	
     select ea.answer_id 
-    from evaluation_answersi ea,
-	 evaluation_tasks et
-    where content_revision__is_live(ea.answer_id) = true
-      and ea.party_id = evaluation__party_id(:student_id,:task_id)
-      and ea.task_item_id = et.task_item_id
-      and et.task_id = :task_id
+    from evaluation_answers ea,
+	 cr_items cri
+    where cri.live_revision = ea.answer_id
+      and ea.party_id = 
+	( select
+	CASE 
+	  WHEN et3.number_of_members = 1 THEN :student_id
+	  ELSE 
+	(select etg2.group_id from evaluation_task_groups etg2,
+                                                      evaluation_tasks et2,
+                                                      acs_rels map
+                                                      where map.object_id_one = etg2.group_id
+                                                        and map.object_id_two = :student_id
+                                                        and etg2.task_item_id = et2.task_item_id
+                                                        and et2.task_id = :task_id)
+	END as nom
+               from evaluation_tasks et3
+              where et3.task_id = :task_id
+	)
+--evaluation__party_id(:student_id,:task_id)
+      and ea.task_item_id = :task_item_id
 
       </querytext>
 </fullquery>
@@ -61,15 +86,33 @@
 
 	select ese.grade,
 	ese.description as comments,
-	(ese.grade*:task_weight*:grade_weight)/10000 as net_grade,
+	(ese.grade*:t_weight*:g_weight)/10000 as net_grade,
 	person__name(ese.creation_user) as grader_name
 	from evaluation_student_evalsi ese,
+	cr_items cri, 
 	evaluation_tasks et
 	where ese.task_item_id = et.task_item_id
-	and content_revision__is_live(ese.evaluation_id) = true
-	and ese.party_id = evaluation__party_id(:student_id,:task_id)
-	and et.task_id = :task_id      
+	and et.task_id = :task_id
+	and cri.live_revision = ese.evaluation_id
+	and ese.party_id = 
+	( select
+	CASE 
+	  WHEN et3.number_of_members = 1 THEN :student_id
+	  ELSE 
+	(select etg2.group_id from evaluation_task_groups etg2,
+                                                      evaluation_tasks et2,
+                                                      acs_rels map
+                                                      where map.object_id_one = etg2.group_id
+                                                        and map.object_id_two = :student_id
+                                                        and etg2.task_item_id = et2.task_item_id
+                                                        and et2.task_id = :task_id)
+	END as nom
+               from evaluation_tasks et3
+              where et3.task_id = :task_id
+	)
 
+-- evaluation__party_id(:student_id,:task_id)
+
       </querytext>
 </fullquery>
     
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 -r1.4 -r1.5
--- openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl	24 Aug 2004 22:40:30 -0000	1.4
+++ openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl	10 Sep 2004 19:16:28 -0000	1.5
@@ -66,7 +66,6 @@
     set assignments_orderby " order by task_name asc"
 }
 
-set max_weight 0.00
 set max_grade 0.00
 set total_grade 0.00
 
@@ -99,13 +98,14 @@
     db_0or1row get_grade_info { *SQL* }
 
     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 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 net_grade "[_ evaluation.na_]"
 	set grade "[_ evaluation.na_]"
 	set grader "[_ evaluation.na_]"
 	append task_status " [_ evaluation.Not_evaluated_] "
@@ -133,5 +133,6 @@
     
 }
 
+set total_grade [format %.2f [lc_numeric [expr $total_grade]]]
 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/tasks-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/Attic/tasks-chunk-postgresql.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql	30 Aug 2004 13:04:32 -0000	1.11
+++ openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql	10 Sep 2004 19:16:28 -0000	1.12
@@ -13,16 +13,19 @@
 		et.task_item_id,
 		et.item_id,
 		et.requires_grade_p, et.description, et.grade_item_id,
-		coalesce(cr.content_length,0) as content_length,
+		coalesce(round(cr.content_length/1024,0),0) as content_length,
 		et.data as task_data,
 		cr.title as task_title,
+		crmt.label as pretty_mime_type,
    		et.task_id as revision_id
 	from cr_revisions cr,
 	     evaluation_tasksi et,
-	     cr_items cri	
+	     cr_items cri,
+	     cr_mime_types crmt	
 	where cr.revision_id = et.revision_id
 	  and et.grade_item_id = :grade_item_id	
 	  and cri.live_revision = et.task_id
+	  and et.mime_type = crmt.mime_type
 	$assignments_orderby
 
       </querytext>
@@ -42,14 +45,17 @@
 		cr.title as task_title,
 		et.data as task_data,
 	   	et.task_id as revision_id,
-		coalesce(cr.content_length,0) as content_length,
-		et.late_submit_p
+		coalesce(round(cr.content_length/1024,0),0) as content_length,
+		et.late_submit_p,
+		crmt.label as pretty_mime_type
 	from cr_revisions cr, 
 		 evaluation_tasksi et,
-	         cr_items cri
+	         cr_items cri,
+		 cr_mime_types crmt 
 	where cr.revision_id = et.revision_id
 	  and grade_item_id = :grade_item_id
 	  and cri.live_revision = et.task_id
+	  and et.mime_type = crmt.mime_type
     $assignments_orderby
 	
       </querytext>
@@ -66,7 +72,17 @@
 <fullquery name="get_group_id">      
       <querytext>
 
-		select evaluation__party_id(:user_id,:task_id)
+	select coalesce((select etg2.group_id from evaluation_task_groups etg2, 
+                                                      evaluation_tasks et2, 
+                                                      acs_rels map 
+                                                      where map.object_id_one = etg2.group_id 
+                                                        and map.object_id_two = :user_id 
+                                                        and etg2.task_item_id = et2.task_item_id 
+                                                        and et2.task_id = :task_id),0)
+               from evaluation_tasks et3 
+              where et3.task_id = :task_id 
+
+--		select evaluation__party_id(:user_id,:task_id)
 	
       </querytext>
 </fullquery>
@@ -100,7 +116,24 @@
       from evaluation_answers ea, cr_items cri
       where ea.task_item_id = :task_item_id 
       and cri.live_revision = ea.answer_id
-      and ea.party_id = evaluation__party_id(:user_id,:task_id)
+      and ea.party_id =
+	( select 
+	CASE  
+	  WHEN et3.number_of_members = 1 THEN :user_id 
+	  ELSE  
+	(select etg2.group_id from evaluation_task_groups etg2, 
+                                                      evaluation_tasks et2, 
+                                                      acs_rels map 
+                                                      where map.object_id_one = etg2.group_id 
+                                                        and map.object_id_two = :user_id 
+                                                        and etg2.task_item_id = et2.task_item_id 
+                                                        and et2.task_id = :task_id) 
+	END as nom 
+               from evaluation_tasks et3 
+              where et3.task_id = :task_id 
+	) 
+
+-- evaluation__party_id(:user_id,:task_id)
       
       </querytext>
 </fullquery>
Index: openacs-4/packages/evaluation/lib/tasks-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/tasks-chunk.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/evaluation/lib/tasks-chunk.tcl	30 Aug 2004 13:04:32 -0000	1.13
+++ openacs-4/packages/evaluation/lib/tasks-chunk.tcl	10 Sep 2004 19:16:28 -0000	1.14
@@ -12,7 +12,7 @@
 set base_url [ad_conn package_url]
 
 set mode display
-set return_url "[ad_conn url]?[ns_conn query]&[export_vars { grade_id }]"
+set return_url "[ad_conn url]?[ns_conn query]"
 
 set elements [list task_name \
 		  [list label "[_ evaluation-portlet.Name_]" \
@@ -115,7 +115,7 @@
 	} else {
 	    # we assume it's a file
 	    set task_url "[export_vars -base "${base_url}view/$task_title" { revision_id }]"
-	    set task_name "$task_name ([format %.0f [lc_numeric [expr ($content_length/1024)]]] Kb)"
+	    set task_name "$task_name ([lc_numeric $content_length] Kb - ${pretty_mime_type})"
 	}
 
 	if { [db_0or1row solution_info { *SQL* }] } { 
@@ -157,7 +157,7 @@
 	} else {
 	    # we assume it's a file
 	    set task_url "[export_vars -base "${base_url}view/$task_title" { revision_id }]"
-	    set task_name "$task_name ([format %.0f [lc_numeric [expr ($content_length/1024)]]] Kb)"
+	    set task_name "$task_name ([lc_numeric $content_length] Kb - ${pretty_mime_type})"
 	}
 
 	if { [string eq $online_p "t"] } {
Index: openacs-4/packages/evaluation/sql/postgresql/evaluation-calendar-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/sql/postgresql/evaluation-calendar-create.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/sql/postgresql/evaluation-calendar-create.sql	10 Sep 2004 19:16:28 -0000	1.1
@@ -0,0 +1,13 @@
+-- Simple mapping between cal_items and assignments
+
+create table evaluation_cal_task_map (
+	task_item_id	integer
+			constraint evaluation_cal_task_tid_fk
+			references cr_items(item_id),
+	cal_item_id	integer
+			constraint evaluation_cal_task_cid_fk
+			references cal_items(cal_item_id)
+);
+
+create index evaluation_cal_task_map_tcid_index on evaluation_cal_task_map(task_item_id,cal_item_id);
+
Index: openacs-4/packages/evaluation/sql/postgresql/evaluation-calendar-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/sql/postgresql/evaluation-calendar-drop.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/sql/postgresql/evaluation-calendar-drop.sql	10 Sep 2004 19:16:28 -0000	1.1
@@ -0,0 +1,32 @@
+
+
+-- deleting calendar mappings
+create function inline_0 ()
+returns integer as '
+declare
+    v_cal_item_cursor RECORD;
+        
+begin
+
+    FOR v_cal_item_cursor IN
+        select map.cal_item_id
+	from evaluation_tasks et,
+	evaluation_cal_task_map map
+	where et.task_item_id = map.task_item_id
+    LOOP
+	delete from evaluation_cal_task_map where cal_item_id = v_cal_item_cursor.cal_item_id;
+	PERFORM cal_item__delete (v_cal_item_cursor.cal_item_id);
+    END LOOP;
+
+    return 0;
+end;
+' language 'plpgsql';
+
+
+select inline_0 ();
+drop function inline_0 ();
+
+drop index evaluation_cal_task_map_tcid_index;
+
+drop table evaluation_cal_task_map;
+
Index: openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql	25 Aug 2004 18:17:36 -0000	1.15
+++ openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql	10 Sep 2004 19:16:28 -0000	1.16
@@ -1499,3 +1499,4 @@
 select inline_0();
 drop function inline_0();
 
+\i evaluation-calendar-create.sql
Index: openacs-4/packages/evaluation/sql/postgresql/evaluation-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/sql/postgresql/evaluation-drop.sql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/sql/postgresql/evaluation-drop.sql	14 Jul 2004 17:42:06 -0000	1.8
+++ openacs-4/packages/evaluation/sql/postgresql/evaluation-drop.sql	10 Sep 2004 19:16:29 -0000	1.9
@@ -1,5 +1,6 @@
 -- jopez@galileo.edu
 
+\i evaluation-calendar-drop.sql
 
 -- Unregister the content template
 select content_type__unregister_template (
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.15 -r1.16
--- openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql	25 Aug 2004 18:17:37 -0000	1.15
+++ openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql	10 Sep 2004 19:16:29 -0000	1.16
@@ -444,7 +444,11 @@
 <fullquery name="evaluation::notification::get_url.get_grade_id">      
       <querytext>
 
-	select eg.grade_id from evaluation_tasks est, evaluation_grades eg where est.task_id = :task_id and est.grade_item_id = eg.grade_item_id and content_revision__is_live(est.task_id) = true and content_revision__is_live(eg.grade_id) = true
+	select eg.grade_id 
+	from evaluation_tasks est, evaluation_grades eg, cr_items cri
+	where est.task_id = :task_id
+	and est.grade_item_id = eg.grade_item_id 
+	and cri.live_revision = eg.grade_id
 	
       </querytext>
 </fullquery>
@@ -453,7 +457,7 @@
       <querytext>
 
 	select cu.person_id as party_id, cu.last_name||' - '||cu.first_names as party_name,  
-               ese.grade,
+               round(ese.grade,2) as grade,
                ese.description as comments
          from cc_users cu left outer join evaluation_student_evalsi ese on (ese.party_id = cu.person_id
                                                                             and ese.task_item_id = :task_item_id
@@ -522,10 +526,11 @@
 	select eg.grade_name, 
 	et.task_name 
 	from evaluation_grades eg, 
-	evaluation_tasks et 
+	evaluation_tasks et,
+	cr_items cri 
 	where et.task_id = :task_id
 	and et.grade_item_id = eg.grade_item_id
-	and content_revision__is_live(eg.grade_id) = true	
+	and cri.live_revision = eg.grade_id
 
       </querytext>
 </fullquery>
@@ -845,18 +850,23 @@
       <querytext>
 
 	select evaluation__party_name(ea.party_id, et.task_id) as party_name,
-	ea.title as answer_title,
-	ea.revision_id,
-	cri.storage_type
+	crr.title as answer_title,
+	crr.revision_id,
+	crr.content as cr_file_name,
+	cri.storage_type,
+	cri.storage_area_key as cr_path
 	from evaluation_answersi ea, 
+	cr_revisions crr,
 	evaluation_tasks et,
-	cr_items cri
+	cr_items cri,
+	cr_items cri2
 	where ea.task_item_id = et.task_item_id
-	and ea.item_id = cri.item_id
+	and ea.answer_item_id = cri.item_id
+	and crr.revision_id = ea.answer_id
 	and et.task_id = :task_id
 	and ea.data is not null
-	and content_revision__is_live(ea.answer_id) = true
-	and not exists (select 1 from evaluation_student_evals ese where ese.party_id = ea.party_id and ese.task_item_id = et.task_item_id and content_revision__is_live(ese.evaluation_id) = true)
+	and cri2.live_revision = ea.answer_id
+	and not exists (select 1 from evaluation_student_evals ese, cr_items cri3 where ese.party_id = ea.party_id and ese.task_item_id = et.task_item_id and cri3.live_revision = ese.evaluation_id)
 
       </querytext>
 </fullquery>
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.14 -r1.15
--- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	20 Aug 2004 00:34:23 -0000	1.14
+++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	10 Sep 2004 19:16:29 -0000	1.15
@@ -109,6 +109,7 @@
 		set notif_text "[_ evaluation.lt_An_assignment_was_mod] \n"
 	    }
 	    append notif_text "[_ evaluation.click_on_this_link_] [evaluation::notification::get_url -task_id $task_id -notif_type one_assignment_notif] \n"
+	    append notif_text $sms_text
 	    set response_id $task_id
 	    
 	}
@@ -134,25 +135,13 @@
 	-response_id $response_id \
 	-notif_subject $notif_subject \
 	-notif_text $notif_text 
+
 } 
 
 ad_proc -public evaluation::package_key {} {
     return "evaluation"
 }
 
-ad_proc -public evaluation::make_url { 
-    -file_name_from_db:required 
-} {
-    if { [regexp "view" $file_name_from_db] } {
-	return $file_name_from_db
-    } elseif { [regexp "http://" $file_name_from_db] } {
-	return $file_name_from_db
-    } else {
-	return $file_name_from_db
-    }
-}
-
-
 ad_proc -public evaluation::new_grade {
     -item_id:required
     -content_type:required
@@ -360,7 +349,7 @@
 	@param new_item_p If true make a new item using item_id
 	@param task_id Task which "owns" the solution
 	@param title The name of the task solution
-	@param storage_type lob or text, depending on what are we going to store
+	@param storage_type lob, file or text, depending on what are we going to store
 
 } {
 
@@ -417,7 +406,7 @@
 	@param new_item_p If true make a new item using item_id
 	@param task_id Task which "owns" the answer
 	@param title The name of the task solution
-	@param storage_type lob or text, depending on what are we going to store
+	@param storage_type lob, file or text, depending on what are we going to store
 	@param party_id Group or user_id thaw owns the anser
 } {
 
@@ -478,7 +467,7 @@
 	@param party_id Party been evaluated
 	@param grade Grade of the evaluation
 	@param show_student_p If the student(s) will be able to see the grade
-	@param storage_type lob or text, depending on what are we going to store
+	@param storage_type lob, file or text, depending on what are we going to store
 	@param description Comments on the evaluation
 	@param mime_type Mime type of the evaluation.
 } {
@@ -578,7 +567,7 @@
 	@param new_item_p If true make a new item using item_id
 	@param task_id Task which "owns" the grades sheet
 	@param title The name of the grades sheet
-	@param storage_type lob 
+	@param storage_type lob or file 
 	@param mime_type Mime tipe of the grades sheet
 
 } {
@@ -622,7 +611,7 @@
     } 
 	
     set csv_content [list] 
-    lappend csv_content "Grades sheet for assighment \"$task_name\""  
+    lappend csv_content "[_ evaluation.lt_Grades_sheet_for_assi]"  
 
 	lappend csv_content "\n[_ evaluation.Max_Grade_]"
   	lappend csv_content "100"
@@ -652,7 +641,7 @@
 	
     db_foreach parties_with_to_grade { *SQL* } {
 	if { ![empty_string_p $grade] } {
-	    set grade [format %.2f [lc_numeric $grade]]
+	    set grade [lc_numeric $grade]
 	}
 	    lappend csv_content "\n$party_id" 
 	    lappend csv_content "$party_name" 
@@ -763,6 +752,11 @@
     notification::type::delivery_method_enable \
 	-type_id $type_id \
 	-delivery_method_id [notification::delivery::get_id -short_name email]
+
+    # Enable the delivery methods
+    notification::type::delivery_method_enable \
+	-type_id $type_id \
+	-delivery_method_id [notification::delivery::get_id -short_name sms]
 }
 
 ad_proc -public evaluation::apm::create_folders {
@@ -886,13 +880,20 @@
     file mkdir $dir
 
     db_foreach get_answers_for_task { *SQL* } {
-	if { [string eq $storage_type "lob"] } {
+	if { [string eq $storage_type "lob"] || [string eq $storage_type "file"] } {
 	    # it is a file
 	    
 	    regsub -all {[<>:\"|/@\\\#%&+\\ ,]} $party_name {_} file_name
 	    append file_name [file extension $answer_title]
 	    
-	    db_blob_get_file select_object_content { *SQL* } -file [file join ${dir} ${file_name}]
+	    if { [string eq $storage_type "file"] } {
+		# its a file
+		
+		file copy -- "[cr_fs_path $cr_path]${cr_file_name}" [file join ${dir} ${file_name}]
+	    } else {
+		# its a lob
+		db_blob_get_file select_object_content { *SQL* } -file [file join ${dir} ${file_name}]
+	    }
 	    
 	} else {
 	    # it is a url
Index: openacs-4/packages/evaluation/www/answer-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/answer-add-edit-postgresql.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/www/answer-add-edit-postgresql.xql	25 Aug 2004 18:17:37 -0000	1.8
+++ openacs-4/packages/evaluation/www/answer-add-edit-postgresql.xql	10 Sep 2004 19:16:30 -0000	1.9
@@ -14,7 +14,7 @@
 <fullquery name="task_info">      
       <querytext>
 	
-		select task_item_id
+		select task_item_id, task_name
 		from evaluation_tasks
 		where task_id = :task_id
 	
@@ -61,16 +61,6 @@
       </querytext>
 </fullquery>
 
-<fullquery name="lob_size">      
-      <querytext>
-
-	update cr_revisions
- 	set content_length = :content_length
-	where revision_id = :revision_id
-
-     </querytext>
-</fullquery>
-
 <fullquery name="lob_content">      
       <querytext>
 	
Index: openacs-4/packages/evaluation/www/answer-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/answer-add-edit.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/evaluation/www/answer-add-edit.tcl	24 Aug 2004 22:40:30 -0000	1.9
+++ openacs-4/packages/evaluation/www/answer-add-edit.tcl	10 Sep 2004 19:16:30 -0000	1.10
@@ -15,30 +15,30 @@
     upload_file.tmpfile:tmpfile,optional
     return_url:notnull
 } -validate {
-    late_submit {
+    late_submit -requires { task_id:integer } {
 	if { [string eq [db_string late_turn_in { *SQL* }] "f"] && [db_string compare_dates { *SQL* } -default 0] } {
 	    ad_complain "[_ evaluation.lt_This_task_can_not_be_]"
 	}
     }
 }
 
+db_1row task_info { *SQL* }
+
 set user_id [ad_conn user_id]
 set party_id [db_string get_party_id { *SQL* }]
 
 set package_id [ad_conn package_id]
 
 if { [ad_form_new_p -key answer_id] } {
-	set page_title "[_ evaluation.Upload_Answer_]"
+	set page_title "[_ evaluation.lt_Upload_Answer_for_tas]"
 } else {
-	set page_title "[_ evaluation.Change_Answer_]"
+	set page_title "[_ evaluation.lt_Change_Answer_for_tas]"
 	db_1row item_data { *SQL* }
 
 }
 
 set context [list $page_title]
 
-db_1row task_info { *SQL* }
-
 db_0or1row double_click { *SQL* }
 
 ad_form -html { enctype multipart/form-data } -name answer -cancel_url $return_url -export { item_id grade_id task_id return_url } -form {
@@ -92,7 +92,12 @@
 			set title [template::util::file::get_property filename $upload_file]
 			set mime_type [cr_filename_to_mime_type -create $title]
 
-			set storage_type lob
+			if { [parameter::get -parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]] } {
+			    set storage_type file
+			} else {
+			    set storage_type lob
+			}
+
 		}  elseif { ![string eq $url "http://"] } {
 			set mime_type "text/plain"
 			set title "link"
@@ -113,19 +118,28 @@
 		if { ![empty_string_p $upload_file] }  {
 
 			set tmp_file [template::util::file::get_property tmp_filename $upload_file]
+			set content_length [file size $tmp_file]
 			
-			# create the new item
-			db_dml lob_content { *SQL* } -blob_files [list $tmp_file]
+			if { [parameter::get -parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]] } {
+			    # create the new item
+			    
+			    set filename [cr_create_content_file $item_id $revision_id $tmp_file]
+			    db_dml set_file_content { *SQL* }
 
-			set content_length [file size $tmp_file]
-			# Unfortunately, we can only calculate the file size after the lob is uploaded 
-			db_dml lob_size { *SQL* }
+			} else {
+			    
+			    # create the new item
+			    db_dml lob_content { *SQL* } -blob_files [list $tmp_file]
 
+			    # Unfortunately, we can only calculate the file size after the lob is uploaded 
+			    db_dml lob_size { *SQL* }
+			}
+
 		} elseif { ![string eq $url "http://"] } {
 			
 			db_dml link_content { *SQL* }
 			set content_length 0
-			db_dml lob_size { *SQL* }
+			db_dml content_size { *SQL* }
 			
 		}
 	}
Index: openacs-4/packages/evaluation/www/answer-add-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/answer-add-edit.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/www/answer-add-edit.xql	10 Sep 2004 19:16:30 -0000	1.1
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+<fullquery name="set_file_content">      
+      <querytext>
+
+		update cr_revisions
+		set content = :filename,
+		mime_type = :mime_type,
+		content_length = :content_length
+		where revision_id = :revision_id
+			
+      </querytext>
+</fullquery>
+
+<fullquery name="lob_size">      
+      <querytext>
+
+	update cr_revisions
+ 	set content_length = :content_length
+	where revision_id = :revision_id
+
+     </querytext>
+</fullquery>
+
+<fullquery name="content_size">      
+      <querytext>
+
+	update cr_revisions
+ 	set content_length = :content_length
+	where revision_id = :revision_id
+
+     </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.5 -r1.6
--- openacs-4/packages/evaluation/www/index-postgresql.xql	30 Jul 2004 22:50:09 -0000	1.5
+++ openacs-4/packages/evaluation/www/index-postgresql.xql	10 Sep 2004 19:16:30 -0000	1.6
@@ -9,9 +9,9 @@
 		select eg.grade_plural_name,
 		eg.grade_id,
 	 	eg.grade_item_id
-   	 	from evaluation_gradesx eg, acs_objects ao
-		where content_revision__is_live(eg.grade_id) = true
-          and eg.item_id = ao.object_id
+   	 	from evaluation_grades eg, acs_objects ao, cr_items cri
+		where cri.live_revision = eg.grade_id
+          and eg.grade_item_id = ao.object_id
    		  and ao.context_id = :package_id
 		order by grade_plural_name desc
 	
@@ -21,7 +21,36 @@
 <fullquery name="get_total_grade">      
       <querytext>
 
-	select evaluation__class_total_grade(:user_id,:package_id)
+        select coalesce(sum((ese.grade*et.weight*eg.weight)/10000),0) as grade
+        from evaluation_grades eg, evaluation_tasks et, evaluation_student_evals ese, acs_objects ao, cr_items cri1, cr_items cri2, cr_items cri3
+        where et.task_item_id = ese.task_item_id
+		  and et.grade_item_id = eg.grade_item_id
+          and eg.grade_item_id = ao.object_id
+   		  and ao.context_id = :package_id
+   		  and ese.party_id = 
+
+	( select
+	CASE 
+	  WHEN et3.number_of_members = 1 THEN $user_id
+	  ELSE 
+	(select etg2.group_id from evaluation_task_groups etg2,
+                                                      evaluation_tasks et2,
+                                                      acs_rels map
+                                                      where map.object_id_one = etg2.group_id
+                                                        and map.object_id_two = $user_id
+                                                        and etg2.task_item_id = et2.task_item_id
+                                                        and et2.task_id = et.task_id)
+
+	END as nom
+               from evaluation_tasks et3
+              where et3.task_id = et.task_id
+	)
+
+	and cri1.live_revision = eg.grade_id
+	and cri2.live_revision = et.task_id
+	and cri3.live_revision = ese.evaluation_id
+
+--	select evaluation__class_total_grade(:user_id,:package_id)
 	
       </querytext>
 </fullquery>
Index: openacs-4/packages/evaluation/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/www/index.adp	30 Jul 2004 22:50:09 -0000	1.8
+++ openacs-4/packages/evaluation/www/index.adp	10 Sep 2004 19:16:30 -0000	1.9
@@ -13,7 +13,7 @@
 <li>#evaluation.lt_There_are_no_tasks_fo#</li>
 </if><else>
 <multiple name="grades">
-	<li><strong>@grades.grade_plural_name@</strong> <br />
+	<li><strong>@grades.grade_plural_name;noquote@</strong> <br />
 	<include src="../lib/tasks-chunk" grade_item_id=@grades.grade_item_id@ grade_id=@grades.grade_id@ assignments_orderby=@assignments_orderby@>
 	</li>
 </multiple>
@@ -26,7 +26,7 @@
 <li>#evaluation.lt_There_are_no_tasks_to#</li>
 </if><else>
  <multiple name="grades">
-	<li><strong>@grades.grade_plural_name@</strong> <br />
+	<li><strong>@grades.grade_plural_name;noquote@</strong> <br />
 	<include src="../lib/evaluations-chunk" grade_item_id=@grades.grade_item_id@ grade_id=@grades.grade_id@ evaluations_orderby=@evaluations_orderby@>
 	</li>
  </multiple>
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.8 -r1.9
--- openacs-4/packages/evaluation/www/task-view.tcl	24 Aug 2004 22:40:30 -0000	1.8
+++ openacs-4/packages/evaluation/www/task-view.tcl	10 Sep 2004 19:16:30 -0000	1.9
@@ -35,7 +35,7 @@
 
 if { ![empty_string_p $task_data] } {
 
-    if { [regexp "http://" $task_data] } {
+    if { [string eq $task_title "link"] } {
  	set task_url "<a href=\"$task_data\">$task_data</a>"
     } else {
 	# we assume it's a file
Index: openacs-4/packages/evaluation/www/admin/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/index-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/index-postgresql.xql	30 Jul 2004 22:50:09 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/index-postgresql.xql	10 Sep 2004 19:16:30 -0000	1.5
@@ -9,9 +9,9 @@
 		select eg.grade_plural_name,
 		eg.grade_id,
 	   	eg.grade_item_id
-   	 	from evaluation_gradesx eg, acs_objects ao
-		where content_revision__is_live(eg.grade_id) = true
-          and eg.item_id = ao.object_id
+   	 	from evaluation_grades eg, acs_objects ao, cr_items cri
+		where cri.live_revision = eg.grade_id
+          and eg.grade_item_id = ao.object_id
    		  and ao.context_id = :package_id
 		order by grade_plural_name desc
 	
Index: openacs-4/packages/evaluation/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/index.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/evaluation/www/admin/index.adp	30 Jul 2004 22:50:09 -0000	1.9
+++ openacs-4/packages/evaluation/www/admin/index.adp	10 Sep 2004 19:16:30 -0000	1.10
@@ -17,7 +17,7 @@
 <li>#evaluation.lt_There_are_no_tasks_fo#</li>
 </if><else>
 <multiple name="grades">
-	<li><strong>@grades.grade_plural_name@</strong> <br />
+	<li><strong>@grades.grade_plural_name;noquote@</strong> <br />
 	<include src="../../lib/tasks-chunk" grade_item_id=@grades.grade_item_id@ grade_id=@grades.grade_id@ assignments_orderby=@assignments_orderby@>
 	</li>
 </multiple>
@@ -31,7 +31,7 @@
 <li>#evaluation.lt_There_are_no_tasks_to#</li>
 </if><else>
 <multiple name="grades">
-	<li><strong>@grades.grade_plural_name@</strong> <br />
+	<li><strong>@grades.grade_plural_name;noquote@</strong> <br />
 	<include src="../../lib/evaluations-chunk" grade_item_id=@grades.grade_item_id@ grade_id=@grades.grade_id@ evaluations_orderby=@evaluations_orderby@>
 	</li>
 </multiple>
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl	13 Aug 2004 17:09:55 -0000	1.8
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl	10 Sep 2004 19:16:31 -0000	1.9
@@ -148,19 +148,34 @@
 	set title [template::util::file::get_property filename $upload_file]
 	set mime_type [cr_filename_to_mime_type -create $title]
 
+	if { [parameter::get -parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]] } {
+	    set storage_type file
+	} else {
+	    set storage_type lob
+	}
+
 	set revision_id [evaluation::new_grades_sheet -new_item_p 1 -item_id $grades_sheet_item_id -content_type evaluation_grades_sheets \
-			     -content_table evaluation_grades_sheets -content_id grades_sheet_id -storage_type lob -task_item_id $task_item_id \
+			     -content_table evaluation_grades_sheets -content_id grades_sheet_id -storage_type $storage_type -task_item_id $task_item_id \
 			     -title $title -mime_type $mime_type]
 	
 	evaluation::set_live -revision_id $revision_id
 
-	# create the new item
-	db_dml lob_content { *SQL* } -blob_files [list $tmp_filename]
+	if { [parameter::get -parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]] } {
+	    # create the new item
+	    
+	    set filename [cr_create_content_file $item_id $revision_id $tmp_file]
+	    db_dml set_file_content { *SQL* }
+	    
+	} else {
+
+	    # create the new item
+	    db_dml lob_content { *SQL* } -blob_files [list $tmp_filename]
+	    
+	    set content_length [file size $tmp_filename]
+	    # Unfortunately, we can only calculate the file size after the lob is uploaded 
+	    db_dml lob_size { *SQL* }
+	}
 	
-	set content_length [file size $tmp_filename]
-	# Unfortunately, we can only calculate the file size after the lob is uploaded 
-	db_dml lob_size { *SQL* }
-	
 	foreach party_id [array names grades_gs] {
 	    if { ![info exists comments_gs($party_id)] } {
 		set comments_gs($party_id) ""
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.xql	30 Jul 2004 22:50:10 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.xql	10 Sep 2004 19:16:31 -0000	1.3
@@ -22,6 +22,18 @@
       </querytext>
 </fullquery>
 
+<fullquery name="set_file_content">      
+      <querytext>
+
+		update cr_revisions
+		set content = :filename,
+		mime_type = :mime_type,
+		content_length = :content_length
+		where revision_id = :revision_id
+			
+      </querytext>
+</fullquery>
+
 <fullquery name="task_info">      
       <querytext>
 	
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp	12 Aug 2004 17:46:42 -0000	1.6
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp	10 Sep 2004 19:16:31 -0000	1.7
@@ -9,6 +9,7 @@
 	@export_vars;noquote@
       <input type=hidden name=task_id value="@task_id@">
       <input type=hidden name=max_grade value="@max_grade@">
+      <input type=submit value="#evaluation.Grade_1#" > <input type=button value="#evaluation.Go#" onClick="history.go(-1)"> 
 		<blockquote>
         <table>
           <multiple name="evaluations_wa">
@@ -30,6 +31,7 @@
   @export_vars;noquote@ 
   <input type=hidden name=task_id value="@task_id@"> 
   <input type=hidden name=max_grade value="@max_grade@"> 
+  <input type=submit value="#evaluation.Grade_1#" >
   <blockquote> 
     <table> 
 	<multiple name="evaluations_na"> 
@@ -54,6 +56,7 @@
 	@export_vars;noquote@
       <input type=hidden name=task_id value="@task_id@">
       <input type=hidden name=max_grade value="@max_grade@">
+      <input type=submit value="#evaluation.Confirm#">
 		<blockquote>
         <table>
           <multiple name="evaluations">
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl	12 Aug 2004 17:46:42 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl	10 Sep 2004 19:16:31 -0000	1.5
@@ -7,118 +7,121 @@
     @creation-date Mar 2004
     @cvs-id $Id$
 } { 
-	task_id:integer,notnull
-	max_grade:integer,notnull
-	item_ids:array,integer,optional
-	item_to_edit_ids:array,integer,optional
- 
-	grades:array,optional
-	reasons:array,optional
-	show_student:array,optional
-	evaluation_ids:array,integer,optional
+    task_id:integer,notnull
+    max_grade:integer,notnull
+    item_ids:array,integer,optional
+    item_to_edit_ids:array,integer,optional
+    
+    grades:array,optional
+    reasons:array,optional
+    show_student:array,optional
+    evaluation_ids:array,integer,optional
 
-	grades_wa:array,optional
-	comments_wa:array,optional
-	show_student_wa:array,optional
+    grades_wa:array,optional
+    comments_wa:array,optional
+    show_student_wa:array,optional
 
-	grades_na:array,optional
-	comments_na:array,optional
-	show_student_na:array,optional
+    grades_na:array,optional
+    comments_na:array,optional
+    show_student_na:array,optional
 
-	{grade_all ""}
+    {grade_all ""}
 } -validate {
-	valid_grades_wa {
-		set counter 0
-		foreach party_id [array names grades_wa] {
-			if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } {
-				incr counter
-				if { ![ad_var_type_check_number_p $grades_wa($party_id)] } {
-				    set wrong_grade $grades_wa($party_id)
-				    ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]"
-				}
-			}
+    valid_grades_wa {
+	set counter 0
+	foreach party_id [array names grades_wa] {
+	    if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } {
+		incr counter
+		if { ![ad_var_type_check_number_p $grades_wa($party_id)] } {
+		    set wrong_grade $grades_wa($party_id)
+		    ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]"
 		}
-		if { !$counter && ([array size show_student_wa] > 0)} {
-			ad_complain "[_ evaluation.lt_There_must_be_at_leas]"
-		}
+	    }
 	}
-	valid_grades_na {
-		set counter 0
-		foreach party_id [array names grades_na] {
-			if { [empty_string_p $grade_all] } {
-				if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)] } {
-					incr counter
-					if { ![ad_var_type_check_number_p $grades_na($party_id)] } {
-					    set wrong_grade $grades_na($party_id)
-					    ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]"
-					}
-				}
-			} else {
-				set grades_na($party_id) 0
-			}
-		}
-		if { !$counter && ([array size show_student_na] > 0) && [empty_string_p $grade_all] } {
-			ad_complain "[_ evaluation.lt_There_must_be_at_leas]"
-		}
+	if { !$counter && ([array size show_student_wa] > 0) } {
+	    ad_complain "[_ evaluation.lt_There_must_be_at_leas]"
 	}
-	valid_grades {
-		set counter 0
-		foreach party_id [array names grades] {
-			if { [info exists grades($party_id)] && ![empty_string_p $grades($party_id)] } {
-				if { ![ad_var_type_check_number_p $grades($party_id)] } {
-				    set wrong_grade $grades($party_id)
-				    ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]"
-				} else {			
-				    set old_grade  [format %.2f [lc_numeric [db_string get_old_grade { *SQL* }]]]
-				    if { ![string eq $old_grade  [format %.2f [lc_numeric $grades($party_id)]]] } {
-						incr counter
-						if { ![info exists reasons($party_id)] || [empty_string_p $reasons($party_id)] } {
-						    set grade_wo_reason $grades($party_id)
-						    ad_complain "[_ evaluation.lt_You_must_give_an_edit]"
-						}
-						set grades_to_edit($party_id) $grades($party_id)
-						set reasons_to_edit($party_id) $reasons($party_id)
-						set show_student_to_edit($party_id) $show_student($party_id)				
-					}
-				}
-			}
+    }
+    valid_grades_na {
+	set counter 0
+	foreach party_id [array names grades_na] {
+	    if { [empty_string_p $grade_all] } {
+		if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)] } {
+		    incr counter
+		    if { ![ad_var_type_check_number_p $grades_na($party_id)] } {
+			set wrong_grade $grades_na($party_id)
+			ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]"
+		    }
 		}
-		if { !$counter && ([array size show_student] > 0) } {
-			ad_complain "[_ evaluation.lt_There_must_be_at_leas]"
-		}
+	    } else {
+		set grades_na($party_id) 0
+	    }
 	}
-	valid_data {
-		foreach party_id [array names comments_wa] {
-			if { [info exists comments_wa($party_id)] && ![info exists grades_wa($party_id)] } {
-			    set wrong_comments $comments_wa($party_id)
-			    ad_complain "[_ evaluation.lt_There_is_a_comment_fo]"
+	if { !$counter && ([array size show_student_na] > 0) && [empty_string_p $grade_all] } {
+	    ad_complain "[_ evaluation.lt_There_must_be_at_leas]"
+	}
+    }
+    valid_grades {
+	set counter 0
+	foreach party_id [array names grades] {
+	    if { [info exists grades($party_id)] && ![empty_string_p $grades($party_id)] } {
+		if { ![ad_var_type_check_number_p $grades($party_id)] } {
+		    set wrong_grade $grades($party_id)
+		    ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]"
+		} else {			
+		    set old_grade  [format %.2f [db_string get_old_grade { *SQL* }]]
+		    if { ![string eq $old_grade  [format %.2f [expr $grades($party_id)*100/$max_grade]]] } {
+			incr counter
+			if { $max_grade != 100  } {
+			    append reasons($party_id) "[_ evaluation.Weight_change]"
 			}
-			if { [info exists comments_wa($party_id)] && ([string length $comments_wa($party_id)] > 400) } {
-			    set wrong_comments $comments_wa($party_id)
-			    ad_complain "[_ evaluation.lt_There_is_a_comment_la_1]"
+			if { ![info exists reasons($party_id)] || [empty_string_p $reasons($party_id)] } {
+			    set grade_wo_reason $grades($party_id)
+			    ad_complain "[_ evaluation.lt_You_must_give_an_edit]"
 			}
+			set grades_to_edit($party_id) $grades($party_id)
+			set reasons_to_edit($party_id) $reasons($party_id)
+			set show_student_to_edit($party_id) $show_student($party_id)				
+		    }
 		}
-		foreach party_id [array names comments_na] {
-			if { [info exists comments_na($party_id)] && ![info exists grades_na($party_id)] } {
-			    set wrong_comments $comments_na($party_id)
-			    ad_complain "[_ evaluation.lt_There_is_a_comment_fo]"
-			}
-			if { [info exists comments_na($party_id)] && ([string length $comments_na($party_id)] > 400) } {
-			    set wrong_comments $comments_na($party_id)
-			    ad_complain "[_ evaluation.lt_There_is_a_comment_la]"
-			}
-		}
-		foreach party_id [array names reasons] {
-			if { [info exists reasons($party_id)] && ![info exists grades($party_id)] } {
-			    set wrong_comments $reasons($party_id)
-			    ad_complain "[_ evaluation.lt_There_is_an_edit_reas]"
-			}
-			if { [info exists reasons($party_id)] && ([string length $reasons($party_id)] > 400) } {
-			    set wrong_comments $reasons($party_id)
-			    ad_complain "[_ evaluation.lt_There_is_an_edit_reas_1]"
-			}
-		}
+	    }
 	}
+	if { !$counter && ([array size show_student] > 0) && ($max_grade == 100) } {
+	    ad_complain "[_ evaluation.lt_There_must_be_at_leas]"
+	}
+    }
+    valid_data {
+	foreach party_id [array names comments_wa] {
+	    if { [info exists comments_wa($party_id)] && ![info exists grades_wa($party_id)] } {
+		set wrong_comments $comments_wa($party_id)
+		ad_complain "[_ evaluation.lt_There_is_a_comment_fo]"
+	    }
+	    if { [info exists comments_wa($party_id)] && ([string length $comments_wa($party_id)] > 400) } {
+		set wrong_comments $comments_wa($party_id)
+		ad_complain "[_ evaluation.lt_There_is_a_comment_la_1]"
+	    }
+	}
+	foreach party_id [array names comments_na] {
+	    if { [info exists comments_na($party_id)] && ![info exists grades_na($party_id)] } {
+		set wrong_comments $comments_na($party_id)
+		ad_complain "[_ evaluation.lt_There_is_a_comment_fo]"
+	    }
+	    if { [info exists comments_na($party_id)] && ([string length $comments_na($party_id)] > 400) } {
+		set wrong_comments $comments_na($party_id)
+		ad_complain "[_ evaluation.lt_There_is_a_comment_la]"
+	    }
+	}
+	foreach party_id [array names reasons] {
+	    if { [info exists reasons($party_id)] && ![info exists grades($party_id)] } {
+		set wrong_comments $reasons($party_id)
+		ad_complain "[_ evaluation.lt_There_is_an_edit_reas]"
+	    }
+	    if { [info exists reasons($party_id)] && ([string length $reasons($party_id)] > 400) } {
+		set wrong_comments $reasons($party_id)
+		ad_complain "[_ evaluation.lt_There_is_an_edit_reas_1]"
+	    }
+	}
+    }
 }
 
 set page_title "[_ evaluation.lt_Confirm_Your_Evaluati]"
@@ -131,20 +134,20 @@
 # if the structure of the multirow datasource ever changes, this needs to be rewritten    
 set counter 0
 foreach party_id [array names show_student_wa] {
-	if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } { 
-		incr counter 
-		set party_name [db_string get_party_name { *SQL* }]
-		set evaluations_wa:${counter}(rownum) $counter
-		set evaluations_wa:${counter}(party_name) $party_name
-		set evaluations_wa:${counter}(grade) $grades_wa($party_id)
-		set evaluations_wa:${counter}(comment) $comments_wa($party_id)
-		if { [string eq $show_student_wa($party_id) "t"] } {
-			set evaluations_wa:${counter}(show_student) "[_ evaluation.Yes_]"
-		} else {
-			set evaluations_wa:${counter}(show_student) "[_ evaluation.No_]"
-		}
-		set item_ids($party_id) [db_nextval acs_object_id_seq]
+    if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } { 
+	incr counter 
+	set party_name [db_string get_party_name { *SQL* }]
+	set evaluations_wa:${counter}(rownum) $counter
+	set evaluations_wa:${counter}(party_name) $party_name
+	set evaluations_wa:${counter}(grade) $grades_wa($party_id)
+	set evaluations_wa:${counter}(comment) " $comments_wa($party_id)"
+	if { [string eq $show_student_wa($party_id) "t"] } {
+	    set evaluations_wa:${counter}(show_student) "[_ evaluation.Yes_]"
+	} else {
+	    set evaluations_wa:${counter}(show_student) "[_ evaluation.No_]"
 	}
+	set item_ids($party_id) [db_nextval acs_object_id_seq]
+    }
 }
 
 set evaluations_wa:rowcount $counter
@@ -154,20 +157,20 @@
 # if the structure of the multirow datasource ever changes, this needs to be rewritten    
 set counter 0
 foreach party_id [array names show_student_na] {
-	if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)] } { 
-		incr counter 
-		set party_name [db_string get_party_name { *SQL* }]
-		set evaluations_na:${counter}(rownum) $counter
-		set evaluations_na:${counter}(party_name) $party_name
-		set evaluations_na:${counter}(grade) $grades_na($party_id)
-		set evaluations_na:${counter}(comment) $comments_na($party_id)
-		if { [string eq $show_student_na($party_id) "t"] } {
-			set evaluations_na:${counter}(show_student) "[_ evaluation.Yes_]"
-		} else {
-			set evaluations_na:${counter}(show_student) "[_ evaluation.No_]"
-		}
-		set item_ids($party_id) [db_nextval acs_object_id_seq]
+    if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)] } { 
+	incr counter 
+	set party_name [db_string get_party_name { *SQL* }]
+	set evaluations_na:${counter}(rownum) $counter
+	set evaluations_na:${counter}(party_name) $party_name
+	set evaluations_na:${counter}(grade) $grades_na($party_id)
+	set evaluations_na:${counter}(comment) " $comments_na($party_id)"
+	if { [string eq $show_student_na($party_id) "t"] } {
+	    set evaluations_na:${counter}(show_student) "[_ evaluation.Yes_]"
+	} else {
+	    set evaluations_na:${counter}(show_student) "[_ evaluation.No_]"
 	}
+	set item_ids($party_id) [db_nextval acs_object_id_seq]
+    }
 }
 
 set evaluations_na:rowcount $counter
@@ -177,19 +180,19 @@
 # if the structure of the multirow datasource ever changes, this needs to be rewritten    
 set counter 0
 foreach party_id [array names show_student] {
-	if { [info exists grades_to_edit($party_id)] && ![empty_string_p $grades_to_edit($party_id)] } { 
-		incr counter 
-		set party_name [db_string get_party_name { *SQL* }]
-		set evaluations:${counter}(rownum) $counter
-		set evaluations:${counter}(party_name) $party_name
-		set evaluations:${counter}(grade) $grades_to_edit($party_id)
-		set evaluations:${counter}(reason) $reasons_to_edit($party_id)
-		if { [string eq  $show_student_to_edit($party_id) "t"] } {
-			set evaluations:${counter}(show_student) "[_ evaluation.Yes_]"
-		} else {
-			set evaluations:${counter}(show_student) "[_ evaluation.No_]"
-		}
+    if { [info exists grades_to_edit($party_id)] && ![empty_string_p $grades_to_edit($party_id)] } { 
+	incr counter 
+	set party_name [db_string get_party_name { *SQL* }]
+	set evaluations:${counter}(rownum) $counter
+	set evaluations:${counter}(party_name) $party_name
+	set evaluations:${counter}(grade) $grades_to_edit($party_id)
+	set evaluations:${counter}(reason) $reasons_to_edit($party_id)
+	if { [string eq  $show_student_to_edit($party_id) "t"] } {
+	    set evaluations:${counter}(show_student) "[_ evaluation.Yes_]"
+	} else {
+	    set evaluations:${counter}(show_student) "[_ evaluation.No_]"
 	}
+    }
 }
 
 set evaluations:rowcount $counter
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit-postgresql.xql	12 Aug 2004 17:46:42 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit-postgresql.xql	10 Sep 2004 19:16:31 -0000	1.5
@@ -8,7 +8,7 @@
 
 	select evaluation__party_name(ese.party_id,et.task_id) as party_name,
 	ese.party_id,
-	ese.grade,
+	round(ese.grade,2) as grade,
 	ese.last_modified as evaluation_date,
 	et.online_p,
 	et.due_date,
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp	20 Aug 2004 01:11:17 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp	10 Sep 2004 19:16:31 -0000	1.6
@@ -3,16 +3,16 @@
 <property name="context">@context;noquote@</property>
 
 <if @evaluated_students:rowcount@ gt 0>
-  <form action="evaluate-students">
-      <input type=hidden name=task_id value="@task_id@">
+  <form action="evaluate-students" method="POST">
+      <input type=hidden name=task_id value="@task_id@" />
+		@export_vars;noquote@
 	   <blockquote><listtemplate name="evaluated_students"></listtemplate></blockquote>
         <input type=submit value="#evaluation.Edit#">
-		@export_vars;noquote@
   </form>
   <blockquote>
   <form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">  
-    <input type="hidden" name="grades_sheet_item_id" value="@grades_sheet_item_id@"> 
-    <input type="hidden" name="task_id" value=@task_id@> 
+    <input type="hidden" name="grades_sheet_item_id" value="@grades_sheet_item_id@" /> 
+    <input type="hidden" name="task_id" value="@task_id@" /> 
        <table> 
           <tr> 
           <th style="text-align:right;">#evaluation.lt_Grade_students_using_file#</th> 
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl	24 Aug 2004 22:40:32 -0000	1.8
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl	10 Sep 2004 19:16:31 -0000	1.9
@@ -55,14 +55,14 @@
 
 db_multirow -extend { answer answer_url radio_yes_checked radio_no_checked submission_date_pretty } evaluated_students get_evaluated_students { *SQL* } {
 
-    set grade [format %.2f [lc_numeric $grade]]
+    set grade [lc_numeric $grade]
     if { [string eq $online_p "t"] } {
 	if { [db_0or1row get_answer_info { *SQL* }] } {
 	    
 	    # working with answer stuff (if it has a file/url attached)
 	    if { [empty_string_p $answer_data] } {
 		set answer "[_ evaluation.No_response_]"
-	    } elseif { [regexp "http://" $answer_data] } {
+	    } elseif { [string eq $answer_title "link"] } {
 		set answer_url "[export_vars -base "$answer_data" { }]"
 		set answer "[_ evaluation.View_answer_]"
 	    } else {
Index: openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl	30 Jul 2004 22:50:10 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl	10 Sep 2004 19:16:31 -0000	1.5
@@ -55,7 +55,7 @@
 } -edit_request {
 	
 	db_1row evaluation_info { *SQL* }
-	set grade [format %.2f [lc_numeric $grade]]
+	set grade [lc_numeric $grade]
 	
 } -validate {
 	{grade 
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql	24 Aug 2004 22:40:32 -0000	1.9
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql	10 Sep 2004 19:16:31 -0000	1.10
@@ -6,18 +6,23 @@
 <fullquery name="evaluated_students">      
       <querytext>
 
-	select evaluation__party_name(ese.party_id,et.task_id) as party_name,
-	ese.party_id,
-	ese.grade,
+	select ese.party_id,
+	case when et.number_of_members = 1 then 
+	(select last_name||', '||first_names from persons where person_id = ese.party_id)
+	else  
+ 	(select group_name from groups where group_id = ese.party_id)
+	end as party_name,
+	round(ese.grade,2) as grade,
 	ese.last_modified as evaluation_date,
 	et.online_p,
 	et.due_date,
 	ese.evaluation_id
 	from evaluation_tasks et,
-	     evaluation_student_evalsi ese 
+	     evaluation_student_evalsi ese,
+	     cr_items cri
 	where et.task_id = :task_id
 	  and et.task_item_id = ese.task_item_id
-	  and content_revision__is_live(ese.evaluation_id) = true
+	  and cri.live_revision = ese.evaluation_id
         $orderby       
 	
       </querytext>
@@ -26,7 +31,11 @@
 <fullquery name="get_not_eval_wa">      
       <querytext>
 
-		select count(party_id) from evaluation_answers ea where ea.task_item_id = :task_item_id $processed_clause and content_revision__is_live(ea.answer_id) = true
+	select count(party_id) 
+	from evaluation_answers ea, cri_items cri
+	where ea.task_item_id = :task_item_id 
+	$processed_clause 
+	and cri.live_revision = ea.answer_id
 	
       </querytext>
 </fullquery>
@@ -55,10 +64,10 @@
 	    ea.revision_id,
 	    to_char(ea.creation_date, 'YYYY-MM-DD HH24:MI:SS') as submission_date_ansi,
 	    ea.last_modified as submission_date
-	    from evaluation_answersi ea 
+	    from evaluation_answersi ea, cr_items cri
             where ea.party_id = :party_id 
 	    and ea.task_item_id = :task_item_id
-	    and content_revision__is_live(ea.answer_id) = true
+	    and cri.live_revision = ea.answer_id
 	
       </querytext>
 </fullquery>
@@ -67,10 +76,10 @@
       <querytext>
 
 		select count(*) 
-		from evaluation_student_evals ese, evaluation_tasks et 
+		from evaluation_student_evals ese, evaluation_tasks et, cr_items cri
 		where ese.task_item_id = et.task_item_id
 		and et.task_id = :task_id 
-		and content_revision__is_live(ese.evaluation_id) = true
+		and cri.live_revision = ese.evaluation_id
 	
       </querytext>
 </fullquery>
@@ -86,7 +95,12 @@
 <fullquery name="get_not_evaluated_wa_students">      
       <querytext>
 
-	select evaluation__party_name(ea.party_id, :task_id) as party_name,
+	select ea.party_id,
+	case when et.number_of_members = 1 then 
+	(select last_name||', '||first_names from persons where person_id = ea.party_id)
+	else  
+ 	(select group_name from groups where group_id = ea.party_id)
+	end as party_name,
         ea.party_id,
 	ea.data as answer_data,
 	ea.title as answer_title,
@@ -102,7 +116,8 @@
           and ea.data is not null
           and cri.live_revision = ea.answer_id
         $processed_clause
-	
+	$orderby_wa
+
       </querytext>
 </fullquery>
 
@@ -118,24 +133,30 @@
 		to_char(et.due_date, 'YYYY-MM-DD HH24:MI:SS') as due_date_ansi,
 		et.number_of_members,
 		et.online_p
-		from evaluation_grades eg, evaluation_tasks et
+		from evaluation_grades eg, evaluation_tasks et, cr_items cri
 		where et.task_id = :task_id
 		  and et.grade_item_id = eg.grade_item_id
-		  and content_revision__is_live(eg.grade_id) = true
+		  and cri.live_revision = eg.grade_id
 	
       </querytext>
 </fullquery>
 
 <partialquery name="sql_query_groups">
 	  <querytext>         
-		select acs_group__name(etg.group_id) as party_name,
-		etg.group_id as party_id
-		from evaluation_task_groups etg, evaluation_tasks et
-        where etg.task_item_id = et.task_item_id
-		and et.task_id = :task_id
-		$not_in_clause
-		$orderby_na
+
+		select g.group_name as party_name,
+		g.group_id as party_id
+		from groups g, evaluation_task_groups etg, evaluation_tasks et,
+		acs_rels map
+		where g.group_id = etg.group_id
+		  and etg.group_id = map.object_id_one
+		  and map.rel_type = 'evaluation_task_group_rel'
+		  and etg.task_item_id = et.task_item_id
+	   	  and et.task_id = :task_id
+		  $not_in_clause
+		group by g.group_id, g.group_name
+
 	  </querytext>
 </partialquery>
 
-</queryset>
+</queryset>
\ No newline at end of file
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.8 -r1.9
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp	2 Aug 2004 18:06:32 -0000	1.8
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp	10 Sep 2004 19:16:31 -0000	1.9
@@ -24,15 +24,16 @@
 </td>
 </tr>
 <tr>
-	<th>@groups_admin;noquote@</th>
-	<td></td>
+	<td>@groups_admin;noquote@</td>
+	<td>@task_admin;noquote@</a></td>
 </tr>
 </table>
 
 <h2>#evaluation.lt_Evaluated_Students_to#</h2>
 <p>#evaluation.Theese#</p>
 <blockquote><listtemplate name="evaluated_students"></listtemplate></blockquote>
 <br />
+
 <h2>#evaluation.lt_Students_with_answers#</h2>
 <p>#evaluation.lt_These_are_the_student#</p>
 
@@ -124,6 +125,10 @@
 </blockquote>
 </if><else>
 <p>#evaluation.lt_There_are_no_students_1#</p>
+<if @number_of_members@ gt 0 and @total_processed@ eq 0>
+<p> #evaluation.lt_task_name_is_in_group# </p>
+</if>
 </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.13 -r1.14
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	24 Aug 2004 22:40:32 -0000	1.13
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	10 Sep 2004 19:16:31 -0000	1.14
@@ -18,23 +18,26 @@
 } 
 
 set user_id [ad_conn user_id]
-set page_title "[_ evaluation.Student_List_]"
-set context [list "[_ evaluation.Student_List_]"]
+db_1row get_task_info { *SQL* }
 
+set page_title "[_ evaluation.lt_Students_List_for_tas]"
+set context [list "[_ evaluation.lt_Students_List_for_tas]"]
+
 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 %r"]
+set return_url "[ad_conn url]?[ad_conn query]"
 
 if { $number_of_members > 1 } {
     set groups_admin "<a href=[export_vars -base ../groups/one-task { task_id }]>[_ evaluation.lt_Groups_administration]</a>"
 } else {
     set groups_admin ""
 }
+set task_admin "<a href=[export_vars -base ../tasks/task-add-edit { task_id grade_id return_url }]>[_ evaluation.lt_task_name_administrat]</a>"
 
 set done_students [list]
 set evaluation_mode "display"
@@ -45,7 +48,11 @@
 
 set actions [list "[_ evaluation.Edit_Evaluations_]" [export_vars -base "evaluations-edit" { task_id }]]
 
-set elements [list party_name \
+set elements [list count \
+		  [list label "" \
+		       display_template { @evaluated_students.rownum@. } \
+		       ] \
+		  party_name \
 		  [list label "[_ evaluation.Name_]" \
 		       orderby_asc {party_name asc} \
 		       orderby_desc {party_name desc} \
@@ -112,18 +119,18 @@
 } 
 
 set total_evaluated 0
-db_multirow -extend { action action_url submission_date_pretty } evaluated_students evaluated_students { *SQL* } {
+db_multirow -extend { action action_url submission_date_pretty count } evaluated_students evaluated_students { *SQL* } {
     
     incr total_evaluated
     lappend done_students $party_id
-    set grade [format %.2f [lc_numeric $grade]]
+    set grade [lc_numeric $grade]
     
     if { [string eq $online_p "t"] } {
 	if { [db_0or1row get_answer_info { *SQL* }] } {
 	    # working with answer stuff (if it has a file/url attached)
 	    if { [empty_string_p $answer_data] } {
 		set action "[_ evaluation.No_response_]"
-	    } elseif { [regexp "http://" $answer_data] } {
+	    } elseif { [string eq $answer_title "link"] } {
 		set action_url "[export_vars -base "$answer_data" { }]"
 		set action "[_ evaluation.View_answer_]"
 	    } else {
@@ -222,21 +229,18 @@
     }
 
     lappend done_students $party_id
-    if { [string eq $online_p "t"] } {
-	set submission_date_pretty  "[lc_time_fmt $submission_date_ansi "%q %r"]"
-	if { [db_string compare_submission_date { *SQL* } -default 0] } {
-	    set submission_date_pretty "[_ evaluation.lt_submission_date_prett_1]"
-	} else {
-	}
-	set answer "[_ evaluation.View_answer_]"
-	# working with answer stuff (if it has a file/url attached)
-	if { [regexp "http://" $answer_data] } {
-	    set answer_url [export_vars -base "$answer_data" { }]
-	} else {
-	    # we assume it's a file
-	    set answer_url [export_vars -base "../../view/$answer_title" { revision_id }]
-	}
+    set submission_date_pretty  "[lc_time_fmt $submission_date_ansi "%q %r"]"
+    if { [db_string compare_submission_date { *SQL* } -default 0] } {
+	set submission_date_pretty "[_ evaluation.lt_submission_date_prett_1]"
     } 
+    set answer "[_ evaluation.View_answer_]"
+    # working with answer stuff (if it has a file/url attached)
+    if { [string eq $answer_title "link"] } {
+	set answer_url [export_vars -base "$answer_data" { }]
+    } else {
+	# we assume it's a file
+	set answer_url [export_vars -base "../../view/$answer_title" { revision_id }]
+    }
 }
 
 #
@@ -295,9 +299,9 @@
 } else {
     set community_id [dotlrn_community::get_community_id]
     if { [llength $done_students] > 0 } {
-	set not_in_clause [db_map not_yet_in_clause]
+	set not_in_clause [db_map not_yet_in_clause_non_empty]
     } else {
-	set not_in_clause [db_map not_yet_in_clause]
+	set not_in_clause [db_map not_yet_in_clause_empty]
     }
 
     # if this page is called from within a community (dotlrn) we have to show only the students
@@ -326,6 +330,8 @@
     }
 }
 
+set total_processed [llength $done_students]
+
 set grades_sheet_item_id [db_nextval acs_object_id_seq]
 
 
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql	24 Aug 2004 22:40:32 -0000	1.8
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql	10 Sep 2004 19:16:31 -0000	1.9
@@ -27,13 +27,13 @@
       </querytext>
 </fullquery>
 
-<partialquery name="not_yet_in_clause">
+<partialquery name="not_yet_in_clause_non_empty">
 	  <querytext>         
 		where p.person_id not in ([join $done_students ","])
 	  </querytext>
 </partialquery>
 
-<partialquery name="not_yet_in_clause">
+<partialquery name="not_yet_in_clause_empty">
 	  <querytext>         
  
       , cc_users cu 
@@ -68,16 +68,18 @@
 
 <partialquery name="sql_query_individual">
 	  <querytext>         
+
 		select p.person_id as party_id,
 		p.last_name||', '||p.first_names as party_name
 		from persons p 
 		$not_in_clause
-		$orderby_na
+
 	  </querytext>
 </partialquery>
 
 <partialquery name="sql_query_community_individual">
 	  <querytext>         
+
             select app.user_id as party_id,
   		   p.last_name||', '||p.first_names as party_name
             from dotlrn_member_rels_approved app,
@@ -86,14 +88,15 @@
 	      and app.community_id = :community_id
 	      and app.user_id = p.person_id
 	      and app.role = 'student'
-	      $orderby_na
+
 	  </querytext>
 </partialquery>
 
 <fullquery name="get_not_evaluated_na_students">      
       <querytext>
 
 		$sql_query
+		$orderby_na
 	
       </querytext>
 </fullquery>
Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl	10 Jun 2004 21:08:54 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl	10 Sep 2004 19:16:32 -0000	1.3
@@ -9,22 +9,29 @@
 } {
     grade_id:integer,notnull
     return_url
-	operation
+    operation
 } 
 
 if { [string eq $operation "[_ evaluation.lt_Yes_I_really_want_to__1]"] } {
     db_transaction {
 
-		db_exec_plsql delete_grade { *SQL* }		
-		
+	# calendar integration (begin)
+	db_foreach cal_map { *SQL* } {
+	    db_dml delete_mapping { *SQL* }
+	    calendar::item::delete -cal_item_id $cal_item_id
+	}
+	# calendar integration (end)
+
+	db_exec_plsql delete_grade { *SQL* }		
+	
     } on_error {
-		ad_return_error "[_ evaluation.lt_Error_deleting_the_gr]" "[_ evaluation.lt_We_got_the_following__1]"
-		ad_script_abort
+	ad_return_error "[_ evaluation.lt_Error_deleting_the_gr]" "[_ evaluation.lt_We_got_the_following__1]"
+	ad_script_abort
     }
 } else {
     if { [empty_string_p $return_url] } {
-		# redirect to the index page by default
-		set return_url "grades"
+	# redirect to the index page by default
+	set return_url "grades"
     }
 }
 
Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.xql	10 Sep 2004 19:16:32 -0000	1.1
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+
+<fullquery name="cal_map">      
+      <querytext>
+
+	    select map.cal_item_id
+	    from evaluation_tasks et,
+	    evaluation_grades eg,
+	    evaluation_cal_task_map map
+	    where eg.grade_id = :grade_id
+	    and et.grade_item_id = eg.grade_item_id
+	    and et.task_item_id = map.task_item_id
+	
+      </querytext>
+</fullquery>
+
+<fullquery name="delete_mapping">      
+      <querytext>
+
+		delete from evaluation_cal_task_map where cal_item_id = :cal_item_id
+	    
+      </querytext>
+</fullquery>
+
+
+</queryset>
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.7 -r1.8
--- openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.7
+++ openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql	10 Sep 2004 19:16:32 -0000	1.8
@@ -7,9 +7,9 @@
       <querytext>
 
 		select count(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
+          from evaluation_grades eg, acs_objects ao, cr_items cri 
+          where cri.live_revision = eg.grade_id
+          and eg.grade_item_id = ao.object_id
    		  and ao.context_id = [ad_conn package_id]
 
       </querytext>
@@ -21,9 +21,9 @@
 	    select eg.grade_id, 
 		eg.grade_plural_name,
 		eg.weight
-   	    from evaluation_gradesx eg, acs_objects ao
-		where content_revision__is_live(eg.grade_id) = true
-          and eg.item_id = ao.object_id
+   	    from evaluation_grades eg, acs_objects ao, cr_items cri
+		where cri.live_revision = eg.grade_id
+          and eg.grade_item_id = ao.object_id
    		  and ao.context_id = :package_id
 	    order by grade_plural_name
 
@@ -33,15 +33,67 @@
 <partialquery name="grade_total_grade">
 	  <querytext>         
 
-	, [lc_numeric trunc(evaluation__grade_total_grade(cu.user_id,$grade_id),2)] as grade_$grade_id 
+	, round((select coalesce((select sum((ese.grade*et.weight*eg.weight)/10000) 
+        from   evaluation_grades eg, evaluation_tasks et, evaluation_student_evals ese
+        where et.task_item_id = ese.task_item_id 
+		  and et.grade_item_id = eg.grade_item_id 
+          and eg.grade_id = $grade_id 
+   		  and ese.party_id =  
+	( select 
+	CASE  
+	  WHEN et3.number_of_members = 1 THEN cu.user_id 
+	  ELSE  
+	(select etg2.group_id from evaluation_task_groups etg2, 
+                                                      evaluation_tasks et2, 
+                                                      acs_rels map 
+                                                      where map.object_id_one = etg2.group_id 
+                                                        and map.object_id_two = cu.user_id 
+                                                        and etg2.task_item_id = et2.task_item_id 
+                                                        and et2.task_id = et.task_id) 
+	END as nom 
+               from evaluation_tasks et3 
+              where et3.task_id = et.task_id 
+	) 
+	and et.requires_grade_p = 't'
+	and exists (select 1 from cr_items where live_revision = et.task_id) 
+	and exists (select 1 from cr_items where live_revision = ese.evaluation_id)),0)),2) as grade_${grade_id}
+ 
+--	, [lc_numeric trunc(evaluation__grade_total_grade(cu.user_id,$grade_id),2)] as grade_$grade_id 
 
 	  </querytext>
 </partialquery>
 
 <partialquery name="class_total_grade">
 	  <querytext>         
 
-	, [lc_numeric trunc(evaluation__class_total_grade(cu.user_id,$package_id),2)] as total_grade 
+	, round(coalesce((select sum(ese.grade*et.weight*eg.weight/10000)
+        from evaluation_grades eg, evaluation_tasks et, evaluation_student_evals ese, acs_objects ao,
+	cr_items cri1, cr_items cri2, cr_items cri3 
+        where et.task_item_id = ese.task_item_id 
+		  and et.grade_item_id = eg.grade_item_id 
+          and eg.grade_item_id = ao.object_id 
+   		  and ao.context_id = $package_id 
+   		  and ese.party_id = 
+	( select 
+	CASE  
+	  WHEN et3.number_of_members = 1 THEN cu.user_id 
+	  ELSE 
+	(select etg2.group_id from evaluation_task_groups etg2, 
+                                                     evaluation_tasks et2, 
+                                                      acs_rels map 
+                                                      where map.object_id_one = etg2.group_id 
+                                                        and map.object_id_two = cu.user_id 
+                                                        and etg2.task_item_id = et2.task_item_id 
+                                                        and et2.task_id = et.task_id) 
+	END as nom 
+               from evaluation_tasks et3 
+              where et3.task_id = et.task_id 
+	) 
+	and cri1.live_revision = eg.grade_id
+	and cri2.live_revision = et.task_id
+	and cri3.live_revision = ese.evaluation_id),0),2) as total_grade
+--	, 1 as total_grade
+--	, [lc_numeric trunc(evaluation__class_total_grade(cu.user_id,$package_id),2)] as total_grade 
 
 	  </querytext>
 </partialquery>
@@ -65,10 +117,8 @@
 	cu.user_id
 	$sql_query
     from cc_users cu,
-	registered_users ru,
         dotlrn_member_rels_approved app
     where app.community_id = :community_id
-      and app.user_id = ru.user_id
       and app.user_id = cu.person_id
       and app.role = 'student'		
     $orderby
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.7 -r1.8
--- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports-postgresql.xql	13 Aug 2004 17:09:55 -0000	1.7
+++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports-postgresql.xql	10 Sep 2004 19:16:32 -0000	1.8
@@ -7,8 +7,8 @@
 	    select et.task_id, 
 		et.task_name,
 		et.weight
-   	    from evaluation_tasksi et, evaluation_grades eg
-		where content_revision__is_live(et.task_id) = true
+   	    from evaluation_tasksi et, evaluation_grades eg, cr_items cri
+		where cri.live_revision = et.task_id
    		  and eg.grade_id = :grade_id
 	          and eg.grade_item_id = et.grade_item_id
 	    order by task_name
@@ -35,10 +35,8 @@
 		cu.user_id
 		$sql_query
    	 	from cc_users cu,
-		registered_users ru,
 	        dotlrn_member_rels_approved app
 	    where app.community_id = :community_id
-	      and app.user_id = ru.user_id
 	      and app.user_id = cu.person_id
 	      and app.role = 'student'		
 		$orderby
@@ -49,16 +47,67 @@
 <partialquery name="task_grade">
 	  <querytext>         
 
-	, [lc_numeric trunc(evaluation__task_grade(cu.user_id,$task_id),2)] as task_$task_id 
+	, round((select coalesce((select (ese.grade*et.weight*eg.weight)/10000
+	from evaluation_student_evals ese, evaluation_tasks et, evaluation_grades eg,
+	cr_items cri1, cr_items cri2
+	where party_id = 
+	( select 
+	CASE  
+	  WHEN et3.number_of_members = 1 THEN cu.user_id 
+	  ELSE 
+	(select etg2.group_id from evaluation_task_groups etg2, 
+                                                     evaluation_tasks et2, 
+                                                      acs_rels map 
+                                                      where map.object_id_one = etg2.group_id 
+                                                        and map.object_id_two = cu.user_id 
+                                                        and etg2.task_item_id = et2.task_item_id 
+                                                        and et2.task_id = et.task_id) 
+	END as nom 
+               from evaluation_tasks et3 
+              where et3.task_id = et.task_id 
+	) 
+	  and et.task_id = $task_id
+	  and ese.task_item_id = et.task_item_id
+	  and et.grade_item_id = eg.grade_item_id
+	  and cri1.live_revision = ese.evaluation_id
+	  and cri2.live_revision = eg.grade_id),0)),2) as task_${task_id}
 
+--	, [lc_numeric trunc(evaluation__task_grade(cu.user_id,$task_id),2)] as task_$task_id 
+
 	  </querytext>
 </partialquery>
 
 <partialquery name="grade_total_grade">
 	  <querytext>         
 
-	, [lc_numeric trunc(evaluation__grade_total_grade(cu.user_id,:grade_id),2)] as total_grade 
+	, round((select coalesce((select sum((ese.grade*et.weight*eg.weight)/10000) 
+        from   evaluation_grades eg, evaluation_tasks et, evaluation_student_evals ese
+        where et.task_item_id = ese.task_item_id 
+		  and et.grade_item_id = eg.grade_item_id 
+          and eg.grade_id = $grade_id 
+   		  and ese.party_id =  
+	( select 
+	CASE  
+	  WHEN et3.number_of_members = 1 THEN cu.user_id 
+	  ELSE  
+	(select etg2.group_id from evaluation_task_groups etg2, 
+                                                      evaluation_tasks et2, 
+                                                      acs_rels map 
+                                                     where map.object_id_one = etg2.group_id 
+                                                        and map.object_id_two = cu.user_id 
+                                                        and etg2.task_item_id = et2.task_item_id 
+                                                        and et2.task_id = et.task_id) 
+	END as nom 
+               from evaluation_tasks et3 
+              where et3.task_id = et.task_id 
+	) 
+	and et.requires_grade_p = 't'
+	and exists (select 1 from cr_items where live_revision = et.task_id) 
+	and exists (select 1 from cr_items where live_revision = ese.evaluation_id)),0)),2) as total_grade
 
+-- , 1 as total_grade
+--	, [lc_numeric trunc(evaluation__grade_total_grade(cu.user_id,:grade_id),2)] as total_grade 
+
 	  </querytext>
 </partialquery>
 
Index: openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql	7 Jul 2004 17:26:45 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql	10 Sep 2004 19:16:32 -0000	1.3
@@ -8,8 +8,8 @@
 
 		select eg.grade_plural_name,
 		eg.grade_id
-   	 	from evaluation_gradesx eg, acs_objects ao
-		where content_revision__is_live(eg.grade_id) = true
+   	 	from evaluation_gradesx eg, acs_objects ao, cr_items cri
+		where cri.live_revision = eg.grade_id
           and eg.item_id = ao.object_id
    		  and ao.context_id = :package_id
 		order by grade_plural_name desc
@@ -32,8 +32,35 @@
 <fullquery name="get_total_grade">      
       <querytext>
 
-	select evaluation__class_total_grade(:student_id,:package_id)
+        select coalesce(sum((ese.grade*et.weight*eg.weight)/10000),0) as grade
+        from evaluation_grades eg, evaluation_tasks et, evaluation_student_evals ese, acs_objects ao
+        where et.task_item_id = ese.task_item_id
+		  and et.grade_item_id = eg.grade_item_id
+          and eg.grade_item_id = ao.object_id
+   		  and ao.context_id = :package_id
+   		  and ese.party_id = 
+	( select
+	CASE 
+	  WHEN et3.number_of_members = 1 THEN :student_id
+	  ELSE 
+	(select etg2.group_id from evaluation_task_groups etg2,
+                                                      evaluation_tasks et2,
+                                                      acs_rels map
+                                                      where map.object_id_one = etg2.group_id
+                                                        and map.object_id_two = :student_id
+                                                        and etg2.task_item_id = et2.task_item_id
+                                                        and et2.task_id = et.task_id)
+	END as nom
+               from evaluation_tasks et3
+              where et3.task_id = et.task_id
+	)
+	and et.requires_grade_p = 't'
+	and exists (select 1 from cr_items where live_revision = eg.grade_id)
+	and exists (select 1 from cr_items where live_revision = et.task_id)
+	and exists (select 1 from cr_items where live_revision = ese.evaluation_id)
 
+--	select evaluation__class_total_grade(:student_id,:package_id)
+
       </querytext>
 </fullquery>
 
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 -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp	15 Jun 2004 23:20:29 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp	10 Sep 2004 19:16:32 -0000	1.2
@@ -20,7 +20,7 @@
 	<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>
+<h2>#evaluation.lt_TOTAL_GRADE_total_cla# / @max_possible_grade@ </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 -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl	24 Aug 2004 22:40:33 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl	10 Sep 2004 19:16:32 -0000	1.3
@@ -29,5 +29,19 @@
 }
 
 set total_class_grade [format %.2f [lc_numeric [db_string get_total_grade { *SQL* }]]]
+set max_possible_grade [format %.2f [lc_numeric [db_string max_possible_grade {
+    select sum(et.weight*eg.weight/100)
+    from evaluation_tasks et,
+    evaluation_grades eg,
+    cr_items cri1,
+    cr_items cri2,
+    acs_objects ao
+    where et.grade_item_id = eg.grade_item_id
+    and cri1.live_revision = eg.grade_id
+    and cri2.live_revision = et.task_id
+    and et.requires_grade_p = 't'
+    and ao.object_id = eg.grade_item_id
+    and ao.context_id = :package_id
+}]]]
 
 ad_return_template
Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-postgresql.xql	30 Jul 2004 22:50:11 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-postgresql.xql	10 Sep 2004 19:16:32 -0000	1.4
@@ -6,9 +6,11 @@
 <fullquery name="get_groups_for_task">      
       <querytext>
 
-	select count(*) 
-	from evaluation_task_groups etg, evaluation_tasks et
-	where etg.task_item_id = et.task_item_id 
+	select count(*)
+	from evaluation_task_groups etg, evaluation_tasks et, acs_rels map
+	where etg.task_item_id = et.task_item_id
+          and map.rel_type = 'evaluation_task_group_rel'
+          and map.object_id_one = etg.group_id
 	  and et.task_id = :task_id
 
       </querytext>
@@ -44,14 +46,23 @@
 									 null,
 									 'evaluation_task_group_rel',
 									 :new_evaluation_group_id,
-									 map.object_id_two,
+									 :new_member_id,
 									 :package_id,
 									 :creation_user_id,
 									 :creation_ip
-									 )
-               from acs_rels map where map.object_id_one = :from_evaluation_group_id;
+									 );
 	
       </querytext>
 </fullquery>
 
+<fullquery name="from_rel">      
+      <querytext>
+
+	    select map.object_id_two as new_member_id
+	    from acs_rels map 
+	    where map.object_id_one = :from_evaluation_group_id
+
+      </querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl	30 Jul 2004 22:50:11 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl	10 Sep 2004 19:16:32 -0000	1.4
@@ -31,7 +31,9 @@
 		
 		evaluation::new_evaluation_group -group_id $new_evaluation_group_id -group_name $group_name -task_item_id $task_item_id -context $package_id
 
-		db_exec_plsql evaluation_relationship_new { *SQL* }
+		db_foreach from_rel { *SQL* }  {
+		    db_exec_plsql evaluation_relationship_new { *SQL* }
+		}
 
 	}
 } on_error { 
Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/groups/group-reuse-postgresql.xql	30 Jul 2004 22:50:11 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/groups/group-reuse-postgresql.xql	10 Sep 2004 19:16:32 -0000	1.5
@@ -9,12 +9,13 @@
 	select et.task_name, et.number_of_members,
     et.task_id as from_task_id,
     eg.grade_plural_name
-	from evaluation_tasksi et, evaluation_gradesi eg
-	where content_revision__is_live(et.task_id) = true 
-      and et.number_of_members > 1
+	from evaluation_tasks et, evaluation_grades eg, acs_objects ao, cr_items cri1, cr_items cri2
+	where et.number_of_members > 1
       and et.grade_item_id = eg.grade_item_id
-      and content_revision__is_live(eg.grade_id) = true 
-      and content_revision__is_live(et.task_id) = true
+      and cri1.live_revision = eg.grade_id
+      and cri2.live_revision = et.task_id
+      and ao.object_id = eg.grade_item_id
+      and ao.context_id = :package_id
       and et.task_id <> :task_id
       $orderby
 	
Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl	10 Jun 2004 21:08:54 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl	10 Sep 2004 19:16:32 -0000	1.6
@@ -11,6 +11,7 @@
 	{orderby:optional}
 }
 
+set package_id [ad_conn package_id]
 set page_title "[_ evaluation.Reuse_Groups_]"
 set context [list [list "[export_vars -base one-task { task_id }]" "[_ evaluation.Task_Groups_]"] "[_ evaluation.Reuse_Groups_]"]
 
Index: openacs-4/packages/evaluation/www/admin/groups/one-task.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/admin/groups/one-task.adp	30 Jul 2004 22:50:11 -0000	1.6
+++ openacs-4/packages/evaluation/www/admin/groups/one-task.adp	10 Sep 2004 19:16:32 -0000	1.7
@@ -15,7 +15,7 @@
 		<td align=right>@reuse_link;noquote@</td>
 		</tr>
 	</table>
-	<form action="group-new"
+	<form action="group-new">
 	<input type=hidden name=task_id value="@task_id@">
 	<blockquote>
 	<table>
Index: openacs-4/packages/evaluation/www/admin/groups/one-task.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/admin/groups/one-task.xql	30 Aug 2004 11:31:24 -0000	1.6
+++ openacs-4/packages/evaluation/www/admin/groups/one-task.xql	10 Sep 2004 19:16:32 -0000	1.7
@@ -90,115 +90,14 @@
 <fullquery name="get_groups_for_task">      
       <querytext>
 
-		select count(*) from evaluation_task_groups etg, evaluation_tasks et
-		where et.task_id = :task_id
-		  and et.task_item_id = etg.task_item_id
-		  and etg.task_item_id = :task_item_id
+	select count(*)
+	from evaluation_task_groups etg, evaluation_tasks et, acs_rels map
+	where etg.task_item_id = et.task_item_id
+          and map.rel_type = 'evaluation_task_group_rel'
+          and map.object_id_one = etg.group_id
+	  and et.task_id = :task_id
 	
       </querytext>
 </fullquery>
 
 </queryset>
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
-
-<fullquery name="get_number_of_members">      
-      <querytext>
-
-		select task_name, number_of_members from evaluation_tasks where task_id = :task_id
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="get_info">      
-      <querytext>
-
-		select task_name, number_of_members as n_of_members, task_item_id from evaluation_tasks where task_id = :task_id
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="get_students_without_group">      
-      <querytext>
-
-		select p.last_name ||', '|| p.first_names as student_name,
-		p.person_id as student_id
-		from cc_users p
-		where p.person_id not in (select map.object_id_two from acs_rels map, evaluation_task_groups etg, evaluation_tasks et
-							  where map.object_id_two = p.person_id
-							  and map.object_id_one = etg.group_id
-							  and etg.task_item_id = :task_item_id
-							  and etg.task_item_id = et.task_item_id
-							  and et.task_id = :task_id
-							  and map.rel_type = 'evaluation_task_group_rel')
-		$orderby
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="community_get_students_without_group">      
-      <querytext>
-
-		select p.last_name ||', '|| p.first_names as student_name,
-		p.person_id as student_id
-		from cc_users p,
-		registered_users ru,
-                dotlrn_member_rels_approved app
-		where p.person_id not in (select map.object_id_two from acs_rels map, evaluation_task_groups etg, evaluation_tasks et
-							  where map.object_id_two = p.person_id
-							  and map.object_id_one = etg.group_id
-							  and etg.task_item_id = :task_item_id
-							  and etg.task_item_id = et.task_item_id
-							  and et.task_id = :task_id
-							  and map.rel_type = 'evaluation_task_group_rel')
-	        and app.community_id = :community_id
-                and app.user_id = ru.user_id
-	        and app.user_id = p.person_id
-	        and app.role = 'student'		
-		$orderby
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="get_task_groups">      
-      <querytext>
-
-		select g.group_id as evaluation_group_id, g.group_name,
-		count(map.object_id_two) as number_of_members
-		from groups g, evaluation_task_groups etg, evaluation_tasks et,
-		acs_rels map
-		where g.group_id = etg.group_id
-		  and etg.group_id = map.object_id_one
-		  and map.rel_type = 'evaluation_task_group_rel'
-		  and etg.task_item_id = :task_item_id
-	   	  and et.task_id = :task_id
-		group by g.group_id, g.group_name
-   		$orderby_groups
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="get_group_members">      
-      <querytext>
-
-		select p.last_name||', '||p.first_names from cc_users p, acs_rels map
-                                            where p.person_id = map.object_id_two
-                                              and map.object_id_one = :evaluation_group_id
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="get_groups_for_task">      
-      <querytext>
-
-		select count(*) from evaluation_task_groups etg, evaluation_tasks et
-		where et.task_id = :task_id
-		  and et.task_item_id = etg.task_item_id
-		  and etg.task_item_id = :task_item_id
-	
-      </querytext>
-</fullquery>
-
-</queryset>
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.9 -r1.10
--- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl	24 Aug 2004 22:40:33 -0000	1.9
+++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl	10 Sep 2004 19:16:33 -0000	1.10
@@ -42,7 +42,7 @@
 
     db_1row get_sol_info { *SQL* }
     
-    if { [string eq $storage_type "lob"] } {
+    if { [string eq $storage_type "lob"] || [string eq $storage_type "file"] } {
 
 	if { [string eq $solution_mode "edit"] } {
 	    set attached_p "t"
@@ -184,7 +184,12 @@
 		
 		set title [template::util::file::get_property filename $upload_file]
 		set mime_type [cr_filename_to_mime_type -create $title]
-		set storage_type lob
+
+		if { [parameter::get -parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]] } {
+		    set storage_type file
+		} else {
+		    set storage_type lob
+		}
 		
 	    }  elseif { ![string eq $url "http://"] } {
 		set mime_type "text/plain"
@@ -210,19 +215,28 @@
 	    if { ![empty_string_p $upload_file] }  {
 		
 		set tmp_file [template::util::file::get_property tmp_filename $upload_file]
-		
-		# create the new item
-		db_dml lob_content { *SQL* } -blob_files [list $tmp_file]
-		
 		set content_length [file size $tmp_file]
-		# Unfortunately, we can only calculate the file size after the lob is uploaded 
-		db_dml lob_size { *SQL* }
 		
+		if { [parameter::get -parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]] } {
+		    # create the new item
+		    
+		    set filename [cr_create_content_file $item_id $revision_id $tmp_file]
+		    db_dml set_file_content { *SQL* }
+		    
+		} else {
+
+		    # create the new item
+		    db_dml lob_content { *SQL* } -blob_files [list $tmp_file]
+		    
+		    # Unfortunately, we can only calculate the file size after the lob is uploaded 
+		    db_dml lob_size { *SQL* }
+		}
+		
 	    } elseif { ![string eq $url "http://"] } {
 		
 		db_dml link_content { *SQL* }
 		set content_length [string length $url] 
-		db_dml lob_size { *SQL* }
+		db_dml content_size { *SQL* }
 		
 	    } elseif { [string eq $attached_p "t"] && ![string eq $unattach_p "t"] } {
 		# just copy the old content to the new revision
Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.xql	12 Aug 2004 17:46:42 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.xql	10 Sep 2004 19:16:33 -0000	1.5
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="solution_info">      
       <querytext>
@@ -24,6 +23,28 @@
      </querytext>
 </fullquery>
 
+<fullquery name="content_size">      
+      <querytext>
+
+	update cr_revisions
+ 	set content_length = :content_length
+	where revision_id = :revision_id
+
+     </querytext>
+</fullquery>
+
+<fullquery name="set_file_content">      
+      <querytext>
+
+		update cr_revisions
+		set content = :filename,
+		mime_type = :mime_type,
+		content_length = :content_length
+		where revision_id = :revision_id
+			
+      </querytext>
+</fullquery>
+
 <fullquery name="lob_content">      
       <querytext>
 
Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql	17 Aug 2004 01:10:53 -0000	1.8
+++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql	10 Sep 2004 19:16:33 -0000	1.9
@@ -79,6 +79,16 @@
      </querytext>
 </fullquery>
 
+<fullquery name="content_size">      
+      <querytext>
+
+	update cr_revisions
+ 	set content_length = :content_length
+	where revision_id = :revision_id
+
+     </querytext>
+</fullquery>
+
 <fullquery name="copy_content">      
       <querytext>
 
Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl	17 Aug 2004 01:10:54 -0000	1.16
+++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl	10 Sep 2004 19:16:33 -0000	1.17
@@ -56,7 +56,7 @@
 
     db_1row get_task_info { *SQL* }
     
-    if { [string eq $storage_type "lob"] } {
+    if { [string eq $storage_type "lob"] || [string eq $storage_type "file"] } {
 
 	if { [string eq $mode "edit"] } {
 	    set attached_p "t"
@@ -268,6 +268,10 @@
 	{ [string eq [format %.2f $weight] 0.00] || ([empty_string_p $weight] && [string eq $requires_grade_p f]) || (($weight > 0) && ([string eq [format %.2f $net_value] 0.00] || [empty_string_p $net_value])) }
 	{ [_ evaluation.lt_The_weight_must_be_gr] }
     }
+    {number_of_members
+	{ $number_of_members >= 1 }
+	{ [_ evaluation.lt_The_number_of_members]}
+    }
 } -new_data {
     
     evaluation::notification::do_notification -task_id $revision_id -package_id [ad_conn package_id] -edit_p 0 -notif_type one_assignment_notif
@@ -299,7 +303,11 @@
 	    set title [template::util::file::get_property filename $upload_file]
 	    set mime_type [cr_filename_to_mime_type -create $title]
 	    
-	    set storage_type lob
+	    if { [parameter::get -parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]] } {
+		set storage_type file
+	    } else {
+		set storage_type lob
+	    }
 	} elseif { ![string eq $url "http://"] } {
 	    set mime_type "text/plain"
 	    set title "link"
@@ -328,25 +336,54 @@
 	if { ![empty_string_p $upload_file] }  {
 	    
 	    set tmp_file [template::util::file::get_property tmp_filename $upload_file]
-	    
-	    # create the new item
-	    db_dml lob_content { *SQL* } -blob_files [list $tmp_file]
-	    
 	    set content_length [file size $tmp_file]
-	    # Unfortunately, we can only calculate the file size after the lob is uploaded 
-	    db_dml lob_size { *SQL* }
 	    
+	    if { [parameter::get -parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]] } {
+		# create the new item
+
+		set filename [cr_create_content_file $item_id $revision_id $tmp_file]
+                db_dml set_file_content { *SQL* }
+
+	    } else {
+		# create the new item
+		db_dml lob_content { *SQL* } -blob_files [list $tmp_file]
+		
+		# Unfortunately, we can only calculate the file size after the lob is uploaded 
+		db_dml lob_size { *SQL* }
+	    }
+	    
 	} elseif { ![string eq $url "http://"] } {
 	    
 	    db_dml link_content { *SQL* }
 	    set content_length [string length $url]
-	    db_dml lob_size { *SQL* }
+	    db_dml content_size { *SQL* }
 	    
 	} elseif { [string eq $attached_p "t"] && ![string eq $unattach_p "t"] } {
 
 	    # just copy the old content to the new revision
 	    db_exec_plsql copy_content { *SQL* }
 	}	
+	
+	# integration with calendar
+	# since there is no service contract defined
+
+	set desc_url "<a href=\"$return_url\">[_ evaluation.lt_Click_here_to_go_to_t]</a>"
+
+	set url [dotlrn_community::get_community_url $community_id]
+	
+	array set community_info [site_node::get -url "${url}calendar"]
+	set community_package_id $community_info(package_id)
+	set calendar_id [db_string get_cal_id { *SQL* }]
+
+	if { ![db_0or1row calendar_mappings { *SQL* }] } {
+	    # create cal_item
+	    set cal_item_id [calendar::item::new -start_date $due_date -end_date $due_date -name "[_ evaluation.Due_date_task_name]" -description $desc_url -calendar_id $calendar_id]
+	    db_dml insert_cal_mapping { *SQL* }
+	} else {
+	    # edit previous cal_item
+	    calendar::item::edit -cal_item_id $cal_item_id -start_date $due_date -end_date $due_date -name "[_ evaluation.Due_date_task_name]" -description $desc_url -calendar_id $calendar_id
+	}
+
     }
 } -after_submit {
     set redirect_to_groups_p 0
Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl	30 Jul 2004 22:50:11 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl	10 Sep 2004 19:16:33 -0000	1.4
@@ -8,24 +8,33 @@
     @cvs-id $Id$
 } {
     task_id:integer,notnull
-	grade_id:integer,notnull
-	operation
-	return_url
+    grade_id:integer,notnull
+    operation
+    return_url
 } 
 
 if { [string eq $operation [_ evaluation.lt_Yes_I_really_want_to__3]] } {
+
     db_transaction {
 
-		db_exec_plsql delete_task { *SQL* }		
-		
+	# calendar integration (begin)
+	db_1row get_item_id { *SQL* }
+	db_foreach cal_map { *SQL* } {
+	    db_dml delete_mapping { *SQL* }
+	    calendar::item::delete -cal_item_id $cal_item_id
+	}
+	# calendar integration (end)
+
+	db_exec_plsql delete_task { *SQL* }		
+	
     } on_error {
-		ad_return_error "[_ evaluation.lt_Error_deleting_the_ta]" "[_ evaluation.lt_We_got_the_following__2]"
-		ad_script_abort
+	ad_return_error "[_ evaluation.lt_Error_deleting_the_ta]" "[_ evaluation.lt_We_got_the_following__2]"
+	ad_script_abort
     }
 } else {
     if { [empty_string_p $return_url] } {
-		# redirect to the index page by default
-		set return_url "$return_url"
+	# redirect to the index page by default
+	set return_url "$return_url"
     }
 }
 
Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.xql	10 Sep 2004 19:16:33 -0000	1.1
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+
+<fullquery name="get_item_id">      
+      <querytext>
+
+	    select task_item_id
+	    from evaluation_tasks
+	    where task_id = :task_id
+	
+      </querytext>
+</fullquery>
+
+<fullquery name="cal_map">      
+      <querytext>
+
+	   select cal_item_id
+	   from evaluation_cal_task_map
+	   where task_item_id = :task_item_id
+	
+      </querytext>
+</fullquery>
+
+<fullquery name="delete_mapping">      
+      <querytext>
+
+	delete from evaluation_cal_task_map where cal_item_id = :cal_item_id
+	    
+      </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/evaluation/www/view/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/index.vuh,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/view/index.vuh	14 Jul 2004 17:42:07 -0000	1.3
+++ openacs-4/packages/evaluation/www/view/index.vuh	10 Sep 2004 19:16:34 -0000	1.4
@@ -22,7 +22,7 @@
 set template_root ""
 
 # Serve the page
-ns_log Notice "url $the_url the_root $content_root !!\n"
+
 if { [content::init the_url the_root $content_root $template_root public $revision_id $content_type] } {
   set file "$the_root/$the_url"
   rp_internal_redirect -absolute_path $file