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.2 -r1.3
--- openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl	12 May 2004 02:07:44 -0000	1.2
+++ openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl	13 May 2004 16:29:40 -0000	1.3
@@ -237,6 +237,7 @@
 } {
 	
 	set ev_grades_fid [db_string get_f_id "select content_item__get_id('evaluation_grades_'||:package_id,null,'f')"]
+	set ev_grades_sheets_fid [db_string get_f_id "select content_item__get_id('evaluation_grades_sheets_'||:package_id,null,'f')"]
 	set ev_tasks_fid [db_string get_f_id "select content_item__get_id('evaluation_tasks_'||:package_id,null,'f')"]
 	set ev_tasks_sols_fid [db_string get_f_id "select content_item__get_id('evaluation_tasks_sols_'||:package_id,null,'f')"]
 	set ev_answers_fid [db_string get_f_id "select content_item__get_id('evaluation_answers_'||:package_id,null,'f')"]
@@ -248,28 +249,28 @@
 												:package_id
 												);
 		}
-
+		
 		db_exec_plsql delte_grades_folder {
 			select evaluation__delete_folder (
-											  :ev_grades_fid,
+											  :ev_grades_sheets_fid,
 											  'evaluation_grades_sheets'
 											  );
 		}
-
+		
 		db_exec_plsql delte_grades_folder {
 			select evaluation__delete_folder (
 											  :ev_grades_fid,
 											  'evaluation_grades'
 											  );
 		}
-			
+		
 		db_exec_plsql delte_task_folder {
 			select evaluation__delete_folder (
 											  :ev_tasks_fid,
 											  'evaluation_tasks'
 											  );
 		}
-
+		
 		db_exec_plsql delte_task_sols_folder {
 			select evaluation__delete_folder (
 											  :ev_tasks_sols_fid,
@@ -289,6 +290,5 @@
 											  'evaluation_student_evals'
 											  );
 		}
-		}
-    }
+	}
 }
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.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp	13 May 2004 16:29:40 -0000	1.2
@@ -8,7 +8,6 @@
    <form action="evaluate-students-2" method="post">
 	@export_vars;noquote@
       <input type=hidden name=task_id value="@task_id@">
-      <input type=hidden name=grade_id value="@grade_id@">
       <input type=hidden name=max_grade value="@max_grade@">
 		<blockquote>
         <table>
@@ -31,7 +30,6 @@
    <form action="evaluate-students-2" method+"post">
 	@export_vars;noquote@
       <input type=hidden name=task_id value="@task_id@">
-      <input type=hidden name=grade_id value="@grade_id@">
       <input type=hidden name=max_grade value="@max_grade@">
 		<blockquote>
         <table>
@@ -54,7 +52,6 @@
    <form action="evaluate-students-2" method="post">
 	@export_vars;noquote@
       <input type=hidden name=task_id value="@task_id@">
-      <input type=hidden name=grade_id value="@grade_id@">
       <input type=hidden name=max_grade value="@max_grade@">
 		<blockquote>
         <table>
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.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp	12 May 2004 02:07:45 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp	13 May 2004 16:29:40 -0000	1.3
@@ -7,6 +7,7 @@
       <input type=hidden name=task_id value="@task_id@">
 	   <blockquote><listtemplate name="evaluated_students"></listtemplate></blockquote>
         <input type=submit value="Edit Grades">
+		@export_vars;noquote@
   </form>
   <blockquote>
   <form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">  
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.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl	12 May 2004 02:07:45 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl	13 May 2004 16:29:40 -0000	1.3
@@ -35,8 +35,9 @@
 					  ] \
 				  show_student_p \
 				  [list label "Allow the students <br> to see the grade?" \
-					   display_template { [if { [string eq @evaluated_students.show_student_p@ "t"] } { return "Yes <input checked type=radio name=\"show_student.@evaluated_students.party_id@\" value=t> No <input type=radio name=\"show_student.@evaluated_students.party_id@\" value=f>" } else { return "Yes <input type=radio name=\"show_student.@evaluated_students.party_id@\" value=t> No <input checked type=radio name=\"show_student.@evaluated_students.party_id@\" value=f>" }] } ] \
-				  ]\
+					   display_template { Yes <input @evaluated_students.radio_yes_checked@ type=radio name="show_student.@evaluated_students.party_id@" value=t> No <input @evaluated_students.radio_no_checked@ type=radio name="show_student.@evaluated_students.party_id@" value=f> } \
+					  ] \
+				 ]
 
 template::list::create \
     -name evaluated_students \
@@ -51,7 +52,7 @@
     set orderby " order by party_name asc"
 } 
 
-db_multirow -extend { answer answer_url } evaluated_students get_evaluated_students { *SQL* } {
+db_multirow -extend { answer answer_url radio_yes_checked radio_no_checked } evaluated_students get_evaluated_students { *SQL* } {
 	
 	set grade [format %.2f $grade]
 	if { [string eq $online_p "t"] } {
@@ -63,7 +64,7 @@
 			set answer "View answer"
 		} else {
 			# we assume it's a file
-			set answer_url "[export_vars -base "../../view/$answer_title" { }]"
+			set answer_url "[export_vars -base "[ad_conn package_url]view/$answer_title" { }]"
 		}
 		if { ![string eq $answer "No response"] && ([template::util::date::compare $submission_date $evaluation_date] > 0) } {
 			append answer_url "<span style=\"color:red;\"> (NEW answer)</span>"
@@ -73,8 +74,19 @@
 		}
 	}
 
+	if { [string eq $show_student_p "t"] } {
+		set radio_yes_checked "checked"
+		set radio_no_checked ""
+	} else {
+		set radio_yes_checked ""
+		set radio_no_checked "checked"
+	}
+
+	set evaluation_ids($party_id) $evaluation_id
+	set item_to_edit_ids($party_id) $item_id
 } 
 
 set grades_sheet_item_id [db_nextval acs_object_id_seq]
+set export_vars [export_vars -form { evaluation_ids item_to_edit_ids }]
 
 ad_return_template
Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	28 Apr 2004 11:06:42 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	13 May 2004 16:29:41 -0000	1.2
@@ -27,8 +27,8 @@
 					  ] \
 				  requires_grade \
 				  [list label "Requires Grade?" \
-					   display_template { [if { [string eq @grades.requires_grade_p@ "t"] } { return "Yes <input checked type=radio name=\"no_grade.@grades.task_id@\" value=t> No <input type=radio name=\"no_grade.@grades.task_id@\" value=f>" } else { return "Yes <input type=radio name=\"no_grade.@grades.task_id@\" value=t> No <input checked type=radio name=\"no_grade.@grades.task_id@\" value=f>" }] } \
-					   ] \
+					   display_template { Yes <input @grades.radio_yes_checked@ type=radio name="no_grade.@grades.task_id@" value=t> No <input @grades.radio_no_checked@ type=radio name="no_grade.@grades.task_id@" value=f> } \
+					  ] \
 				  ]
 
 template::list::create \
@@ -45,7 +45,16 @@
     set orderby " order by task_name asc"
 }
 
-db_multirow grades get_grade_tasks { *SQL* } {
+db_multirow -extend { radio_yes_checked radio_no_checked } grades get_grade_tasks { *SQL* } {
+
+	if { [string eq $requires_grade_p "t"] } {
+		set radio_yes_checked "checked"
+		set radio_no_checked ""
+	} else {
+		set radio_yes_checked ""
+		set radio_no_checked "checked"
+	}
+
 } 	
 
 
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.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl	12 May 2004 02:07:46 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl	13 May 2004 16:29:41 -0000	1.3
@@ -24,7 +24,7 @@
 									 orderby_asc {number_of_members asc} \
 									 orderby_desc {number_of_members desc}] \
 				  grade_name \
-				  [list label "Task Type" \
+				  [list label "Assignment Type" \
 									 orderby_asc {grade_name asc} \
 									 orderby_desc {grade_name desc}] \
 				 ]