Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql	13 Jan 2005 23:43:26 -0000	1.1
+++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql	4 Apr 2005 18:23:47 -0000	1.2
@@ -3,62 +3,14 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="get_tasks_admin">      
-      <querytext>
-
-	select et.task_name, 
-	round(et.weight,2) as task_weight,
-    et.task_id
-	from evaluation_tasksi et, cr_items cri
-	where grade_item_id = :grade_item_id
-	  and cri.live_revision = et.task_id
-      $evaluations_orderby
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="get_grade_tasks">      
-      <querytext>
-
-	select et.task_name, 
-	et.task_item_id,
-	et.weight as t_weight,
-	eg.weight as g_weight,
-	round((et.weight*eg.weight)/100,2) as task_weight,
-	et.number_of_members,
-        et.task_id
-	from evaluation_grades eg,
-	evaluation_tasksi et,
-	cr_items cri
-	where eg.grade_id = :grade_id
-	and eg.grade_item_id = et.grade_item_id
-	and cri.live_revision = et.task_id
-	$evaluations_orderby
-	
-      </querytext>
-</fullquery>
-
 <fullquery name="get_group_id">      
       <querytext>
-
-	select nvl((select etg2.group_id from evaluation_task_groups etg2, 
-                                                      evaluation_tasks et2, 
-                                                      acs_rels map 
-                                                      where map.object_id_one = etg2.group_id 
-                                                        and map.object_id_two = :user_id 
-                                                        and etg2.task_item_id = et2.task_item_id 
-                                                        and et2.task_id = :task_id),0)
-               from evaluation_tasks et3 
-              where et3.task_id = :task_id 
-
---		select evaluation__party_id(:user_id,:task_id)
-	
+	select evaluation.party_id(:user_id,:task_id) from dual
       </querytext>
 </fullquery>
 
 <fullquery name="get_evaluation_info">      
       <querytext>
-
 	    select round(ese.grade,2) as grade,
 	    ese.evaluation_id,
 	    ese.description as comments,
@@ -67,55 +19,19 @@
 	    from evaluation_student_evalsi ese, cr_items cri
 	    where ese.task_item_id = :task_item_id
 	    and cri.live_revision = ese.evaluation_id
-	    and ese.party_id = 
-	( select 
-	CASE  
-	  WHEN et3.number_of_members = 1 THEN :user_id 
-	  ELSE  
-	(select etg2.group_id from evaluation_task_groups etg2, 
-                                                      evaluation_tasks et2, 
-                                                      acs_rels map 
-                                                      where map.object_id_one = etg2.group_id 
-                                                        and map.object_id_two = :user_id 
-                                                        and etg2.task_item_id = et2.task_item_id 
-                                                        and et2.task_id = :task_id) 
-	END as nom 
-               from evaluation_tasks et3 
-              where et3.task_id = :task_id 
-	) 
--- evaluation__party_id(:user_id,:task_id)
-
+	    and ese.party_id = evaluation.party_id(:user_id,:task_id)
       </querytext>
 </fullquery>
 
 <fullquery name="get_answer_info">      
       <querytext>
-
 	    select ea.data as answer_data, 
 	    ea.title as answer_title, 
 	    ea.answer_id 
 	    from evaluation_answersi ea, cr_items cri
 	    where ea.task_item_id = :task_item_id 
 	    and cri.live_revision = ea.answer_id
-	    and ea.party_id = 
-	( select 
-	CASE  
-	  WHEN et3.number_of_members = 1 THEN :user_id 
-	  ELSE  
-	(select etg2.group_id from evaluation_task_groups etg2, 
-                                                      evaluation_tasks et2, 
-                                                      acs_rels map 
-                                                      where map.object_id_one = etg2.group_id 
-                                                        and map.object_id_two = :user_id 
-                                                        and etg2.task_item_id = et2.task_item_id 
-                                                        and et2.task_id = :task_id) 
-	END as nom 
-               from evaluation_tasks et3 
-              where et3.task_id = :task_id 
-	) 
-
--- evaluation__party_id(:user_id,:task_id)
-
+	    and ea.party_id = evaluation.party_id(:user_id,:task_id)
       </querytext>
 </fullquery>