');
my $personal_table =
&personal_data_display($ccuname,$ccdomain,$newuser,$context,
$inst_results{$ccuname.':'.$ccdomain});
$r->print($personal_table);
+#FIXME
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($ccdomain,'hserver',
'default','hide');
@@ -1020,7 +849,7 @@ $lt{'hs'}: $home_server_pick
$r->print($home_server_pick);
}
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
- $r->print('
'.
&Apache::loncommon::start_data_table().
&build_tools_display($ccuname,$ccdomain,
'requestcourses').
@@ -1094,7 +923,6 @@ ENDAUTH
my %lt=&Apache::lonlocal::texthash(
'cup' => "Modify existing user: ",
'ens' => "Enroll one student: ",
- 'enm' => "Enroll one member: ",
'id' => "in domain",
);
$r->print(<
ENDCHANGEUSER
if ($env{'form.action'} eq 'singlestudent') {
- if ($crstype eq 'Community') {
- $r->print($lt{'enm'});
- } else {
- $r->print($lt{'ens'});
- }
+ $r->print($lt{'ens'});
} else {
$r->print($lt{'cup'});
}
@@ -1122,9 +946,9 @@ ENDCHANGEUSER
$r->print(&Apache::lonuserutils::forceid_change($context));
}
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
- $r->print(''.&mt('User Can Request Creation of Courses/Communities in this Domain?').'
'.
+ $r->print(''.&mt('User Can Request Creation of Courses in this Domain?').'
'.
&Apache::loncommon::start_data_table());
- if ($env{'request.role.domain'} eq $ccdomain) {
+ if ($env{'request.role.domain'} eq $ccdomain) {
$r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
} else {
$r->print(&coursereq_externaluser($ccuname,$ccdomain,
@@ -1206,13 +1030,7 @@ ENDNOTOOLSPRIV
} ## End of new user/old user logic
if ($env{'form.action'} eq 'singlestudent') {
- my $btntxt;
- if ($crstype eq 'Community') {
- $btntxt = &mt('Enroll Member');
- } else {
- $btntxt = &mt('Enroll Student');
- }
- $r->print('
'."\n");
+ $r->print('
'."\n");
} else {
$r->print(''.&mt('Add Roles').'
');
my $addrolesdisplay = 0;
@@ -1251,14 +1069,9 @@ ENDNOTOOLSPRIV
}
sub singleuser_breadcrumb {
- my ($crstype) = @_;
my %breadcrumb_text;
if ($env{'form.action'} eq 'singlestudent') {
- if ($crstype eq 'Community') {
- $breadcrumb_text{'search'} = 'Enroll a member';
- } else {
- $breadcrumb_text{'search'} = 'Enroll a student';
- }
+ $breadcrumb_text{'search'} = 'Enroll a student';
$breadcrumb_text{'userpicked'} = 'Select a user',
$breadcrumb_text{'modify'} = 'Set section/dates',
} else {
@@ -1473,9 +1286,9 @@ sub display_existing_roles {
}
$row.= ''.$plaintext.
' | '.$area.
- ' | '.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time)
+ ' | '.($role_start_time?localtime($role_start_time)
: ' ' ).
- ' | '.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time)
+ ' | '.($role_end_time ?localtime($role_end_time)
: ' ' )
." | ";
$sortrole{$sortkey}=$envkey;
@@ -1486,7 +1299,7 @@ sub display_existing_roles {
} # end of foreach (table building loop)
my $rolesdisplay = 0;
my %output = ();
- foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {
+ foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
$output{$type} = '';
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) {
@@ -1506,8 +1319,7 @@ sub display_existing_roles {
if ($rolesdisplay == 1) {
my $contextrole='';
if ($env{'request.course.id'}) {
- my $crstype = &Apache::loncommon::course_type();
- $contextrole = "Existing Roles in this $crstype";
+ $contextrole = 'Existing Roles in this Course';
} elsif ($env{'request.role'} =~ /^au\./) {
$contextrole = 'Existing Co-Author Roles in your Construction Space';
} else {
@@ -1522,7 +1334,7 @@ sub display_existing_roles {
''.$lt{'rol'}.' | '.$lt{'ext'}.
' | '.$lt{'sta'}.' | '.$lt{'end'}.' | '.
&Apache::loncommon::end_data_table_header_row());
- foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {
+ foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
if ($output{$type}) {
$r->print($output{$type}."\n");
}
@@ -1619,10 +1431,8 @@ sub new_domain_roles {
&mt('Extent').''.
''.&mt('Start').' | '.&mt('End').' | '.
&Apache::loncommon::end_data_table_header_row();
- my @allroles = &Apache::lonuserutils::roles_by_context('domain');
foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) {
- foreach my $role (@allroles) {
- next if ($role eq 'ad');
+ foreach my $role ('dc','li','dg','au','sc') {
if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
my $plrole=&Apache::lonnet::plaintext($role);
my %lt=&Apache::lonlocal::texthash(
@@ -2017,7 +1827,7 @@ sub get_inststatuses {
# ================================================================= Phase Three
sub update_user_data {
- my ($r,$context,$crstype) = @_;
+ my ($r,$context) = @_;
my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
$env{'form.ccdomain'});
# Error messages
@@ -2041,7 +1851,7 @@ sub update_user_data {
$jsback."\n".
'// ]]>'."\n".
''."\n";
- my %breadcrumb_text = &singleuser_breadcrumb($crstype);
+ my %breadcrumb_text = &singleuser_breadcrumb();
my $args;
if ($env{'form.popup'}) {
$args->{'no_nav_bar'} = 1;
@@ -2140,7 +1950,7 @@ sub update_user_data {
$env{'form.ccuname'}, $env{'form.ccdomain'}).'');
my (%alerts,%rulematch,%inst_results,%curr_rules);
my @usertools = ('aboutme','blog','portfolio');
- my @requestcourses = ('official','unofficial');
+ my @requestcourses = ('official','unofficial','community');
my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
if ($env{'form.makeuser'}) {
@@ -2221,13 +2031,7 @@ sub update_user_data {
}
}
foreach my $item (@requestcourses) {
- $newcustom{$item} = $env{'form.crsreq_'.$item};
- if ($env{'form.crsreq_'.$item} eq 'autolimit') {
- $newcustom{$item} .= '=';
- unless ($env{'form.crsreq_'.$item.'_limit'} =~ /\D/) {
- $newcustom{$item} .= $env{'form.crsreq_'.$item.'_limit'};
- }
- }
+ $newcustom{$item} = $env{'form.requestcourses_'.$item};
$changed{$item} = &tool_admin($item,$newcustom{$item},
\%changeHash,'requestcourses');
}
@@ -2273,10 +2077,9 @@ sub update_user_data {
}
}
##
- my (@userroles,%userupdate,$cnum,$cdom,$crstype,$namechanged);
+ my (@userroles,%userupdate,$cnum,$cdom,$namechanged);
if ($context eq 'course') {
($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
- $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);
}
if (! $env{'form.makeuser'} ) {
# Check for need to change
@@ -2360,7 +2163,7 @@ sub update_user_data {
if ($role eq 'cr') {
push(@longroles,'Custom');
} else {
- push(@longroles,&Apache::lonnet::plaintext($role,$crstype));
+ push(@longroles,&Apache::lonnet::plaintext($role));
}
}
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
@@ -2514,7 +2317,8 @@ sub update_user_data {
\%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext);
} else {
&tool_changes('reqcrsotherdom',\@requestcourses,\%oldaccess,\%oldaccesstext,
- \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext);
+ \%userenv,
+ \%changeHash,\%changed,\%newaccess,\%newaccesstext);
}
if ($env{'form.cfirstname'} ne $userenv{'firstname'} ||
$env{'form.cmiddlename'} ne $userenv{'middlename'} ||
@@ -2541,11 +2345,13 @@ sub update_user_data {
($env{'user.domain'} eq $env{'form.ccdomain'})) {
my %newenvhash;
foreach my $key (keys(%changed)) {
- if (($key eq 'official') || ($key eq 'unofficial')) {
+ if (($key eq 'official') || ($key eq 'unofficial')
+ || ($key eq 'community')) {
$newenvhash{'environment.requestcourses.'.$key} =
$changeHash{'requestcourses.'.$key};
if ($changeHash{'requestcourses.'.$key} ne '') {
- $newenvhash{'environment.canrequest.'.$key} = 1;
+ $newenvhash{'environment.canrequest.'.$key} =
+ $changeHash{'requestcourses.'.$key};
} else {
$newenvhash{'environment.canrequest.'.$key} =
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
@@ -2602,6 +2408,7 @@ sub update_user_data {
'portfolio' => 'Portfolio Availability',
'official' => 'Can Request Official Courses',
'unofficial' => 'Can Request Unofficial Courses',
+ 'community' => 'Can Request Communities',
'inststatus' => "Affiliation",
'prvs' => 'Previous Value:',
'chto' => 'Changed To:'
@@ -2755,6 +2562,7 @@ END
'portfolio' => "Portfolio Availability",
'official' => "Can Request Official Courses",
'unofficial' => "Can Request Unofficial Courses",
+ 'community' => "Can Request Communities",
'inststatus' => "Affiliation",
);
$r->print(<<"END");
@@ -2825,14 +2633,9 @@ END
.'');
}
if ($env{'form.action'} eq 'singlestudent') {
- &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype);
- $r->print('');
- if ($crstype eq 'Community') {
- $r->print(&mt('Enroll Another Member'));
- } else {
- $r->print(&mt('Enroll Another Student'));
- }
- $r->print('
');
+ &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context);
+ $r->print(''.
+ &mt('Enroll Another Student').'
');
} else {
my @rolechanges = &update_roles($r,$context);
if ($namechanged) {
@@ -2874,29 +2677,16 @@ sub tool_changes {
return;
}
if ($context eq 'reqcrsotherdom') {
- my @options = ('approval','validate','autolimit');
- my $optregex = join('|',@options);
- my %reqdisplay = &courserequest_display();
my $cdom = $env{'request.role.domain'};
foreach my $tool (@{$usertools}) {
- $oldaccesstext->{$tool} = &mt('No');
- $newaccesstext->{$tool} = $oldaccesstext->{$tool};
+ $oldaccesstext->{$tool} = &mt('no');
$changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
- my $newop;
- if ($env{'form.'.$context.'_'.$tool}) {
- $newop = $env{'form.'.$context.'_'.$tool};
- if ($newop eq 'autolimit') {
- my $limit = $env{'form.'.$context.'_'.$tool.'_limit'};
- $limit =~ s/\D+//g;
- $newop .= '='.$limit;
- }
- }
if ($userenv->{$context.'.'.$tool} eq '') {
- if ($newop) {
- $changed->{$tool}=&tool_admin($tool,$cdom.':'.$newop,
+ if ($env{'form.'.$context.'_'.$tool}) {
+ $changed->{$tool}=&tool_admin($tool,$cdom,
$changeHash,$context);
if ($changed->{$tool}) {
- $newaccesstext->{$tool} = &mt('Yes');
+ $newaccesstext->{$tool} = &mt('yes');
} else {
$newaccesstext->{$tool} = $oldaccesstext->{$tool};
}
@@ -2905,32 +2695,23 @@ sub tool_changes {
my @curr = split(',',$userenv->{$context.'.'.$tool});
my @new;
my $changedoms;
- foreach my $req (@curr) {
- if ($req =~ /^\Q$cdom\E\:($optregex\=?\d*)$/) {
- $oldaccesstext->{$tool} = &mt('Yes');
- my $oldop = $1;
- if ($oldop ne $newop) {
- $changedoms = 1;
- foreach my $item (@curr) {
- my ($reqdom,$option) = split(':',$item);
- unless ($reqdom eq $cdom) {
- push(@new,$item);
- }
+ if (grep(/^\Q$cdom\E$/,@curr)) {
+ $oldaccesstext->{$tool} = &mt('yes');
+ unless ($env{'form.'.$context.'_'.$tool}) {
+ $changedoms = 1;
+ foreach my $dom (@curr) {
+ unless ($dom eq $cdom) {
+ push(@new,$dom);
}
- if ($newop) {
- push(@new,$cdom.':'.$newop);
- }
- @new = sort(@new);
}
- last;
}
- }
- if ((!$changedoms) && ($newop)) {
+ } elsif ($env{'form.'.$context.'_'.$tool}) {
$changedoms = 1;
- @new = sort(@curr,$cdom.':'.$newop);
+ @new = sort(@curr,$cdom);
}
+ $newaccesstext->{$tool} = $oldaccesstext->{$tool};
if ($changedoms) {
- my $newdomstr;
+ my $newdomstr;
if (@new) {
$newdomstr = join(',',@new);
}
@@ -2938,19 +2719,9 @@ sub tool_changes {
$context);
if ($changed->{$tool}) {
if ($env{'form.'.$context.'_'.$tool}) {
- if ($env{'form.'.$context.'_'.$tool} eq 'autolimit') {
- my $limit = $env{'form.'.$context.'_'.$tool.'_limit'};
- $limit =~ s/\D+//g;
- if ($limit) {
- $newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user.',$limit);
- } else {
- $newaccesstext->{$tool} = &mt('Yes, processed automatically');
- }
- } else {
- $newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}};
- }
+ $newaccesstext->{$tool} = &mt('yes');
} else {
- $newaccesstext->{$tool} = &mt('No');
+ $newaccesstext->{$tool} = &mt('no');
}
}
}
@@ -2959,15 +2730,6 @@ sub tool_changes {
return;
}
foreach my $tool (@{$usertools}) {
- my $newval;
- if ($context eq 'requestcourses') {
- $newval = $env{'form.crsreq_'.$tool};
- if ($newval eq 'autolimit') {
- $newval .= '='.$env{'form.crsreq_'.$tool.'_limit'};
- }
- } else {
- $newval = $env{'form.'.$context.'_'.$tool};
- }
if ($userenv->{$context.'.'.$tool} ne '') {
$oldaccess->{$tool} = &mt('custom');
if ($userenv->{$context.'.'.$tool}) {
@@ -2977,12 +2739,12 @@ sub tool_changes {
}
$changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
if ($env{'form.custom'.$tool} == 1) {
- if ($newval ne $userenv->{$context.'.'.$tool}) {
- $changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
- $context);
+ if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$tool}) {
+ $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
+ $changeHash,$context);
if ($changed->{$tool}) {
$newaccess->{$tool} = &mt('custom');
- if ($newval) {
+ if ($env{'form.'.$context.'_'.$tool}) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
@@ -3015,11 +2777,11 @@ sub tool_changes {
} else {
$oldaccess->{$tool} = &mt('default');
if ($env{'form.custom'.$tool} == 1) {
- $changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
- $context);
+ $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
+ $changeHash,$context);
if ($changed->{$tool}) {
$newaccess->{$tool} = &mt('custom');
- if ($newval) {
+ if ($env{'form.'.$context.'_'.$tool}) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
@@ -3301,14 +3063,8 @@ sub update_roles {
}
sub enroll_single_student {
- my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype) = @_;
- $r->print('');
- if ($crstype eq 'Community') {
- $r->print(&mt('Enrolling Member'));
- } else {
- $r->print(&mt('Enrolling Student'));
- }
- $r->print('
');
+ my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context) = @_;
+ $r->print(''.&mt('Enrolling Student').'
');
# Remove non alphanumeric values from section
$env{'form.sections'}=~s/\W//g;
@@ -3341,13 +3097,7 @@ sub enroll_single_student {
}
$r->print('.
'.$showstart.'; '.$showend);
if ($startdate <= $now && !$newuser) {
- $r->print(' ');
- if ($crstype eq 'Community') {
- $r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role will be available when the member next logs in.'));
- } else {
- $r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.'));
- }
- $r->print('
');
+ $r->print(" ".&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.')."
");
}
} else {
$r->print(&mt('unable to enroll').": ".$enroll_result);
@@ -3540,25 +3290,16 @@ sub custom_role_editor {
my ($jsback,$elements) = &crumb_utilities();
my $button_code = "\n";
my $head_script = "\n";
- $head_script .= ''."\n";
+ $head_script .= "\n".$jsback."\n"
+ .'// ]]>'."\n"
+ .''."\n";
$r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.form1,'pickrole','')",
@@ -3596,7 +3337,7 @@ ENDCCF
''.$lt{'ssl'}.' | '.
&Apache::loncommon::end_data_table_header_row());
foreach my $priv (sort keys %full) {
- my $privtext = &Apache::lonnet::plaintext($priv,$crstype);
+ my $privtext = &Apache::lonnet::plaintext($priv);
$r->print(&Apache::loncommon::start_data_table_row().
''.$privtext.' | '.
($courselevel{$priv}?'';
return ($button_code);
}
@@ -3701,11 +3442,11 @@ sub set_custom_role {
return;
}
my ($jsback,$elements) = &crumb_utilities();
- my $jscript = '';
+ my $jscript = ''."\n";
$r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
&Apache::lonhtmlcommon::add_breadcrumb
@@ -3787,10 +3528,9 @@ sub handler {
$r->send_http_header;
return OK;
}
- my ($context,$crstype);
+ my $context;
if ($env{'request.course.id'}) {
$context = 'course';
- $crstype = &Apache::loncommon::course_type();
} elsif ($env{'request.role'} =~ /^au\./) {
$context = 'author';
} else {
@@ -3809,7 +3549,7 @@ sub handler {
#SD Following files not added to help, because the corresponding .tex-files seem to
#be missing: Course_Approve_Selfenroll,Course_User_Logs,
my ($permission,$allowed) =
- &Apache::lonuserutils::get_permission($context,$crstype);
+ &Apache::lonuserutils::get_permission($context);
if (!$allowed) {
$env{'user.error.msg'}=
"/adm/createuser:cst:0:0:Cannot create/modify user data ".
@@ -3824,7 +3564,7 @@ sub handler {
if (! exists($env{'form.action'})) {
$r->print(&header());
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
- $r->print(&print_main_menu($permission,$context,$crstype));
+ $r->print(&print_main_menu($permission,$context));
$r->print(&Apache::loncommon::end_page());
} elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
$r->print(&header());
@@ -3840,7 +3580,7 @@ sub handler {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);
} elsif ($env{'form.state'} eq 'got_file') {
&Apache::lonuserutils::print_upload_manager_form($r,$context,
- $permission,$crstype);
+ $permission);
} elsif ($env{'form.state'} eq 'enrolling') {
if ($env{'form.datatoken'}) {
&Apache::lonuserutils::upfile_drop_add($r,$context,$permission);
@@ -3865,13 +3605,13 @@ sub handler {
if ($env{'form.srchterm'} !~ /^$match_username$/) {
my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
$env{'form.phase'} = '';
- &print_username_entry_form($r,$context,$response,$srch,undef,$crstype);
+ &print_username_entry_form($r,$context,$response,$srch);
} else {
my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'});
my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'});
&print_user_modification_page($r,$ccuname,$ccdomain,
$srch,$response,$context,
- $permission,$crstype);
+ $permission);
}
} elsif ($env{'form.phase'} eq 'get_user_info') {
my ($currstate,$response,$forcenewuser,$results) =
@@ -3881,7 +3621,7 @@ sub handler {
}
if ($currstate eq 'select') {
&print_user_selection_page($r,$response,$srch,$results,
- \@search,$context,undef,$crstype);
+ \@search,$context);
} elsif ($currstate eq 'modify') {
my ($ccuname,$ccdomain);
if (($srch->{'srchby'} eq 'uname') &&
@@ -3899,24 +3639,24 @@ sub handler {
}
&print_user_modification_page($r,$ccuname,$ccdomain,
$srch,$response,$context,
- $permission,$crstype);
+ $permission);
} elsif ($currstate eq 'query') {
&print_user_query_page($r,'createuser');
} else {
$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch,
- $forcenewuser,$crstype);
+ $forcenewuser);
}
} elsif ($env{'form.phase'} eq 'userpicked') {
my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
&print_user_modification_page($r,$ccuname,$ccdomain,$srch,'',
- $context,$permission,$crstype);
+ $context,$permission);
}
} elsif ($env{'form.phase'} eq 'update_user_data') {
- &update_user_data($r,$context,$crstype);
+ &update_user_data($r,$context);
} else {
- &print_username_entry_form($r,$context,undef,$srch,undef,$crstype);
+ &print_username_entry_form($r,$context,undef,$srch);
}
} elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
if ($env{'form.phase'} eq 'set_custom_roles') {
@@ -3975,25 +3715,19 @@ sub handler {
}
} elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) {
$r->print(&header());
- my $brtext;
- if ($crstype eq 'Community') {
- $brtext = 'Drop Members';
- } else {
- $brtext = 'Drop Students';
- }
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/createuser?action=drop',
- text=>$brtext});
+ text=>"Drop Students"});
if (!exists($env{'form.state'})) {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
'Course_Drop_Student'));
- &Apache::lonuserutils::print_drop_menu($r,$context,$permission,$crstype);
+ &Apache::lonuserutils::print_drop_menu($r,$context,$permission);
} elsif ($env{'form.state'} eq 'done') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/createuser?action=drop',
text=>"Result"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext,
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
'Course_Drop_Student'));
&Apache::lonuserutils::update_user_list($r,$context,undef,
$env{'form.action'});
@@ -4003,7 +3737,7 @@ sub handler {
if ($permission->{'cusr'}) {
$r->print(&header(undef,undef,{'no_nav_bar' => 1}).
&Apache::lonuserutils::date_section_selector($context,
- $permission,$crstype).
+ $permission).
&Apache::loncommon::end_page());
} else {
$r->print(&header().
@@ -4038,14 +3772,11 @@ sub handler {
my $cid = $env{'request.course.id'};
my $cdom = $env{'course.'.$cid.'.domain'};
my $cnum = $env{'course.'.$cid.'.num'};
- my $coursedesc = $env{'course.'.$cid.'.description'};
if (!exists($env{'form.state'})) {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment requests',
'Course_SelfEnrollment_Approval'));
$r->print(''.&mt('Pending enrollment requests').''."\n");
- $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
- $cdom,$cnum));
-
+ &display_selfenroll_queue($r,$context,$permission,$cnum,$cdom);
} elsif ($env{'form.state'} eq 'done') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/createuser?action=selfenrollqueue',
@@ -4053,8 +3784,7 @@ sub handler {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment result',
'Course_Self_Enrollment'));
$r->print(''.&mt('Enrollment request processing').''."\n");
- $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
- $cdom,$cnum,$coursedesc));
+ &update_selfenroll_queue($r,$context,$permission,$cid,$cnum,$cdom);
}
$r->print(&Apache::loncommon::end_page());
} elsif ($env{'form.action'} eq 'changelogs') {
@@ -4069,7 +3799,7 @@ sub handler {
} else {
$r->print(&header());
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
- $r->print(&print_main_menu($permission,$context,$crstype));
+ $r->print(&print_main_menu($permission,$context));
$r->print(&Apache::loncommon::end_page());
}
return OK;
@@ -4088,11 +3818,11 @@ sub header {
sub add_script {
my ($js) = @_;
- return ''."\n";
+ return ''."\n";
}
sub verify_user_display {
@@ -4113,137 +3843,169 @@ END
###############################################################
# Menu Phase One
sub print_main_menu {
- my ($permission,$context,$crstype) = @_;
- my $linkcontext = $context;
- my $stuterm = lc(&Apache::lonnet::plaintext('st',$crstype));
- if (($context eq 'course') && ($crstype eq 'Community')) {
- $linkcontext = lc($crstype);
- $stuterm = 'Members';
- }
-
+ my ($permission,$context) = @_;
my %links = (
- domain => {
- upload => 'Upload a File of Users',
- singleuser => 'Add/Modify a Single User',
- listusers => 'Manage Multiple Users',
- },
- author => {
- upload => 'Upload a File of Co-authors',
- singleuser => 'Add/Modify a Single Co-author',
- listusers => 'Display Co-authors and Manage Multiple Users',
- },
- course => {
- upload => 'Upload a File of Course Users',
- singleuser => 'Add/Modify a Single Course User',
- listusers => 'Display Class Lists and Manage Multiple Users',
- },
- community => {
- upload => 'Upload a File of Community Users',
- singleuser => 'Add/Modify a Community User',
- listusers => 'Manage Community Users',
- },
+ domain => {
+ upload => 'Upload a File of Users',
+ singleuser => 'Add/Modify a User',
+ listusers => 'Manage Users',
+ },
+ author => {
+ upload => 'Upload a File of Co-authors',
+ singleuser => 'Add/Modify a Co-author',
+ listusers => 'Manage Co-authors',
+ },
+ course => {
+ upload => 'Upload a File of Course Users',
+ singleuser => 'Add/Modify a Course User',
+ listusers => 'Manage Course Users',
+ },
);
- my @menu =
- (
- { text => $links{$context}{'upload'},
- help => 'Course_Create_Class_List',
- action => 'upload',
- permission => $permission->{'cusr'},
+ my @menu = ( {categorytitle => 'Single Users',
+ items =>
+ [
+ {
+ linktext => $links{$context}{'singleuser'},
+ icon => 'edit-redo.png',
+ #help => 'Course_Change_Privileges',
+ url => '/adm/createuser?action=singleuser',
+ permission => $permission->{'cusr'},
+ linktitle => 'Add a user with a certain role to this course.',
+ },
+ ]},
+
+ {categorytitle => 'Multiple Users',
+ items =>
+ [
+ {
+ linktext => $links{$context}{'upload'},
+ icon => 'sctr.png',
+ #help => 'Course_Create_Class_List',
+ url => '/adm/createuser?action=upload',
+ permission => $permission->{'cusr'},
+ linktitle => 'Upload a CSV or a text file containing users.',
+ },
+ {
+ linktext => $links{$context}{'listusers'},
+ icon => 'edit-find.png',
+ #help => 'Course_View_Class_List',
+ url => '/adm/createuser?action=listusers',
+ permission => ($permission->{'view'} || $permission->{'cusr'}),
+ linktitle => 'Show and manage users of this course.',
},
- { text => $links{$context}{'singleuser'},
- help => 'Course_Change_Privileges',
- action => 'singleuser',
- permission => $permission->{'cusr'},
+
+ ]},
+
+ {categorytitle => 'Administration',
+ items => [ ]},
+ );
+
+ if ($context eq 'domain'){
+
+ push(@{ $menu[2]->{items} }, #Category: Administration
+ {
+ linktext => 'Custom Roles',
+ icon => 'emblem-photos.png',
+ #help => 'Course_Editing_Custom_Roles',
+ url => '/adm/createuser?action=custom',
+ permission => $permission->{'custom'},
+ linktitle => 'Configure a custom role.',
},
- { text => $links{$context}{'listusers'},
- help => 'Course_View_Class_List',
- action => 'listusers',
- permission => ($permission->{'view'} || $permission->{'cusr'}),
- },
);
- if ($context eq 'domain' || $context eq 'course') {
- my $customlink = { text => 'Edit Custom Roles',
- help => 'Course_Editing_Custom_Roles',
- action => 'custom',
- permission => $permission->{'custom'},
- };
- push(@menu,$customlink);
- }
- if ($context eq 'course') {
+
+ }elsif ($context eq 'course'){
my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
- my @courselinks =
- (
- { text => 'Enroll a Single Student',
- help => 'Course_Add_Student',
- action => 'singlestudent',
- permission => $permission->{'cusr'},
- },
- { text => 'Drop Students',
- help => 'Course_Drop_Student',
- action => 'drop',
- permission => $permission->{'cusr'},
- });
- if (!exists($permission->{'cusr_section'})) {
- if ($crstype ne 'Community') {
- push(@courselinks,
- { text => 'Automated Enrollment Manager',
- help => 'Course_Automated_Enrollment',
- permission => (&Apache::lonnet::auto_run($cnum,$cdom)
- && $permission->{'cusr'}),
- url => '/adm/populate',
- });
- }
- push(@courselinks,
- { text => 'Configure User Self-enrollment',
- help => 'Course_Self_Enrollment',
- action => 'selfenroll',
- permission => $permission->{'cusr'},
- });
- }
+
+ push(@{ $menu[0]->{items} }, #Category: Single Users
+ {
+ linktext => 'Add/Modify a Student',
+ #help => 'Course_Add_Student',
+ icon => 'list-add.png',
+ url => '/adm/createuser?action=singlestudent',
+ permission => $permission->{'cusr'},
+ linktitle => 'Add a user with the role student to this course.',
+ },
+ );
+
+ push(@{ $menu[1]->{items} }, #Category: Multiple Users
+ {
+ linktext => 'Drop Students',
+ icon => 'edit-undo.png',
+ #help => 'Course_Drop_Student',
+ url => '/adm/createuser?action=drop',
+ permission => $permission->{'cusr'},
+ linktitle =>'Remove a student from this course.',
+ },
+ );
+ push(@{ $menu[2]->{items} }, #Category: Administration
+ {
+ linktext => 'Custom Roles',
+ icon => 'emblem-photos.png',
+ #help => 'Course_Editing_Custom_Roles',
+ url => '/adm/createuser?action=custom',
+ permission => $permission->{'custom'},
+ linktitle => 'Configure a custom role.',
+ },
+ {
+ linktext => 'Course Groups',
+ icon => 'conf.png',
+ #help => 'Course_Manage_Group',
+ url => '/adm/coursegroups?refpage=cusr',
+ permission => $permission->{'grp_manage'},
+ linktitle => 'Manage course groups.',
+ },
+ {
+ linktext => 'Change Logs',
+ icon => 'document-properties.png',
+ #help => 'Course_User_Logs',
+ url => '/adm/createuser?action=changelogs',
+ permission => $permission->{'cusr'},
+ linktitle => 'View change log.',
+ },
+ );
if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
- push(@courselinks,
- { text => 'Enrollment Requests',
- help => 'Course_Approve_Selfenroll',
- action => 'selfenrollqueue',
- permission => $permission->{'cusr'},
- });
- }
- push(@courselinks,
- { text => 'Manage Course Groups',
- help => 'Course_Manage_Group',
- permission => $permission->{'grp_manage'},
- url => '/adm/coursegroups?refpage=cusr',
- },
- { text => 'View Change Logs',
- help => 'Course_User_Logs',
- action => 'changelogs',
+ push(@{ $menu[2]->{items} },
+ {
+ linktext => 'Enrollment Requests',
+ icon => 'selfenrl-queue.png',
+ #help => 'Course_Approve_Selfenroll',
+ url => '/adm/createuser?action=selfenrollqueue',
+ permission => $permission->{'cusr'},
+ linktitle =>'Approve or reject enrollment requests.',
+ },
+ );
+ }
+
+ if (!exists($permission->{'cusr_section'})){
+
+ push(@{ $menu[2]->{items} },
+ {
+ linktext => 'Automated Enrollment',
+ icon => 'roles.png',
+ #help => 'Course_Automated_Enrollment',
+ permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+ && $permission->{'cusr'}),
+ url => '/adm/populate',
+ linktitle => 'Automated enrollment manager.',
+ },
+ {
+ linktext => 'User Self-Enrollment',
+ icon => 'cstr.png',
+ #help => 'Course_Self_Enrollment',
+ url => '/adm/createuser?action=selfenroll',
permission => $permission->{'cusr'},
- },);
+ linktitle => 'Configure user self enrollment.',
+ },
+ );
+
+ }
+ };
+return Apache::lonhtmlcommon::generate_menu(@menu);
# { text => 'View Log-in History',
# help => 'Course_User_Logins',
# action => 'logins',
# permission => $permission->{'cusr'},
# });
- push(@menu,@courselinks);
- }
- my $menu_html = '';
- foreach my $menu_item (@menu) {
- next if (! $menu_item->{'permission'});
- $menu_html.='';
- if (exists($menu_item->{'help'})) {
- $menu_html.=
- &Apache::loncommon::help_open_topic($menu_item->{'help'});
- }
- $menu_html.='';
- if (exists($menu_item->{'url'})) {
- $menu_html.=qq{};
- } else {
- $menu_html.=
- qq{}; }
- $menu_html.= &mt($menu_item->{'text'}).'';
- $menu_html.=' ';
- }
- return $menu_html;
}
sub restore_prev_selections {
@@ -4471,9 +4233,7 @@ ENDSCRIPT
if (ref($lt) eq 'HASH') {
$title = $lt->{$item};
}
- $output .=
- &Apache::lonhtmlcommon::row_title($title,
- 'LC_selfenroll_pick_box_title','LC_oddrow_value')."\n";
+ $output .= &Apache::lonhtmlcommon::row_title($title);
if ($item eq 'types') {
my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'};
my $showdomdesc = 1;
@@ -4705,14 +4465,287 @@ ENDSCRIPT
return;
}
+sub display_selfenroll_queue {
+ my ($r,$context,$permission,$cnum,$cdom) = @_;
+ my $namespace = 'selfenrollrequests';
+ my ($output,%queue_by_date);
+ my %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum);
+ if (keys(%requesthash) > 0) {
+ $r->print(''.
+ ''.
+ ''.
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ ' | '.&mt('Action').' | '.
+ ''.&mt('Requestor').' | '.
+ ''.&mt('Section').' | '.
+ ''.&mt('Date requested').' | '.
+ &Apache::loncommon::end_data_table_header_row());
+ foreach my $item (keys(%requesthash)) {
+ my ($timestamp,$usec) = split(/:/,$requesthash{$item});
+ if (exists($queue_by_date{$timestamp})) {
+ if (ref($queue_by_date{$timestamp}) eq 'ARRAY') {
+ push(@{$queue_by_date{$timestamp}},$item.':'.$usec);
+ }
+ } else {
+ @{$queue_by_date{$timestamp}} = ($item.':'.$usec);
+ }
+ }
+ my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
+ my $count = 0;
+ foreach my $item (@sortedtimes) {
+ if (ref($queue_by_date{$item}) eq 'ARRAY') {
+ foreach my $request (sort(@{$queue_by_date{$item}})) {
+ my ($puname,$pudom,$pusec) = split(/:/,$request);
+ my $showsec = $pusec;
+ if ($showsec eq '') {
+ $showsec = &mt('none');
+ }
+ my $namelink = &Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($puname,$pudom),
+ $puname,$pudom);
+ $r->print(&Apache::loncommon::start_data_table_row().
+ '
'.
+ '
| '.
+ ''.$namelink.' | '.
+ ''.$showsec.' | '.
+ ''.&Apache::lonlocal::locallocaltime($item).' | '.
+ &Apache::loncommon::end_data_table_row());
+ $count ++;
+ }
+ }
+ }
+ $r->print(&Apache::loncommon::end_data_table().
+ '');
+ } else {
+ $r->print(&mt('There are currently no enrollment requests.'));
+ }
+ return;
+}
+
+sub update_selfenroll_queue {
+ my ($r,$context,$permission,$cid,$cnum,$cdom) = @_;
+ my @approvals = &Apache::loncommon::get_env_multiple('form.approvereq');
+ my @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq');
+ my $access_start = $env{'course.'.$cid.'.internal.selfenroll_start_access'};
+ my $access_end = $env{'course.'.$cid.'.internal.selfenroll_end_access'};
+ my $limit = $env{'course.'.$cid.'.internal.selfenroll_limit'};
+ my $cap = $env{'course.'.$cid.'.internal.selfenroll_cap'};
+ my $notifylist = $env{'course.'.$cid.'.internal.selfenroll_notifylist'};
+ my $namespace = 'selfenrollrequests';
+ my ($stucounts,$idx,$classlist) = &get_student_counts($cdom,$cnum);
+ my %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum);
+ my $coursedesc = $env{'course.'.$cid.'.description'};
+ my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
+ my $hostname = &Apache::lonnet::hostname($chome);
+ my $protocol = $Apache::lonnet::protocol{$chome};
+ $protocol = 'http' if ($protocol ne 'https');
+ my (@existing,@missingreq,@invalidusers,@limitexceeded,@enrolled,
+ @enrollerrors,@warn_approves,@warn_rejects);
+ my $now = time;
+ my $sender = $env{'user.name'}.':'.$env{'user.domain'};
+ my $approvedmsg = [{
+ mt => 'Your request for enrollment has been approved.',
+ },
+ {
+ mt => 'Visit [_1], to log-in and access the course',
+ args => [$protocol.'://'.$hostname],
+ }];
+
+ my $rejectedmsg = [{
+ mt => 'Your request for enrollment has not been approved.',
+ }];
+ foreach my $item (sort {$a <=> $b} @approvals) {
+ my ($num,$uname,$udom,$usec) = split(/:/,$item);
+ my $uhome = &Apache::lonnet::homeserver($uname,$udom);
+ if ($uhome ne 'no_host') {
+ if (exists($requesthash{$uname.':'.$udom})) {
+
+ if (exists($classlist->{$uname.':'.$udom})) {
+ if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') {
+ if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') ||
+ ($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Future')) {
+ push(@existing,$uname.':'.$udom);
+ next;
+ }
+ }
+ }
+ } else {
+ push(@missingreq,$uname.':'.$udom);
+ next;
+ }
+ if (!grep(/^\Q$item\E$/,@rejections)) {
+ if ($limit eq 'allstudents') {
+ if ($stucounts->{$limit} >= $cap) {
+ push(@limitexceeded,$uname.':'.$udom);
+ last;
+ }
+ } elsif ($limit eq 'selfenrolled') {
+ if ($stucounts->{$limit} >= $cap) {
+ push(@limitexceeded,$uname.':'.$udom);
+ last;
+ }
+ }
+ my $result =
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$usec,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1);
+ if ($result eq 'ok') {
+ push(@enrolled,$uname.':'.$udom);
+ $stucounts->{'allstudents'} ++;
+ $stucounts->{'selfenrolled'} ++;
+ &Apache::selfenroll::send_notification($uname.':'.$udom,$approvedmsg,$cid,
+ $coursedesc,$now,'enroller',$sender);
+ my %userrequest = (
+ $cdom.'_'.$cnum => {
+ timestamp => $now,
+ section => $usec,
+ adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
+ status => 'approved',
+ }
+ );
+ my $userresult =
+ &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
+ if ($userresult ne 'ok') {
+ push(@warn_approves,$uname.':'.$udom);
+ }
+ } else {
+ push(@enrollerrors,$uname.':'.$udom);
+ }
+ }
+ } else {
+ push(@invalidusers,$uname.':'.$udom);
+ }
+ }
+ my @changes = (@enrolled,@rejections);
+ if (@rejections) {
+ foreach my $user (@rejections) {
+ &Apache::selfenroll::send_notification($user,$rejectedmsg,$cid,
+ $coursedesc,$now,'enroller',$sender);
+ my ($uname,$udom) = split(/:/,$user);
+ my %userrequest = (
+ $cdom.'_'.$cnum => {
+ timestamp => $now,
+ adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
+ status => 'rejected',
+ }
+ );
+ my $userresult =
+ &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
+ if ($userresult ne 'ok') {
+ push(@warn_rejects,$user);
+ }
+ }
+ }
+ if (@changes) {
+ my $delresult = &Apache::lonnet::del($namespace,\@changes,$cdom,$cnum);
+ if ($delresult eq 'ok') {
+ my $namelink =
+ &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}).' ('.$env{'user.name'}.':'.$env{'user.domain'}.')';
+ my $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink";
+ my ($approvedlist,$rejectedlist);
+ if (@enrolled) {
+ $approvedlist = join("\n",@enrolled);
+ $r->print(''.&mt('The following were enrolled in the course:').'
');
+ foreach my $user (@enrolled) {
+ my ($uname,$udom) = split(/:/,$user);
+ my $userlink =
+ &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom);
+ $r->print('- '.$userlink.'
');
+ }
+ $r->print('
');
+ }
+ if (@rejections) {
+ $rejectedlist = join("\n",@rejections);
+ $r->print(''.&mt('The following enrollment requests were rejected:').'
');
+ foreach my $user (@rejections) {
+ $r->print('- '.$user.'
');
+ }
+ $r->print('
');
+ }
+ &Apache::selfenroll::send_notification($notifylist,$chgmsg,$cid,
+ $coursedesc,$now,'managers',
+ $sender,$approvedlist,$rejectedlist);
+ }
+ }
+ if (@existing) {
+ $r->print(''.&mt('The following enrollment requests were deleted because the user is already enrolled in the course:').'
');
+ foreach my $user (@existing) {
+ $r->print('- '.$user.'
');
+ }
+ $r->print('
');
+ }
+ if (@missingreq) {
+ $r->print(''.&mt('The following enrollment requests were ignored because the request is no longer in the enrollment queue:').'
');
+ foreach my $user (@missingreq) {
+ $r->print('- '.$user.'
');
+ }
+ $r->print('
');
+ }
+ if (@invalidusers) {
+ $r->print(''.&mt('The following enrollment requests were deleted because the requestor does not have a LON-CAPA account:').'
');
+ foreach my $user (@invalidusers) {
+ $r->print('- '.$user.'
');
+ }
+ $r->print('
');
+ }
+ if (@limitexceeded) {
+ $r->print(''.&mt('The following enrollment requests were skipped because the enrollment limit has been reached for the course:').'
');
+ foreach my $user (@limitexceeded) {
+ $r->print('- '.$user.'
');
+ }
+ $r->print('
');
+ }
+ if (@enrollerrors) {
+ $r->print(''.&mt('The following enrollment requests could not be processed because an error occurred:').'
');
+ foreach my $user (@enrollerrors) {
+ $r->print('- '.$user.'
');
+ }
+ $r->print('
');
+ }
+ if (@warn_approves) {
+ $r->print(''.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'
');
+ foreach my $user (@warn_approves) {
+ $r->print('- '.$user.'
');
+ }
+ $r->print('
');
+ }
+ if (@warn_rejects) {
+ $r->print(''.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'
');
+ foreach my $user (@warn_rejects) {
+ $r->print('- '.$user.'
');
+ }
+ $r->print('
');
+ }
+ return;
+}
+
+sub get_student_counts {
+ my ($cdom,$cnum) = @_;
+ my (%idx,%stucounts);
+ my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum);
+ $idx{'type'} = &Apache::loncoursedata::CL_TYPE();
+ $idx{'status'} = &Apache::loncoursedata::CL_STATUS();
+ while (my ($student,$data) = each(%$classlist)) {
+ if (($data->[$idx{'status'}] eq 'Active') ||
+ ($data->[$idx{'status'}] eq 'Future')) {
+ if ($data->[$idx{'type'}] eq 'selfenroll') {
+ $stucounts{'selfenroll'} ++;
+ }
+ $stucounts{'allstudents'} ++;
+ }
+ }
+ return (\%stucounts,\%idx,$classlist);
+}
+
sub visible_in_cat {
my ($cdom,$cnum) = @_;
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
my ($cathash,%settable,@vismsgs,$cansetvis);
my %visactions = &Apache::lonlocal::texthash(
- vis => 'Your course/community currently appears in the Course/Community Catalog for this domain.',
+ vis => 'Your course currently appears in the Course Catalog for this domain.',
gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
- miss => 'Your course/community does not currently appear in the Course/Community Catalog for this domain.',
+ miss => 'Your course does not currently appear in the Course Catalog for this domain.',
yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',
coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
@@ -4928,7 +4961,6 @@ sub print_userchangelogs_display {
my $formname = 'roleslog';
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my $crstype = &Apache::loncommon::course_type();
my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum);
if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }
@@ -4967,14 +4999,7 @@ sub print_userchangelogs_display {
}
my (%whodunit,%changed,$version);
($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/);
- $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version,$crstype));
- my $showntablehdr = 0;
- my $tablehdr = &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row().
- ' | '.&mt('When').' | '.&mt('Who made the change').
- ' | '.&mt('Changed User').' | '.&mt('Role').' | '.&mt('Section').' | '.
- &mt('Context').' | '.&mt('Start').' | '.&mt('End').' | '.
- &Apache::loncommon::end_data_table_header_row();
+ $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version));
my ($minshown,$maxshown);
$minshown = 1;
my $count = 0;
@@ -4984,6 +5009,9 @@ sub print_userchangelogs_display {
$minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
}
}
+
+ # Collect user change log data
+ my $content = '';
foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) {
next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) ||
($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'}));
@@ -5005,10 +5033,7 @@ sub print_userchangelogs_display {
}
$count ++;
next if ($count < $minshown);
- if (!$showntablehdr) {
- $r->print($tablehdr);
- $showntablehdr = 1;
- }
+
if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') {
$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} =
&Apache::loncommon::plainname($roleslog{$id}{'exe_uname'},$roleslog{$id}{'exe_udom'});
@@ -5043,24 +5068,45 @@ sub print_userchangelogs_display {
if ($roleslog{$id}{'logentry'}{'selfenroll'}) {
$chgcontext = 'selfenroll';
}
- my %lt = &rolechg_contexts($crstype);
+ my %lt = &rolechg_contexts();
if ($chgcontext ne '' && $lt{$chgcontext} ne '') {
$chgcontext = $lt{$chgcontext};
}
- $r->print(&Apache::loncommon::start_data_table_row().''.$count.' | '.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).' | '.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.' | '.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.' | '.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'},$crstype).' | '.$sec.' | '.$chgcontext.' | '.$rolestart.' | '.$roleend.' | '.&Apache::loncommon::end_data_table_row()."\n");
+ $content .=
+ &Apache::loncommon::start_data_table_row()
+ .''.$count.' | '
+ .''.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).' | '
+ .''.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.' | '
+ .''.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.' | '
+ .''.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).' | '
+ .''.$sec.' | '
+ .''.$chgcontext.' | '
+ .''.$rolestart.' | '
+ .''.$roleend.' | '
+ .&Apache::loncommon::end_data_table_row();
+ }
+
+ # Form Footer
+ my $form_footer =
+ ''
+ .''
+ .'';
+
+ # Only display table, if content is available (has been collected above)
+ if (!$content) {
+ $r->print(''
+ .&mt('There are no records to display.')
+ .'
'
+ );
+ $r->print($form_footer);
+ return;
}
- if ($showntablehdr) {
- $r->print(&Apache::loncommon::end_data_table().'
');
- if (($curr{'page'} > 1) || ($more_records)) {
- $r->print('');
- $r->print(<<"ENDSCRIPT");
+
+ # Content to display, so create navigation and display table
+
+ # Create Navigation:
+ # Navigation Script
+ my $nav_script = <<"ENDSCRIPT";
ENDSCRIPT
- }
- } else {
- $r->print(''.
- &mt('There are no records to display').
- '
');
- }
- $r->print(''.
- '');
+ # Navigation Buttons
+ my $nav_links;
+ $nav_links = '';
+ if (($curr{'page'} > 1) || ($more_records)) {
+ if ($curr{'page'} > 1) {
+ $nav_links .= ' ';
+ }
+ if ($more_records) {
+ $nav_links .= '';
+ }
+ }
+ $nav_links .= '
';
+
+ # Table Header
+ my $tableheader =
+ &Apache::loncommon::start_data_table_header_row()
+ .' | '
+ .''.&mt('When').' | '
+ .''.&mt('Who made the change').' | '
+ .''.&mt('Changed User').' | '
+ .''.&mt('Role').' | '
+ .''.&mt('Section').' | '
+ .''.&mt('Context').' | '
+ .''.&mt('Start').' | '
+ .''.&mt('End').' | '
+ .&Apache::loncommon::end_data_table_header_row();
+
+ # Print Content
+ $r->print(
+ $nav_script
+ .$nav_links
+ .&Apache::loncommon::start_data_table()
+ .$tableheader
+ .$content
+ .&Apache::loncommon::end_data_table()
+ .$nav_links
+ .$form_footer
+ );
return;
}
sub role_display_filter {
- my ($formname,$cdom,$cnum,$curr,$version,$crstype) = @_;
+ my ($formname,$cdom,$cnum,$curr,$version) = @_;
my $context = 'course';
- my $lctype = lc($crstype);
my $nolink = 1;
my $output = ''.
''.&mt('Changes/page:').'
'.
@@ -5105,23 +5186,27 @@ sub role_display_filter {
&Apache::lonhtmlcommon::date_setter($formname,'rolelog_end_date',
$curr->{'rolelog_end_date'},undef,
undef,undef,undef,undef,undef,undef,$nolink);
- my %lt = &rolechg_contexts($crstype);
- $output .= ' | '.&mt('Window during which changes occurred:').'
| '.&mt('After:').
- ' | '.$startform.' | | '.&mt('Before:').' | '.
- $endform.' |
| | '.
+ my %lt = &rolechg_contexts();
+ $output .= ''.&mt('Window during which changes occurred:').'
'.
+ '| '.&mt('After:').
+ ' | '.$startform.' | '.
+ '| '.&mt('Before:').' | '.
+ ''.$endform.' |
'.
+ ' | '.
+ ' | '.
''.&mt('Role:').'
'.
' | | '.
+ $output .= ' | '.
+ ' | '.
+ ''.
&mt('Context:').'
|