--- loncom/interface/loncreateuser.pm 2014/04/25 17:56:42 1.399
+++ loncom/interface/loncreateuser.pm 2016/02/17 19:15:48 1.408
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.399 2014/04/25 17:56:42 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.408 2016/02/17 19:15:48 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2244,8 +2244,8 @@ sub personal_data_display {
'<input type="text" name="uname" size="25" value="" autocomplete="off" />';
$rowcount ++;
$output .= &Apache::lonhtmlcommon::row_closure(1);
- my $upassone = '<input type="password" name="upass'.$now.'" size="10" autocomplete="off" />';
- my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="10" autocomplete="off" />';
+ my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />';
+ my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="off" />';
$output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'<b>*</b>',
'LC_pick_box_title',
'LC_oddrow_value')."\n".
@@ -2282,19 +2282,15 @@ sub personal_data_display {
}
} else {
if ($context eq 'selfcreate') {
- if (($item eq 'permanentemail') && ($newuser eq 'email')) {
- $row .= $ccuname;
- } else {
- if ($canmodify{$item}) {
- if ($newuser eq 'email') {
- $row .= '<input type="text" name="'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
- } else {
- $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
- }
- $editable ++;
+ if ($canmodify{$item}) {
+ if ($newuser eq 'email') {
+ $row .= '<input type="text" name="'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
} else {
- $hiderow = 1;
+ $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
}
+ $editable ++;
+ } else {
+ $hiderow = 1;
}
} else {
$row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
@@ -3048,7 +3044,7 @@ sub update_user_data {
my %newenvhash;
foreach my $key (keys(%changed)) {
if (($key eq 'official') || ($key eq 'unofficial')
- || ($key eq 'community')) {
+ || ($key eq 'community') || ($key eq 'textbook')) {
$newenvhash{'environment.requestcourses.'.$key} =
$changeHash{'requestcourses.'.$key};
if ($changeHash{'requestcourses.'.$key}) {
@@ -3114,7 +3110,7 @@ sub update_user_data {
\%newsettingstext);
if ($env{'form.cid'} ne $userenv{'id'}) {
&Apache::lonnet::idput($env{'form.ccdomain'},
- ($env{'form.ccuname'} => $env{'form.cid'}));
+ {$env{'form.ccuname'} => $env{'form.cid'}},$uhome,'ids');
if (($recurseid) &&
(&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
my $idresult =
@@ -3629,7 +3625,7 @@ sub update_roles {
my @rolechanges;
my %disallowed;
$r->print('<h3>'.&mt('Modifying Roles').'</h3>');
- foreach my $key (keys (%env)) {
+ foreach my $key (keys(%env)) {
next if (! $env{$key});
next if ($key eq 'form.action');
# Revoke roles
@@ -3811,7 +3807,7 @@ sub update_roles {
} else {
my %curr_groups =
&Apache::longroup::coursegroups($one,$two);
- foreach my $sec (sort {$a cmp $b} keys %sections) {
+ foreach my $sec (sort {$a cmp $b} keys(%sections)) {
if (($sec eq 'none') || ($sec eq 'all') ||
exists($curr_groups{$sec})) {
$disallowed{$sec} = $url;
@@ -3857,7 +3853,7 @@ sub update_roles {
my %curr_groups =
&Apache::longroup::coursegroups($one,$two);
my $emptysec = 0;
- foreach my $sec (sort {$a cmp $b} keys %sections) {
+ foreach my $sec (sort {$a cmp $b} keys(%sections)) {
$sec =~ s/\W//g;
if ($sec ne '') {
if (($sec eq 'none') || ($sec eq 'all') ||
@@ -3897,7 +3893,7 @@ sub update_roles {
$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,'',$context));
} else {
my $emptysec = 0;
- foreach my $sec (sort {$a cmp $b} keys %sections) {
+ foreach my $sec (sort {$a cmp $b} keys(%sections)) {
if ($sec ne '') {
my $securl = $url.'/'.$sec;
$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$two,$start,$end,$one,undef,$sec,$context));
@@ -4993,6 +4989,7 @@ sub handler {
selfenroll_end_access => $env{'course.'.$cid.'.internal.selfenroll_end_access'},
default_enrollment_start_date => $env{'course.'.$cid.'.default_enrollment_start_date'},
default_enrollment_end_date => $env{'course.'.$cid.'.default_enrollment_end_date'},
+ uniquecode => $env{'course.'.$cid.'.internal.uniquecode'},
);
push(@{$brcrum},
{href => '/adm/createuser?action=selfenroll',
@@ -5012,7 +5009,7 @@ sub handler {
bread_crumbs_component => 'Self-enrollment result'};
$r->print(&header(undef,$args));
$r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
- &update_selfenroll_config($r,$cid,$cdom,$cnum,\%currsettings);
+ &update_selfenroll_config($r,$cid,$cdom,$cnum,$context,$crstype,\%currsettings);
}
} else {
$r->print(&header(undef,{'no_nav_bar' => 1}).
@@ -5547,6 +5544,7 @@ sub print_selfenroll_menu {
butn => 'but no user types have been checked.',
wilf => "Please uncheck 'activate' or check at least one type.",
);
+ &js_escape(\%alerts);
my $selfenroll_js = <<"ENDSCRIPT";
function update_types(caller,num) {
var delidx = getIndexByName('selfenroll_delete');
@@ -5740,28 +5738,70 @@ ENDSCRIPT
'// ]]>'."\n".
'</script>'."\n".
'<h3>'.$lt->{'selfenroll'}.'</h3>'."\n";
- my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
- if (ref($visactions) eq 'HASH') {
- if ($visible) {
- $output .= '<p class="LC_info">'.$visactions->{'vis'}.'</p>';
- } else {
- $output .= '<p class="LC_warning">'.$visactions->{'miss'}.'</p>'
- .$visactions->{'yous'}.
- '<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'};
- if (ref($vismsgs) eq 'ARRAY') {
- $output .= '<br />'.$visactions->{'make'}.'<ul>';
- foreach my $item (@{$vismsgs}) {
- $output .= '<li>'.$visactions->{$item}.'</li>';
+
+ my $visactions = &cat_visibility();
+ my ($cathash,%cattype);
+ my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
+ if (ref($domconfig{'coursecategories'}) eq 'HASH') {
+ $cathash = $domconfig{'coursecategories'}{'cats'};
+ $cattype{'auth'} = $domconfig{'coursecategories'}{'auth'};
+ $cattype{'unauth'} = $domconfig{'coursecategories'}{'unauth'};
+ if ($cattype{'auth'} eq '') {
+ $cattype{'auth'} = 'std';
+ }
+ if ($cattype{'unauth'} eq '') {
+ $cattype{'unauth'} = 'std';
+ }
+ } else {
+ $cathash = {};
+ $cattype{'auth'} = 'std';
+ $cattype{'unauth'} = 'std';
+ }
+ if (($cattype{'auth'} eq 'none') && ($cattype{'unauth'} eq 'none')) {
+ $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}.
+ '<br />'.
+ '<br />'.$visactions->{'take'}.'<ul>'.
+ '<li>'.$visactions->{'dc_chgconf'}.'</li>'.
+ '</ul>');
+ } elsif (($cattype{'auth'} !~ /^(std|domonly)$/) && ($cattype{'unauth'} !~ /^(std|domonly)$/)) {
+ if ($currsettings->{'uniquecode'}) {
+ $r->print('<span class="LC_info">'.$visactions->{'vis'}.'</span>');
+ } else {
+ $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}.
+ '<br />'.
+ '<br />'.$visactions->{'take'}.'<ul>'.
+ '<li>'.$visactions->{'dc_setcode'}.'</li>'.
+ '</ul><br />');
+ }
+ } else {
+ my ($visible,$cansetvis,$vismsgs) = &visible_in_stdcat($cdom,$cnum,\%domconfig);
+ if (ref($visactions) eq 'HASH') {
+ if ($visible) {
+ $output .= '<p class="LC_info">'.$visactions->{'vis'}.'</p>';
+ } else {
+ $output .= '<p class="LC_warning">'.$visactions->{'miss'}.'</p>'
+ .$visactions->{'yous'}.
+ '<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'};
+ if (ref($vismsgs) eq 'ARRAY') {
+ $output .= '<br />'.$visactions->{'make'}.'<ul>';
+ foreach my $item (@{$vismsgs}) {
+ $output .= '<li>'.$visactions->{$item}.'</li>';
+ }
+ $output .= '</ul>';
}
- $output .= '</ul>';
+ $output .= '</p>';
}
- $output .= '</p>';
}
}
my $actionhref = '/adm/createuser';
if ($context eq 'domain') {
$actionhref = '/adm/modifycourse';
}
+
+ my %noedit;
+ unless ($context eq 'domain') {
+ %noedit = &get_noedit_fields($cdom,$cnum,$crstype,$row);
+ }
$output .= '<form name="'.$formname.'" method="post" action="'.$actionhref.'">'."\n".
&Apache::lonhtmlcommon::start_pick_box();
if (ref($row) eq 'ARRAY') {
@@ -5776,6 +5816,37 @@ ENDSCRIPT
if (ref($currsettings) eq 'HASH') {
$curr_types = $currsettings->{'selfenroll_types'};
}
+ if ($noedit{$item}) {
+ if ($curr_types eq '*') {
+ $output .= &mt('Any user in any domain');
+ } else {
+ my @entries = split(/;/,$curr_types);
+ if (@entries > 0) {
+ $output .= '<ul>';
+ foreach my $entry (@entries) {
+ my ($currdom,$typestr) = split(/:/,$entry);
+ next if ($typestr eq '');
+ my $domdesc = &Apache::lonnet::domain($currdom);
+ my @currinsttypes = split(',',$typestr);
+ my ($othertitle,$usertypes,$types) =
+ &Apache::loncommon::sorted_inst_types($currdom);
+ if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
+ $usertypes->{'any'} = &mt('any user');
+ if (keys(%{$usertypes}) > 0) {
+ $usertypes->{'other'} = &mt('other users');
+ }
+ my @longinsttypes = map { $usertypes->{$_}; } @currinsttypes;
+ $output .= '<li>'.$domdesc.':'.join(', ',@longinsttypes).'</li>';
+ }
+ }
+ $output .= '</ul>';
+ } else {
+ $output .= &mt('None');
+ }
+ }
+ $output .= '<br />'.&mt('(Set by Domain Coordinator)');
+ next;
+ }
my $showdomdesc = 1;
my $includeempty = 1;
my $num = 0;
@@ -5844,6 +5915,15 @@ ENDSCRIPT
if (ref($currsettings) eq 'HASH') {
$registered = $currsettings->{'selfenroll_registered'};
}
+ if ($noedit{$item}) {
+ if ($registered) {
+ $output .= &mt('Must be registered in course');
+ } else {
+ $output .= &mt('No requirement');
+ }
+ $output .= '<br />'.&mt('(Set by Domain Coordinator)');
+ next;
+ }
if ($registered) {
$regon = ' checked="checked" ';
$regoff = ' ';
@@ -5868,6 +5948,12 @@ ENDSCRIPT
$endtime = $currsettings->{'default_enrollment_end_date'};
}
}
+ if ($noedit{$item}) {
+ $output .= &mt('From: [_1], to: [_2]',&Apache::lonlocal::locallocaltime($starttime),
+ &Apache::lonlocal::locallocaltime($endtime));
+ $output .= '<br />'.&mt('(Set by Domain Coordinator)');
+ next;
+ }
my $startform =
&Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_date',$starttime,
undef,undef,undef,undef,undef,undef,undef,$nolink);
@@ -5887,6 +5973,12 @@ ENDSCRIPT
$endtime = $currsettings->{'default_enrollment_end_date'};
}
}
+ if ($noedit{$item}) {
+ $output .= &mt('From: [_1], to: [_2]',&Apache::lonlocal::locallocaltime($starttime),
+ &Apache::lonlocal::locallocaltime($endtime));
+ $output .= '<br />'.&mt('(Set by Domain Coordinator)');
+ next;
+ }
my $startform =
&Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_access',$starttime,
undef,undef,undef,undef,undef,undef,undef,$nolink);
@@ -5906,6 +5998,15 @@ ENDSCRIPT
$newsecval = $currsec;
}
}
+ if ($noedit{$item}) {
+ if ($currsec ne '') {
+ $output .= $currsec;
+ } else {
+ $output .= &mt('No specific section');
+ }
+ $output .= '<br />'.&mt('(Set by Domain Coordinator)');
+ next;
+ }
my $sections_select =
&Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec);
$output .= '<table class="LC_createuser">'."\n".
@@ -5915,7 +6016,6 @@ ENDSCRIPT
&mt('New section').'<br />'."\n".
'<input type="text" name="newsec" size="15" value="'.$newsecval.'" />'."\n".
'<input type="hidden" name="sections" value="" />'."\n".
- '<input type="hidden" name="state" value="done" />'."\n".
'</td></tr></table>'."\n";
} elsif ($item eq 'approval') {
my ($currnotified,$currapproval,%appchecked);
@@ -5927,6 +6027,11 @@ ENDSCRIPT
if ($currapproval !~ /^[012]$/) {
$currapproval = 0;
}
+ if ($noedit{$item}) {
+ $output .= $selfdescs{'approval'}{$currapproval}.
+ '<br />'.&mt('(Set by Domain Coordinator)');
+ next;
+ }
$appchecked{$currapproval} = ' checked="checked"';
for my $i (0..2) {
$output .= '<label>'.
@@ -5995,6 +6100,20 @@ ENDSCRIPT
$currlim = $currsettings->{'selfenroll_limit'};
$currcap = $currsettings->{'selfenroll_cap'};
}
+ if ($noedit{$item}) {
+ if (($currlim eq 'allstudents') || ($currlim eq 'selfenrolled')) {
+ if ($currlim eq 'allstudents') {
+ $output .= &mt('Limit by total students');
+ } elsif ($currlim eq 'selfenrolled') {
+ $output .= &mt('Limit by total self-enrolled students');
+ }
+ $output .= ' '.&mt('Maximum: [_1]',$currcap).
+ '<br />'.&mt('(Set by Domain Coordinator)');
+ } else {
+ $output .= &mt('No limit').'<br />'.&mt('(Set by Domain Coordinator)');
+ }
+ next;
+ }
if ($currlim eq 'allstudents') {
$crslimit = ' checked="checked" ';
$selflimit = ' ';
@@ -6026,43 +6145,51 @@ ENDSCRIPT
$output .= &Apache::lonhtmlcommon::end_pick_box().
'<br /><input type="button" name="selfenrollconf" value="'
.&mt('Save').'" onclick="validate_types(this.form);" />'
- .'<input type="hidden" name="action" value="selfenroll" />'.
+ .'<input type="hidden" name="action" value="selfenroll" />'
+ .'<input type="hidden" name="state" value="done" />'."\n".
$additional.'</form>';
$r->print($output);
return;
}
-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 => 'This course/community currently appears in the Course/Community 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 => 'This course/community does not currently appear in the Course/Community Catalog for this domain.',
- yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding this 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:',
- take => 'Take the following action to ensure the course appears in the Catalog:',
- dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
- dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
- dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).',
- dc_catalog => 'Ask a domain coordinator to enable or create at least one course category in the domain.',
- dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.',
- dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
- dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
- );
- $visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
- $visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
- $visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
- if (ref($domconf{'coursecategories'}) eq 'HASH') {
- if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
+sub get_noedit_fields {
+ my ($cdom,$cnum,$crstype,$row) = @_;
+ my %noedit;
+ if (ref($row) eq 'ARRAY') {
+ my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook',
+ 'internal.selfenrollmgrdc',
+ 'internal.selfenrollmgrcc'],$cdom,$cnum);
+ my $type = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype,\%settings);
+ my (%specific_managebydc,%specific_managebycc,%default_managebydc);
+ map { $specific_managebydc{$_} = 1; } (split(/,/,$settings{'internal.selfenrollmgrdc'}));
+ map { $specific_managebycc{$_} = 1; } (split(/,/,$settings{'internal.selfenrollmgrcc'}));
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+ map { $default_managebydc{$_} = 1; } (split(/,/,$domdefaults{$type.'selfenrolladmdc'}));
+
+ foreach my $item (@{$row}) {
+ next if ($specific_managebycc{$item});
+ if (($specific_managebydc{$item}) || ($default_managebydc{$item})) {
+ $noedit{$item} = 1;
+ }
+ }
+ }
+ return %noedit;
+}
+
+sub visible_in_stdcat {
+ my ($cdom,$cnum,$domconf) = @_;
+ my ($cathash,%settable,@vismsgs,$cansetvis,$visible);
+ unless (ref($domconf) eq 'HASH') {
+ return ($visible,$cansetvis,\@vismsgs);
+ }
+ if (ref($domconf->{'coursecategories'}) eq 'HASH') {
+ if ($domconf->{'coursecategories'}{'togglecats'} eq 'crs') {
$settable{'togglecats'} = 1;
}
- if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+ if ($domconf->{'coursecategories'}{'categorize'} eq 'crs') {
$settable{'categorize'} = 1;
}
- $cathash = $domconf{'coursecategories'}{'cats'};
+ $cathash = $domconf->{'coursecategories'}{'cats'};
}
if ($settable{'togglecats'} && $settable{'categorize'}) {
$cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.');
@@ -6077,10 +6204,10 @@ sub visible_in_cat {
my %currsettings =
&Apache::lonnet::get('environment',['hidefromcat','categories','internal.coursecode'],
$cdom,$cnum);
- my $visible = 0;
+ $visible = 0;
if ($currsettings{'internal.coursecode'} ne '') {
- if (ref($domconf{'coursecategories'}) eq 'HASH') {
- $cathash = $domconf{'coursecategories'}{'cats'};
+ if (ref($domconf->{'coursecategories'}) eq 'HASH') {
+ $cathash = $domconf->{'coursecategories'}{'cats'};
if (ref($cathash) eq 'HASH') {
if ($cathash->{'instcode::0'} eq '') {
push(@vismsgs,'dc_addinst');
@@ -6104,8 +6231,8 @@ sub visible_in_cat {
}
if ($currsettings{'categories'} ne '') {
my $cathash;
- if (ref($domconf{'coursecategories'}) eq 'HASH') {
- $cathash = $domconf{'coursecategories'}{'cats'};
+ if (ref($domconf->{'coursecategories'}) eq 'HASH') {
+ $cathash = $domconf->{'coursecategories'}{'cats'};
if (ref($cathash) eq 'HASH') {
if (keys(%{$cathash}) == 0) {
push(@vismsgs,'dc_catalog');
@@ -6151,7 +6278,33 @@ sub visible_in_cat {
unshift(@vismsgs,'dc_unhide')
}
}
- return ($visible,$cansetvis,\@vismsgs,\%visactions);
+ return ($visible,$cansetvis,\@vismsgs);
+}
+
+sub cat_visibility {
+ my %visactions = &Apache::lonlocal::texthash(
+ vis => 'This course/community currently appears in the Course/Community 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 => 'This course/community does not currently appear in the Course/Community Catalog for this domain.',
+ none => 'Display of a course catalog is disabled for this domain.',
+ yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding this 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:',
+ take => 'Take the following action to ensure the course appears in the Catalog:',
+ dc_chgconf => 'Ask a domain coordinator to change the Catalog type for this domain.',
+ dc_setcode => 'Ask a domain coordinator to assign a six character code to the course',
+ dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
+ dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
+ dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).',
+ dc_catalog => 'Ask a domain coordinator to enable or create at least one course category in the domain.',
+ dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.',
+ dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
+ dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
+ );
+ $visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
+ $visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
+ $visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
+ return \%visactions;
}
sub new_selfenroll_dom_row {
@@ -7164,13 +7317,13 @@ sub course_level_table {
((($role eq 'cc') || ($role eq 'co')) && ($isowner))) {
$table .= &course_level_row($protectedcourse,$role,$area,$domain,
$plrole,\%sections_count,\%lt,
- $defaultcredits,$crstype);
+ $showcredits,$defaultcredits,$crstype);
} elsif ($env{'request.course.sec'} ne '') {
if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'.
$env{'request.course.sec'})) {
$table .= &course_level_row($protectedcourse,$role,$area,$domain,
$plrole,\%sections_count,\%lt,
- $defaultcredits,$crstype);
+ $showcredits,$defaultcredits,$crstype);
}
}
}
@@ -7179,7 +7332,8 @@ sub course_level_table {
next if ($crstype eq 'Community' && $customroles{$cust} =~ /bre\&S/);
my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust;
$table .= &course_level_row($protectedcourse,$role,$area,$domain,
- $cust,\%sections_count,\%lt);
+ $cust,\%sections_count,\%lt,
+ $showcredits,$defaultcredits,$crstype);
}
}
}
@@ -7193,7 +7347,11 @@ sub course_level_table {
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
'<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th>'."\n".
-'<th>'.$lt{'ext'}.'</th><th>'.$lt{'crd'}.'</th>'."\n".
+'<th>'.$lt{'ext'}.'</th><th>'."\n";
+ if ($showcredits) {
+ $result .= $lt{'crd'}.'</th>';
+ }
+ $result .=
'<th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th>'."\n".
'<th>'.$lt{'end'}.'</th>'.
&Apache::loncommon::end_data_table_header_row().
@@ -7204,14 +7362,14 @@ $table.
sub course_level_row {
my ($protectedcourse,$role,$area,$domain,$plrole,$sections_count,
- $lt,$defaultcredits,$crstype) = @_;
+ $lt,$showcredits,$defaultcredits,$crstype) = @_;
my $creditem;
my $row = &Apache::loncommon::start_data_table_row().
' <td><input type="checkbox" name="act_'.
$protectedcourse.'_'.$role.'" /></td>'."\n".
' <td>'.$plrole.'</td>'."\n".
' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";
- if (($role eq 'st') && ($crstype eq 'Course')) {
+ if (($showcredits) && ($role eq 'st') && ($crstype eq 'Course')) {
$row .=
'<td><input type="text" name="credits_'.$protectedcourse.'_'.
$role.'" size="3" value="'.$defaultcredits.'" /></td>';
@@ -7300,8 +7458,8 @@ sub course_level_dc {
my $plrole=&Apache::lonnet::plaintext($role);
$otheritems .= ' <option value="'.$role.'">'.$plrole.'</option>';
}
- if ( keys %customroles > 0) {
- foreach my $cust (sort keys %customroles) {
+ if ( keys(%customroles) > 0) {
+ foreach my $cust (sort(keys(%customroles))) {
my $custrole='cr_cr_'.$env{'user.domain'}.
'_'.$env{'user.name'}.'_'.$cust;
$otheritems .= ' <option value="'.$custrole.'">'.$cust.'</option>';
@@ -7336,14 +7494,19 @@ ENDTIMEENTRY
}
sub update_selfenroll_config {
- my ($r,$cid,$cdom,$cnum,$currsettings) = @_;
+ my ($r,$cid,$cdom,$cnum,$context,$crstype,$currsettings) = @_;
return unless (ref($currsettings) eq 'HASH');
my ($row,$lt) = &Apache::lonuserutils::get_selfenroll_titles();
my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
my (%changes,%warning);
my $curr_types;
+ my %noedit;
+ unless ($context eq 'domain') {
+ %noedit = &get_noedit_fields($cdom,$cnum,$crstype,$row);
+ }
if (ref($row) eq 'ARRAY') {
foreach my $item (@{$row}) {
+ next if ($noedit{$item});
if ($item eq 'enroll_dates') {
my (%currenrolldate,%newenrolldate);
foreach my $type ('start','end') {
@@ -7663,19 +7826,49 @@ sub update_selfenroll_config {
} else {
$r->print(&mt('No changes were made to the existing self-enrollment settings in this course.'));
}
- my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
- if (ref($visactions) eq 'HASH') {
- if (!$visible) {
+ my $visactions = &cat_visibility();
+ my ($cathash,%cattype);
+ my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
+ if (ref($domconfig{'coursecategories'}) eq 'HASH') {
+ $cathash = $domconfig{'coursecategories'}{'cats'};
+ $cattype{'auth'} = $domconfig{'coursecategories'}{'auth'};
+ $cattype{'unauth'} = $domconfig{'coursecategories'}{'unauth'};
+ } else {
+ $cathash = {};
+ $cattype{'auth'} = 'std';
+ $cattype{'unauth'} = 'std';
+ }
+ if (($cattype{'auth'} eq 'none') && ($cattype{'unauth'} eq 'none')) {
+ $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}.
+ '<br />'.
+ '<br />'.$visactions->{'take'}.'<ul>'.
+ '<li>'.$visactions->{'dc_chgconf'}.'</li>'.
+ '</ul>');
+ } elsif (($cattype{'auth'} !~ /^(std|domonly)$/) && ($cattype{'unauth'} !~ /^(std|domonly)$/)) {
+ if ($currsettings->{'uniquecode'}) {
+ $r->print('<span class="LC_info">'.$visactions->{'vis'}.'</span>');
+ } else {
$r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}.
- '<br />');
- if (ref($vismsgs) eq 'ARRAY') {
- $r->print('<br />'.$visactions->{'take'}.'<ul>');
- foreach my $item (@{$vismsgs}) {
- $r->print('<li>'.$visactions->{$item}.'</li>');
+ '<br />'.
+ '<br />'.$visactions->{'take'}.'<ul>'.
+ '<li>'.$visactions->{'dc_setcode'}.'</li>'.
+ '</ul><br />');
+ }
+ } else {
+ my ($visible,$cansetvis,$vismsgs) = &visible_in_stdcat($cdom,$cnum,\%domconfig);
+ if (ref($visactions) eq 'HASH') {
+ if (!$visible) {
+ $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}.
+ '<br />');
+ if (ref($vismsgs) eq 'ARRAY') {
+ $r->print('<br />'.$visactions->{'take'}.'<ul>');
+ foreach my $item (@{$vismsgs}) {
+ $r->print('<li>'.$visactions->{$item}.'</li>');
+ }
+ $r->print('</ul>');
}
- $r->print('</ul>');
+ $r->print($cansetvis);
}
- $r->print($cansetvis);
}
}
return;