--- loncom/interface/lonpopulate.pm 2015/06/09 21:22:57 1.83 +++ loncom/interface/lonpopulate.pm 2016/07/24 14:34:59 1.84 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.83 2015/06/09 21:22:57 damieng Exp $ +# $Id: lonpopulate.pm,v 1.84 2016/07/24 14:34:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -350,6 +350,10 @@ sub print_main_frame { '.&mt('Use [_1]View students and change type[_2] to display the current course roster, and (optionally) change enrollment type for selected students from "auto" to "manual" and vice versa.','"','"').' +   + '.&mt('Use [_1]Change zero enrollment failsafe[_2] to set number of existing enrollments in an institutional section above which no automated drops occur whenever section enrollment retrieved from institutional data is zero.','"','"').' + +   @@ -423,6 +427,70 @@ sub print_main_frame { '."\n"); + } elsif ($action eq 'chgfailsafe') { + my $autofailsafe; + my %domconfig = + &Apache::lonnet::get_dom('configuration',['autoenroll'],$dom); + if (ref($domconfig{'autoenroll'}) eq 'HASH') { + $autofailsafe = $domconfig{'autoenroll'}->{'autofailsafe'}; + if ($autofailsafe =~ /\D/) { + undef($autofailsafe); + } + } + $r->print(' +

+ + + + +
'.$$tasktitleref{$action}.'

'. + &mt('In a course where multiple institutional sections provide enrollment, the "failsafe" value can prevent automated enrollment from expiring student roles for registered students in one section, in the case where no enrollment is returned for that particular section because of a temporary institutional data retrieval problem external to LON-CAPA.').'

'. + '

'.&mt('For example if this value is set to 10, and the current LON-CAPA enrollment count is 11 or more for a particular course section, no role expiration will occur if the latest retrieved enrollment count is zero for that institutional section (or cross-listing).').'

'); + if ($enrollvar{'autodropfailsafe'} eq '') { + $r->print('

'.&mt('Currently no course-specific failsafe value is set.').' '); + if ($autofailsafe eq '') { + $r->print(&mt('Currently no domain default failsafe is set either.')); + } else { + $r->print(&mt('The current domain default of [_1] will apply, unless a value is set here specific to this course.',$autofailsafe)); + } + $r->print('

'); + } else { + $r->print('

'.&mt('Currently, the course-specific failsafe is set to [_1].',"$enrollvar{'autodropfailsafe'}").'

'); + } + $r->print(' +
+ + + + + + + + + + + + + + +
+ '.&mt('Failsafe (enter an integer)').'   +
'); + if ($enrollvar{'autodropfailsafe'}) { + if ($autofailsafe) { + $r->print(&mt('Leave blank to use domain default of [_1].',$autofailsafe)); + } else { + $r->print(&mt('Leave blank to not use.')); + } + } + $r->print(' +
 
'.&mt('Push "Go" to save your changes').' +
 
+ +
+ + +
'."\n"); } elsif ($action eq 'setdates') { my ($start_table,$end_table) = &date_setting_table($enrollvar{autostart},$enrollvar{autoend},$action); my $oldstartshow = ''; @@ -1064,7 +1132,7 @@ sub print_main_frame { - + @@ -1467,28 +1535,15 @@ sub print_doc_base { ################################################################### sub print_chgsettings_response { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.crosslistings','internal.autostart','internal.autoend','internal.autoadds','internal.autodrops'],$dom,$crs); - my ($currend,$currstart,$currsecs,$currxlists,$curradds,$currdrops, - $autoadds,$autodrops,$response,$warning,$warn_prefix,$warn_suffix, - $warnfiller); + my %settings = &Apache::lonnet::get('environment',['internal.autoadds','internal.autodrops'],$dom,$crs); + my ($curradds,$currdrops,$autoadds,$autodrops,$response,$warning, + $warn_prefix,$warn_suffix,$warnfiller); if ( defined($settings{'internal.autoadds'}) ) { $curradds = $settings{'internal.autoadds'}; } if ( defined($settings{'internal.autodrops'}) ) { $currdrops = $settings{'internal.autodrops'}; } - if ( defined($settings{'internal.autostart'}) ) { - $currstart = $settings{'internal.autostart'}; - } - if ( defined($settings{'internal.autoend'}) ) { - $currend = $settings{'internal.autoend'}; - } - if ( defined($settings{'internal.sectionnums'}) ) { - $currsecs = $settings{'internal.sectionnums'}; - } - if ( defined($settings{'internal.crosslistings'}) ) { - $currxlists = $settings{'internal.crosslistings'} - } if ( exists($env{'form.autoadds'}) ) { $autoadds=$env{'form.autoadds'}; } @@ -1538,7 +1593,7 @@ sub print_chgsettings_response { unless ($warning eq '') { $response .= '
'. ''.&mt('Warning.').' '; - if ($autodrops && $autodrops) { + if ($autoadds && $autodrops) { $response .= &mt('Although you indicated that nightly adds and drops should be enabled, additional action is required.'); } elsif ($autoadds) { @@ -1556,6 +1611,39 @@ sub print_chgsettings_response { return; } +sub print_chgfailsafe_response { + my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; + my %settings = &Apache::lonnet::get('environment',['internal.autodropfailsafe'], + $dom,$crs); + my ($currfailsafe,$newfailsafe,$response); + if ( defined($settings{'internal.autodropfailsafe'}) ) { + $currfailsafe = $settings{'internal.autodropfailsafe'}; + } + if (exists($env{'form.autodropfailsafe'})) { + $env{'form.autodropfailsafe'} =~ s{^\s+|\s+$}{}g; + if ($env{'form.autodropfailsafe'} !~ /\D/) { + $newfailsafe = $env{'form.autodropfailsafe'}; + } + } + if ($currfailsafe ne $newfailsafe) { + my %cenv = ('internal.autodropfailsafe' => $newfailsafe); + my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); + if ($reply ne 'ok') { + $response = + &mt('There was a problem processing your requested changes.').' '. + &mt('The automated enrollment settings for this course have been left unchanged.').'
'; + } elsif ($newfailsafe ne '') { + $response = &mt('Automated drop failsafe set to [_1]',$newfailsafe); + } else { + $response = &mt('Course-specific automated drop failsafe deleted.'); + } + } else { + $response = &mt('The new value for the automated drop failsafe was the same as the existing value, so no changes have been made.'); + } + &print_reply($r,$response,$$tasktitleref{$action}); + return; +} + sub print_setdates_response { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; my %settings = @@ -2728,7 +2816,7 @@ sub print_update_result { &Apache::lonnet::get('environment', ['internal.coursecode','internal.sectionnums','internal.crosslistings', 'internal.authtype','internal.autharg','internal.showphoto','internal.defaultcredits', - 'internal.textbook'], + 'internal.autodropfailsafe','internal.textbook'], $dom,$crs); my $coursecode = $settings{'internal.coursecode'}; my $authtype = $settings{'internal.authtype'}; @@ -2750,6 +2838,10 @@ sub print_update_result { } } } + my $failsafe = $settings{'internal.autodropfailsafe'}; + if ($failsafe eq '') { + $failsafe = $domdefaults{'autofailsafe'}; + } my ($startaccess,$endaccess) = &get_dates_from_form(); if ( exists($env{'form.updateadds'}) ) { $updateadds = $env{'form.updateadds'}; @@ -2784,7 +2876,7 @@ sub print_update_result { ": ".$outcome); } if ($reply{$crs} > 0) { - ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$startaccess,$endaccess,$authtype,$autharg,$showcredits,$defaultcredits,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow",\%phototypes); + ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$startaccess,$endaccess,$authtype,$autharg,$showcredits,$defaultcredits,$failsafe,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow",\%phototypes); } else { $response = &mt('There was a problem retrieving institutional class list data for the course sections and crosslisted courses which contribute enrollment to this course.').' '. &mt('No updates have been carried out, and the roster remains unchanged.'); @@ -3155,6 +3247,7 @@ sub get_task_text { &Apache::lonlocal::texthash( information => 'Task information', chgsettings => 'Automated adds/drops', + chgfailsafe => 'Change zero enrollment failsafe', setdates => 'Change enrollment dates', setaccess => 'Change access dates', notify => 'Notification of changes', @@ -3171,6 +3264,7 @@ sub get_task_text { my %tasktitle = &Apache::lonlocal::texthash( chgsettings => 'Changes to nightly automated enrollments', + chgfailsafe => 'Changes to failsafe protection for data retrieval problems', setdates => 'Changes to first and/or last automated enrollment dates', setaccess => 'Changes to default start and/or end dates for student access', notify => 'Notification of enrollment changes', @@ -3208,7 +3302,7 @@ sub handler { $r->send_http_header; my @tasks = ('information','chgsettings','setdates','setaccess','notify','crosslist', - 'sections','photos','updatenow','updatephotos','viewclass'); + 'sections','photos','updatenow','updatephotos','viewclass','chgfailsafe'); my ($tasklong,$tasktitle) = &get_task_text(); my $realm; @@ -3274,6 +3368,8 @@ sub handler { &print_main_frame($r,$realm,$dom,$crs,$tasktitle); } elsif ($action eq "chgsettings") { &print_chgsettings_response($r,$realm,$dom,$crs,$action,$tasktitle); + } elsif ($action eq "chgfailsafe") { + &print_chgfailsafe_response($r,$realm,$dom,$crs,$action,$tasktitle); } elsif ($action eq "setdates") { &print_setdates_response($r,$realm,$dom,$crs,$action,$tasktitle); } elsif ($action eq "setaccess") {