--- loncom/interface/lonmodifycourse.pm 2008/06/30 04:14:40 1.39
+++ loncom/interface/lonmodifycourse.pm 2011/01/11 22:09:49 1.58
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.39 2008/06/30 04:14:40 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.58 2011/01/11 22:09:49 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,23 +35,44 @@ use Apache::lonhtmlcommon;
use Apache::lonlocal;
use Apache::lonuserutils;
use Apache::lonpickcourse;
-use LONCAPA::Enrollment;
use lib '/home/httpd/lib/perl';
use LONCAPA;
sub get_dc_settable {
- return ('courseowner','coursecode','authtype','autharg');
+ my ($type) = @_;
+ if ($type eq 'Community') {
+ return ('courseowner');
+ } else {
+ return ('courseowner','coursecode','authtype','autharg');
+ }
+}
+
+sub autoenroll_keys {
+ my $internals = ['coursecode','courseowner','authtype','autharg','autoadds','autodrops',
+ 'autostart','autoend','sectionnums','crosslistings',
+ 'co-owners'];
+ my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];
+ return ($internals,$accessdates);
}
sub catalog_settable {
- my ($confhash) = @_;
+ my ($confhash,$type) = @_;
my @settable;
if (ref($confhash) eq 'HASH') {
- if ($confhash->{'togglecats'} ne 'crs') {
- push(@settable,'togglecats');
- }
- if ($confhash->{'categorize'} ne 'crs') {
- push(@settable,'categorize');
+ if ($type eq 'Community') {
+ if ($confhash->{'togglecatscomm'} ne 'comm') {
+ push(@settable,'togglecats');
+ }
+ if ($confhash->{'categorizecomm'} ne 'comm') {
+ push(@settable,'categorize');
+ }
+ } else {
+ if ($confhash->{'togglecats'} ne 'crs') {
+ push(@settable,'togglecats');
+ }
+ if ($confhash->{'categorize'} ne 'crs') {
+ push(@settable,'categorize');
+ }
}
} else {
push(@settable,('togglecats','categorize'));
@@ -61,14 +82,17 @@ sub catalog_settable {
sub get_enrollment_settings {
my ($cdom,$cnum) = @_;
- my %settings = &Apache::lonnet::dump('environment',$cdom,$cnum);
+ my ($internals,$accessdates) = &autoenroll_keys();
+ my @items;
+ if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
+ @items = map { 'internal.'.$_; } (@{$internals});
+ push(@items,@{$accessdates});
+ }
+ my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum);
my %enrollvar;
$enrollvar{'autharg'} = '';
$enrollvar{'authtype'} = '';
- my %lt=&Apache::lonlocal::texthash(
- 'noen' => "No end date",
- );
- foreach my $item (keys %settings) {
+ foreach my $item (keys(%settings)) {
if ($item =~ m/^internal\.(.+)$/) {
my $type = $1;
if ( ($type eq "autoadds") || ($type eq "autodrops") ) {
@@ -79,11 +103,11 @@ sub get_enrollment_settings {
}
} elsif ( ($type eq "autostart") || ($type eq "autoend") ) {
if ( ($type eq "autoend") && ($settings{$item} == 0) ) {
- $enrollvar{$type} = $lt{'noen'};
+ $enrollvar{$type} = &mt('No end date');
} else {
- $enrollvar{$type} = localtime($settings{$item});
+ $enrollvar{$type} = &Apache::lonlocal::locallocaltime($settings{$item});
}
- } elsif ($type eq "sectionnums") {
+ } elsif (($type eq 'sectionnums') || ($type eq 'co-owners')) {
$enrollvar{$type} = $settings{$item};
$enrollvar{$type} =~ s/,/, /g;
} elsif ($type eq "authtype"
@@ -102,11 +126,11 @@ sub get_enrollment_settings {
} elsif ($item =~ m/^default_enrollment_(start|end)_date$/) {
my $type = $1;
if ( ($type eq 'end') && ($settings{$item} == 0) ) {
- $enrollvar{$item} = $lt{'noen'};
+ $enrollvar{$item} = &mt('No end date');
} elsif ( ($type eq 'start') && ($settings{$item} eq '') ) {
$enrollvar{$item} = 'When enrolled';
} else {
- $enrollvar{$item} = localtime($settings{$item});
+ $enrollvar{$item} = &Apache::lonlocal::locallocaltime($settings{$item});
}
}
}
@@ -115,114 +139,200 @@ sub get_enrollment_settings {
sub print_course_search_page {
my ($r,$dom,$domdesc) = @_;
- &print_header($r);
+ my $action = '/adm/modifycourse';
+ my $type = $env{'form.type'};
+ if (!defined($env{'form.type'})) {
+ $type = 'Course';
+ }
+ &print_header($r,$type);
my $filterlist = ['descriptfilter',
'instcodefilter','ownerfilter',
- 'ownerdomfilter','coursefilter'];
+ 'coursefilter'];
my $filter = {};
- my $type = 'Course';
- my $action = '/adm/modifycourse';
- my $cctitle = &Apache::lonnet::plaintext('cc',$type);
- my $dctitle = &Apache::lonnet::plaintext('dc');
- $r->print(
- '
'.&mt('Search for a course in the [_1] domain',$domdesc).'
'.
- &mt('Actions available after searching for a course:').'
'.
- '
'.&mt('Enter the course with the role of [_1]',$cctitle).'
'."\n".
- '
'.&mt('View or modify course settings which only a [_1] may modify.'
- ,$dctitle).'
'."\n".'
');
+ my ($numtitles,$cctitle,$dctitle,@codetitles);
+ my $ccrole = 'cc';
+ if ($type eq 'Community') {
+ $ccrole = 'co';
+ }
+ $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
+ $dctitle = &Apache::lonnet::plaintext('dc');
+ $r->print(&Apache::lonpickcourse::js_changer());
+ if ($type eq 'Community') {
+ $r->print('
'.&mt('Search for a community in the [_1] domain',$domdesc).'
');
+ } else {
+ $r->print('
'.&mt('Search for a course in the [_1] domain',$domdesc).'
');
+ }
$r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
- undef,undef,$filter,$action,'modifycourse'));
+ undef,undef,$filter,$action,\$numtitles,'modifycourse',
+ undef,undef,undef,\@codetitles));
+ if ($type eq 'Community') {
+ $r->print(&mt('Actions available after searching for a community:').'
'.
+ '
'.&mt('Enter the community with the role of [_1]',$cctitle).'
'."\n".
+ '
'.&mt('View or modify community settings which only a [_1] may modify.',$dctitle).
+ '
'."\n".'
');
+ } else {
+ $r->print(&mt('Actions available after searching for a course:').'
'.
+ '
'.&mt('Enter the course with the role of [_1]',$cctitle).'
'."\n".
+ '
'.&mt('View or modify course settings which only a [_1] may modify.',$dctitle).
+ '
'."\n".'
');
+ }
}
sub print_course_selection_page {
my ($r,$dom,$domdesc) = @_;
- &print_header($r);
+ my $type = $env{'form.type'};
+ if (!defined($type)) {
+ $type = 'Course';
+ }
+ &print_header($r,$type);
# Criteria for course search
my $filterlist = ['descriptfilter',
'instcodefilter','ownerfilter',
'ownerdomfilter','coursefilter'];
my %filter;
- my $type = $env{'form.type'};
- if ($type eq '') {
- $type = 'Course';
- }
my $action = '/adm/modifycourse';
my $dctitle = &Apache::lonnet::plaintext('dc');
- $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').
');
+ my ($numtitles,@codetitles);
+ $r->print(&Apache::lonpickcourse::js_changer());
+ $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.'). ');
$r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
- undef,undef,\%filter,$action));
+ undef,undef,\%filter,$action,\$numtitles,
+ undef,undef,undef,undef,\@codetitles));
$filter{'domainfilter'} = $dom;
my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,
- \%filter);
- &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,
+ \%filter,$numtitles,undef,
+ undef,undef,\@codetitles);
+ &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,
%courses);
return;
}
sub print_modification_menu {
- my ($r,$cdesc,$domdesc,$dom) = @_;
- &print_header($r,$cdesc);
- my $type = 'Course';
- my $action = '/adm/modifycourse';
- my $cctitle = &Apache::lonnet::plaintext('cc',$type);
- my $dctitle = &Apache::lonnet::plaintext('dc');
- my %lt=&Apache::lonlocal::texthash(
- 'some' => "Certain settings which control auto-enrollment of students from your institution's student information system.",
- 'crqo' => 'The total disk space allocated for storage of portfolio files in all groups in a course.',
- );
+ my ($r,$cdesc,$domdesc,$dom,$type) = @_;
+ &print_header($r,$type);
+ my ($ccrole,$categorytitle,$setquota_text,$setparams_text,$cat_text);
+ if ($type eq 'Community') {
+ $ccrole = 'co';
+ } else {
+ $ccrole = 'cc';
+ }
+ if ($type eq 'Community') {
+ $categorytitle = 'View/Modify Community Settings';
+ $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.');
+ $setparams_text = 'View/Modify community owner';
+ $cat_text = 'View/Modify catalog settings for community';
+ } else {
+ $categorytitle = 'View/Modify Course Settings';
+ $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.');
+ $setparams_text = 'View/Modify course owner, institutional code, and default authentication';
+ $cat_text = 'View/Modify catalog settings for course';
+ }
+ my $anon_text = 'Responder threshold required to display anonymous survey submissions';
+
+ my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
+ my @additional_params = &catalog_settable($domconf{'coursecategories'},$type);
+
+ sub phaseurl {
+ my $phase = shift;
+ return "javascript:changePage(document.menu,'$phase')"
+ }
my @menu =
- (
- { text => 'Modify quota for group portfolio files',
- phase => 'setquota',
+ ({ categorytitle => $categorytitle,
+ items => [
+ {
+ linktext => $setparams_text,
+ url => &phaseurl('setparms'),
+ permission => 1,
+ #help => '',
+ icon => 'crsconf.png',
+ linktitle => ''
},
- { text => 'Display current settings for automated enrollment',
- phase => 'viewparms',
+ {
+ linktext => 'View/Modify quota for group portfolio files',
+ url => &phaseurl('setquota'),
+ permission => 1,
+ #help => '',
+ icon => 'groupportfolioquota.png',
+ linktitle => ''
},
- { text => 'Modify institutional code, course owner and/or default authentication',
- phase => 'setparms',
- },
- );
- my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
- my @additional_params = &catalog_settable($domconf{'coursecategories'});
- if (@additional_params > 0) {
- push (@menu, { text => 'Modify course catalog settings for course',
- phase => 'catsettings',
- });
- }
- my $menu_html = '
'.&mt('View/Modify settings for: ').$cdesc.'
'."\n".
- &mt('Although almost all course settings can be modified by a [_1], a number of settings exist which only a [_2] may change:',$cctitle,$dctitle).'
-
';
+ if ($type eq 'Community') {
+ $menu_html .= &mt('Although almost all community settings can be modified by a Coordinator, the following may only be set or modified by a Domain Coordinator:');
+ } else {
+ $menu_html .= &mt('Although almost all course settings can be modified by a Course Coordinator, the following may only be set or modified by a Domain Coordinator:');
+ }
+ $menu_html .= '
'.&mt('Manual cataloging of a course (can be [_1]configured[_2] to be modifiable in course context)','','').'
'."\n";
-
+ if ($type eq 'Community') {
+ if ($item eq 'togglecats') {
+ $menu_html .= '
'.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','','').'
'.&mt('Hiding/unhiding a course from the course catalog (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','','').'
'.
+ ''
+ );
}
sub print_setquota {
my ($r,$cdom,$cnum,$cdesc,$type) = @_;
- my $dctitle = &Apache::lonnet::plaintext('dc');
- my $cctitle = &Apache::lonnet::plaintext('cc',$type);
- my $subdiv = &mt('Although a [_1] will assign the disk quota for each individual group, the size of the quota is constrained by the total disk space allocated by the [_2] for portfolio files in a course.',$cctitle,$dctitle);
my %lt = &Apache::lonlocal::texthash(
- 'cquo' => 'Disk space for storage of group portfolio files',
+ 'cquo' => 'Disk space for storage of group portfolio files for:',
'gpqu' => 'Course portfolio files disk space',
- 'each' => 'Each course group can be assigned a quota for portfolio files uploaded to the group.',
- 'modi' => 'Modify quota',
- 'back' => "Back to options page",
+ 'modi' => 'Save',
+ 'back' => 'Pick another action',
);
+ if ($type eq 'Community') {
+ $lt{'gpqu'} = &mt('Community portfolio files disk space');
+ }
my %settings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum);
my $coursequota = $settings{'internal.coursequota'};
if ($coursequota eq '') {
$coursequota = 20;
}
- &print_header($r,$cdesc);
+ &print_header($r,$type);
my $hidden_elements = &hidden_form_elements();
+ my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_Quota');
$r->print(<
-
$lt{'cquo'}.
+
+ENDDOCUMENT
+ return;
+}
+
sub print_catsettings {
- my ($r,$cdom,$cnum,$cdesc) = @_;
- &print_header($r,$cdesc);
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+ &print_header($r,$type);
my %lt = &Apache::lonlocal::texthash(
- 'back' => 'Back to options page',
+ 'back' => 'Pick another action',
+ 'catset' => 'Catalog Settings for Course',
+ 'visi' => 'Visibility in Course/Community Catalog',
+ 'exclude' => 'Exclude from course catalog:',
+ 'categ' => 'Categorize Course',
+ 'assi' => 'Assign one or more categories and/or subcategories to this course.'
);
+ if ($type eq 'Community') {
+ $lt{'catset'} = &mt('Catalog Settings for Community');
+ $lt{'exclude'} = &mt('Exclude from course catalog');
+ $lt{'categ'} = &mt('Categorize Community');
+ $lt{'assi'} = &mt('Assign one or more subcategories to this community.');
+ }
$r->print('');
+ return;
+}
+
+sub modifiable_only_title {
+ my ($type) = @_;
+ my $dctitle = &Apache::lonnet::plaintext('dc');
+ if ($type eq 'Community') {
+ return &mt('Community settings modifiable only by [_1] for:',$dctitle);
+ } else {
+ return &mt('Course settings modifiable only by [_1] for:',$dctitle);
+ }
+}
- my $helplink=&Apache::loncommon::help_open_topic('Modify_Course',&mt("Help on Modifying Courses"));
+sub gather_authenitems {
+ my ($cdom,$enrollvar) = @_;
my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom);
my $curr_authtype = '';
my $curr_authfield = '';
- if ($enrollvar{'authtype'} =~ /^krb/) {
- $curr_authtype = 'krb';
- } elsif ($enrollvar{'authtype'} eq 'internal' ) {
- $curr_authtype = 'int';
- } elsif ($enrollvar{'authtype'} eq 'localauth' ) {
- $curr_authtype = 'loc';
+ if (ref($enrollvar) eq 'HASH') {
+ if ($enrollvar->{'authtype'} =~ /^krb/) {
+ $curr_authtype = 'krb';
+ } elsif ($enrollvar->{'authtype'} eq 'internal' ) {
+ $curr_authtype = 'int';
+ } elsif ($enrollvar->{'authtype'} eq 'localauth' ) {
+ $curr_authtype = 'loc';
+ }
}
unless ($curr_authtype eq '') {
$curr_authfield = $curr_authtype.'arg';
}
- my $javascript_validations=&Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom,$curr_authtype,$curr_authfield);
+ my $javascript_validations =
+ &Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom,
+ $curr_authtype,$curr_authfield);
my %param = ( formname => 'document.'.$env{'form.phase'},
- kerb_def_dom => $krbdefdom,
- kerb_def_auth => $krbdef,
+ kerb_def_dom => $krbdefdom,
+ kerb_def_auth => $krbdef,
mode => 'modifycourse',
curr_authtype => $curr_authtype,
- curr_autharg => $enrollvar{'autharg'}
- );
+ curr_autharg => $enrollvar->{'autharg'}
+ );
my (%authform,$authenitems);
$authform{'krb'} = &Apache::loncommon::authform_kerberos(%param);
$authform{'int'} = &Apache::loncommon::authform_internal(%param);
@@ -479,164 +706,80 @@ all settings except course code, course
if ($authform{$item} ne '') {
$authenitems .= $authform{$item}.' ';
}
- }
- if ($numlocalcc == 0) {
- $ownertable = $lt{'nocc'};
- }
-
- if ($numlocalcc > 0) {
- @local_ccs = sort @local_ccs;
- $ownertable = qq(
-
-
";
}
- &print_header($r,$cdesc,$javascript_validations);
- my $type = $env{'form.type'};
- if ($type eq '') {
- $type = 'Course';
- }
- my $dctitle = &Apache::lonnet::plaintext('dc');
- my $cctitle = &Apache::lonnet::plaintext('cc',$type);
- my $mainheader = &mt('Course settings modifiable by [_1] only.',$dctitle);
- my $hidden_elements = &hidden_form_elements();
- $r->print(<
-
$mainheader
-
-
-
-
Use the appropriate text boxes and radio buttons below to change some or all of the four automated enrollment settings that may only be changed by a Domain Coordinator.
-
-
-
- $lt{'ccod'}:
-
- $lt{'ccus'}
-
-
- $lt{'cown'}:
- $ownertable
-
- $lt{'cous'}
-
-
-
-
- $lt{'deam'}:
- $authenitems
-
- $lt{'deus'}.
-
-
-
-
-
-
-
- $hidden_elements
-
-
-
-
-
-
-
-ENDDOCUMENT
- return;
+ return($javascript_validations,$authenitems);
}
sub modify_course {
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
- my %longtype = &course_settings_descrip();
- my %settings = &Apache::lonnet::get('environment',['internal.courseowner','internal.coursecode','internal.authtype','internal.autharg','internal.sectionnums','internal.crosslistings','description'],$cdom,$cnum);
- my %currattr = ();
- my %newattr = ();
- my %cenv = ();
- my $response;
- my $chgresponse;
- my $nochgresponse;
- my $warning;
- my $reply;
- my @changes = ();
- my @nochanges = ();
- my @sections = ();
- my @xlists = ();
- my %changed = ( code => 0,
- owner => 0,
- );
- unless ($settings{'internal.sectionnums'} eq '') {
- if ($settings{'internal.sectionnums'} =~ m/,/) {
- @sections = split/,/,$settings{'internal.sectionnums'};
- } else {
- $sections[0] = $settings{'internal.sectionnums'};
- }
+ my %longtype = &course_settings_descrip($type);
+ my @items = ('internal.courseowner','description','internal.co-owners',
+ 'internal.pendingco-owners');
+ unless ($type eq 'Community') {
+ push(@items,('internal.coursecode','internal.authtype','internal.autharg',
+ 'internal.sectionnums','internal.crosslistings'));
}
- unless ($settings{'internal.crosslistings'} eq'') {
- if ($settings{'internal.crosslistings'} =~ m/,/) {
- @xlists = split/,/,$settings{'internal.crosslistings'};
- } else {
- $xlists[0] = $settings{'internal.crosslistings'};
- }
- }
-
- my @modifiable_params = &get_dc_settable();
+ my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum);
+ my $description = $settings{'description'};
+ my ($ccrole,$response,$chgresponse,$nochgresponse,$reply,%currattr,%newattr,%cenv,%changed,
+ @changes,@nochanges,@sections,@xlists,@warnings);
+ my @modifiable_params = &get_dc_settable($type);
foreach my $param (@modifiable_params) {
- my $attr = 'internal.'.$param;
- $currattr{$param} = $settings{$attr};
+ $currattr{$param} = $settings{'internal.'.$param};
}
+ if ($type eq 'Community') {
+ %changed = ( owner => 0 );
+ $ccrole = 'co';
+ } else {
+ %changed = ( code => 0,
+ owner => 0,
+ );
+ $ccrole = 'cc';
+ unless ($settings{'internal.sectionnums'} eq '') {
+ if ($settings{'internal.sectionnums'} =~ m/,/) {
+ @sections = split/,/,$settings{'internal.sectionnums'};
+ } else {
+ $sections[0] = $settings{'internal.sectionnums'};
+ }
+ }
+ unless ($settings{'internal.crosslistings'} eq'') {
+ if ($settings{'internal.crosslistings'} =~ m/,/) {
+ @xlists = split/,/,$settings{'internal.crosslistings'};
+ } else {
+ $xlists[0] = $settings{'internal.crosslistings'};
+ }
+ }
+ if ($env{'form.login'} eq 'krb') {
+ $newattr{'authtype'} = $env{'form.login'};
+ $newattr{'authtype'} .= $env{'form.krbver'};
+ $newattr{'autharg'} = $env{'form.krbarg'};
+ } elsif ($env{'form.login'} eq 'int') {
+ $newattr{'authtype'} ='internal';
+ if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) {
+ $newattr{'autharg'} = $env{'form.intarg'};
+ }
+ } elsif ($env{'form.login'} eq 'loc') {
+ $newattr{'authtype'} = 'localauth';
+ if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
+ $newattr{'autharg'} = $env{'form.locarg'};
+ }
+ }
+ if ( $newattr{'authtype'}=~ /^krb/) {
+ if ($newattr{'autharg'} eq '') {
+ push(@warnings,
+ &mt('As you did not include the default Kerberos domain'
+ .' to be used for authentication in this class, the'
+ .' institutional data used by the automated'
+ .' enrollment process must include the Kerberos'
+ .' domain for each new student.'));
+ }
+ }
- my $description = $settings{'description'};
-
- if ($env{'form.login'} eq 'krb') {
- $newattr{'authtype'} = $env{'form.login'};
- $newattr{'authtype'} .= $env{'form.krbver'};
- $newattr{'autharg'} = $env{'form.krbarg'};
- } elsif ($env{'form.login'} eq 'int') {
- $newattr{'authtype'} ='internal';
- if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) {
- $newattr{'autharg'} = $env{'form.intarg'};
- }
- } elsif ($env{'form.login'} eq 'loc') {
- $newattr{'authtype'} = 'localauth';
- if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
- $newattr{'autharg'} = $env{'form.locarg'};
- }
- }
- if ( $newattr{'authtype'}=~ /^krb/) {
- if ($newattr{'autharg'} eq '') {
- $warning = qq().
- &mt("As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student").qq();
+ if ( exists($env{'form.coursecode'}) ) {
+ $newattr{'coursecode'}=$env{'form.coursecode'};
+ unless ( $newattr{'coursecode'} eq $currattr{'coursecode'} ) {
+ $changed{'code'} = 1;
+ }
}
}
@@ -646,94 +789,108 @@ sub modify_course {
$changed{'owner'} = 1;
}
}
-
- if ( exists($env{'form.coursecode'}) ) {
- $newattr{'coursecode'}=$env{'form.coursecode'};
- unless ( $newattr{'coursecode'} eq $currattr{'coursecode'} ) {
- $changed{'code'} = 1;
- }
- }
- if ($changed{'owner'} || $changed{'code'}) {
+
+ if ($changed{'owner'} || $changed{'code'}) {
my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,
undef,undef,'.');
if (ref($crsinfo{$env{'form.pickedcourse'}}) eq 'HASH') {
- $crsinfo{$env{'form.pickedcourse'}}{'inst_code'} = $env{'form.coursecode'};
- $crsinfo{$env{'form.pickedcourse'}}{'owner'} = $env{'form.courseowner'};
+ if ($changed{'code'}) {
+ $crsinfo{$env{'form.pickedcourse'}}{'inst_code'} = $env{'form.coursecode'};
+ }
+ if ($changed{'owner'}) {
+ $crsinfo{$env{'form.pickedcourse'}}{'owner'} = $env{'form.courseowner'};
+ }
my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
+ if ($putres eq 'ok') {
+ &update_coowners($cdom,$cnum,$chome,\%settings,\%newattr);
+ }
}
}
foreach my $param (@modifiable_params) {
if ($currattr{$param} eq $newattr{$param}) {
push(@nochanges,$param);
} else {
- my $attr = 'internal.'.$param;
- $cenv{$attr} = $newattr{$param};
+ $cenv{'internal.'.$param} = $newattr{$param};
push(@changes,$param);
}
}
if (@changes > 0) {
- $chgresponse = &mt("The following automated enrollment parameters have been changed:
");
+ $chgresponse = &mt("The following settings have been changed:
");
}
- if (@nochanges > 0) {
- $nochgresponse = &mt("The following automated enrollment parameters remain unchanged:
");
+ if (@nochanges > 0) {
+ $nochgresponse = &mt("The following settings remain unchanged:
");
}
if (@changes > 0) {
my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
if ($putreply !~ /^ok$/) {
- $response = &mt("There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged. ").&mt('Error: ').$putreply;
+ $response = '
'.
+ &mt('There was a problem processing your requested changes.').' ';
+ if ($type eq 'Community') {
+ $response .= &mt('Settings for this community have been left unchanged.');
+ } else {
+ $response .= &mt('Settings for this course have been left unchanged.');
+ }
+ $response .= ' '.&mt('Error: ').$putreply.'
';
} else {
foreach my $attr (@modifiable_params) {
- if (grep/^$attr$/,@changes) {
- $chgresponse .= "
$longtype{$attr} ".&mt("now set to \"").$newattr{$attr}."\".
";
+ if (grep/^\Q$attr\E$/,@changes) {
+ $chgresponse .= '
'.$longtype{$attr}.' '.&mt('now set to:').' "'.$newattr{$attr}.'".
';
} else {
- $nochgresponse .= "
$longtype{$attr} ".&mt("still set to \"").$currattr{$attr}."\".
";
+ $nochgresponse .= '
'.$longtype{$attr}.' '.&mt('still set to:').' "'.$currattr{$attr}.'".
';
}
}
- if ($changed{'code'} || $changed{'owner'}) {
+ if (($type ne 'Community') && ($changed{'code'} || $changed{'owner'})) {
if ( $newattr{'courseowner'} eq '') {
- $warning .= &mt("There is no owner associated with this LON-CAPA course. If automated enrollment in LON-CAPA courses at your institution requires validation of course owners, automated enrollment will fail for this course. ");
+ push(@warnings,&mt('There is no owner associated with this LON-CAPA course.').
+ ' '.&mt('If automated enrollment at your institution requires validation of course owners, automated enrollment will fail.'));
} else {
if (@sections > 0) {
if ($changed{'code'}) {
+ my %crsenv = &Apache::lonnet::get('environment',['internal.co-owners'],$cdom,$cnum);
+ my $coowners = $crsenv{'internal.co-owners'};
foreach my $sec (@sections) {
if ($sec =~ m/^(.+):/) {
+ my $instsec = $1;
my $inst_course_id = $newattr{'coursecode'}.$1;
my $course_check = &Apache::lonnet::auto_validate_courseID($cnum,$cdom,$inst_course_id);
if ($course_check eq 'ok') {
- my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});
- unless ($outcome eq 'ok') {
- $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome. ");
+ my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners);
+ unless ($outcome eq 'ok') {
+
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).' ');
}
} else {
- $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $course_check. ");
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$course_check));
}
} else {
- $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry. ");
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3], because this is not a valid section entry.',$description,$newattr{'coursecode'},$sec));
}
}
} elsif ($changed{'owner'}) {
foreach my $sec (@sections) {
if ($sec =~ m/^(.+):/) {
- my $inst_course_id = $newattr{'coursecode'}.$1;
- my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});
+ my $instsec = $1;
+ my $inst_course_id = $newattr{'coursecode'}.$instsec;
+ my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners);
unless ($outcome eq 'ok') {
- $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome. ");
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome));
}
} else {
- $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry. ");
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3], because this is not a valid section entry.',$description,$newattr{'coursecode'},$sec));
}
}
}
} else {
- $warning .= &mt("As no section numbers are currently listed for LON-CAPA course: ").$description.&mt(", automated enrollment will not occur for any sections of coursecode: ").$newattr{'coursecode'}." ";
+ push(@warnings,&mt('As no section numbers are currently listed for "[_1]", automated enrollment will not occur for any sections of institutional course code: "[_2]".',$description,$newattr{'coursecode'}));
}
if ( (@xlists > 0) && ($changed{'owner'}) ) {
foreach my $xlist (@xlists) {
if ($xlist =~ m/^(.+):/) {
- my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$1,$newattr{'courseowner'});
+ my $instxlist = $1;
+ my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$instxlist,$newattr{'courseowner'},$coowners);
unless ($outcome eq 'ok') {
- $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for crosslisted class: ").$1.&mt(" for the following reason: $outcome. ");
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for crosslisted class "[_2]" for the following reason: "[_3]".',$description,$instxlist,$outcome));
}
}
}
@@ -743,7 +900,7 @@ sub modify_course {
}
} else {
foreach my $attr (@modifiable_params) {
- $nochgresponse .= "
$longtype{$attr} ".&mt("still set to")." \"".$currattr{$attr}."\".
";
+ $nochgresponse .= '
'.$longtype{$attr}.' '.&mt('still set to').' "'.$currattr{$attr}.'".
';
}
}
@@ -753,38 +910,190 @@ sub modify_course {
if (@nochanges > 0) {
$nochgresponse .= "
";
}
- unless ($warning eq '') {
- $warning = &mt("The following warning messages were generated as a result of applying the changes you specified to course settings that can affect the automated enrollment process:
").$warning;
+ my ($warning,$numwarnings);
+ my $numwarnings = scalar(@warnings);
+ if ($numwarnings) {
+ $warning = &mt('The following [quant,_1,warning was,warnings were] generated when applying your changes to automated enrollment:',$numwarnings).'