Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql 30 Jan 2002 22:54:59 -0000 1.1 @@ -0,0 +1,53 @@ + + + + oracle8.1.6 + + + + select dotlrn_users.user_id, + dotlrn_users.first_names, + dotlrn_users.last_name, + dotlrn_users.email, + nvl((select 'f' + from dotlrn_full_user_rels + where dotlrn_full_user_rels.rel_id = dotlrn_users.rel_id), + 't') as limited_access_p, + acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p + from dotlrn_users + where dotlrn_users.type = :type + and ( + lower(dotlrn_users.last_name) like lower('%' || :search_text || '%') + or lower(dotlrn_users.first_names) like lower('%' || :search_text || '%') + or lower(dotlrn_users.email) like lower('%' || :search_text || '%') + ) + order by dotlrn_users.last_name + + + + + + select persons.person_id, + persons.first_name, + persons.last_name, + parties.email, + 't', + 'f', + acs_permission.permission_p(:root_object_id, persons.person_id, 'admin') as site_wide_admin_p + from persons, + parties + where persons.person_id = parties.party_id + and not exists (select 1 + from dotlrn_users + where dotlrn_users.user_id = persons.person_id) + and ( + lower(dotlrn_users.last_name) like lower('%' || :search_text || '%') + or lower(dotlrn_users.first_names) like lower('%' || :search_text || '%') + or lower(dotlrn_users.email) like lower('%' || :search_text || '%') + ) + order by persons.last_name + + + + Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp 30 Jan 2002 22:54:59 -0000 1.1 @@ -0,0 +1,45 @@ + + + + + + +
+ + + + + + + + +<% set i 0 %> + + + +<% + if {!$i} {set bgcolor #ffffff} else {set bgcolor #cccccc} + set i [expr 1 - $i] +%> + + + + + + + + + + +
UserAccessRead Private Data?Site-wide Admin?
@users.last_name@, @users.first_names@ (@users.email@)limitedfullyesno + + + yes + + + no + + + yes +
+
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-large.tcl 30 Jan 2002 22:54:59 -0000 1.1 @@ -0,0 +1,47 @@ +ad_page_contract { + Displays main dotLRN admin page + + @author Ben Adida (ben@openforce.net) + @creation-date 2001-11-04 +} -query { + {search_text ""} +} -properties { + user_id:onevalue + users:multirow +} + +if {![exists_and_not_null type]} { + set type admin +} + +form create user_search + +element create user_search search_text \ + -label Search \ + -datatype text \ + -widget text \ + -value $search_text + +element create user_search type \ + -label Type \ + -datatype text \ + -widget hidden \ + -value $type + +if {[form is_valid user_search]} { + form get_values user_search search_text + + set user_id [ad_conn user_id] + set dotlrn_package_id [dotlrn::get_package_id] + set root_object_id [acs_magic_object security_context_root] + + if {[string equal $type "pending"] == 1} { + db_multirow users select_non_dotlrn_users {} + } else { + db_multirow users select_dotlrn_users {} + } +} else { + multirow create users dummy +} + +ad_return_template Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql 30 Jan 2002 22:54:59 -0000 1.1 @@ -0,0 +1,69 @@ + + + + oracle8.1.6 + + + + select count(*) + from dual + where exists (select 1 + from dotlrn_users + where dotlrn_users.type = :type + and upper(substr(dotlrn_users.last_name, 1, 1)) = upper(:dimension)) + + + + + + select count(*) + from dual + where exists (select 1 + from persons + where not exists (select 1 + from dotlrn_users + where dotlrn_users.user_id = persons.person_id) + and upper(substr(persons.last_name, 1, 1)) = upper(:dimension)) + + + + + + select dotlrn_users.user_id, + dotlrn_users.first_names, + dotlrn_users.last_name, + dotlrn_users.email, + nvl((select 'f' + from dotlrn_full_user_rels + where dotlrn_full_user_rels.rel_id = dotlrn_users.rel_id), + 't') as limited_access_p, + acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p + from dotlrn_users + where dotlrn_users.type = :type + and upper(substr(dotlrn_users.last_name, 1, 1)) = upper(:section) + order by dotlrn_users.last_name + + + + + + select persons.person_id, + persons.first_name, + persons.last_name, + parties.email, + 't', + 'f', + acs_permission.permission_p(:root_object_id, persons.person_id, 'admin') as site_wide_admin_p + from persons, + parties + where persons.person_id = parties.party_id + and not exists (select 1 + from dotlrn_users + where dotlrn_users.user_id = persons.person_id) + and upper(substr(persons.last_name, 1, 1)) = upper(:section) + order by persons.last_name + + + + Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp 30 Jan 2002 22:54:59 -0000 1.1 @@ -0,0 +1,45 @@ +

@control_bar@

+ + + + + +
+ + + + + + + + +<% set i 0 %> + + + +<% + if {!$i} {set bgcolor #ffffff} else {set bgcolor #cccccc} + set i [expr 1 - $i] +%> + + + + + + + + + + +
UserAccessRead Private Data?Site-wide Admin?
@users.last_name@, @users.first_names@ (@users.email@)limitedfullyesno + + + yes + + + no + + + yes +
+
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium.tcl 30 Jan 2002 22:54:59 -0000 1.1 @@ -0,0 +1,45 @@ +ad_page_contract { + Displays main dotLRN admin page + + @author Ben Adida (ben@openforce.net) + @creation-date 2001-11-04 +} -query { + {section ""} +} -properties { + user_id:onevalue + control_bar:onevalue + users:multirow +} + +set user_id [ad_conn user_id] +set dotlrn_package_id [dotlrn::get_package_id] +set root_object_id [acs_magic_object security_context_root] + +if {![exists_and_not_null type]} { + set type admin +} + +set default_section Z +foreach dimension {A B C D E F G H I J K L M N O P Q R S T U V W X Y Z} { + if {[string equal $type "pending"] == 1} { + set section_count [db_string select_non_dotlrn_users_count {}] + } else { + set section_count [db_string select_dotlrn_users_count {}] + } + + if {[empty_string_p $section] && $section_count} { + set section $dimension + } + + lappend dimensions [list $dimension $dimension {} $section_count] +} + +set control_bar [portal::dimensional [list [list section {} $section $dimensions]]] + +if {[string equal $type "pending"] == 1} { + db_multirow users select_non_dotlrn_users {} +} else { + db_multirow users select_dotlrn_users {} +} + +ad_return_template Index: openacs-4/packages/dotlrn/www/admin/users-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/users-chunk-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-oracle.xql 30 Jan 2002 22:54:59 -0000 1.1 @@ -0,0 +1,24 @@ + + + + oracle8.1.6 + + + + select count(*) + from dotlrn_users + where dotlrn_users.type = :type + + + + + + select count(*) + from persons + where not exists (select 1 + from dotlrn_users + where dotlrn_users.user_id = persons.person_id) + + + + Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 30 Jan 2002 22:54:59 -0000 1.1 @@ -0,0 +1,43 @@ + + + + oracle8.1.6 + + + + select dotlrn_users.user_id, + dotlrn_users.first_names, + dotlrn_users.last_name, + dotlrn_users.email, + nvl((select 'f' + from dotlrn_full_user_rels + where dotlrn_full_user_rels.rel_id = dotlrn_users.rel_id), + 't') as limited_access_p, + acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p + from dotlrn_users + where dotlrn_users.type = :type + order by dotlrn_users.last_name + + + + + + select persons.person_id, + persons.first_name, + persons.last_name, + parties.email, + 't', + 'f', + acs_permission.permission_p(:root_object_id, persons.person_id, 'admin') as site_wide_admin_p + from persons, + parties + where persons.person_id = parties.party_id + and not exists (select 1 + from dotlrn_users + where dotlrn_users.user_id = persons.person_id) + order by persons.last_name + + + + Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp 30 Jan 2002 22:54:59 -0000 1.1 @@ -0,0 +1,43 @@ + + + + +
+ + + + + + + + +<% set i 0 %> + + + +<% + if {!$i} {set bgcolor #ffffff} else {set bgcolor #cccccc} + set i [expr 1 - $i] +%> + + + + + + + + + + +
UserAccessRead Private Data?Site-wide Admin?
@users.last_name@, @users.first_names@ (@users.email@)limitedfullyesno + + + yes + + + no + + + yes +
+
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small.tcl 30 Jan 2002 22:54:59 -0000 1.1 @@ -0,0 +1,27 @@ +ad_page_contract { + Displays main dotLRN admin page + + @author Ben Adida (ben@openforce.net) + @creation-date 2001-11-04 +} -query { +} -properties { + user_id:onevalue + users:multirow +} + +set user_id [ad_conn user_id] +set dotlrn_package_id [dotlrn::get_package_id] +set root_object_id [acs_magic_object security_context_root] + +if {![exists_and_not_null type]} { + set type admin +} + +# Currently, just present a list of dotLRN users +if {[string equal $type "pending"] == 1} { + db_multirow users select_non_dotlrn_users {} +} else { + db_multirow users select_dotlrn_users {} +} + +ad_return_template Index: openacs-4/packages/dotlrn/www/admin/users-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp 30 Jan 2002 22:54:59 -0000 1.1 @@ -0,0 +1,13 @@ +

@control_bar@

+ + + + + + + + + + + + Index: openacs-4/packages/dotlrn/www/admin/users-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/users-chunk.tcl 30 Jan 2002 22:54:59 -0000 1.1 @@ -0,0 +1,30 @@ +ad_page_contract { + Displays main dotLRN admin page + + @author Ben Adida (ben@openforce.net) + @creation-date 2001-11-04 +} -query { + {type admin} +} -properties { + control_bar:onevalue + n_users:onevalue +} + +set control_bar [ad_dimensional { + {type {User Type:} admin + { + {admin Administrators {}} + {professor Professors {}} + {student Students {}} + {pending Pending {}} + } + } +}] + +if {[string equal $type "pending"] == 1} { + set n_users [db_string select_non_dotlrn_users_count {}] +} else { + set n_users [db_string select_dotlrn_users_count {}] +} + +ad_return_template Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/users-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/www/admin/users.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.adp,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/admin/users.adp 23 Jan 2002 00:15:44 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/users.adp 30 Jan 2002 22:54:59 -0000 1.12 @@ -2,68 +2,14 @@ Users @context_bar@ -[ create a new user ] +[ Create A New User ]

Add a new dotLRN user:
- - - - -
- - - - - - - - - -<% set i 0 %> - - - -<% - if {$i == 0} {set bgcolor white} else {set bgcolor #cccccc} - set i [expr 1 - $i] -%> - - - - - - - - - - - -
UserTypeAccessRead Private Data?Site-wide Admin?
@users.last_name@, @users.first_names@ (@users.email@)@users.type@limitedfullyesno - - - yes - - - no - - - yes -
-
-

- -
- Add a new dotLRN user: -
- -

- -[ create a new user ] - + 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.6 -r1.7 --- openacs-4/packages/dotlrn/www/admin/users.tcl 23 Jan 2002 00:15:44 -0000 1.6 +++ openacs-4/packages/dotlrn/www/admin/users.tcl 30 Jan 2002 22:54:59 -0000 1.7 @@ -6,17 +6,8 @@ } -query { } -properties { context_bar:onevalue - user_id:onevalue - users:multirow } -set user_id [ad_conn user_id] - -set dotlrn_package_id [dotlrn::get_package_id] - -# Currently, just present a list of dotLRN users -db_multirow users select_dotlrn_users {} - set context_bar {Users} ad_return_template Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/users.xql'. Fisheye: No comparison available. Pass `N' to diff?