Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql	7 Jul 2004 17:26:44 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql	14 Jul 2004 17:42:07 -0000	1.5
@@ -7,24 +7,18 @@
       <querytext>
 
 	select evaluation__party_name(ese.party_id,et.task_id) as party_name,
-	ea.data as answer_data,
-	ea.title as answer_title,
-	ea.revision_id,
 	ese.party_id,
 	ese.grade,
-	to_char(ea.last_modified, 'YYYY-MM-DD HH24:MI:SS') as submission_date_ansi,
-	ea.last_modified as submission_date,
 	ese.last_modified as evaluation_date,
 	et.online_p,
 	et.due_date,
 	ese.evaluation_id
 	from evaluation_tasks et,
-	     evaluation_student_evalsi ese left outer join evaluation_answersi ea on (ea.party_id = ese.party_id 
- 											  and ea.task_id = ese.task_id
-											  and content_revision__is_live(ea.answer_id) = true)
+	     evaluation_student_evalsi ese 
 	where et.task_id = :task_id
 	  and et.task_id = ese.task_id
 	  and content_revision__is_live(ese.evaluation_id) = true
+        $orderby       
 	
       </querytext>
 </fullquery>
@@ -37,6 +31,22 @@
       </querytext>
 </fullquery>
 
+<fullquery name="get_answer_info">      
+      <querytext>
+
+	    select ea.data as answer_data,
+	    ea.title as answer_title,
+	    ea.revision_id,
+	    to_char(ea.last_modified, 'YYYY-MM-DD HH24:MI:SS') as submission_date_ansi,
+	    ea.last_modified as submission_date
+	    from evaluation_answersi ea 
+            where ea.party_id = :party_id 
+	    and ea.task_id = :task_id
+	    and content_revision__is_live(ea.answer_id) = true
+	
+      </querytext>
+</fullquery>
+
 <fullquery name="count_evaluated_students">      
       <querytext>
 
@@ -68,11 +78,12 @@
 	et.due_date,
 	ea.last_modified as submission_date
 	from evaluation_answersi ea, 
-	     evaluation_tasks et
+	     evaluation_tasks et,
+	     cr_items cri
 	where ea.task_id = et.task_id
           and et.task_id = :task_id
           and ea.data is not null
-	  and content_revision__is_live(ea.answer_id) = true
+          and cri.live_revision = ea.answer_id
         $processed_clause
 	
       </querytext>