Index: openacs-4/packages/evaluation/www/admin/groups/one-task.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/admin/groups/one-task.xql	30 Aug 2004 11:31:24 -0000	1.6
+++ openacs-4/packages/evaluation/www/admin/groups/one-task.xql	10 Sep 2004 19:16:32 -0000	1.7
@@ -90,115 +90,14 @@
 <fullquery name="get_groups_for_task">      
       <querytext>
 
-		select count(*) from evaluation_task_groups etg, evaluation_tasks et
-		where et.task_id = :task_id
-		  and et.task_item_id = etg.task_item_id
-		  and etg.task_item_id = :task_item_id
+	select count(*)
+	from evaluation_task_groups etg, evaluation_tasks et, acs_rels map
+	where etg.task_item_id = et.task_item_id
+          and map.rel_type = 'evaluation_task_group_rel'
+          and map.object_id_one = etg.group_id
+	  and et.task_id = :task_id
 	
       </querytext>
 </fullquery>
 
 </queryset>
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
-
-<fullquery name="get_number_of_members">      
-      <querytext>
-
-		select task_name, number_of_members from evaluation_tasks where task_id = :task_id
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="get_info">      
-      <querytext>
-
-		select task_name, number_of_members as n_of_members, task_item_id from evaluation_tasks where task_id = :task_id
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="get_students_without_group">      
-      <querytext>
-
-		select p.last_name ||', '|| p.first_names as student_name,
-		p.person_id as student_id
-		from cc_users p
-		where p.person_id not in (select map.object_id_two from acs_rels map, evaluation_task_groups etg, evaluation_tasks et
-							  where map.object_id_two = p.person_id
-							  and map.object_id_one = etg.group_id
-							  and etg.task_item_id = :task_item_id
-							  and etg.task_item_id = et.task_item_id
-							  and et.task_id = :task_id
-							  and map.rel_type = 'evaluation_task_group_rel')
-		$orderby
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="community_get_students_without_group">      
-      <querytext>
-
-		select p.last_name ||', '|| p.first_names as student_name,
-		p.person_id as student_id
-		from cc_users p,
-		registered_users ru,
-                dotlrn_member_rels_approved app
-		where p.person_id not in (select map.object_id_two from acs_rels map, evaluation_task_groups etg, evaluation_tasks et
-							  where map.object_id_two = p.person_id
-							  and map.object_id_one = etg.group_id
-							  and etg.task_item_id = :task_item_id
-							  and etg.task_item_id = et.task_item_id
-							  and et.task_id = :task_id
-							  and map.rel_type = 'evaluation_task_group_rel')
-	        and app.community_id = :community_id
-                and app.user_id = ru.user_id
-	        and app.user_id = p.person_id
-	        and app.role = 'student'		
-		$orderby
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="get_task_groups">      
-      <querytext>
-
-		select g.group_id as evaluation_group_id, g.group_name,
-		count(map.object_id_two) as number_of_members
-		from groups g, evaluation_task_groups etg, evaluation_tasks et,
-		acs_rels map
-		where g.group_id = etg.group_id
-		  and etg.group_id = map.object_id_one
-		  and map.rel_type = 'evaluation_task_group_rel'
-		  and etg.task_item_id = :task_item_id
-	   	  and et.task_id = :task_id
-		group by g.group_id, g.group_name
-   		$orderby_groups
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="get_group_members">      
-      <querytext>
-
-		select p.last_name||', '||p.first_names from cc_users p, acs_rels map
-                                            where p.person_id = map.object_id_two
-                                              and map.object_id_one = :evaluation_group_id
-	
-      </querytext>
-</fullquery>
-
-<fullquery name="get_groups_for_task">      
-      <querytext>
-
-		select count(*) from evaluation_task_groups etg, evaluation_tasks et
-		where et.task_id = :task_id
-		  and et.task_item_id = etg.task_item_id
-		  and etg.task_item_id = :task_item_id
-	
-      </querytext>
-</fullquery>
-
-</queryset>