Index: openacs-4/packages/acs-subsite/www/members/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/index.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/members/index.xql	10 Nov 2003 17:32:15 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/members/index.xql	3 Dec 2003 23:38:27 -0000	1.2
@@ -11,6 +11,7 @@
            membership_rels mr,
            cc_users u
     where  r.object_id_one = :group_id
+    and    r.rel_type = 'membership_rel'
     and    mr.rel_id = r.rel_id
     and    u.user_id = r.object_id_two
     [template::list::filter_where_clauses -and -name "members"]
@@ -19,35 +20,57 @@
       </querytext>
 </fullquery>
 
+<fullquery name="pretty_roles">
+      <querytext>
 
+        select admin_role.pretty_name as admin_role_pretty,
+          member_role.pretty_name as member_role_pretty
+        from acs_rel_roles admin_role, acs_rel_roles member_role
+        where admin_role.role = 'admin'
+          and member_role.role = 'member';
+
+      </querytext>
+</fullquery>
+
 <fullquery name="members_select">      
       <querytext>
 
     select r.rel_id, 
            u.user_id,
            u.first_names || ' ' || u.last_name as name,
            u.email,
-           r.rel_type,
-           rt.role_two as rel_role,
-           role.pretty_name as rel_role_pretty,
-           mr.member_state
+           mr.member_state,
+           (select count(*)
+            from rel_segment_party_map
+            where rel_type = 'admin_rel'
+              and group_id = :group_id
+              and party_id = u.user_id) as member_admin_p
     from   acs_rels r,
            membership_rels mr,
-           cc_users u,
-           acs_rel_types rt,
-           acs_rel_roles role
+           cc_users u
     where  r.object_id_one = :group_id
     and    mr.rel_id = r.rel_id
+    and    r.rel_id = mr.rel_id
     and    u.user_id = r.object_id_two
-    and    rt.rel_type = r.rel_type
-    and    role.role = rt.role_two
     [template::list::filter_where_clauses -and -name "members"]
     [template::list::page_where_clause -and -name "members" -key "r.rel_id"]
     [template::list::orderby_clause -orderby -name "members"]
 
-
       </querytext>
 </fullquery>
 
+<fullquery name="select_member_states">
+      <querytext>
+
+        select mr.member_state as state, 
+               count(mr.rel_id) as num_members
+        from   membership_rels mr, acs_rels r
+        where  r.rel_id = mr.rel_id
+          and  r.object_id_one = :group_id
+          and  r.rel_type = 'membership_rel'
+        group  by mr.member_state
+
+      </querytext>
+</fullquery>
  
 </queryset>