Index: openacs-4/packages/evaluation/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/index-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/index-postgresql.xql	30 Jul 2004 22:50:09 -0000	1.5
+++ openacs-4/packages/evaluation/www/index-postgresql.xql	10 Sep 2004 19:16:30 -0000	1.6
@@ -9,9 +9,9 @@
 		select eg.grade_plural_name,
 		eg.grade_id,
 	 	eg.grade_item_id
-   	 	from evaluation_gradesx eg, acs_objects ao
-		where content_revision__is_live(eg.grade_id) = true
-          and eg.item_id = ao.object_id
+   	 	from evaluation_grades eg, acs_objects ao, cr_items cri
+		where cri.live_revision = eg.grade_id
+          and eg.grade_item_id = ao.object_id
    		  and ao.context_id = :package_id
 		order by grade_plural_name desc
 	
@@ -21,7 +21,36 @@
 <fullquery name="get_total_grade">      
       <querytext>
 
-	select evaluation__class_total_grade(:user_id,:package_id)
+        select coalesce(sum((ese.grade*et.weight*eg.weight)/10000),0) as grade
+        from evaluation_grades eg, evaluation_tasks et, evaluation_student_evals ese, acs_objects ao, cr_items cri1, cr_items cri2, cr_items cri3
+        where et.task_item_id = ese.task_item_id
+		  and et.grade_item_id = eg.grade_item_id
+          and eg.grade_item_id = ao.object_id
+   		  and ao.context_id = :package_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 = et.task_id)
+
+	END as nom
+               from evaluation_tasks et3
+              where et3.task_id = et.task_id
+	)
+
+	and cri1.live_revision = eg.grade_id
+	and cri2.live_revision = et.task_id
+	and cri3.live_revision = ese.evaluation_id
+
+--	select evaluation__class_total_grade(:user_id,:package_id)
 	
       </querytext>
 </fullquery>