Index: openacs-4/packages/dotlrn/www/admin/users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/users.tcl	6 Mar 2002 00:08:02 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/users.tcl	12 Mar 2002 16:42:00 -0000	1.12
@@ -15,22 +15,28 @@
 set context_bar {Users}
 
 set dotlrn_roles [db_list_of_lists select_dotlrn_roles {
-    select type,
-           pretty_name,
+    select dotlrn_user_types.type,
+           dotlrn_user_types.pretty_name || ' (' || (select count(*)
+                                                     from party_member_map
+                                                     where party_member_map.party_id = dotlrn_user_types.group_id
+                                                     and party_member_map.member_id <> dotlrn_user_types.group_id) || ')',
            ''
     from dotlrn_user_types
-    order by pretty_name
+    order by dotlrn_user_types.pretty_name
 }]
 
-lappend dotlrn_roles {pending Pending {}}
-lappend dotlrn_roles {deactivated Deactivated {}}
+set n_pending_users [db_string select_non_dotlrn_users_count {}]
+lappend dotlrn_roles [list pending "Pending ($n_pending_users)" {}]
 
+set n_deactivated_users [db_string select_deactivated_users_count {}]
+lappend dotlrn_roles [list deactivated "Deactivated ($n_deactivated_users)" {}]
+
 set control_bar [ad_dimensional [list [list type {User Type:} admin $dotlrn_roles]]]
 
 if {[string equal $type "deactivated"] == 1} {
-    set n_users [db_string select_deactivated_users_count {}]
+    set n_users $n_deactivated_users
 } elseif {[string equal $type "pending"] == 1} {
-    set n_users [db_string select_non_dotlrn_users_count {}]
+    set n_users $n_pending_users
 } else {
     set n_users [db_string select_dotlrn_users_count {}]
 }