--- loncom/interface/lonpopulate.pm 2016/11/09 00:48:52 1.85 +++ loncom/interface/lonpopulate.pm 2022/01/03 04:56:27 1.91 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.85 2016/11/09 00:48:52 raeburn Exp $ +# $Id: lonpopulate.pm,v 1.91 2022/01/03 04:56:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,7 @@ use Apache::lonuserutils; use Apache::Constants qw(:common :http REDIRECT); use Time::Local; use LONCAPA::Enrollment; +use LONCAPA qw(:DEFAULT :match); ############################################################### sub header { @@ -49,8 +50,9 @@ sub header { ############################################################### sub choose_header { - my ($action,$permref) = @_; + my ($action,$permref,$dom) = @_; my $notify_check = '/^note_[0-9]+$/'; + my $additems; my %js_lt = &Apache::lonlocal::texthash( adds => 'You must select either "Enable" or "Disable" for nightly additions based on classlist changes', @@ -219,18 +221,58 @@ function countChecked(field) { } ENDJSTWO + } elsif ($action eq 'chgfailsafe') { + my %domconfig = + &Apache::lonnet::get_dom('configuration',['autoenroll'],$dom); + my $includedom = 1; + if (ref($domconfig{'autoenroll'}) eq 'HASH') { + if ($domconfig{'autoenroll'}->{'failsafe'} eq 'off') { + $includedom = 0; + } + } + $scripttag .= < "toggleFailsafe(document.enter);" }; } $scripttag .= < ENDJS - my $args = &make_crumbs($action,$permref); + my $args = &make_crumbs($action,$permref,$additems); return &Apache::loncommon::start_page('Classlist Manager', $scripttag,$args); } sub make_crumbs { - my ($action,$permref) = @_; + my ($action,$permref,$additems) = @_; my ($tasklong,$tasktitle) = &get_task_text($permref); my $brcrum = [{href=>"/adm/createuser", text=>"User Management",}, @@ -254,7 +296,8 @@ sub make_crumbs { ); } return {bread_crumbs => $brcrum, - bread_crumbs_component => 'Automated Management'}; + bread_crumbs_component => 'Automated Management', + add_entries => $additems}; } sub print_navmenu { @@ -368,8 +411,8 @@ 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.','"','"').' +   + '.&mt('Use [_1]View/change enrollment failsafe[_2] to (a) set number of drops from existing enrollments in an institutional section above which no automated drops will occur (e.g., when section enrollment retrieved from institutional data is incomplete) and (b) set whether this only applies when retrieved data contains zero records for the institutional section.','"','"').' '); } else { if (($permref->{'view'}) || ($permref->{'view_section'} ne '')) { @@ -406,8 +449,8 @@ sub print_main_frame { '"','"').' -   - '.&mt('Use [_1]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.','"','"').' +   + '.&mt('Use [_1]Enrollment failsafe[_2] to display (a) number of drops from existing enrollments in an institutional section above which no automated drops occur (e.g., when section enrollment retrieved from institutional data is incomplete), and (b) whether this only applies when retrieved data contains zero records for the institutional section.','"','"').' '); } if (($permref->{'show'}) || ($permref->{'show_section'} ne '')) { @@ -494,7 +537,12 @@ sub print_main_frame { '."\n"); } elsif ($action eq 'chgfailsafe') { - my $autofailsafe; + my ($autofailsafe,$failsafetype,$failsafesty,%failsafechecked); + $failsafesty = 'inline-block'; + %failsafechecked = ( + dom => ' checked="checked"', + ); + my $domdefault; my %domconfig = &Apache::lonnet::get_dom('configuration',['autoenroll'],$dom); if (ref($domconfig{'autoenroll'}) eq 'HASH') { @@ -502,42 +550,101 @@ sub print_main_frame { if ($autofailsafe =~ /\D/) { undef($autofailsafe); } + if ($domconfig{'autoenroll'}->{'failsafe'} eq 'off') { + undef($autofailsafe); + $failsafesty = 'none'; + $failsafetype = 'off'; + $domdefault = &mt('Failsafe is not in use.'); + } elsif ($domconfig{'autoenroll'}->{'failsafe'} eq 'any') { + $failsafesty = 'inline-block'; + $failsafetype = 'any'; + $domdefault = &mt('Failsafe will apply if retrieved enrollment for institutional section is zero or greater.'); + } else { + $failsafesty = 'inline-block'; + $failsafetype = 'zero'; + $domdefault = &mt('Failsafe will only apply if retrieved enrollment for institutional section is zero.'); + } + } + if ((exists($enrollvar{'autodropfailsafetype'})) && + ($enrollvar{'autodropfailsafetype'} ne '')) { + if ($enrollvar{'autodropfailsafetype'} eq 'off') { + $failsafesty = 'none'; + $failsafechecked{'dom'} = ''; + $failsafechecked{'off'} = ' checked="checked"'; + } elsif ($enrollvar{'autodropfailsafetype'} eq 'any') { + $failsafesty = 'inline-block'; + $failsafechecked{'dom'} = ''; + $failsafechecked{'any'} = ' checked="checked"'; + } elsif ($enrollvar{'autodropfailsafetype'} eq 'zero') { + $failsafesty = 'inline-block'; + $failsafechecked{'dom'} = ''; + $failsafechecked{'zero'} = ' checked="checked"'; + } } $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).').'

'); + &mt('The "failsafe" mechanism for automated enrollment can prevent unwanted expiration of student roles for registered students in an institutional section, in the case where either no enrollment, or only partial enrollment, is returned for that particular section because of a temporary institutional data retrieval problem external to LON-CAPA.').'

'. + '

'.&mt('For example if the threshold 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.').' '); + $r->print('

'.&mt('Currently no course-specific failsafe threshold 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(&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'}").'

'); + unless (($enrollvar{'autodropfailsafetype'} eq 'off') || + (($enrollvar{'autodropfailsafetype'} eq '') && ($failsafetype eq 'off'))) { + $r->print('

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

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

'.&mt('Currently no course-specific failsafe condition is set.').' '); + if ($failsafetype eq 'any') { + $r->print(&mt('The current domain default, whereby the failsafe is in effect if the retrieved section enrollment is zero or greater, will apply unless overridden here for this specific course.')); + } elsif ($failsafetype eq 'zero') { + $r->print(&mt('The current domain default, whereby the failsafe is only in effect if the retrieved section enrollment is zero, will apply unless overridden here for this specific course.')); + } elsif ($failsafetype eq 'off') { + $r->print(&mt('The current domain default (failsafe not in use) will apply unless overridden here for this specific course.')); + } + $r->print('

'); + } else { + if ($enrollvar{'autodropfailsafetype'} eq 'zero') { + $r->print('

'.&mt('Currently, the course-specific failsafe condition is set such that any failsafe threshold is only in effect when the retrieved institutional section enrollment is zero.')); + } elsif ($enrollvar{'autodropfailsafetype'} eq 'any') { + $r->print('

'.&mt('Currently, the course-specific failsafe condition is set such that any failsafe threshold is in effect when the retrieved institutional section enrollment is zero (or greater).')); + } elsif ($enrollvar{'autodropfailsafetype'} eq 'off') { + $r->print('

'.&mt('Currently, the course-specific failsafe condition is set such that a failsafe will not be used.')); + } + $r->print('

'); + } } $r->print('
- - + @@ -903,10 +1010,12 @@ sub print_main_frame { '); $r->print(&Apache::loncommon::end_data_table_row()); - for (my $i=0; $i<@xlists; $i++) { + my @showable; + &reformat_xlists($dom,$crs,$enrollvar{'coursecode'},\@xlists,\@showable); + for (my $i=0; $i<@showable; $i++) { my $xl = ' '; my $lc_sec = ' '; - if ($xlists[$i] =~ /^([^:]+):?(.*)$/) { + if ($showable[$i] =~ /^([^:]+):?(.*)$/) { $xl = $1; $lc_sec = $2; } @@ -1680,32 +1789,58 @@ sub print_chgsettings_response { sub print_chgfailsafe_response { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.autodropfailsafe'], + my %settings = &Apache::lonnet::get('environment', + ['internal.autodropfailsafe', + 'internal.autodropfailsafetype'], $dom,$crs); - my ($currfailsafe,$newfailsafe,$response); - if ( defined($settings{'internal.autodropfailsafe'}) ) { + my ($currfailsafe,$newfailsafe,$currfailsafetype,$newfailsafetype,$response); + if (defined($settings{'internal.autodropfailsafe'})) { $currfailsafe = $settings{'internal.autodropfailsafe'}; } + if (defined($settings{'internal.autodropfailsafetype'})) { + $currfailsafetype = $settings{'internal.autodropfailsafetype'}; + } 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); + if ($env{'form.autodropfailsafetype'} =~ /^(any|zero|off)$/) { + $newfailsafetype = $env{'form.autodropfailsafetype'}; + } + if (($currfailsafe ne $newfailsafe) || ($currfailsafetype ne $newfailsafetype)) { + my %cenv = ('internal.autodropfailsafe' => $newfailsafe, + 'internal.autodropfailsafetype' => $newfailsafetype, + ); 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.'); + if ($currfailsafetype ne $newfailsafetype) { + if ($env{'form.autodropfailsafetype'} eq 'dom') { + $response = &mt('Course-specific setting for condition for when failsafe applies deleted; domain default now applies.'); + } elsif ($newfailsafetype eq 'off') { + $response = &mt('Course-specific setting set to disable failsafe use.'); + } elsif ($newfailsafetype eq 'zero') { + $response = &mt('Course-specific setting set so failsafe applies when zero enrollment retrieved for an institutional section.'); + } else { + $response = &mt('Course-specific setting set so failsafe applies when zero or greater enrollment is retrieved for an institutional section.'); + } + $response .= '
'; + } + if ($currfailsafe ne $newfailsafe) { + if ($newfailsafe ne '') { + $response .= &mt('Course-specific setting for drop failsafe threshold set to [_1]',$newfailsafe); + } else { + $response .= &mt('Course-specific setting for drop failsafe threshold deleted; domain default now applies.'); + } + } } } else { - $response = &mt('The new value for the automated drop failsafe was the same as the existing value, so no changes have been made.'); + $response = &mt('The new values for the automated drop failsafe threshold and conditions under which failsafe applies were the same as the existing values, so no changes have been made.'); } &print_reply($r,$response,$$tasktitleref{$action}); return; @@ -2063,8 +2198,10 @@ sub print_crosslistings_menu { if ($crosscount > 0) { $response .= &mt('The [quant,_1,course] listed below remain crosslisted with this LON-CAPA course, and students enrolling in these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update.',$crosscount). '
    '."\n"; - foreach my $xl (@xlists) { - my ($xlist,$lc_sec) = split(/:/,$xl); + my @showable; + &reformat_xlists($dom,$crs,$coursecode,\@xlists,\@showable); + foreach my $item (@showable) { + my ($xlist,$lc_sec) = split(/:/,$item); $response .= '
  • '.&mt('[_1] - ID: [_2]',$xlist,$lc_sec).'
    • '."\n"; } @@ -2074,26 +2211,86 @@ sub print_crosslistings_menu { if ( exists($env{'form.numcross'}) ) { my $numcross = $env{'form.numcross'}; if ($numcross) { - $response .= - &mt('You indicated that you wish to add an additional [quant,_1,crosslisting].',$numcross).' '. - &mt('For each new crosslisting enter the institutional course section code (e.g., fs03zol101001, for section 001 of zol101 for fs03 semester), and the LON-CAPA section ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in the crosslisted course section.').' '. - &mt('The LON-CAPA section ID can be left blank, if you do not wish to tie a section ID to this crosslisting.').' '. - &mt("The institutional course section code should only contain letters and/or numbers, and must be consistent with the scheme adopted by your Domain Coordinator to map course codes (and section numbers) to your institution's student information system."). - '

    - '. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_row().' -
- '."\n". - &Apache::loncommon::end_data_table_row(); - for (my $i=0; $i<$numcross; $i++) { - $response .= - &Apache::loncommon::start_data_table_row().' - - '. + my (@codetitles,%cat_titles,%cat_order,@code_order); + &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, + \%cat_order,\@code_order); + $response .= + &mt('You indicated that you wish to add an additional [quant,_1,crosslisting].',$numcross).' '; + if (@codetitles > 0) { + my $lastitem = pop(@codetitles); + $response .= + &mt('For each new crosslisting select [_1], and enter the [_2] and the LON-CAPA section ID.',join(', ',@codetitles),$lastitem).' '. + &mt('The LON-CAPA section ID can be left blank, if you do not wish to tie a section ID to this crosslisting.').' '. + '

'. + ''."\n". + &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row()."\n"; + foreach my $title (@codetitles) { + if (ref($cat_order{$title}) eq 'ARRAY') { + if (@{$cat_order{$title}} > 0) { + $response .= ''; + } + } + } + $response .= ''."\n". + ''."\n". + ''."\n". + &Apache::loncommon::end_data_table_header_row()."\n"; + for (my $i=0; $i<$numcross; $i++) { + $response .= + &Apache::loncommon::start_data_table_row()."\n"; + foreach my $title (@codetitles) { + if (ref($cat_order{$title}) eq 'ARRAY') { + if (@{$cat_order{$title}} > 0) { + $response .= ''."\n"; + } + } + } + $response .= ''."\n".''."\n".''. + &Apache::loncommon::end_data_table_row()."\n"; + } + $response .= &Apache::loncommon::end_data_table()."\n"; + } else { + $response .= + &mt('For each new crosslisting enter the institutional course section code (e.g., fs03zol101001, for section 001 of zol101 for fs03 semester), and the LON-CAPA section ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in the crosslisted course section.').' '. + &mt('The LON-CAPA section ID can be left blank, if you do not wish to tie a section ID to this crosslisting.').' '. + &mt("The institutional course section code should only contain letters and/or numbers, and must be consistent with the scheme adopted by your Domain Coordinator to map course codes (and section numbers) to your institution's student information system."). + '

'. + ''."\n". + &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_row()."\n". + ''."\n". + ''."\n". &Apache::loncommon::end_data_table_row(); - } - $response .= &Apache::loncommon::end_data_table().' + for (my $i=0; $i<$numcross; $i++) { + $response .= + &Apache::loncommon::start_data_table_row().' + + '. + &Apache::loncommon::end_data_table_row(); + } + $response .= &Apache::loncommon::end_data_table(); + } + $response .= ' @@ -2134,33 +2331,78 @@ sub print_crosslistings_response { } if ($numcross) { my %curr_groups = &Apache::longroup::coursegroups(); + my (@codetitles,%cat_titles,%cat_order,@code_order); + &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, + \%cat_order,\@code_order); + my $lastitem = $codetitles[-1]; for (my $i=0; $i<$numcross; $i++) { - my $xl = "newcross_".$i; + my $xl = ''; + if (@code_order > 0) { + foreach my $item (@code_order) { + my $possval = $env{'form.newcross_'.$i.'_'.$item}; + if ($item eq $lastitem) { + $xl .= $possval; + } else { + my $possval = $env{'form.newcross_'.$i.'_'.$item}; + if (ref($cat_order{$item}) eq 'ARRAY') { + if (grep(/^\Q$possval\E$/,@{$cat_order{$item}})) { + $xl .= $possval; + } + } + } + } + if ($xl ne '') { + my $crskey = $crs.':'.$xl; + if ($env{'form.newcross_'.$i.'_instsec'} ne '') { + my $poss_sec = $env{'form.newcross_'.$i.'_instsec'}; + my %formatted = &Apache::lonnet::auto_instsec_reformat($dom,'clutter', + {$crskey => [$poss_sec]}); + if (ref($formatted{$crskey}) eq 'ARRAY') { + $xl .= $formatted{$crskey}->[0]; + } + } + } + } else { + $xl = $env{'form.newcross_'.$i}; + } my $lc_sec = "newlcsec_".$i; - if ( exists($env{"form.$xl"}) ) { + if ($xl ne '') { if (exists($env{"form.$lc_sec"})) { my $lc_sec_check = &validate_lcsec(\%curr_groups, $env{"form.$lc_sec"}); if ($lc_sec_check eq 'reserved') { - push(@reserved,$env{"form.$xl"}.":".$env{"form.$lc_sec"}); + push(@reserved,$xl.':'.$env{"form.$lc_sec"}); next; } elsif ($lc_sec_check eq 'group') { - push(@matchgroup,$env{"form.$xl"}.":".$env{"form.$lc_sec"}); + push(@matchgroup,$xl.':'.$env{"form.$lc_sec"}); next; } } - my $coursecheck = - &Apache::lonnet::auto_validate_courseID($crs,$dom,$env{"form.$xl"}); + my $coursecheck = + &Apache::lonnet::auto_validate_courseID($crs,$dom,$xl); if ($coursecheck eq 'ok') { my $addcheck = ''; - $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$env{"form.$xl"},$owner,$coowners); - if ($addcheck eq 'ok') { - push(@xlists,$env{"form.$xl"}.":".$env{"form.$lc_sec"}); - } else { - push(@badowner,$env{"form.$xl"}.":".$env{"form.$lc_sec"}); + $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$xl,$owner,$coowners); + unless ($addcheck eq 'ok') { + if ($coowners) { + foreach my $user (split(/,/,$coowners)) { + if ($user =~ /^($match_username):($match_domain)$/) { + if (&Apache::lonnet::auto_validate_inst_crosslist($crs,$dom,$coursecode, + $xl,$user) eq 'valid') { + $addcheck = 'ok'; + last; + } + } + } + } + } + if ($addcheck eq 'ok') { + push(@xlists,$xl.':'.$env{"form.$lc_sec"}); + } else { + push(@badowner,$xl.':'.$env{"form.$lc_sec"}); } } else { - push(@badxlists,$env{"form.$xl"}.":".$env{"form.$lc_sec"}.":".$coursecheck); + push(@badxlists,$xl.':'.$env{"form.$lc_sec"}.":".$coursecheck); } } } @@ -2180,7 +2422,9 @@ sub print_crosslistings_response { '

'; } else { $response = &mt('The courses listed below are now crosslisted with this LON-CAPA course, and students enrolling in these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update.').'
    '."\n"; - foreach my $item (@allxlists) { + my @showable; + &reformat_xlists($dom,$crs,$coursecode,\@allxlists,\@showable); + foreach my $item (@showable) { my ($xlist,$lc_sec) = split(/:/,$item); $response .= '
  • '.&mt('[_1] - ID: [_2]',$xlist,$lc_sec).'
    • '. "\n"; @@ -2192,8 +2436,10 @@ sub print_crosslistings_response { my @oldxlists = split(/,/,$xliststr); $response .= &mt('Although no new crosslistings were added, the courses listed below continue to be crosslisted with your LON-CAPA course.'). '
      '."\n"; - foreach my $xl (@oldxlists) { - my ($xlist,$lc_sec) = split(/:/,$xl); + my @showable; + &reformat_xlists($dom,$crs,$coursecode,\@oldxlists,\@showable); + foreach my $item (@showable) { + my ($xlist,$lc_sec) = split(/:/,$item); $response .= '
    • '.&mt('[_1] - ID: [_2]',$xlist,$lc_sec).'
      • '. "\n"; } @@ -2203,7 +2449,9 @@ sub print_crosslistings_response { if (@badxlists > 0) { $response .= &mt("The courses listed below could not be included in the crosslistings for this LON-CAPA course, because they are not valid courses according to your institution's official schedule of classes and sections."). '
        '."\n"; - foreach my $item (@badxlists) { + my @showable; + &reformat_xlists($dom,$crs,$coursecode,\@badxlists,\@showable); + foreach my $item (@showable) { my ($xlist,$lc_sec,$prob) = split(/:/,$item); $response .= '
      • '. &mt('[_1] - ID: [_2] - Error: [_3]', @@ -2215,7 +2463,9 @@ sub print_crosslistings_response { if (@badowner > 0) { $response .= &mt("The courses listed below could not be included in the crosslistings for this LON-CAPA course, because the owner of this course - [_1] - does not have rights to view enrollment in those classes, as determined by your instititution's policies on access to official classlists.",$owner). '
          '."\n"; - foreach my $item (@badowner) { + my @showable; + &reformat_xlists($dom,$crs,$coursecode,\@badowner,\@showable); + foreach my $item (@showable) { my ($xlist,$lc_sec) = split(/:/,$item); $response .= '
        • '.&mt('[_1] - ID: [_2]',$xlist,$lc_sec).'
          • '. "\n"; @@ -2227,7 +2477,9 @@ sub print_crosslistings_response { &mt('Please [_1]go back[_2] and change the section ID for each of these courses.', '','>/a>'). '
            '."\n"; - foreach my $item (@reserved) { + my @showable; + &reformat_xlists($dom,$crs,$coursecode,\@reserved,\@showable); + foreach my $item (@showable) { my ($xlist,$lc_sec) = split(/:/,$item); $response .= '
          • '.&mt('[_1] - ID: [_2]',$xlist,$lc_sec).'
            • '. "\n"; @@ -2239,7 +2491,9 @@ sub print_crosslistings_response { $response .= &mt('The courses listed below could not be included in the crosslistings for this LON-CAPA course, because the section ID associated with the crosslisted course is the name of a group in this course.').' '. &mt('Please [_1]go back[_2] and change the section ID for each of these courses.','            ',''). '
              '."\n"; - foreach my $item (@matchgroup) { + my @showable; + &reformat_xlists($dom,$crs,$coursecode,\@matchgroup,\@showable); + foreach my $item (@showable) { my ($xlist,$lc_sec) = split(/:/,$item); $response .= '
            • '.&mt('[_1] - ID: [_2]',$xlist,$lc_sec).'
              • '. "\n"; @@ -2259,6 +2513,33 @@ sub print_crosslistings_response { return; } +sub reformat_xlists { + my ($dom,$crs,$coursecode,$xlistsref,$showxlistsref) = @_; + return unless ((ref($xlistsref) eq 'ARRAY') && (ref($showxlistsref) eq 'ARRAY')); + my $crskey = $crs.':'.$coursecode; + my (@xlcodes,@lcsecs,@extras); + foreach my $xl (@{$xlistsref}) { + my ($instcodesec,$lc_sec,$extra) = split(/:/,$xl); + push(@xlcodes,$instcodesec); + push(@lcsecs,$lc_sec); + push(@extras,$extra); + } + my %reformatted = + &Apache::lonnet::auto_instsec_reformat($dom,'declutter', + {$crskey => \@xlcodes}); + if (ref($reformatted{$crskey}) eq 'ARRAY') { + @xlcodes = @{$reformatted{$crskey}}; + for (my $i=0; $i<@xlcodes; $i++) { + my $value = $xlcodes[$i].':'.$lcsecs[$i]; + if ($extras[$i] ne '') { + $value .= ':'.$extras[$i]; + } + push(@{$showxlistsref},$value); + } + } + return; +} + sub print_sections_menu { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; my %settings = @@ -2294,7 +2575,15 @@ sub print_sections_menu { push(@sections,$secentry); $seccount ++; } else { - my $newsec = $coursecode.$env{"form.$secnum"}; + my $newsec; + my $crskey = $crs.':'.$coursecode; + my %formattedsec = &Apache::lonnet::auto_instsec_reformat($dom,'clutter', + {$crskey => [$env{"form.$secnum"}]}); + if (ref($formattedsec{$crskey}) eq 'ARRAY') { + $newsec = $coursecode.$formattedsec{$crskey}->[0]; + } else { + $newsec = $coursecode.$env{"form.$secnum"}; + } my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec); if ($coursecheck eq 'ok') { my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner,$coowners); @@ -2482,7 +2771,15 @@ sub print_sections_response { push(@matchgroup,$env{"form.$sec"}.":".$env{"form.$lc_sec"}); next; } - my $newsec = $coursecode.$env{"form.$sec"}; + my $newsec; + my $crskey = $crs.':'.$coursecode; + my %formattedsec = &Apache::lonnet::auto_instsec_reformat($dom,'clutter', + {$crskey => [$env{"form.$sec"}]}); + if (ref($formattedsec{$crskey}) eq 'ARRAY') { + $newsec = $coursecode.$formattedsec{$crskey}->[0]; + } else { + $newsec = $coursecode.$env{"form.$sec"}; + } my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec); if ($coursecheck eq 'ok') { my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner,$coowners); @@ -2801,7 +3098,7 @@ sub print_photoupdate_response { 'internal.sectionnums', 'internal.crosslistings'], $dom,$crs); - &Apache::loncommon::get_institutional_codes(\%settings,\@allcourses,\%LC_code); + &Apache::loncommon::get_institutional_codes($dom,$crs,\%settings,\@allcourses,\%LC_code); if (@allcourses > 0) { @{$affiliates{$crs}} = @allcourses; $outcome = &Apache::lonnet::auto_photoupdate(\%affiliates,$dom,$crs,\%changes); @@ -2883,7 +3180,7 @@ sub print_update_result { &Apache::lonnet::get('environment', ['internal.coursecode','internal.sectionnums','internal.crosslistings', 'internal.authtype','internal.autharg','internal.showphoto','internal.defaultcredits', - 'internal.autodropfailsafe','internal.textbook'], + 'internal.autodropfailsafe','internal.autodropfailsafetype','internal.textbook'], $dom,$crs); my $coursecode = $settings{'internal.coursecode'}; my $authtype = $settings{'internal.authtype'}; @@ -2905,6 +3202,10 @@ sub print_update_result { } } } + my $failsafetype = $settings{'internal.autodropfailsafetype'}; + if ($failsafetype eq '') { + $failsafetype = $domdefaults{'failsafe'}; + } my $failsafe = $settings{'internal.autodropfailsafe'}; if ($failsafe eq '') { $failsafe = $domdefaults{'autofailsafe'}; @@ -2931,7 +3232,7 @@ sub print_update_result { $response = &mt('There was a problem retrieving the course code for this LON-CAPA course.').' '. &mt('An update of the class roster has not been carried out, and enrollment remains unchanged.'); } else { - &Apache::loncommon::get_institutional_codes(\%settings,\@allcourses,\%LC_code); + &Apache::loncommon::get_institutional_codes($dom,$crs,\%settings,\@allcourses,\%LC_code); if (@allcourses > 0) { @{$affiliates{$crs}} = @allcourses; my $outcome = &Apache::lonnet::fetch_enrollment_query('updatenow',\%affiliates,\%reply,$dom,$crs); @@ -2943,7 +3244,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,$failsafe,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow",\%phototypes); + ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$startaccess,$endaccess,$authtype,$autharg,$showcredits,$defaultcredits,$failsafe,$failsafetype,\@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.'); @@ -3323,7 +3624,7 @@ sub get_task_text { &Apache::lonlocal::texthash( information => 'Task information', chgsettings => 'Automated adds/drops', - chgfailsafe => 'Change zero enrollment failsafe', + chgfailsafe => 'View/change enrollment failsafe', setdates => 'Change enrollment dates', setaccess => 'Change access dates', notify => 'Notification of changes', @@ -3355,7 +3656,7 @@ sub get_task_text { ); if ((ref($permref) eq 'HASH') && (!$permref->{'edit'})) { - $tasklong{'chgfailsafe'} = &mt('Zero enrollment failsafe'); + $tasklong{'chgfailsafe'} = &mt('Enrollment failsafe'); $tasklong{'setdates'} = &mt('Enrollment dates'); $tasklong{'setaccess'} = &mt('Access dates'); $tasklong{'crosslist'} = &mt('Crosslistings'); @@ -3463,12 +3764,12 @@ sub handler { $r->print(&header($action,\%permhash)); } else { if ($state eq "choose") { - $r->print(&choose_header($action,\%permhash)); + $r->print(&choose_header($action,\%permhash,$dom)); } else { if ($action eq "crosslist") { if ( exists($env{'form.numcross'}) ) { if ( $env{'form.numcross'} > 0 ) { - $r->print(&choose_header($action,\%permhash)); + $r->print(&choose_header($action,\%permhash,$dom)); } else { $r->print(&header($action,\%permhash)); } @@ -3478,7 +3779,7 @@ sub handler { } elsif ($action eq "sections") { if ( exists($env{'form.numsec'}) ) { if ( $env{'form.numsec'} > 0 ) { - $r->print(&choose_header($action,\%permhash)); + $r->print(&choose_header($action,\%permhash,$dom)); } else { $r->print(&header($action,\%permhash)); }
- '.&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.')); - } +
'.&mt('Condition for use of failsafe in this course').'
+  -- '.$domdefault.'
+
+
+
+
+ '. + &mt('Failsafe threshold (enter an integer)').'   +
'); + if ($autofailsafe) { + $r->print(&mt('Leave blank to use domain default of [_1].',''.$autofailsafe.'')); + } else { + $r->print(&mt('As no domain default is set, failsafe will not be used if blank.')); } - $r->print(' + $r->print('
'.&mt('LON-CAPA section ID').''.&mt('Crosslisting').''.&mt('LON-CAPA section ID').''.$title.''.$lastitem.''.&mt('Institutional section').''.&mt('LON-CAPA section').''. + ''. + ''. + ''. + ''. + ''. + ''.&mt('Crosslisting').''.&mt('LON-CAPA section ID').'