Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql	14 Jul 2004 17:52:59 -0000	1.4
+++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql	30 Jul 2004 22:51:49 -0000	1.5
@@ -11,16 +11,16 @@
 		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,
 		cr.title as task_title,
    		et.task_id as revision_id,
 		ets.solution_id as solution_id
 	from cr_revisions cr,
-		 evaluation_tasksi et left outer join evaluation_tasks_solsi ets on (ets.task_id = et.task_id and content_revision__is_live(ets.solution_id) = true)
+		 evaluation_tasksi et left outer join evaluation_tasks_solsi ets on (ets.task_item_id = et.task_item_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 = :grade_item_id	
 	  and content_revision__is_live(et.task_id) = true 
 	$assignments_orderby
 
@@ -36,17 +36,17 @@
 		et.late_submit_p, 
 		et.item_id,
 		et.due_date,
-		et.requires_grade_p, et.description, et.grade_id,
+		et.requires_grade_p, et.description, et.grade_item_id,
 		cr.title as task_title,
 		et.data as task_data,
 	   	et.task_id as revision_id,
 		cr.content_length,
 		ea.answer_id as answer_id
 	from cr_revisions cr, 
-		 evaluation_tasksi et left outer join evaluation_answersi ea on (ea.task_id = et.task_id and content_revision__is_live(ea.answer_id) = true
+		 evaluation_tasksi 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(:user_id,et.task_id))
 	where cr.revision_id = et.revision_id
-	  and grade_id = :grade_id
+	  and grade_item_id = :grade_item_id
 	  and content_revision__is_live(et.task_id) = true 
     $assignments_orderby
 	
@@ -64,7 +64,9 @@
 <fullquery name="grade_names">      
       <querytext>
 
-		select grade_name, grade_plural_name from evaluation_grades where grade_id = :grade_id
+		select grade_name, grade_plural_name 
+		from evaluation_grades 
+		where grade_item_id = :grade_item_id and content_revision__is_live(grade_id) = true
 	
       </querytext>
 </fullquery>