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.15 -r1.16
--- openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml	27 Oct 2004 01:09:02 -0000	1.15
+++ openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml	21 Mar 2005 15:42:00 -0000	1.16
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="evaluation" package_version="0.3d" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="evaluation" package_version="1.0d" locale="en_US" charset="ISO-8859-1">
 
   <msg key="1__Individual_">1 = Individual </msg>
   <msg key="Add_Assignment_">Add Assignment </msg>
@@ -31,51 +31,6 @@
   <msg key="Audit_info_">Audit info </msg>
   <msg key="Audit_Info__1">Audit Info </msg>
   <msg key="Audit_info_for_task_">Audit info for task </msg>
-  <msg key="Back">#&gt;&quot; onClick=&quot;history.go(-1)&quot;&gt;
-    &lt;/form&gt;
-&lt;/if&gt;
-
-&lt;if %evaluations_na:rowcount% gt 0&gt;
-   &lt;form action=&quot;evaluate-students-2&quot; method+&quot;post&quot;&gt;
-	@export_vars;noquote@
-      &lt;input type=hidden name=task_id value=&quot;%task_id%&quot;&gt;
-      &lt;input type=hidden name=max_grade value=&quot;%max_grade%&quot;&gt;
-		&lt;blockquote&gt;
-        &lt;table&gt;
-          &lt;multiple name=&quot;evaluations_na&quot;&gt;
-                &lt;if %evaluations_na.rownum% odd&gt;&lt;table bgcolor=&quot;#EAF2FF&quot;&gt;&lt;/if&gt;&lt;else&gt;&lt;table bgcolor=&quot;white&quot;&gt;&lt;/else&gt;
-						&lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Name#&lt;/th&gt;&lt;td&gt;%evaluations_na.party_name%&lt;/td&gt;&lt;/tr&gt;
-					 	&lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Grade#&lt;/th&gt;&lt;td&gt;%evaluations_na.grade% / %max_grade%&lt;/td&gt;&lt;/tr&gt;
-                     	&lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Comments#&lt;/th&gt;&lt;td&gt;%evaluations_na.comment%&lt;/td&gt;&lt;/tr&gt;
-                     	&lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Will_the_studens_be# &lt;br /&gt; #evaluation.lt_able_to_see_the_grade#&lt;/th&gt;&lt;td&gt;%evaluations_na.show_student%&lt;/td&gt;&lt;/tr&gt;
-                    &lt;/tr&gt;
-					&lt;/table&gt;
-          &lt;/multiple&gt;
-        &lt;/table&gt;
-		&lt;/blockquote&gt;
-        &lt;input type=submit value=&quot;&lt;# Grade Students </msg>
-  <msg key="Back_1">#&gt;&quot; onClick=&quot;history.go(-1)&quot;&gt; 
-    &lt;/form&gt; 
-&lt;/if&gt; 
-&lt;if %evaluations_na:rowcount% gt 0&gt; 
-  &lt;form action=&quot;evaluate-students-2&quot; method+&quot;post&quot;&gt; 
-  @export_vars;noquote@ 
-  &lt;input type=hidden name=task_id value=&quot;%task_id%&quot;&gt; 
-  &lt;input type=hidden name=max_grade value=&quot;%max_grade%&quot;&gt; 
-  &lt;blockquote&gt; 
-  &lt;table&gt; 
-    &lt;multiple name=&quot;evaluations_na&quot;&gt; 
-    &lt;if %evaluations_na.rownum% odd&gt; &lt;table bgcolor=&quot;#EAF2FF&quot;&gt; &lt;/if&gt;
-    &lt;else&gt;&lt;table bgcolor=&quot;white&quot;&gt;&lt;/else&gt; 
-      &lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Name#&lt;/th&gt;&lt;td&gt;%evaluations_na.party_name%&lt;/td&gt;&lt;/tr&gt; 
-      &lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Grade#&lt;/th&gt;&lt;td&gt;%evaluations_na.grade% / %max_grade%&lt;/td&gt;&lt;/tr&gt; 
-      &lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Comments#&lt;/th&gt;&lt;td&gt;%evaluations_na.comment%&lt;/td&gt;&lt;/tr&gt; 
-      &lt;tr&gt;&lt;th align=&quot;right&quot;&gt;#evaluation.Will_the_studens_be# &lt;br /&gt; #evaluation.lt_able_to_see_the_grade#&lt;/th&gt;&lt;td&gt;%evaluations_na.show_student%&lt;/td&gt;&lt;/tr&gt; &lt;/tr&gt; 
-    &lt;/table&gt; 
-    &lt;/multiple&gt; 
-  &lt;/table&gt; 
-  &lt;/blockquote&gt; 
-  &lt;input type=submit value=&quot;&lt;# Grade Students </msg>
   <msg key="Bad_input_">Bad input </msg>
   <msg key="Change_Answer_">Change Answer </msg>
   <msg key="Click">Click</msg>
@@ -87,6 +42,7 @@
   <msg key="CommentsEdit_reason_">Comments/Edit reason </msg>
   <msg key="Confirm">Confirm</msg>
   <msg key="Confirm_Evaluation_">Confirm Evaluation </msg>
+  <msg key="Continue">Continue</msg>
   <msg key="Create">Group </msg>
   <msg key="Create_Group_">Create Group </msg>
   <msg key="Delete_Evaluation_">Delete Evaluation </msg>
@@ -125,11 +81,11 @@
   <msg key="File_">File </msg>
   <msg key="Fileurl_associated">File/url associated</msg>
   <msg key="Generate_file">Generate file</msg>
-  <msg key="Go">Back </msg>
+  <msg key="Go">Go Back</msg>
   <msg key="Go_Back">Go Back</msg>
   <msg key="Grade">Grade:</msg>
   <msg key="Grade_">Grade </msg>
-  <msg key="Grade_1">Students </msg>
+  <msg key="Grade_1">Grade 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>
@@ -143,25 +99,6 @@
   <msg key="Grades_Reports">Grades Reports</msg>
   <msg key="Grades_Sheet_Name_">Grades Sheet Name </msg>
   <msg key="Grades_Sheets_">Grades Sheets </msg>
-  <msg key="Group">#&gt; %current_groups_plus_one%&quot; size=20&gt;&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-      &lt;input type=hidden name=task_id value=&quot;%task_id%&quot;&gt;
-      &lt;input type=hidden name=evaluation_group_id value=&quot;%evaluation_group_id%&quot;&gt;
-		&lt;blockquote&gt;
-	 	&lt;td&gt;&lt;/td&gt;
-		&lt;td&gt;
-        &lt;table&gt;
-          &lt;multiple name=&quot;students&quot;&gt;
-                &lt;if %students.rownum% odd&gt;&lt;tr class=&quot;list-odd&quot;&gt;&lt;/if&gt;&lt;else&gt;&lt;tr class=&quot;list-even&quot;&gt;&lt;/else&gt;
-						&lt;td&gt;%students.rownum%.&lt;/td&gt;&lt;td&gt;%students.student_name%&lt;/td&gt;&lt;/tr&gt;
-                    &lt;/tr&gt;
-          &lt;/multiple&gt;
-        &lt;/table&gt;
-		&lt;/td&gt;
-		&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>
@@ -203,7 +140,7 @@
   <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_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>
@@ -213,16 +150,16 @@
   <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>
   <msg key="lt_Confirm_your_evaluati">Confirm your evaluation(s) on &quot;%task_name%&quot;</msg>
-  <msg key="lt_Currently_content_is_">Currently $content is associated to this task solution, but you can associate a different url/file just by adding it here </msg>
-  <msg key="lt_Currently_content_is__1">Currently $content is associated to this task, but you can associate a different url/file just by adding it here </msg>
-  <msg key="lt_Currently_title_is_at">Currently $title is attached to this task solution, but you can attach a different file/url just by adding it here </msg>
-  <msg key="lt_Currently_title_is_at_1">Currently $title is attached to this task, but you can attach a different file/url just by adding it here </msg>
+  <msg key="lt_Currently_content_is_">Currently %content% is associated to this task solution, but you can associate a different url/file just by adding it here </msg>
+  <msg key="lt_Currently_content_is__1">Currently %content% is associated to this task, but you can associate a different url/file just by adding it here </msg>
+  <msg key="lt_Currently_title_is_at">Currently %title% is attached to this task solution, but you can attach a different file/url just by adding it here </msg>
+  <msg key="lt_Currently_title_is_at_1">Currently %title% is attached to this task, but you can attach a different file/url just by adding it here </msg>
   <msg key="lt_Delete_Assignment_Typ">Delete Assignment Type </msg>
   <msg key="lt_Delete_assignment_typ">Delete assignment type </msg>
   <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_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>
@@ -260,7 +197,7 @@
   <msg key="lt_if_you_want_to_see_th">if you want to see the portraits of the students</msg>
   <msg key="lt_In_order_to_generate_">In order to generate this file there must be some parties assigned to this task. </msg>
   <msg key="lt_In_this_page_you_can_">In this page you can administer the groups for the assignment.</msg>
-  <msg key="lt_Input_Will_the_studen">Input \&quot;Will the student be able to see the grade\&quot; must be 1 (one) for YES or 0 (zero) for NO, please don't leave it blank. </msg>
+  <msg key="lt_Input_Will_the_studen">Input &quot;Will the student be able to see the grade&quot; must be 1 (one) for YES or 0 (zero) for NO, please don't leave it blank. </msg>
   <msg key="lt_Is_the_task_submitted">Is the task submitted online?</msg>
   <msg key="lt_Max_Grade_does_not_se">Max Grade does not seem to be a real number. Please don't leave it in blank. </msg>
   <msg key="lt_New_Assignment_grade_">New Assignment (%grade_name% %community_name%) </msg>
@@ -285,9 +222,9 @@
   <msg key="lt_Save_the_csv_file_and">Save the csv file and KEEP THE CSV FORMAT. The CSV file can be edited with any text editor (and MS Excell) but you have to save it keeping the CSV format. If you do not keep the format, the system will not be able to parse the file.</msg>
   <msg key="lt_See_grades_sheets_ass">See grades sheets associated with this task</msg>
   <msg key="lt_Send_the_file_using_t">Send the file using the &quot;Send file&quot; botton. The system will parse the file and you will be asked for a confirmation (if everything is ok with the file) for the grades.</msg>
-  <msg key="lt_smallTotal_points_in_">&lt;small&gt;Total points in this category: ${total_grade}/${max_grade} &lt;br /&gt;
-    $grade_plural_name represents the ${grade_weight}% of the 100% of the class&lt;/small&gt; </msg>
-  <msg key="lt_Students_List_for_tas">Students List for \&quot;%task_name%\&quot;</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>
@@ -298,50 +235,14 @@
   <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>
   <msg key="lt_The_estimated_time_mu">The estimated time must be grather than 0</msg>
-  <msg key="lt_The_file_extension_of">The file extension of the file is &quot;%file_extension&quot; and it should be .CSV. Sorry, we can't process it&quot;
-	} 
-    } 
-}  
-
-set page_title &quot;&lt;#_ Confirm Evaluation </msg>
-  <msg key="lt_The_file_extension_of_1">The file extension of the file is \&quot;$file_extension\&quot; and it should be .CSV, we can't process it </msg>
-  <msg key="lt_The_file_is_too_large">The file is too large. (The maximun file size is %pretty_maxnbytes% bytes)&quot; 
-        return 0 
-    }
-    
-    set errors 0 
-    set errors_text &quot;&quot; 
-    set counter 0
-    set line_number 0 
-    
-    set file_handler [open $tmp_filename {RDWR}] 
-	
-	while { ![eof $file_handler] } { 
-		incr line_number 
-		set one_line [gets $file_handler] 
-		
-		# jump first two lines 
-		if { $line_number &lt;= 2 } { 
-			continue 
-		} 
-		
-		# replace enters (&lt;-|) with semicolons (;)
-		regsub -all {(,[\r\n])} $one_line &quot;&quot; clean_line 
-		regsub -all {[\r\n]} $clean_line &quot;&quot; clean_line 
-		
-		set evaluation [split $clean_line &quot;,&quot;] 
-
-		if { $line_number == 3 } {
-			set max_grade [string trim [lindex $evaluation 1]] 
-			if { ![ad_var_type_check_number_p $max_grade] } {
-				ad_return_error &quot;&lt;#_ Invalid Max Grade </msg>
+  <msg key="lt_The_file_extension_of_1">The file extension of the file is &quot;%file_extension%&quot; and it should be .CSV, we can't process it </msg>
   <msg key="lt_The_file_is_too_large_1">The file is too large. (The maximun file size is %pretty_maxnbytes% bytes) </msg>
   <msg key="lt_The_file_should_have_">The file should have a pre-defined format so the system can parse it and obtain the information. If you want to use this functionallity you must follow the following steps:</msg>
   <msg key="lt_The_grade_most_be_a_v">The grade most be a valid number: %wrong_grade% </msg>
   <msg key="lt_The_grade_must_be_a_R">The grade must be a REAL NUMBER.</msg>
   <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_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>
@@ -396,8 +297,8 @@
   <msg key="lt_to_submit_their_answe">to submit their answers after due date?</msg>
   <msg key="lt_To_unassociate_a_memb">To unassociate a member of the group, click on the &quot;Unassociate member&quot; link.</msg>
   <msg key="lt_TOTAL_GRADE_total_cla">TOTAL GRADE: %total_class_grade%</msg>
-  <msg key="lt_Total_points_in_this_">Total points in this category: %total_grade% / $max_grade&lt;br /&gt;
-                     This grade category represents the ${grade_weight}% of the 100% of the class </msg>
+  <msg key="lt_Total_points_in_this_">Total points in this category: %total_grade% / %max_grade%&lt;br /&gt;
+                     This grade category represents the %grade_weight%% of the 100% of the class </msg>
   <msg key="lt_Total_points_in_this__1">Total points in this category: %total_grade% / %max_grade%&lt;br /&gt;
                      This grade category represents the %grade_weight%% of the 100% of the class </msg>
   <msg key="lt_Total_points_in_this__2">Total points in this category: %total_grade%/%max_grade%</msg>
@@ -407,8 +308,8 @@
   <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_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>
@@ -419,12 +320,9 @@
   <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;}
-	{html {size 5}}
-	{help_text &quot;&lt;#_ You can enter the weight over %grade_weight%% of %grade_plural_name% or you can enter the net value of it in the field below. </msg>
   <msg key="lt_Weight_over_grade_wei_2">Weight over %grade_weight%% of %grade_plural_name% </msg>
-  <msg key="lt_Weight_used_in_grade_">Weight used in $grade_plural_name: ${category_weight}% (of 100% of $grade_plural_name) &lt;br /&gt;
-                    $grade_plural_name represents ${grade_weight}% of the 100% of the class </msg>
+  <msg key="lt_Weight_used_in_grade_">Weight used in %grade_plural_name%: %category_weight%% (of 100% of $grade_plural_name) &lt;br /&gt;
+                    %grade_plural_name% represents %grade_weight%% of the 100% of the class </msg>
   <msg key="lt_Weight_used_in_grade__1">Weight used in %grade_plural_name%: ${category_weight}% (of 100% of $grade_plural_name) &lt;br /&gt;
                     $grade_plural_name represents ${grade_weight}% of the 100% of the class </msg>
   <msg key="lt_Weight_used_in_grade__2">Weight used in %grade_plural_name%: %category_weight%% (of 100% of %grade_plural_name%) &lt;br /&gt;
@@ -448,6 +346,7 @@
   <msg key="lt_You_can_upload_a_file">You can upload a file associated to this task by using the browse button (optional) </msg>
   <msg key="lt_You_can_upload_a_file_1">You can upload a file associated to this task by using the browse button and select the file from your computer (optional) </msg>
   <msg key="lt_You_must_give_an_edit">You must give an edit reason (%old_grade% --&gt; %grade_wo_reason% </msg>
+  <msg key="lt_Your_answer_has_been_">Your answer has been submited successfully.</msg>
   <msg key="lt_Your_total_grade_in_t">Your total grade in this class is:</msg>
   <msg key="Max_Grade_">Max Grade: </msg>
   <msg key="Maximun_Grade_">Maximun Grade: </msg>
@@ -487,7 +386,7 @@
   <msg key="Project">Project</msg>
   <msg key="Projects_">Projects </msg>
   <msg key="Remove_Grade">Remove Grade</msg>
-  <msg key="Rename">Group </msg>
+  <msg key="Rename">Rename Group </msg>
   <msg key="Requires_Grade_">Requires Grade? </msg>
   <msg key="Reuse_Groups_">Reuse Groups </msg>
   <msg key="Send">Send file </msg>
Index: openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl	1 Mar 2005 00:01:35 -0000	1.18
+++ openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl	21 Mar 2005 15:42:00 -0000	1.19
@@ -39,58 +39,65 @@
 	
 	# Enable the delivery intervals and delivery methods for a specific evaluation
 	enable_intervals_and_methods -type_id $type_id
-#Create the conten_type
-content::type::new -content_type {evaluation_grades} -supertype {content_revision} -pretty_name {Evaluation Grade} -pretty_plural {Evaluation Grades} -table_name {evaluation_grades} -id_column {grade_id}
-content::type::new -content_type {evaluation_tasks} -supertype {content_revision} -pretty_name {Evaluation Task} -pretty_plural {Evaluation Tasks} -table_name {evaluation_tasks} -id_column {task_id}
-content::type::new -content_type {evaluation_tasks_sols} -supertype {content_revision} -pretty_name {Evaluation Task Solution} -pretty_plural {Evaluation Tasks Solutions} -table_name {evaluation_tasks_sols} -id_column {solution_id}
-content::type::new -content_type {evaluation_answers} -supertype {content_revision} -pretty_name {Student Answer} -pretty_plural {Student Answers} -table_name {evaluation_answers} -id_column {answer_id}
-content::type::new -content_type {evaluation_student_evals} -supertype {content_revision} -pretty_name {Student Evaluation} -pretty_plural {Student Evaluations} -table_name {evaluation_student_evals} -id_column {evaluation_id}
-content::type::new -content_type {evaluation_grades_sheets} -supertype {content_revision} -pretty_name {Evaluation Grades Sheet} -pretty_plural {Evaluation Grades Sheets} -table_name {evaluation_grades_sheets} -id_column {grades_sheet_id}
 
-#Create the new and register template
-set template_id [content::template::new -name {evaluation-tasks-default} -text {@text;noquote@} -is_live {t}]
-content::type::register_template -content_type {evaluation_tasks} -template_id $template_id -use_context {public} -is_default {t}
-set template_id [content::template::new -name {evaluation-tasks-sols-default} -text {@text;noquote@} -is_live {t}]
-content::type::register_template -content_type {evaluation_tasks_sols} -template_id $template_id -use_context {public} -is_default {t}
-set template_id [content::template::new -name {evaluation-answers-default} -text {@text;noquote@} -is_live {t}]
-content::type::register_template -content_type {evaluation_answers} -template_id $template_id -use_context {public} -is_default {t}
-set template_id [content::template::new -name {evaluation-grades-sheets-default} -text {@text;noquote@} -is_live {t}]
-content::type::register_template -content_type {evaluation_grades_sheets} -template_id $template_id -use_context {public} -is_default {t}
+	#Create the conten types
+	content::type::new -content_type evaluation_grades -supertype content_revision -pretty_name "Evaluation Grade" -pretty_plural "Evaluation Grades" -table_name evaluation_grades -id_column grade_id
+	content::type::new -content_type evaluation_tasks -supertype content_revision -pretty_name "Evaluation Task" -pretty_plural "Evaluation Tasks" -table_name evaluation_tasks -id_column task_id
+	content::type::new -content_type evaluation_tasks_sols -supertype content_revision -pretty_name "Evaluation Task Solution" -pretty_plural "Evaluation Tasks Solutions" -table_name evaluation_tasks_sols -id_column solution_id
+	content::type::new -content_type evaluation_answers -supertype content_revision -pretty_name "Student Answer" -pretty_plural "Student Answers" -table_name evaluation_answers -id_column answer_id
+	content::type::new -content_type evaluation_student_evals -supertype content_revision -pretty_name "Student Evaluation" -pretty_plural "Student Evaluations" -table_name evaluation_student_evals -id_column evaluation_id
+	content::type::new -content_type evaluation_grades_sheets -supertype content_revision -pretty_name "Evaluation Grades Sheet" -pretty_plural "Evaluation Grades Sheets" -table_name evaluation_grades_sheets -id_column grades_sheet_id
 
-#evaluation_grades
-content::type::attribute::new -content_type {evaluation_grades} -attribute_name {grade_item_id} -datatype {number}  -pretty_name {grade_item_id} -column_spec {integer}
-content::type::attribute::new -content_type {evaluation_grades} -attribute_name {grade_name} -datatype {string}    -pretty_name {grade_name} -column_spec {varchar(100)}
-content::type::attribute::new -content_type {evaluation_grades} -attribute_name {grade_plural_name} -datatype {string}    -pretty_name {grade_plural_name} -column_spec {varchar(100)}
-content::type::attribute::new -content_type {evaluation_grades} -attribute_name {comments} -datatype {string}    -pretty_name {HTML display Options} -column_spec {varchar(500)}
-content::type::attribute::new -content_type {evaluation_grades} -attribute_name {weight} -datatype {number}    -pretty_name { weight} -column_spec {numeric}
-#evaluation_tasks
-content::type::attribute::new -content_type {evaluation_tasks} -attribute_name {task_item_id} -datatype {number}  -pretty_name {task_item_id} -column_spec {integer}
-content::type::attribute::new -content_type {evaluation_tasks} -attribute_name {task_name} -datatype {number}  -pretty_name {task_name} -column_spec {integer}
-content::type::attribute::new -content_type {evaluation_tasks} -attribute_name {number_of_members} -datatype {string}  -pretty_name {number_of_members} -column_spec {varchar}
-content::type::attribute::new -content_type {evaluation_tasks} -attribute_name {due_date} -datatype {number}  -pretty_name {due_date} -column_spec {timestamptz}
-content::type::attribute::new -content_type {evaluation_tasks} -attribute_name {grade_item_id} -datatype {number}  -pretty_name {grade_item_id} -column_spec {integer}
-content::type::attribute::new -content_type {evaluation_tasks} -attribute_name {weight} -datatype {number}  -pretty_name {weight} -column_spec {numeric}
-content::type::attribute::new -content_type {evaluation_tasks} -attribute_name {online_p} -datatype {string}  -pretty_name {online_p} -column_spec {varchar(1)}
-content::type::attribute::new -content_type {evaluation_tasks} -attribute_name {late_submit_p} -datatype {string}  -pretty_name {late_submit_p} -column_spec {varchar(1)}
-content::type::attribute::new -content_type {evaluation_tasks} -attribute_name {requires_grade_p} -datatype {string}  -pretty_name {requires_grade_p} -column_spec {varchar(1)}
-#evaluation_tasks_sols
-content::type::attribute::new -content_type {evaluation_tasks_sols} -attribute_name {solution_item_id} -datatype {number}  -pretty_name {solution_item_id} -column_spec {integer}
-content::type::attribute::new -content_type {evaluation_tasks_sols} -attribute_name {task_item_id} -datatype {number}  -pretty_name {task_item_id} -column_spec {integer}
-#evaluation_answers
-content::type::attribute::new -content_type {evaluation_answers} -attribute_name {answer_item_id} -datatype {number}  -pretty_name {answer_item_id} -column_spec {integer}
-content::type::attribute::new -content_type {evaluation_answers} -attribute_name {party_id} -datatype {number}  -pretty_name {party_id} -column_spec {integer}
-content::type::attribute::new -content_type {evaluation_answers} -attribute_name {task_item_id} -datatype {number}  -pretty_name {task_item_id} -column_spec {integer}
-#evaluation_student_evals
-content::type::attribute::new -content_type {evaluation_student_evals} -attribute_name {evaluation_item_id} -datatype {number}  -pretty_name {evaluation_item_id} -column_spec {integer}
-content::type::attribute::new -content_type {evaluation_student_evals} -attribute_name {task_item_id} -datatype {number}  -pretty_name {task_item_id} -column_spec {integer}
-content::type::attribute::new -content_type {evaluation_student_evals} -attribute_name {party_id} -datatype {number}  -pretty_name {party_id} -column_spec {integer}
-content::type::attribute::new -content_type {evaluation_student_evals} -attribute_name {grade} -datatype {number}  -pretty_name {grade} -column_spec {numeric}
-content::type::attribute::new -content_type {evaluation_student_evals} -attribute_name {show_student_p} -datatype {string}  -pretty_name {show_student_p} -column_spec {varchar(1)}
-#evaluation_grades_sheets
-content::type::attribute::new -content_type {evaluation_grades_sheets} -attribute_name {grades_sheet_item_id} -datatype {number}  -pretty_name {grades_sheet_item_id} -column_spec {integer}
-content::type::attribute::new -content_type {evaluation_grades_sheets} -attribute_name {task_item_id} -datatype {number}  -pretty_name {task_item_id} -column_spec {integer}
+	#Create and register the templates
+	set template_id [content::template::new -name evaluation-tasks-default -text "@text;noquote@" -is_live t]
+	content::type::register_template -content_type evaluation_tasks -template_id $template_id -use_context public -is_default t
+	set template_id [content::template::new -name evaluation-tasks-sols-default -text "@text;noquote@" -is_live t]
+	content::type::register_template -content_type evaluation_tasks_sols -template_id $template_id -use_context public -is_default t
+	set template_id [content::template::new -name evaluation-answers-default -text "@text;noquote@" -is_live t]
+	content::type::register_template -content_type evaluation_answers -template_id $template_id -use_context public -is_default t
+	set template_id [content::template::new -name evaluation-grades-sheets-default -text "@text;noquote@" -is_live t]
+	content::type::register_template -content_type evaluation_grades_sheets -template_id $template_id -use_context public -is_default t
+
+	#Create content type attributes for content type evaluation_grades
+	content::type::attribute::new -content_type evaluation_grades -attribute_name grade_item_id -datatype number -pretty_name grade_item_id -column_spec integer
+	content::type::attribute::new -content_type evaluation_grades -attribute_name grade_name -datatype string -pretty_name grade_name -column_spec "varchar(100)"
+	content::type::attribute::new -content_type evaluation_grades -attribute_name grade_plural_name -datatype string -pretty_name grade_plural_name -column_spec "varchar(100)"
+	content::type::attribute::new -content_type evaluation_grades -attribute_name comments -datatype string -pretty_name Comments -column_spec "varchar(500)"
+	content::type::attribute::new -content_type evaluation_grades -attribute_name weight -datatype number -pretty_name Weight -column_spec numeric
+
+	#Create content type attributes for content type evaluation_tasks
+	content::type::attribute::new -content_type evaluation_tasks -attribute_name task_item_id -datatype number -pretty_name task_item_id -column_spec integer
+	content::type::attribute::new -content_type evaluation_tasks -attribute_name task_name -datatype number -pretty_name task_name -column_spec integer
+	content::type::attribute::new -content_type evaluation_tasks -attribute_name number_of_members -datatype string -pretty_name number_of_members -column_spec varchar
+	content::type::attribute::new -content_type evaluation_tasks -attribute_name due_date -datatype number -pretty_name due_date -column_spec timestamptz
+	content::type::attribute::new -content_type evaluation_tasks -attribute_name grade_item_id -datatype number -pretty_name grade_item_id -column_spec integer
+	content::type::attribute::new -content_type evaluation_tasks -attribute_name weight -datatype number -pretty_name weight -column_spec numeric
+	content::type::attribute::new -content_type evaluation_tasks -attribute_name online_p -datatype string -pretty_name online_p -column_spec "varchar(1)"
+	content::type::attribute::new -content_type evaluation_tasks -attribute_name late_submit_p -datatype string -pretty_name late_submit_p -column_spec "varchar(1)"
+	content::type::attribute::new -content_type evaluation_tasks -attribute_name requires_grade_p -datatype string -pretty_name requires_grade_p -column_spec "varchar(1)"
+
+	#Create content type attributes for content type evaluation_tasks_sols
+	content::type::attribute::new -content_type evaluation_tasks_sols -attribute_name solution_item_id -datatype number -pretty_name solution_item_id -column_spec integer
+	content::type::attribute::new -content_type evaluation_tasks_sols -attribute_name task_item_id -datatype number -pretty_name task_item_id -column_spec integer
+
+	#Create content type attributes for content type evaluation_answers
+	content::type::attribute::new -content_type evaluation_answers -attribute_name answer_item_id -datatype number -pretty_name answer_item_id -column_spec integer
+	content::type::attribute::new -content_type evaluation_answers -attribute_name party_id -datatype number -pretty_name party_id -column_spec integer
+	content::type::attribute::new -content_type evaluation_answers -attribute_name task_item_id -datatype number -pretty_name task_item_id -column_spec integer
+
+	#Create content type attributes for content type evaluation_student_evals
+	content::type::attribute::new -content_type evaluation_student_evals -attribute_name evaluation_item_id -datatype number -pretty_name evaluation_item_id -column_spec integer
+	content::type::attribute::new -content_type evaluation_student_evals -attribute_name task_item_id -datatype number -pretty_name task_item_id -column_spec integer
+	content::type::attribute::new -content_type evaluation_student_evals -attribute_name party_id -datatype number -pretty_name party_id -column_spec integer
+	content::type::attribute::new -content_type evaluation_student_evals -attribute_name grade -datatype number -pretty_name grade -column_spec numeric
+	content::type::attribute::new -content_type evaluation_student_evals -attribute_name show_student_p -datatype string -pretty_name show_student_p -column_spec "varchar(1)"
+
+	#Create content type attributes for content type evaluation_grades_sheets
+	content::type::attribute::new -content_type evaluation_grades_sheets -attribute_name grades_sheet_item_id -datatype number -pretty_name grades_sheet_item_id -column_spec integer
+	content::type::attribute::new -content_type evaluation_grades_sheets -attribute_name task_item_id -datatype number -pretty_name task_item_id -column_spec integer
+
+    }
 }
-}
 
 ad_proc -public evaluation::apm_callback::package_uninstall { 
 } {
@@ -111,54 +118,55 @@
         # Delete the implementation for the notification of an evaluation
 	delete_one_evaluation_impl
 
-#Delete content type template
-set template_id [content::type::get_template -content_type {evaluation_tasks} -use_context {public}]
-content::type::unregister_template -content_type {evaluation_tasks} -template_id $template_id -use_context {public}
-content::template::delete -template_id $template_id
-set template_id [content::type::get_template -content_type {evaluation_tasks_sols} -use_context {public}]
-content::type::unregister_template -content_type {evaluation_tasks_sols} -template_id $template_id -use_context {public}
-content::template::delete -template_id $template_id
-set template_id [content::type::get_template -content_type {evaluation_answers} -use_context {public}]
-content::type::unregister_template -content_type {evaluation_answers} -template_id $template_id -use_context {public}
-content::template::delete -template_id $template_id
-set template_id [content::type::get_template -content_type {evaluation_grades_sheets} -use_context {public}]
-content::type::unregister_template -content_type {evaluation_grades_sheets} -template_id $template_id -use_context {public}
-content::template::delete -template_id $template_id
-#Delete content type attribute
-content::type::attribute::delete -content_type {evaluation_grades} -attribute_name {grade_item_id}
-content::type::attribute::delete -content_type {evaluation_grades} -attribute_name {grade_name} 
-content::type::attribute::delete -content_type {evaluation_grades} -attribute_name {grade_plural_name} 
-content::type::attribute::delete -content_type {evaluation_grades} -attribute_name {comments} 
-content::type::attribute::delete -content_type {evaluation_grades} -attribute_name {weight} 
-content::type::attribute::delete -content_type {evaluation_tasks} -attribute_name {task_item_id} 
-content::type::attribute::delete -content_type {evaluation_tasks} -attribute_name {task_name} 
-content::type::attribute::delete -content_type {evaluation_tasks} -attribute_name {number_of_members} 
-content::type::attribute::delete -content_type {evaluation_tasks} -attribute_name {due_date} 
-content::type::attribute::delete -content_type {evaluation_tasks} -attribute_name {grade_item_id} 
-content::type::attribute::delete -content_type {evaluation_tasks} -attribute_name {weight} 
-content::type::attribute::delete -content_type {evaluation_tasks} -attribute_name {online_p} 
-content::type::attribute::delete -content_type {evaluation_tasks} -attribute_name {late_submit_p} 
-content::type::attribute::delete -content_type {evaluation_tasks} -attribute_name {requires_grade_p} 
-content::type::attribute::delete -content_type {evaluation_tasks_sols} -attribute_name {solution_item_id} 
-content::type::attribute::delete -content_type {evaluation_tasks_sols} -attribute_name {task_item_id} 
-content::type::attribute::delete -content_type {evaluation_answers} -attribute_name {answer_item_id} 
-content::type::attribute::delete -content_type {evaluation_answers} -attribute_name {party_id} 
-content::type::attribute::delete -content_type {evaluation_answers} -attribute_name {task_item_id} 
-content::type::attribute::delete -content_type {evaluation_student_evals} -attribute_name {evaluation_item_id} 
-content::type::attribute::delete -content_type {evaluation_student_evals} -attribute_name {task_item_id} 
-content::type::attribute::delete -content_type {evaluation_student_evals} -attribute_name {party_id} 
-content::type::attribute::delete -content_type {evaluation_student_evals} -attribute_name {grade} 
-content::type::attribute::delete -content_type {evaluation_student_evals} -attribute_name {show_student_p}
-content::type::attribute::delete -content_type {evaluation_grades_sheets} -attribute_name {grades_sheet_item_id}
-content::type::attribute::delete -content_type {evaluation_grades_sheets} -attribute_name {task_item_id}                                                        
-#Delete Content type
-content::type::delete -content_type {evaluation_grades}
-content::type::delete -content_type {evaluation_tasks}
-content::type::delete -content_type {evaluation_tasks_sols}
-content::type::delete -content_type {evaluation_answers}
-content::type::delete -content_type {evaluation_student_evals}
-content::type::delete -content_type {evaluation_grades_sheets}                                                                                            
- } 
+	#Delete content type templates
+	set template_id [content::type::get_template -content_type evaluation_tasks -use_context public]
+	content::type::unregister_template -content_type evaluation_tasks -template_id $template_id -use_context public
+	content::template::delete -template_id $template_id
+	set template_id [content::type::get_template -content_type evaluation_tasks_sols -use_context public]
+	content::type::unregister_template -content_type evaluation_tasks_sols -template_id $template_id -use_context public
+	content::template::delete -template_id $template_id
+	set template_id [content::type::get_template -content_type evaluation_answers -use_context public]
+	content::type::unregister_template -content_type evaluation_answers -template_id $template_id -use_context public
+	content::template::delete -template_id $template_id
+	set template_id [content::type::get_template -content_type evaluation_grades_sheets -use_context public]
+	content::type::unregister_template -content_type evaluation_grades_sheets -template_id $template_id -use_context public
+	content::template::delete -template_id $template_id
+
+	#Delete content type attributes
+	content::type::attribute::delete -content_type evaluation_grades -attribute_name grade_item_id
+	content::type::attribute::delete -content_type evaluation_grades -attribute_name grade_name 
+	content::type::attribute::delete -content_type evaluation_grades -attribute_name grade_plural_name 
+	content::type::attribute::delete -content_type evaluation_grades -attribute_name comments 
+	content::type::attribute::delete -content_type evaluation_grades -attribute_name weight 
+	content::type::attribute::delete -content_type evaluation_tasks -attribute_name task_item_id 
+	content::type::attribute::delete -content_type evaluation_tasks -attribute_name task_name 
+	content::type::attribute::delete -content_type evaluation_tasks -attribute_name number_of_members 
+	content::type::attribute::delete -content_type evaluation_tasks -attribute_name due_date 
+	content::type::attribute::delete -content_type evaluation_tasks -attribute_name grade_item_id 
+	content::type::attribute::delete -content_type evaluation_tasks -attribute_name weight 
+	content::type::attribute::delete -content_type evaluation_tasks -attribute_name online_p 
+	content::type::attribute::delete -content_type evaluation_tasks -attribute_name late_submit_p 
+	content::type::attribute::delete -content_type evaluation_tasks -attribute_name requires_grade_p 
+	content::type::attribute::delete -content_type evaluation_tasks_sols -attribute_name solution_item_id 
+	content::type::attribute::delete -content_type evaluation_tasks_sols -attribute_name task_item_id 
+	content::type::attribute::delete -content_type evaluation_answers -attribute_name answer_item_id 
+	content::type::attribute::delete -content_type evaluation_answers -attribute_name party_id 
+	content::type::attribute::delete -content_type evaluation_answers -attribute_name task_item_id 
+	content::type::attribute::delete -content_type evaluation_student_evals -attribute_name evaluation_item_id 
+	content::type::attribute::delete -content_type evaluation_student_evals -attribute_name task_item_id 
+	content::type::attribute::delete -content_type evaluation_student_evals -attribute_name party_id 
+	content::type::attribute::delete -content_type evaluation_student_evals -attribute_name grade 
+	content::type::attribute::delete -content_type evaluation_student_evals -attribute_name show_student_p
+	content::type::attribute::delete -content_type evaluation_grades_sheets -attribute_name grades_sheet_item_id
+	content::type::attribute::delete -content_type evaluation_grades_sheets -attribute_name task_item_id                                                        
+	#Delete Content types
+	content::type::delete -content_type evaluation_grades
+	content::type::delete -content_type evaluation_tasks
+	content::type::delete -content_type evaluation_tasks_sols
+	content::type::delete -content_type evaluation_answers
+	content::type::delete -content_type evaluation_student_evals
+	content::type::delete -content_type evaluation_grades_sheets                                                                                            
+    } 
 }
 
 ad_proc -public evaluation::apm_callback::package_instantiate { 
@@ -182,35 +190,33 @@
     set projects_desc "[_ evaluation.lt_Projects_for_students]"
 
     db_transaction {
-    set folder_id [content::folder::new -name "evaluation_grades_$package_id" -label "evaluation_grades_$package_id" -package_id $package_id ]
-    content::folder::register_content_type -folder_id $folder_id -content_type {evaluation_grades} -include_subtypes t
+	set folder_id [content::folder::new -name "evaluation_grades_$package_id" -label "evaluation_grades_$package_id" -package_id $package_id ]
+	content::folder::register_content_type -folder_id $folder_id -content_type evaluation_grades -include_subtypes t
 
-    set folder_id [content::folder::new -name "evaluation_tasks_$package_id" -label "evaluation_tasks_$package_id" -package_id $package_id ]
-    content::folder::register_content_type -folder_id $folder_id -content_type {evaluation_tasks} -include_subtypes t
- 
-    set folder_id [content::folder::new -name "evaluation_tasks_sols_$package_id" -label "evaluation_tasks_sols_$package_id" -package_id $package_id ]
-    content::folder::register_content_type -folder_id $folder_id -content_type {evaluation_tasks_sols} -include_subtypes t
+	set folder_id [content::folder::new -name "evaluation_tasks_$package_id" -label "evaluation_tasks_$package_id" -package_id $package_id ]
+	content::folder::register_content_type -folder_id $folder_id -content_type evaluation_tasks -include_subtypes t
+	
+	set folder_id [content::folder::new -name "evaluation_tasks_sols_$package_id" -label "evaluation_tasks_sols_$package_id" -package_id $package_id ]
+	content::folder::register_content_type -folder_id $folder_id -content_type evaluation_tasks_sols -include_subtypes t
 
-    set folder_id [content::folder::new -name "evaluation_answers_$package_id" -label "evaluation_answers_$package_id" -package_id $package_id ]
-    content::folder::register_content_type -folder_id $folder_id -content_type {evaluation_answers} -include_subtypes t
- 
-    set folder_id [content::folder::new -name "evaluation_grades_sheets_$package_id" -label "evaluation_grades_sheets_$package_id" -package_id $package_id ]
-    content::folder::register_content_type -folder_id $folder_id -content_type {evaluation_grades_sheets} -include_subtypes t
- 
-    set folder_id [content::folder::new -name "evaluation_student_evals_$package_id" -label "evaluation_student_evals_$package_id" -package_id $package_id ]
-    content::folder::register_content_type -folder_id $folder_id -content_type {evaluation_student_evals} -include_subtypes t  
+	set folder_id [content::folder::new -name "evaluation_answers_$package_id" -label "evaluation_answers_$package_id" -package_id $package_id ]
+	content::folder::register_content_type -folder_id $folder_id -content_type evaluation_answers -include_subtypes t
+	
+	set folder_id [content::folder::new -name "evaluation_grades_sheets_$package_id" -label "evaluation_grades_sheets_$package_id" -package_id $package_id ]
+	content::folder::register_content_type -folder_id $folder_id -content_type evaluation_grades_sheets -include_subtypes t
+	
+	set folder_id [content::folder::new -name "evaluation_student_evals_$package_id" -label "evaluation_student_evals_$package_id" -package_id $package_id ]
+	content::folder::register_content_type -folder_id $folder_id -content_type evaluation_student_evals -include_subtypes t  
     }
-    ns_log notice "Primer Error"
+
     set exams_item_id [db_nextval acs_object_id_seq]
     set revision_id [evaluation::new_grade -new_item_p 1 -item_id $exams_item_id -content_type evaluation_grades -content_table evaluation_grades -content_id grade_id -name $exams_singular_name -plural_name $exams_name -description $exams_desc -weight 40 -package_id $package_id]
     content::item::set_live_revision -revision_id $revision_id
 
-    ns_log notice "Segundo Error"
     set tasks_item_id [db_nextval acs_object_id_seq]
     set revision_id [evaluation::new_grade -new_item_p 1 -item_id $tasks_item_id -content_type evaluation_grades -content_table evaluation_grades -content_id grade_id -name $tasks_singular_name -plural_name $tasks_name -description $tasks_desc -weight 40 -package_id $package_id]
     content::item::set_live_revision -revision_id $revision_id
 
-    ns_log notice "Tercer Error"
     set projects_item_id [db_nextval acs_object_id_seq]
     set revision_id [evaluation::new_grade -new_item_p 1 -item_id $projects_item_id -content_type evaluation_grades -content_table evaluation_grades -content_id grade_id -name $projects_singular_name -plural_name $projects_name -description $projects_desc -weight 20 -package_id $package_id]
     content::item::set_live_revision -revision_id $revision_id   
@@ -224,72 +230,133 @@
     Delete Evaluation stuff
 
 } {
-#Delete all content templates
-db_foreach v1 { select ea.answer_id from evaluation_answersi ea, acs_objects ao where ea.item_id = ao.object_id and ao.context_id = p_package_id } {
-content::revision::delete -revision_id $answer_id
-}
-db_foreach v2 { select ets.solution_id from evaluation_tasks_solsi ets, acs_objects ao where ets.item_id = ao.object_id and ao.context_id = p_package_id  } { content::revision::delete -revision_id $solution_id }
-db_foreach v3 { select egs.grades_sheet_id from evaluation_grades_sheetsi egs, acs_objects ao where egs.item_id = ao.object_id and ao.context_id = p_package_id  } {
-content::revision::delete -revision_id $grades_sheet_id }
-db_foreach v4 { select ese.evaluation_id from evaluation_student_evalsi ese, acs_objects ao where ese.item_id = ao.object_id and ao.context_id = p_package_id  } {
-content::revision::delete -revision_id $evaluation_id }
-db_foreach v5 { select et.task_id from evaluation_tasksi et, acs_objects ao where et.item_id = ao.object_id and ao.context_id = p_package_id  } {
-content::revision::delete -revision_id $task_id }
-db_foreach v6 { select eg.grade_id from evaluation_gradesi eg, acs_objects ao where eg.item_id = ao.object_id and ao.context_id = p_package_id  } {
-content::revision::delete -revision_id $grade_id}
+    #Delete all content templates
+    db_foreach answer { 
+	select ea.answer_id from evaluation_answersi ea, acs_objects ao where ea.item_id = ao.object_id and ao.context_id = p_package_id 
+    } {
+	content::revision::delete -revision_id $answer_id
+    }
+    
+    db_foreach solution { 
+	select ets.solution_id from evaluation_tasks_solsi ets, acs_objects ao where ets.item_id = ao.object_id and ao.context_id = p_package_id  
+    } { 
+	content::revision::delete -revision_id $solution_id 
+    }
+    
+    db_foreach grades_sheet { 
+	select egs.grades_sheet_id from evaluation_grades_sheetsi egs, acs_objects ao where egs.item_id = ao.object_id and ao.context_id = p_package_id  
+    } {
+	content::revision::delete -revision_id $grades_sheet_id 
+    }
 
-#Evaluation_Task_Sols
-set v_folder_id [content::item::get_id -item_path "evaluation_tasks_sols_$package_id" -resolve_index {f}]
-db_foreach v11 { select item_id from cr_items where  parent_id = :v_folder_id } {
-        evaluation::delete_grade -grade_item_id $item_id
-}
-content::folder::unregister_content_type -folder_id $v_folder_id  -content_type {content_revision} -include_subtypes {t}
-content::folder::unregister_content_type -folder_id $v_folder_id  -content_type {evaluation_tasks_sols} -include_subtypes {t}
-db_dml delete_v11 "delete from cr_folder_type_map where content_type = 'evaluation_tasks_sols'"
-content::folder::delete -folder_id $v_folder_id
-                                                                                                                                                             
-#evaluation_answers
-set v_folder_id [content::item::get_id -item_path "evaluation_answers_$package_id" -resolve_index {f}]
-db_foreach v12 {select item_id from cr_items where  parent_id = :v_folder_id } {
-        evaluation::delete_grade -grade_item_id $item_id }
-content::folder::unregister_content_type -folder_id $v_folder_id -content_type {content_revision} -include_subtypes {t}
-content::folder::unregister_content_type -folder_id $v_folder_id -content_type {evaluation_answers} -include_subtypes {t}
-db_dml delete_v12 "delete from cr_folder_type_map where content_type = 'evaluation_answers'"
-content::folder::delete -folder_id $v_folder_id
+    db_foreach student_eval { 
+	select ese.evaluation_id from evaluation_student_evalsi ese, acs_objects ao where ese.item_id = ao.object_id and ao.context_id = p_package_id  
+    } {
+	content::revision::delete -revision_id $evaluation_id 
+    }
+    
+    db_foreach evaluation_task { 
+	select et.task_id from evaluation_tasksi et, acs_objects ao where et.item_id = ao.object_id and ao.context_id = p_package_id  
+    } {
+	content::revision::delete -revision_id $task_id 
+    }
 
-#evaluation_students_eval
-set v_folder_id [content::item::get_id -item_path "evaluation_student_evals_$package_id" -resolve_index {f}]
-db_foreach v13 { select item_id from cr_items where  parent_id = :v_folder_id } {
-       evaluation::delete_grade -grade_item_id $item_id }
-content::folder::unregister_content_type -folder_id $v_folder_id -content_type {content_revision} -include_subtypes {t}
-content::folder::unregister_content_type -folder_id $v_folder_id -content_type {evaluation_student_evals} -include_subtypes {t}
-db_dml delete_v13 "delete from cr_folder_type_map where content_type = 'evaluation_student_evals'"
-content::folder::delete -folder_id $v_folder_id
-                                                                                                                                                             
-#evaluation_grades_sheets
-set v_folder_id [content::item::get_id -item_path "evaluation_grades_sheets_$package_id" -resolve_index {f}]
-db_foreach v14 { select item_id  from cr_items where  parent_id = :v_folder_id } {
-       evaluation::delete_grade -grade_item_id $item_id }
-content::folder::unregister_content_type -folder_id $v_folder_id -content_type {content_revision} -include_subtypes {t}
-content::folder::unregister_content_type -folder_id $v_folder_id -content_type {evaluation_grades_sheets} -include_subtypes {t}
-db_dml delete_v14 "delete from cr_folder_type_map where content_type = 'evaluation_grades_sheets'"
-content::folder::delete -folder_id $v_folder_id
-                                                                                                                                                             
-#evaluation_tasks
-set v_folder_id [content::item::get_id -item_path "evaluation_tasks_$package_id" -resolve_index {f}]
-db_foreach v15 { select etg.group_id from evaluation_tasks et, evaluation_task_groups etg where etg.task_item_id = et.task_item_id } {
-       evaluation::delete_grade -grade_item_id $item_id }
-content::folder::unregister_content_type -folder_id $v_folder_id -content_type {content_revision} -include_subtypes {t}
-content::folder::unregister_content_type -folder_id $v_folder_id -content_type {evaluation_tasks} -include_subtypes {t}
-db_dml delete_v15 "delete from cr_folder_type_map where content_type = 'evaluation_tasks'"
-content::folder::delete -folder_id $v_folder_id
+    db_foreach evaluation_grade { 
+	select eg.grade_id from evaluation_gradesi eg, acs_objects ao where eg.item_id = ao.object_id and ao.context_id = p_package_id  
+    } {
+	content::revision::delete -revision_id $grade_id
+    }
 
-#evaluation_grades
-set v_folder_id [content::item::get_id -item_path "evaluation_grades_$package_id" -resolve_index {f}]
-db_foreach v16 { select item_id from cr_items where  parent_id = :v_folder_id } {
-       evaluation::delete_grade -grade_item_id $item_id }
-content::folder::unregister_content_type -folder_id $v_folder_id -content_type {content_revision} -include_subtypes {t}
-content::folder::unregister_content_type -folder_id $v_folder_id -content_type {evaluation_grades} -include_subtypes {t}
-db_dml delete_v16 "delete from cr_folder_type_map where content_type = 'evaluation_grades'"
-content::folder::delete -folder_id $v_folder_id 
+    #evaluation_task_sols
+    set folder_id [content::item::get_id -item_path "evaluation_tasks_sols_$package_id" -resolve_index f]
+    db_foreach task_sol_item { 
+	select item_id from cr_items where  parent_id = :folder_id 
+    } {
+        evaluation::item::delete -item_id $item_id
+    }
+    content::folder::unregister_content_type -folder_id $folder_id  -content_type content_revision -include_subtypes t
+    content::folder::unregister_content_type -folder_id $folder_id  -content_type evaluation_tasks_sols -include_subtypes t
+
+    db_dml delete_task_sols_folder_map "delete from cr_folder_type_map where content_type = 'evaluation_tasks_sols'"
+    content::folder::delete -folder_id $folder_id
+    
+    #evaluation_answers
+    set folder_id [content::item::get_id -item_path "evaluation_answers_$package_id" -resolve_index f]
+
+    db_foreach answer_item {
+	select item_id from cr_items where  parent_id = :folder_id 
+    } {
+	    content::item::delete -item_id $item_id 
+    }
+
+    content::folder::unregister_content_type -folder_id $v_folder_id -content_type content_revision -include_subtypes t
+    content::folder::unregister_content_type -folder_id $v_folder_id -content_type evaluation_answers -include_subtypes t
+    db_dml delete_answer_folder_map "delete from cr_folder_type_map where content_type = 'evaluation_answers'"
+    content::folder::delete -folder_id $folder_id
+
+    #evaluation_students_eval
+    set folder_id [content::item::get_id -item_path "evaluation_student_evals_$package_id" -resolve_index f]
+
+    db_foreach student_eval_item { 
+	select item_id from cr_items where  parent_id = :folder_id 
+    } {
+	evaluation::delete_student_eval -evaluation_id $item_id 
+    }
+
+    content::folder::unregister_content_type -folder_id $folder_id -content_type content_revision -include_subtypes t
+    content::folder::unregister_content_type -folder_id $folder_id -content_type evaluation_student_evals -include_subtypes t
+
+    db_dml delete_student_eval_folder_map "delete from cr_folder_type_map where content_type = 'evaluation_student_evals'"
+    content::folder::delete -folder_id $folder_id
+    
+    #evaluation_grades_sheets
+    set folder_id [content::item::get_id -item_path "evaluation_grades_sheets_$package_id" -resolve_index f]
+
+    db_foreach grade_sheet_item { 
+	select item_id  from cr_items where  parent_id = :folder_id 
+    } {
+	content::delete::item -item_id $item_id 
+    }
+
+    content::folder::unregister_content_type -folder_id $folder_id -content_type content_revision -include_subtypes t
+    content::folder::unregister_content_type -folder_id $folder_ied -content_type evaluation_grades_sheets -include_subtypes t
+
+    db_dml delete_grade_sheet_folder_map "delete from cr_folder_type_map where content_type = 'evaluation_grades_sheets'"
+    content::folder::delete -folder_id $folder_id
+    
+    #evaluation_tasks
+    set folder_id [content::item::get_id -item_path "evaluation_tasks_$package_id" -resolve_index f]
+
+    db_foreach task_item { 
+	select cri.revision_id as task_id
+	from cr_revisions cri, cr_items cr
+	where cr.item_id = cri.item_id
+	and cr.parent_id = :folder_id
+    } {
+	evaluation::delete_task -task_id $item_id 
+    }
+
+    content::folder::unregister_content_type -folder_id $v_folder_id -content_type content_revision -include_subtypes t
+    content::folder::unregister_content_type -folder_id $v_folder_id -content_type evaluation_tasks -include_subtypes t
+
+    db_dml delete_tasks_folder_map "delete from cr_folder_type_map where content_type = 'evaluation_tasks'"
+    content::folder::delete -folder_id $folder_id
+
+    #evaluation_grades
+    set folder_id [content::item::get_id -item_path "evaluation_grades_$package_id" -resolve_index f]
+
+    db_foreach grade_item { 
+	select cri.revision_id as grade_id
+	from cr_revisions cri, cr_items cr
+	where cr.item_id = cri.item_id
+	and cr.parent_id = :folder_id
+    } {
+	evaluation::delete_grade -grade_id $grade_id 
+    }
+
+    content::folder::unregister_content_type -folder_id $v_folder_id -content_type content_revision -include_subtypes t
+    content::folder::unregister_content_type -folder_id $v_folder_id -content_type evaluation_grades -include_subtypes t
+
+    db_dml delete_grade_folder_map "delete from cr_folder_type_map where content_type = 'evaluation_grades'"
+    content::folder::delete -folder_id $folder_id 
 }
Index: openacs-4/packages/evaluation/tcl/evaluation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	1 Mar 2005 00:01:35 -0000	1.26
+++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	21 Mar 2005 15:42:00 -0000	1.27
@@ -89,55 +89,55 @@
 } {
     delete all grades
 } {
-   db_1row get_grade_id { select grade_item_id from evaluation_grades where grade_id = :grade_id}
-   db_foreach del_rec { select task_item_id from evaluation_tasks where grade_item_id = :grade_item_id } {
-     db_foreach evaluation_delete_student_eval { select evaluation_id from evaluation_student_evals where task_item_id = :task_item_id } {
-     content::revision::delete -revision_id $evaluation_id
-     }
-     db_foreach evaluation_delete_answer { select answer_id from evaluation_answers where task_item_id = :task_item_id } {
-     content::revision::delete -revision_id $answer_id
-     }
-     db_foreach evaluation_delete_task_sol { select solution_id from evaluation_tasks_sols where task_item_id = :task_item_id } {
-     content::revision::delete -revision_id $solution_id
-     }
-     db_foreach evaluation_delete_grades_sheet { select grades_sheet_id from evaluation_grades_sheets where task_item_id = :task_item_id } {
-     content::revision::delete -revision_id $grades_sheet_id
-     }
-     db_foreach evaluation_delete_task { select task_id from evaluation_tasks where task_item_id = :task_item_id } {
-     content::revision::delete -revision_id $task_id                                                                                                              }
-     }
-#    db_1row get_grade_id { select grade_id as grade_task_id from evaluation_grades where grade_item_id = :grade_item_id}
-     content::revision::delete -revision_id $grade_id
+    db_1row get_grade_id { select grade_item_id from evaluation_grades where grade_id = :grade_id }
+    db_foreach del_rec { select task_item_id from evaluation_tasks where grade_item_id = :grade_item_id } {
+	db_foreach evaluation_delete_student_eval { select evaluation_id from evaluation_student_evals where task_item_id = :task_item_id } {
+	    content::revision::delete -revision_id $evaluation_id
+	}
+	db_foreach evaluation_delete_answer { select answer_id from evaluation_answers where task_item_id = :task_item_id } {
+	    content::revision::delete -revision_id $answer_id
+	}
+	db_foreach evaluation_delete_task_sol { select solution_id from evaluation_tasks_sols where task_item_id = :task_item_id } {
+	    content::revision::delete -revision_id $solution_id
+	}
+	db_foreach evaluation_delete_grades_sheet { select grades_sheet_id from evaluation_grades_sheets where task_item_id = :task_item_id } {
+	    content::revision::delete -revision_id $grades_sheet_id
+	}
+	db_foreach evaluation_delete_task { select task_id from evaluation_tasks where task_item_id = :task_item_id } {
+	    content::revision::delete -revision_id $task_id                                                                                                              }
+    }
+    #    db_1row get_grade_id { select grade_id as grade_task_id from evaluation_grades where grade_item_id = :grade_item_id}
+    content::revision::delete -revision_id $grade_id
 }
 
 ad_proc -public evaluation::delete_task {
     -task_id:required
 } {
     delete all tasks
 } {
-     db_1row get_grade_id { select task_item_id from evaluation_tasks where task_id = :task_id}
-     db_foreach evaluation_delete_student_eval { select evaluation_id from evaluation_student_evals where task_item_id = :task_item_id } {
-     content::revision::delete -revision_id $evaluation_id
-     }
-     db_foreach evaluation_delete_answer { select answer_id from evaluation_answers where task_item_id = :task_item_id } {
-     content::revision::delete -revision_id $answer_id
-     }
-     db_foreach evaluation_delete_task_sol { select solution_id from evaluation_tasks_sols where task_item_id = :task_item_id } {
-     content::revision::delete -revision_id $solution_id
-     }
-     db_foreach evaluation_delete_grades_sheet { select grades_sheet_id from evaluation_grades_sheets where task_item_id = :task_item_id } {
-     content::revision::delete -revision_id $grades_sheet_id
-     }
-#    db_1row get_task_id { select task_id as tasks_task_id from evaluation_tasks where task_item_id = :task_item_id }
-     content::revision::delete -revision_id $task_id
+    db_1row get_task_id { select task_item_id from evaluation_tasks where task_id = :task_id }
+    db_foreach evaluation_delete_student_eval { select evaluation_id from evaluation_student_evals where task_item_id = :task_item_id } {
+	content::revision::delete -revision_id $evaluation_id
+    }
+    db_foreach evaluation_delete_answer { select answer_id from evaluation_answers where task_item_id = :task_item_id } {
+	content::revision::delete -revision_id $answer_id
+    }
+    db_foreach evaluation_delete_task_sol { select solution_id from evaluation_tasks_sols where task_item_id = :task_item_id } {
+	content::revision::delete -revision_id $solution_id
+    }
+    db_foreach evaluation_delete_grades_sheet { select grades_sheet_id from evaluation_grades_sheets where task_item_id = :task_item_id } {
+	content::revision::delete -revision_id $grades_sheet_id
+    }
+    #    db_1row get_task_id { select task_id as tasks_task_id from evaluation_tasks where task_item_id = :task_item_id }
+    content::revision::delete -revision_id $task_id
 }
 
-ad_proc -public evaluation::delete_student_eval1 {
+ad_proc -public evaluation::delete_student_eval {
     -evaluation_id:required
 } {
     delete all tasks
 } {
-     content::revision::delete -revision_id $evaluation_id
+    content::revision::delete -revision_id $evaluation_id
 }
 
 ad_proc -public evaluation::notification::do_notification { 
@@ -219,29 +219,31 @@
     @param content_table
     @param new_item_p If true make a new item using item_id 
 } {
+
     if { [empty_string_p $package_id] } {
-    set package_id [ad_conn package_id]
+	set package_id [ad_conn package_id]
     }
+
     set creation_user [ad_conn user_id]
     set creation_ip [ad_conn peeraddr]
     set creation_date [db_string get_date { *SQL* }]
     set item_name "${content_type}_${item_id}"
     
     set revision_id [db_nextval acs_object_id_seq]
     set revision_name "${content_type}_${revision_id}"
-    set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index {f}]
+    set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index f]
     if { $new_item_p } {
-         set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type $content_type -name $item_name -context_id $package_id -creation_date $creation_date]
+	set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type $content_type -name $item_name -context_id $package_id -creation_date $creation_date]
     }
-        set revision_id [content::revision::new \
-                                  -item_id $item_id \
-                                  -content_type $content_type \
-                                  -description $description \
-                                  -creation_date $creation_date \
-                                  -attributes [list [list weight $weight] \
-                                                    [list grade_name $name] \
-                                                    [list comments  $description] \                                                                                                                              [list grade_item_id  $item_id] \
-                                                    [list grade_plural_name $plural_name]] ]  
+    set revision_id [content::revision::new \
+			 -item_id $item_id \
+			 -content_type $content_type \
+			 -description $description \
+			 -creation_date $creation_date \
+			 -attributes [list [list weight $weight] \
+					  [list grade_name $name] \
+					  [list grade_item_id  $item_id] \
+					  [list grade_plural_name $plural_name]] ]  
     return $revision_id
 } 
 
@@ -370,33 +372,35 @@
     if { [empty_string_p $item_name] } {
 	set item_name "${item_id}_${title}"
     }
-#Falta agregarle el title
+    #Falta agregarle el title
     if { $new_item_p } {
-     set item_id [content::item::new -item_id $item_id \
-                                     -parent_id $folder_id \
-                                     -content_type $content_type \
-                                     -name $item_name \
-                                     -context_id $package_id \
-                                     -mime_type $mime_type \
-                                     -title $title \
-                                     -creation_date $creation_date \
-                                     -storage_type $storage_type]
+
+	set item_id [content::item::new -item_id $item_id \
+			 -parent_id $folder_id \
+			 -content_type $content_type \
+			 -name $item_name \
+			 -context_id $package_id \
+			 -mime_type $mime_type \
+			 -creation_date $creation_date \
+			 -storage_type $storage_type]
     }
+
     set revision_id [content::revision::new \
-                                  -item_id $item_id \
-                                  -content_type $content_type \
-                                  -mime_type $mime_type \
-			          -title $title \
-                                  -description $description \
-                                  -creation_date $creation_date \
-			          -attributes [list [list weight $weight] \
-					            [list task_name $name] \
-					            [list task_item_id  $item_id] \                                                                         \                                                   [list online_p  $online_p] \
-						    [list grade_item_id $grade_item_id] \
-						    [list due_date $due_date] \
-						    [list late_submit_p $late_submit_p] \
-						    [list requires_grade_p $requires_grade_p] \
-					            [list number_of_members $number_of_members]] ]
+			 -item_id $item_id \
+			 -content_type $content_type \
+			 -mime_type $mime_type \
+			 -title $title \
+			 -description $description \
+			 -creation_date $creation_date \
+			 -attributes [list [list weight $weight] \
+					  [list task_name $name] \
+					  [list task_item_id  $item_id] \
+					  [list online_p $online_p] \
+					  [list grade_item_id $grade_item_id] \
+					  [list due_date $due_date] \
+					  [list late_submit_p $late_submit_p] \
+					  [list requires_grade_p $requires_grade_p] \
+					  [list number_of_members $number_of_members]]]
 
 
     # in order to find the file we have to set the name in cr_items the same that in cr_revisions
@@ -450,14 +454,14 @@
     if { $new_item_p } {
         set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type $content_type -name $item_name -context_id $package_id -mime_type $mime_type -storage_type $storage_type -title $title -creation_date $creation_date]
     }
-        set revision_id [content::revision::new \
-                                  -item_id $item_id \
-                                  -content_type $content_type \
-                                  -mime_type $mime_type \
-				  -title $title \
-                                  -creation_date $creation_date \
-                                  -attributes [list [list task_item_id  $task_item_id] \
-                                                    [list solution_item_id $item_id]] ]
+    set revision_id [content::revision::new \
+			 -item_id $item_id \
+			 -content_type $content_type \
+			 -mime_type $mime_type \
+			 -title $title \
+			 -creation_date $creation_date \
+			 -attributes [list [list task_item_id  $task_item_id] \
+					  [list solution_item_id $item_id]] ]
 
     # in order to find the file we have to set the name in cr_items the same that in cr_revisions
     db_dml update_item_name { *SQL* }
@@ -522,17 +526,17 @@
 			 -creation_date $creation_date]
     }
     set revision_id [content::revision::new \
-                                  -item_id $item_id \
-                                  -content_type $content_type \
-                                  -mime_type $mime_type \
-                                  -title $title\
-                                  -creation_date $creation_date \
+			 -item_id $item_id \
+			 -content_type $content_type \
+			 -mime_type $mime_type \
+			 -title $title\
+			 -creation_date $creation_date \
 			 -attributes [list [list answer_item_id  $item_id] \
 					  [list party_id $party_id] \
 					  [list task_item_id $task_item_id]] ]
 
 
-                                                                                                                                                            
+    
     # in order to find the file we have to set the name in cr_items the same that in cr_revisions
     db_dml update_item_name { *SQL* }
     return $revision_id
@@ -591,19 +595,19 @@
     }
 
     if { $new_item_p } {
-        set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type $content_type -name $item_name -context_id $package_id -mime_type $mime_type -title $title -storage_type $storage_type -creation_date $creation_date]
+        set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type $content_type -name $item_name -context_id $package_id -mime_type $mime_type -storage_type $storage_type -creation_date $creation_date]
     }   
-        set revision_id [content::revision::new \
-                                  -item_id $item_id \
-                                  -content_type $content_type \
-                                  -mime_type $mime_type \
-                                  -title $title\
-                                  -creation_date $creation_date \
-                                  -attributes [list [list evaluation_item_id  $item_id] \
-                                                    [list party_id $party_id] \
-						    [list grade $grade] \
-						    [list show_student_p $show_student_p] \
-                                                    [list task_item_id $task_item_id]] ]
+    set revision_id [content::revision::new \
+			 -item_id $item_id \
+			 -content_type $content_type \
+			 -mime_type $mime_type \
+			 -title $title\
+			 -creation_date $creation_date \
+			 -attributes [list [list evaluation_item_id  $item_id] \
+					  [list party_id $party_id] \
+					  [list grade $grade] \
+					  [list show_student_p $show_student_p] \
+					  [list task_item_id $task_item_id]]]
 
 } 
 ad_proc -public evaluation::new_evaluation_group {
@@ -702,13 +706,13 @@
         set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type $content_type -name $item_name -context_id $package_id -mime_type $mime_type -title $title -storage_type $storage_type]
 
     }   
-        set revision_id [content::revision::new \
-                                  -item_id $item_id \
-                                  -content_type $content_type \
-				  -title $title \
-                                  -mime_type $mime_type \
-                                  -attributes [list [list grades_sheet_item_id  $item_id] \
-                                                    [list task_item_id $task_item_id]] ]
+    set revision_id [content::revision::new \
+			 -item_id $item_id \
+			 -content_type $content_type \
+			 -title $title \
+			 -mime_type $mime_type \
+			 -attributes [list [list grades_sheet_item_id  $item_id] \
+					  [list task_item_id $task_item_id]] ]
     return $revision_id
 } 
 
@@ -937,7 +941,7 @@
     }
 
     return $dir
-db_foreach get_answers_for_task}
+    db_foreach get_answers_for_task}
 
 ad_proc -public evaluation::get_archive_extension {} {
     return the archive extension that should be added to the output file of
Index: openacs-4/packages/evaluation/www/answer-ok.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/answer-ok.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/answer-ok.adp	8 Oct 2004 23:32:03 -0000	1.1
+++ openacs-4/packages/evaluation/www/answer-ok.adp	21 Mar 2005 15:42:00 -0000	1.2
@@ -2,5 +2,5 @@
 <property name="title">#evaluation.Answer_1#</property>
 <property name="context">#evaluation.Answer_1#</property>
 
+#evaluation.lt_Your_answer_has_been_# <a href=@return_url;noquote@>#evaluation.Continue#</a>.
 
-#evaluation.Your#
\ No newline at end of file
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl	22 Dec 2004 22:06:40 -0000	1.7
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl	21 Mar 2005 15:42:00 -0000	1.8
@@ -14,8 +14,7 @@
 
 if { [string eq $operation [_ evaluation.lt_Yes_I_really_want_to_]] } {
     db_transaction {
-#		db_exec_plsql delete_evaluation { *SQL* }		
-        evaluation::delete_student_eval1 -evaluation_id $evaluation_id
+        evaluation::delete_student_eval -evaluation_id $evaluation_id
     } on_error {
 		ad_return_error "[_ evaluation.lt_Error_deleting_the_ev]" "[_ evaluation.lt_We_got_the_following_]"
 		ad_script_abort
Index: openacs-4/packages/evaluation/www/admin/grades/grades.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/evaluation/www/admin/grades/grades.tcl	22 Dec 2004 22:06:40 -0000	1.13
+++ openacs-4/packages/evaluation/www/admin/grades/grades.tcl	21 Mar 2005 15:42:00 -0000	1.14
@@ -85,10 +85,10 @@
 
 db_1row get_total_weight { *SQL* }
 
-set total_weight [lc_numeric %.2f $total_weight]
+set total_weight [format %.2f $total_weight]
 
 if { ![string eq $total_weight "100.00"] && ![string eq $total_weight "0"] } {
-    set notice "<span style=\"font-style: italic; color: red;\">[_ evaluation.lt_The_sum_of_the_weight]</span>"
+    set notice "es $total_weight <span style=\"font-style: italic; color: red;\">[_ evaluation.lt_The_sum_of_the_weight]</span>"
 } else {
     set notice ""
 }