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.2 -r1.3
--- openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.2
+++ openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql	4 Aug 2004 21:57:45 -0000	1.3
@@ -11,16 +11,17 @@
 		et.online_p, 
 		et.late_submit_p, 
 		et.item_id,
-		et.requires_grade_p, et.description, et.grade_id,
+		et.requires_grade_p, et.description, et.grade_item_id,
 		cr.content_length,
 		et.data as task_data,
 		et.title as task_title,
    		et.task_id as revision_id,
 		ets.solution_id as solution_id
-	from cr_revisions cr, 
+	from cr_revisions cr, evaluation_grades eg,
 		 evaluation_tasksi et left outer join evaluation_tasks_solsi ets on (ets.task_id = et.task_id and content_revision__is_live(ets.solution_id) = true)
 	where cr.revision_id = et.revision_id
-	  and grade_id = :grade_id	
+	  and et.grade_item_id = eg.grade_item_id
+	  and eg.grade_id = :grade_id
 	  and content_revision__is_live(et.task_id) = true 
 	$assignments_orderby
 
@@ -38,17 +39,18 @@
 		et.due_date,
 		et.requires_grade_p, 
 		et.description, 
-		et.grade_id,
+		et.grade_item_id,
 		et.title as task_title,
 		et.data as task_data,
 	   	et.task_id as revision_id,
 		cr.content_length,
 		ea.answer_id as answer_id
-	from cr_revisions cr, 
+	from cr_revisions cr, evaluation_grades eg,
 		 evaluation_tasksi et left outer join evaluation_answersi ea on (ea.task_id = et.task_id and content_revision__is_live(ea.answer_id) = true
                                                                     and ea.party_id = evaluation__party_id(:user_id,et.task_id))
 	where cr.revision_id = et.revision_id
-	  and grade_id = :grade_id
+	  and et.grade_item_id = eg.grade_item_id
+	  and eg.grade_id = :grade_id
 	  and content_revision__is_live(et.task_id) = true 
     $assignments_orderby
 	
@@ -79,12 +81,15 @@
     ea.answer_id,
     person__name(ese.creation_user) as grader_name
     from evaluation_grades eg,
-    evaluation_tasks et2 left outer join evaluation_student_evalsi ese on (ese.task_id = et2.task_id and content_revision__is_live(ese.evaluation_id) = true
+    evaluation_tasks et2 left outer join evaluation_student_evalsi ese on (ese.task_item_id = et2.task_item_id 
+									   and content_revision__is_live(ese.evaluation_id) = true
+									   and content_revision__is_live(et2.task_id) = true
 									   and ese.party_id = evaluation__party_id(:student_id,et2.task_id)),
-    evaluation_tasks et left outer join evaluation_answersi ea on (ea.task_id = et.task_id and content_revision__is_live(ea.answer_id) = true
+    evaluation_tasks et left outer join evaluation_answersi ea on (ea.task_item_id = et.task_item_id 
+								   and content_revision__is_live(ea.answer_id) = true
 								   and ea.party_id = evaluation__party_id(:student_id,et.task_id))
     where eg.grade_id = :grade_id
-    and eg.grade_id = et.grade_id
+    and eg.grade_item_id = et.grade_item_id
     and et.task_id = et2.task_id
     and content_revision__is_live(et.task_id) = true 
     and content_revision__is_live(eg.grade_id) = true