--- loncom/interface/lonmodifycourse.pm 2006/07/18 21:52:01 1.27 +++ loncom/interface/lonmodifycourse.pm 2006/11/14 20:38:21 1.28 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# automated enrollment course setup handler +# handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.27 2006/07/18 21:52:01 albertel Exp $ +# $Id: lonmodifycourse.pm,v 1.28 2006/11/14 20:38:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,145 +31,255 @@ use strict; use Apache::Constants qw(:common :http); use Apache::lonnet; use Apache::loncommon; +use Apache::lonhtmlcommon; use Apache::lonlocal; use Apache::londropadd; +use Apache::lonpickcourse; use LONCAPA::Enrollment; use lib '/home/httpd/lib/perl'; use LONCAPA; -sub print_course_selection_page { - my ($r,$tasklongref) = @_; - my $dom = $env{'request.role.domain'}; +sub get_dc_settable { + return ('courseowner','coursecode','authtype','autharg'); +} + +sub get_enrollment_settings { + my ($cdom,$cnum) = @_; + my %settings = &Apache::lonnet::dump('environment',$cdom,$cnum); + my %enrollvar; + $enrollvar{'autharg'} = ''; + $enrollvar{'authtype'} = ''; my %lt=&Apache::lonlocal::texthash( - 'csae' => "Course settings for automated enrollment", - 'unst' => "Unlike standard LON-CAPA course parameters, such as course description, feedback addresses, and top level map, which are displayed and/or modified using the 'Course Environment Parameters' screen, settings that control automated enrollment based on classlist data available from your institution's student information system are handled differently. Automated enrollment settings fall into two groups: (a) settings that can be modified by a Course Coordinator using the Automated Enrollment Manager and (b) settings that may only be modified by a Domain Coordinator via the 'View/Modify Course settings' menu accessed from this page.", - 'chcs' => "Choose the course for which you wish to view/modify automated enrollment settings from the select box below and click 'Go' to proceed.", - 'eaen' => "Each entry in the select box contains: course code -- course title ------- course owner, and entries are ordered alphabetically by course code.", - 'psac' => "Please select a course", - 'ccrs' => "Choose a course", - 'gobt' => "Go" + 'noen' => "No end date", ); - -# Determine the courses - my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.',undef,undef,'.'); - &print_header($r,$tasklongref); - $r->print(< -

$lt{'csae'}

-

$lt{'unst'} -

$lt{'chcs'} -
$lt{'eaen'} -

-$lt{'ccrs'}: - -  - - -

-"); - &print_footer($r); + return %enrollvar; +} + +sub print_course_search_page { + my ($r,$dom,$domdesc) = @_; + &print_header($r); + my $filterlist = ['descriptfilter', + 'instcodefilter','ownerfilter', + 'ownerdomfilter','coursefilter']; + my $filter = {}; + 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.', + 'tmod' => 'To view or modify these settings use the criteria below to select a course from this domain.', + ); + $r->print('

'. + &mt('Course settings which only a [_1] may modify.' + ,$dctitle).'

'. + &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).' +'. +$lt{'tmod'}.' ('.$domdesc.') +

+ '); + $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type, + undef,undef,$filter,$action,'modifycourse')); +} + +sub print_course_selection_page { + my ($r,$dom,$domdesc) = @_; + &print_header($r); + +# Criteria for course search + my $filterlist = ['descriptfilter', + 'instcodefilter','ownerfilter', + 'ownerdomfilter','coursefilter']; + my %filter; + my $type = $env{'form.type'}; + my $action = '/adm/modifycourse'; + my $dctitle = &Apache::lonnet::plaintext('dc'); + $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').

'); + $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type, + undef,undef,\%filter,$action)); + $filter{'domainfilter'} = $dom; + my %courses = &Apache::lonpickcourse::search_courses($r,$type,0, + \%filter); + if (keys(%courses) > 0) { + $r->print(&mt("Click a 'Select' button to view or modify settings for a [_1] which may only be modified by a [_2] in this domain.",lc($type),$dctitle).'

'); + } + + &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action, + %courses); return; } -sub print_course_modification_page { - my ($r,$tasklongref,$typeref) = @_; - my %enrollvar = (); - my $javascript_validations; - my $course = ''; - my $dom = $env{'request.role.domain'}; - if ( defined($env{'form.course'}) ) { - $course = $env{'form.course'}; +sub print_modification_menu { + my ($r,$cdesc) = @_; + &print_header($r,$cdesc); + my @menu = + ( + { text => 'Modify quota for group portfolio files', + phase => 'setquota', + }, + { text => 'Display current settings for automated enrollment', + phase => 'viewparms', + }, + { text => 'Modify institutional code, course owner and/or default authentication', + phase => 'setparms', + } + ); + my $menu_html = '

'.&mt('View/Modify settings for: ').$cdesc.'

'."\n". + '
'."\n". + &hidden_form_elements(); + foreach my $menu_item (@menu) { + $menu_html.='

'; + $menu_html.=''; + $menu_html.= + qq||; + $menu_html.= &mt($menu_item->{'text'}).''; + $menu_html.='

'; } - my $ok_course = 'ok'; - if ( ($course == -1) || ($course == '-2') || ($course eq '') ) { - $ok_course = 'invalid'; - } else { - $ok_course = &check_course($dom,$course); + + $r->print($menu_html); + return; +} + +sub print_settings_display { + my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my %enrollvar = &get_enrollment_settings($cdom,$cnum); + my %longtype = &course_settings_descrip(); + my %lt = &Apache::lonlocal::texthash( + 'cset' => "Course setting", + 'valu' => "Current value", + 'caes' => 'Current automated enrollment settings for ', + 'cour' => "Course settings that control automated enrollment in this LON-CAPA course are currently:", + 'cose' => "Course settings for LON-CAPA courses that control auto-enrollment based on classlist data available from your institution's student information system fall into two groups:", + 'dcon' => "Modifiable by DC only", + 'back' => "Back to options page", + ); + + my @bgcolors = ('#eeeeee','#cccccc'); + my $cctitle = &Apache::lonnet::plaintext('cc',$type); + my $dctitle = &Apache::lonnet::plaintext('dc'); + my @modifiable_params = &get_dc_settable(); + + my $disp_table = &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row()."\n". + "$lt{'cset'}\n". + "$lt{'valu'}\n". + "$lt{'dcon'}\n". + &Apache::loncommon::end_data_table_header_row()."\n"; + foreach my $key (sort(keys(%enrollvar))) { + $disp_table .= &Apache::loncommon::start_data_table_row()."\n". + "$longtype{$key}\n". + "$enrollvar{$key}\n"; + if (grep(/^\Q$key\E$/,@modifiable_params)) { + $disp_table .= ''.&mt('Yes').''."\n"; + } else { + $disp_table .= ''.&mt('No').''."\n"; + } + $disp_table .= &Apache::loncommon::end_data_table_row()."\n"; } + $disp_table .= &Apache::loncommon::end_data_table()."\n"; + &print_header($r,$cdesc); + $r->print(' +

'.$lt{'caes'}.'

+

+ +'.$lt{'cose'}.'

+

+'.$lt{'cour'}.' +

+'.$disp_table.' +

+'.$lt{'back'}.'     +'.&mt('Modify [_1]-only settings',$dctitle).''."\n". +&hidden_form_elements(). +'

'); +} - unless ($ok_course eq 'ok') { - &print_header($r,$tasklongref,'',\$javascript_validations); - my $reply = "
".&mt("The LON-CAPA course selected was not a valid course for this domain"); - $r->print($reply); - &print_footer($r); - return; +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', + '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", + ); + my %settings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum); + my $coursequota = $settings{'internal.coursequota'}; + if ($coursequota eq '') { + $coursequota = 20; } + &print_header($r,$cdesc); + my $hidden_elements = &hidden_form_elements(); + $r->print(< +

$lt{'cquo'}.

+

+$lt{'each'}
+$subdiv +

+$lt{'gpqu'}: Mb      + +

+$hidden_elements +$lt{'back'} + +ENDDOCUMENT + return; +} - my @bgcolors=("#eeeeee","#cccccc"); +sub print_course_modification_page { + my ($r,$cdom,$cnum,$cdesc,$domdesc) = @_; + my %longtype = &course_settings_descrip(); + my %enrollvar = &get_enrollment_settings($cdom,$cnum); my $ownertable; my %lt=&Apache::lonlocal::texthash( 'actv' => "Active", @@ -180,19 +290,18 @@ sub print_course_modification_page { 'name' => "Name", 'unme' => "Username:Domain", 'stus' => "Status", - 'aecs' => "Automated Enrollment Course Settings", + 'cquo' => "Disk space for storage of group portfolio files", + 'gpqu' => "Course portfolio files disk space", + 'each' => "Each course group can be assigned a quota for portfolio files uploaded to the group.", 'cose' => "Course settings for LON-CAPA courses that control automated student enrollment based on classlist data available from your institution's student information system fall into two groups: (a) settings that can be modified by a Course Coordinator using the ", 'aenm' => "Automated Enrollment Manager", 'andb' => " and (b) settings that may only be modified by a Domain Coordinator via this page.", 'caes' => 'Current automated enrollment settings', 'cour' => "Course settings that control automated enrollment in this LON-CAPA course are currently:", - 'cset' => "Course setting", - 'valu' => "Current value", 'nocc' => "There is currently no course owner set for this course. In addition, no active course coordinators from this LON-CAPA domain were found, so you will not be able assign a course owner. If you wish to assign a course owner, it is recommended that you use the 'User Roles' screen to add a course coordinator with a LON-CAPA account in this domain to the course.", 'ccus' => "A course coordinator can use the 'Automated Enrollment Manager' to change all settings except course code, course owner, and default authentication method for students added to your course (who are also new to the LON-CAPA system at this domain).", - 'mkch' => "Make changes to course settings set by Domain Coordinator", 'ccod' => "Course Code", 'ccus' => "The course code is used during automated enrollment to map the internal LON-CAPA course ID for this course to the corresponding course section ID(s) used by the office responsible for providing official class lists for courses at your institution.", 'cown' => "Course Owner", @@ -203,55 +312,9 @@ all settings except course code, course 'deus' => "The default authentication method, and default authentication parameter (domain, initial password or argument) are used when automatic enrollment of students in a course requires addition of new user accounts in your domain, and the class list file contains empty entries for the <authtype> and <autharg> properties for the new student. If you choose 'internally authenticated', and leave the initial password field empty, the automated enrollment process will create a randomized password for each new student account that it adds to your LON-CAPA domain.", 'gobt' => "Modify settings", ); + my @bgcolors = ('#eeeeee','#cccccc'); - my %settings = &Apache::lonnet::dump('environment',$dom,$course); - $enrollvar{'autharg'} = ''; - $enrollvar{'authtype'} = ''; - foreach my $item (keys %settings) { - if ($item =~ m/^internal\.(.+)$/) { - my $type = $1; - - if ( ($type eq "autoadds") || ($type eq "autodrops") ) { - if ($settings{$item} == 1) { - $enrollvar{$type} = "ON"; - } else { - $enrollvar{$type} = "OFF"; - } - } elsif ( ($type eq "autostart") || ($type eq "autoend") ) { - if ( ($type eq "autoend") && ($settings{$item} == 0) ) { - $enrollvar{$type} = $lt{'noen'}; - } else { - $enrollvar{$type} = localtime($settings{$item}); - } - } elsif ($type eq "sectionums") { - $enrollvar{$type} = $settings{$item}; - $enrollvar{$type} =~ s/,/, /g; - } elsif ($type eq "authtype" - || $type eq "autharg" || $type eq "coursecode" - || $type eq "crosslistings") { - $enrollvar{$type} = $settings{$item}; - } elsif ($type eq 'courseowner') { - if ($settings{$item} =~ /^[^:]+:[^:]+$/) { - $enrollvar{$type} = $settings{$item}; - } else { - if ($settings{$item} ne '') { - $enrollvar{$type} = $settings{$item}.':'.$dom; - } - } - } - } elsif ($item =~ m/^default_enrollment_(start|end)_date$/) { - my $type = $1; - if ( ($type eq 'end') && ($settings{$item} == 0) ) { - $enrollvar{$item} = $lt{'noen'}; - } elsif ( ($type eq 'start') && ($settings{$item} eq '') ) { - $enrollvar{$item} = 'When enrolled'; - } else { - $enrollvar{$item} = localtime($settings{$item}); - } - } - } - - my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$dom,$course); + my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$cdom,$cnum); my @local_ccs = (); my %cc_status = (); my %pname = (); @@ -263,8 +326,8 @@ all settings except course code, course if (!grep(/^\Q$user\E$/,@local_ccs)) { my ($ccname,$ccdom) = split(/:/,$user); $active_cc = - &Apache::loncommon::check_user_status($ccdom,$ccname,$dom, - $course,'cc'); + &Apache::loncommon::check_user_status($ccdom,$ccname,$cdom, + $cnum,'cc'); if ($active_cc eq 'active') { push(@local_ccs,$user); $pname{$user} = &Apache::loncommon::plainname($ccname,$ccdom); @@ -280,7 +343,7 @@ all settings except course code, course $pname{$enrollvar{'courseowner'}} = &Apache::loncommon::plainname($owneruname,$ownerdom); $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname, - $dom,$course,'cc'); + $cdom,$cnum,'cc'); if ($active_cc eq 'active') { $cc_status{$enrollvar{'courseowner'}} = $lt{'actv'}; } else { @@ -290,7 +353,7 @@ all settings except course code, course my $numlocalcc = @local_ccs; my $helplink=&Apache::loncommon::help_open_topic('Modify_Course',&mt("Help on Modifying Courses")); - my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($dom); + my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom); my $curr_authtype = ''; my $curr_authfield = ''; if ($enrollvar{'authtype'} =~ /^krb/) { @@ -303,7 +366,7 @@ all settings except course code, course unless ($curr_authtype eq '') { $curr_authfield = $curr_authtype.'arg'; } - $javascript_validations=&Apache::londropadd::javascript_validations('modifycourse',$krbdefdom,$curr_authtype,$curr_authfield); + my $javascript_validations=&Apache::londropadd::javascript_validations('modifycourse',$krbdefdom,$curr_authtype,$curr_authfield); my %param = ( formname => 'document.cmod', kerb_def_dom => $krbdefdom, kerb_def_auth => $krbdef, @@ -315,35 +378,6 @@ all settings except course code, course my $intform = &Apache::loncommon::authform_internal(%param); my $locform = &Apache::loncommon::authform_local(%param); - my $disp_table = qq| - - - -
- - - - -
- - - - - - |; - my $iter = 0; - foreach my $key (sort keys %enrollvar) { - my $colflag = $iter%2; - $disp_table .= " - - - "; - $iter ++; - } - $disp_table .= "
$lt{'cset'}$lt{'valu'}
$$typeref{$key}$enrollvar{$key}
-
-
"; - if ($numlocalcc == 0) { $ownertable = $lt{'nocc'}; } @@ -354,77 +388,46 @@ all settings except course code, course - - '."\n". + ''."\n". + ''."\n". + &Apache::loncommon::end_data_table_row()."\n"; + } + $ownertable .= &Apache::loncommon::end_data_table()."
$lt{'tabl'} ($dom). $lt{'usrd'} + $lt{'tabl'} - $cdom ($domdesc). $lt{'usrd'}
 
- - - - -
- - - - -
- - - - - - - - ); - for (my $i=0; $i<@local_ccs; $i++) { - my $colflag = $i%2; - $ownertable .= ""; - if ($local_ccs[$i] eq $enrollvar{'courseowner'}) { - $ownertable .= ""; + \n". + "\n". + "\n". + "\n". + &Apache::loncommon::end_data_table_header_row()."\n"; + foreach my $cc (@local_ccs) { + $ownertable .= &Apache::loncommon::start_data_table_row()."\n"; + if ($cc eq $enrollvar{'courseowner'}) { + $ownertable .= ''."\n"; } else { - $ownertable .= ""; + $ownertable .= ''."\n"; } - $ownertable .= " - - - "; - } - $ownertable .= "
$lt{'ownr'}$lt{'name'}$lt{'unme'}$lt{'stus'}
). + &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row()."\n". + "$lt{'ownr'}$lt{'name'}$lt{'unme'}$lt{'stus'}$pname{$local_ccs[$i]}$local_ccs[$i]$cc_status{$local_ccs[$i]} $lt{'ccor'}
-
-
+ $ownertable .= + '		'.$pname{$cc}.''.$cc.''.$cc_status{$cc}.' '.$lt{'ccor'}.'
"; } - &print_header($r,$tasklongref,$settings{'description'},\$javascript_validations); + &print_header($r,$cdesc,$javascript_validations); + my $type = $env{'form.type'}; + 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(< -

$lt{'aecs'}

-$lt{'cose'}$lt{'aenm'}$lt{'andb'} -

- - - - - -
 

$lt{'caes'}

-

-$lt{'cour'} -

-$disp_table -
-

- - - - - - -
  -

$lt{'mkch'}

-
+

+

$mainheader

@@ -458,13 +461,11 @@ $disp_table
 
-

-
- - - + + $hidden_elements +
@@ -472,23 +473,13 @@ $disp_table

ENDDOCUMENT - &print_footer($r); return; } sub modify_course { - my ($r,$tasklongref,$typeref) = @_; - my $dom = $env{'user.domain'}; - my $crs = $env{'form.course'}; - unless ( &check_course($dom,$crs) eq 'ok' ) { - &print_header($r,$tasklongref); - my $reply = "
".&mt("The LON-CAPA course selected was not a valid course for this domain"); - $r->print($reply); - &print_footer($r); - return; - } - - my %settings = &Apache::lonnet::get('environment',['internal.courseowner','internal.coursecode','internal.authtype','internal.autharg','internal.sectionnums','internal.crosslistings','description'],$dom,$crs); + my ($r,$cdom,$cnum,$cdesc,$domdesc) = @_; + 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 = (); @@ -503,7 +494,7 @@ sub modify_course { my @xlists = (); my $changecode = 0; my $changeowner = 0; - unless ($settings{'internal.sectionnums'} eq'') { + unless ($settings{'internal.sectionnums'} eq '') { if ($settings{'internal.sectionnums'} =~ m/,/) { @sections = split/,/,$settings{'internal.sectionnums'}; } else { @@ -518,10 +509,10 @@ sub modify_course { } } - my @params = ('courseowner','coursecode','authtype','autharg'); - foreach (@params) { - my $attr = 'internal.'.$_; - $currattr{$_} = $settings{$attr}; + my @modifiable_params = &get_dc_settable(); + foreach my $param (@modifiable_params) { + my $attr = 'internal.'.$param; + $currattr{$param} = $settings{$attr}; } my $description = $settings{'description'}; @@ -563,17 +554,17 @@ sub modify_course { } } if ($changeowner == 1 || $changecode == 1) { - my $courseid_entry = &escape($dom.'_'.$crs).'='.&escape($description).':'.&escape($env{'form.coursecode'}).':'.&escape($env{'form.courseowner'}); - &Apache::lonnet::courseidput($dom,$courseid_entry,&Apache::lonnet::homeserver($crs,$dom)); + my $courseid_entry = &escape($cdom.'_'.$cnum).'='.&escape($description).':'.&escape($env{'form.coursecode'}).':'.&escape($env{'form.courseowner'}); + &Apache::lonnet::courseidput($cdom,$courseid_entry,&Apache::lonnet::homeserver($cnum,$cdom)); } - foreach (@params) { - if ($currattr{$_} eq $newattr{$_}) { - push @nochanges, $_; + foreach my $param (@modifiable_params) { + if ($currattr{$param} eq $newattr{$param}) { + push(@nochanges,$param); } else { - my $attr = 'internal.'.$_; - $cenv{$attr} = $newattr{$_}; - push @changes, $_; + my $attr = 'internal.'.$param; + $cenv{$attr} = $newattr{$param}; + push(@changes,$param); } } @@ -584,15 +575,15 @@ sub modify_course { $nochgresponse = &mt("The following automated enrollment parameters remain unchanged:

    "); } if (@changes > 0) { - my $putreply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); + 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.
    "); } else { - foreach my $attr (@params) { + foreach my $attr (@modifiable_params) { if (grep/^$attr$/,@changes) { - $chgresponse .= "
  • $$typeref{$attr} ".&mt("now set to \"").$newattr{$attr}."\".
    • "; + $chgresponse .= "
  • $longtype{$attr} ".&mt("now set to \"").$newattr{$attr}."\".
    • "; } else { - $nochgresponse .= "
  • $$typeref{$attr} ".&mt("still set to \"").$currattr{$attr}."\".
    • "; + $nochgresponse .= "
  • $longtype{$attr} ".&mt("still set to \"").$currattr{$attr}."\".
    • "; } } if ($changecode || $changeowner) { @@ -604,9 +595,9 @@ sub modify_course { foreach my $sec (@sections) { if ($sec =~ m/^(.+):/) { my $inst_course_id = $newattr{'coursecode'}.$1; - my $course_check = &Apache::lonnet::auto_validate_courseID($crs,$dom,$inst_course_id); + 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($crs,$dom,$inst_course_id,$newattr{'courseowner'}); + 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.
    "); } @@ -621,7 +612,7 @@ sub modify_course { foreach my $sec (@sections) { if ($sec =~ m/^(.+):/) { my $inst_course_id = $newattr{'coursecode'}.$1; - my $outcome = &Apache::lonnet::auto_new_course($crs,$dom,$inst_course_id,$newattr{'courseowner'}); + 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.
    "); } @@ -636,23 +627,22 @@ sub modify_course { if ( (@xlists > 0) && ($changeowner) ) { foreach my $xlist (@xlists) { if ($xlist =~ m/^(.+):/) { - my $outcome = &Apache::lonnet::auto_new_course($crs,$dom,$1,$newattr{'courseowner'}); + my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$1,$newattr{'courseowner'}); 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.
    "); } - } + } } } } } } } else { - foreach my $attr (@params) { - $nochgresponse .= "
  • $$typeref{$attr} ".&mt("still set to")." \"".$currattr{$attr}."\".
    • "; + foreach my $attr (@modifiable_params) { + $nochgresponse .= "
  • $longtype{$attr} ".&mt("still set to")." \"".$currattr{$attr}."\".
    • "; } } - if (@changes > 0) { $chgresponse .= "


"; } @@ -667,61 +657,131 @@ sub modify_course { } else { $reply = $response; } - &print_header($r,$tasklongref,$description); - $reply = "

".&mt("Automated Enrollment Course Settings")."

".$reply."
"; + &print_header($r,$cdesc); + $reply = '

'. + &mt('Result of Changes to Automated Enrollment Settings.'). + '

'."\n". + '
'.$reply.'
'. + ''. + &hidden_form_elements(). + ''.&mt('Back to options page').' +
'; $r->print($reply); - &print_footer($r); - return; + return; } -sub print_header { - my ($r,$tasklongref,$description,$javascriptref) = @_; - my %lt =&Apache::lonlocal::texthash( - 'chco' => 'Choose a course', - 'main' => 'Main Menu', - 'comg' => 'Course Manager', - ); - my $action = "start"; - if ( exists($env{'form.action'}) ) { - $action = $env{'form.action'}; - } - if ( ($description eq '') || (!defined($description)) ) { - $description = $lt{'comg'}; - } - my $page = ''; - - if ($action eq 'start') { - $page = "$lt{'chco'}"; - } else { - $page = ''.$lt{'chco'}.''; - if ( $action eq 'process' ) { - my $course = $env{'form.course'}; - $page .= "-> ".$$tasklongref{'display'}." -> $$tasklongref{$action} "; +sub modify_quota { + my ($r,$cdom,$cnum,$cdesc,$domdesc) = @_; + &print_header($r,$cdesc); + + my %lt = &Apache::lonlocal::texthash( + 'back' => 'Back to options page', + ); + $r->print(' +
+

'.&mt('Disk space for storage of group portfolio files for [_1]',$cdesc). + '

'); + my %oldsettings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum); + my $defaultquota = 20; + if ($env{'form.coursequota'} ne '') { + my $newquota = $env{'form.coursequota'}; + if ($newquota =~ /^\s*(\d+\.?\d*|\.\d+)\s*$/) { + $newquota = $1; + if ($oldsettings{'internal.coursequota'} eq $env{'form.coursequota'}) { + $r->print(&mt('The disk space allocated for group portfolio files remains unchanged as ').$env{'form.coursequota'}.' Mb'); + } else { + my %cenv = ( + 'internal.coursequota' => $env{'form.coursequota'}, + ); + my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom, + $cnum); + if (($oldsettings{'internal.coursequota'} eq '') && + ($env{'form.coursequota'} == $defaultquota)) { + $r->print(&mt('The disk space allocated for group portfolio files in this course is the default quota for this domain:').' '.$defaultquota.' Mb'); + } else { + if ($putreply eq 'ok') { + my %updatedsettings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum); + $r->print(&mt('The disk space allocated for group portfolio files is now:').' '.$updatedsettings{'internal.coursequota'}.' Mb.'); + my $usage = &Apache::longroup::sum_quotas($cdom.'_'.$cnum); + if ($usage >= $updatedsettings{'internal.coursequota'}) { + my $newoverquota; + if ($usage < $oldsettings{'internal.coursequota'}) { + $newoverquota = 'now'; + } + $r->print('

'. + &mt('Disk usage [_1] exceeds the quota for this course.',$newoverquota).' '. + &mt('Upload of new portfolio files and assignment of a non-zero Mb quota to new groups in the course will not be possible until some files have been deleted, and total usage is below course quota.')); + } + } else { + $r->print(&mt('There was an error')); + } + } + } } else { - $page .= " -> ".$$tasklongref{$action}.""; + $r->print(&mt('The new quota requested contained invalid characters, so the quota is unchanged.')); } } + $r->print(qq|

+$lt{'back'}|); + $r->print(&hidden_form_elements().'
'); + return; +} - my $js; - if ($action eq 'display') { - $js = ''; +sub print_header { + my ($r,$cdesc,$javascript_validations) = @_; + my $phase = "start"; + if ( exists($env{'form.phase'}) ) { + $phase = $env{'form.phase'}; + } + my $js = qq| + +|; + if ($phase eq 'setparms') { + $js .= qq| + +|; + } elsif ($phase eq 'courselist') { + $js .= qq| + +|; + } elsif ($phase eq 'setquota') { + $js .= <<'ENDSCRIPT'; + +ENDSCRIPT } $r->print(&Apache::loncommon::start_page('View/Modify Course Settings', $js)); - $r->print(< - - - $lt{'main'} -> $page
- - - $description   - - - -ENDTHIS + my $bread_text = "View/Modify Courses"; + if ($cdesc ne '') { + $bread_text = "Course Settings: $cdesc"; + } + $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text)); return; } @@ -732,18 +792,58 @@ sub print_footer { } sub check_course { - my ($dom,$course) = @_; - my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.',undef,undef,'.'); - foreach my $key (sort keys %courseIDs) { - if ($key =~ m/^($dom)_(\w+)$/) { - if ($2 eq $course) { - return 'ok'; + my ($r,$dom,$domdesc) = @_; + my ($ok_course,$description,$instcode,$owner); + if (defined($env{'form.pickedcourse'})) { + my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); + if ($cdom eq $dom) { + my %courseIDs = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.', + $cnum,undef,undef,'.'); + if (keys(%courseIDs) > 0) { + $ok_course = 'ok'; + ($description,$instcode,$owner) = + split(/:/,$courseIDs{$cdom.'_'.$cnum}); + $description = &unescape($description); + $instcode = &unescape($instcode); + if ($instcode) { + $description .= " ($instcode)"; + } } } } - return 'invalid course'; + + if ($ok_course ne 'ok') { + $r->print('
'.&mt('The LON-CAPA course selected was not a valid course for the [_1] domain',$domdesc)); + } + return ($ok_course,$description); } +sub course_settings_descrip { + my %longtype = &Apache::lonlocal::texthash( + 'authtype' => 'Default authentication method', + 'autharg' => 'Default authentication parameter', + 'autoadds' => 'Automated adds', + 'autodrops' => 'Automated drops', + 'autostart' => 'Date of first automated enrollment', + 'autoend' => 'Date of last automated enrollment', + 'default_enrollment_start_date' => 'Date of first student access', + 'default_enrollment_end_date' => 'Date of last student access', + 'coursecode' => 'Official course code', + 'courseowner' => "Username:domain of course owner", + 'notifylist' => 'Course Coordinators to be notified of enrollment changes', + 'sectionnums' => 'Course section number(:LON-CAPA section)', + 'crosslistings' => 'Crosslisted class(:LON-CAPA section)', + ); + return %longtype; +} + +sub hidden_form_elements { + my $hidden_elements = + &Apache::lonhtmlcommon::echo_form_input(['gosearch','coursecode', + 'numlocalcc','courseowner', + 'login','coursequota','intarg', 'locarg','krbarg','krbver']); + return $hidden_elements; +} sub handler { my $r = shift; @@ -752,41 +852,76 @@ sub handler { $r->send_http_header; return OK; } - - if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { + my $dom = $env{'request.role.domain'}; + my $domdesc = $Apache::lonnet::domaindescription{$dom}; + if (&Apache::lonnet::allowed('ccc',$dom)) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['action','course']); - my $dom = $env{'user.domain'}; - my %longtype=&Apache::lonlocal::texthash( - 'authtype' => 'Default authentication method', - 'autharg' => 'Default authentication parameter', - 'autoadds' => 'Automated adds', - 'autodrops' => 'Automated drops', - 'autostart' => 'Date of first automated enrollment', - 'autoend' => 'Date of last automated enrollment', - 'default_enrollment_start_date' => 'Date of first student access', - 'default_enrollment_end_date' => 'Date of last student access', - 'coursecode' => 'Official course code', - 'courseowner' => "Username:domain of course owner", - 'notifylist' => 'Course Coordinators to be notified of enrollment changes', - 'sectionnums' => 'Course section number(:groupID)', - 'crosslistings' => 'Crosslisted class(:groupID)', - ); - - my %tasklong = &Apache::lonlocal::texthash( - 'display' => 'View/modify settings', - 'process' => 'Results of changes', - ); - - if ($env{'form.action'} eq 'process') { - &modify_course($r,\%tasklong,\%longtype); - } elsif ($env{'form.action'} eq 'display') { - &print_course_modification_page($r,\%tasklong,\%longtype); + &Apache::lonhtmlcommon::clear_breadcrumbs(); + + my $phase = $env{'form.phase'}; + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/modifycourse", + text=>"Course search"}); + if ($phase eq '') { + &print_course_search_page($r,$dom,$domdesc); } else { - &print_course_selection_page($r,\%tasklong); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'courselist')", + text=>"Choose a course"}); + if ($phase eq 'courselist') { + &print_course_selection_page($r,$dom,$domdesc); + } else { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'menu')", + text=>"Pick action"}); + my ($checked,$cdesc) = &check_course($r,$dom,$domdesc); + my $type = $env{'form.type'}; + if ($checked eq 'ok') { + if ($phase eq 'menu') { + &print_modification_menu($r,$cdesc); + } else { + my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); + if ($phase eq 'setquota') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'$phase')", + text=>"Set quota"}); + &print_setquota($r,$cdom,$cnum,$cdesc,$type) + } elsif ($phase eq 'processquota') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'setquota')", + text=>"Set quota"}); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'$phase')", + text=>"Result"}); + &modify_quota($r,$cdom,$cnum,$cdesc,$domdesc); + } elsif ($phase eq 'viewparms') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'viewparms')", + text=>"Display settings"}); + &print_settings_display($r,$cdom,$cnum,$cdesc,$type); + } elsif ($phase eq 'setparms') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'$phase')", + text=>"Change settings"}); + &print_course_modification_page($r,$cdom,$cnum,$cdesc,$domdesc); + } elsif ($phase eq 'processparms') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'setparms')", + text=>"Change settings"}); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'$phase')", + text=>"Result"}); + &modify_course($r,$cdom,$cnum,$cdesc,$domdesc); + } + } + } else { + $r->print(&mt('The course you selected is not a valid course in this domain')." ($domdesc)"); + } + } } + &print_footer($r); } else { $env{'user.error.msg'}= "/adm/modifycourse:ccc:0:0:Cannot modify course settings";