--- loncom/interface/lonmodifycourse.pm 2010/09/11 21:36:00 1.57.2.1 +++ loncom/interface/lonmodifycourse.pm 2014/07/31 15:45:27 1.74 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.57.2.1 2010/09/11 21:36:00 raeburn Exp $ +# $Id: lonmodifycourse.pm,v 1.74 2014/07/31 15:45:27 musolffc Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,23 +34,28 @@ use Apache::loncommon; use Apache::lonhtmlcommon; use Apache::lonlocal; use Apache::lonuserutils; +use Apache::loncreateuser; use Apache::lonpickcourse; use lib '/home/httpd/lib/perl'; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); sub get_dc_settable { - my ($type) = @_; + my ($type,$cdom) = @_; if ($type eq 'Community') { - return ('courseowner'); + return ('courseowner','selfenrollmgrdc','selfenrollmgrcc'); } else { - return ('courseowner','coursecode','authtype','autharg'); + my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc'); + if (&showcredits($cdom)) { + push(@items,'defaultcredits'); + } + return @items; } } sub autoenroll_keys { - my $internals = ['coursecode','courseowner','authtype','autharg','autoadds','autodrops', - 'autostart','autoend','sectionnums','crosslistings', - 'co-owners']; + my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits', + 'autoadds','autodrops','autostart','autoend','sectionnums', + 'crosslistings','co-owners']; my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date']; return ($internals,$accessdates); } @@ -114,6 +119,12 @@ sub get_enrollment_settings { || $type eq "autharg" || $type eq "coursecode" || $type eq "crosslistings") { $enrollvar{$type} = $settings{$item}; + } elsif ($type eq 'defaultcredits') { + if (&showcredits($cdom)) { + $enrollvar{$type} = $settings{$item}; + } + } elsif ($type eq 'selfenrollmgr') { + $enrollvar{$type} = $settings{$item}; } elsif ($type eq 'courseowner') { if ($settings{$item} =~ /^[^:]+:[^:]+$/) { $enrollvar{$type} = $settings{$item}; @@ -145,25 +156,23 @@ sub print_course_search_page { $type = 'Course'; } &print_header($r,$type); - my $filterlist = ['descriptfilter', - 'instcodefilter','ownerfilter', - 'coursefilter']; - my $filter = {}; - my ($numtitles,$cctitle,$dctitle); + my ($filterlist,$filter) = &get_filters($dom); + 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()); + $r->print(&Apache::loncommon::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,\$numtitles,'modifycourse')); + } + $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action, + \$numtitles,'modifycourse',undef,undef,undef, + \@codetitles,$dom)); if ($type eq 'Community') { $r->print(&mt('Actions available after searching for a community:').''); } + return; } sub print_course_selection_page { @@ -186,43 +196,69 @@ sub print_course_selection_page { &print_header($r,$type); # Criteria for course search - my $filterlist = ['descriptfilter', - 'instcodefilter','ownerfilter', - 'ownerdomfilter','coursefilter']; - my %filter; + my ($filterlist,$filter) = &get_filters(); my $action = '/adm/modifycourse'; my $dctitle = &Apache::lonnet::plaintext('dc'); - my $numtitles; - $r->print(&Apache::lonpickcourse::js_changer()); + my ($numtitles,@codetitles); + $r->print(&Apache::loncommon::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,\$numtitles)); - $filter{'domainfilter'} = $dom; - my %courses = &Apache::lonpickcourse::search_courses($r,$type,0, - \%filter,$numtitles)); + $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action, + \$numtitles,'modifycourse',undef,undef,undef, + \@codetitles,$dom,$env{'form.form'})); + my %courses = &Apache::loncommon::search_courses($dom,$type,$filter,$numtitles, + undef,undef,undef,\@codetitles); &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef, %courses); return; } +sub get_filters { + my ($dom) = @_; + my @filterlist = ('descriptfilter','instcodefilter','ownerfilter', + 'ownerdomfilter','coursefilter','sincefilter'); + # created filter + my $loncaparev = &Apache::lonnet::get_server_loncaparev($dom); + if ($loncaparev ne 'unknown_cmd') { + push(@filterlist,'createdfilter'); + } + my %filter; + foreach my $item (@filterlist) { + $filter{$item} = $env{'form.'.$item}; + } + return (\@filterlist,\%filter); +} + sub print_modification_menu { - my ($r,$cdesc,$domdesc,$dom,$type) = @_; + my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_; &print_header($r,$type); - my ($ccrole,$categorytitle,$setquota_text,$setparams_text,$cat_text); + my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text, + $cdom,$cnum); + if (ref($coursehash) eq 'HASH') { + $cdom = $coursehash->{'domain'}; + $cnum = $coursehash->{'num'}; + } else { + ($cdom,$cnum) = split(/_/,$cid); + } 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.'); + $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.'); $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'; + $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.'); + if (&showcredits($dom)) { + $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, and self-enrollment'; + } else { + $setparams_text = 'View/Modify course owner, institutional code, default authentication, and self-enrollment'; + } $cat_text = 'View/Modify catalog settings for course'; } my $anon_text = 'Responder threshold required to display anonymous survey submissions'; @@ -230,6 +266,17 @@ sub print_modification_menu { my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom); my @additional_params = &catalog_settable($domconf{'coursecategories'},$type); + sub manage_selfenrollment { + my ($cdom,$cnum,$type,$coursehash) = @_; + my ($managed_by_cc,$managed_by_dc) = &Apache::lonuserutils::selfenrollment_administration($cdom,$cnum,$type,$coursehash); + if (ref($managed_by_dc) eq 'ARRAY') { + if (@{$managed_by_dc}) { + return 1; + } + } + return 0; + } + sub phaseurl { my $phase = shift; return "javascript:changePage(document.menu,'$phase')" @@ -246,7 +293,7 @@ sub print_modification_menu { linktitle => '' }, { - linktext => 'View/Modify quota for group portfolio files', + linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.', url => &phaseurl('setquota'), permission => 1, #help => '', @@ -277,6 +324,14 @@ sub print_modification_menu { icon => 'roles.png', linktitle => '' }, + { + linktext => 'View/Modify Self-Enrollment configuration', + icon => 'self_enroll.png', + #help => 'Course_Self_Enrollment', + url => &phaseurl('selfenroll'), + permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash), + linktitle => 'Configure user self-enrollment.', + }, ] }, ); @@ -293,12 +348,18 @@ sub print_modification_menu { } $menu_html .= '

'."\n".'

'. '

'.$lt{'cour'}.'

'.$disp_table.'

'. ''.$lt{'back'}.''."\n". &hidden_form_elements(). @@ -398,28 +463,50 @@ sub print_settings_display { sub print_setquota { my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my $lctype = lc($type); + my $headline = &mt("Set disk space quotas for $lctype: [_1]", + ''.$cdesc.''); my %lt = &Apache::lonlocal::texthash( - 'cquo' => 'Disk space for storage of group portfolio files for:', - 'gpqu' => 'Course portfolio files disk space', + 'gpqu' => 'Disk space for storage of group portfolio files', + 'upqu' => 'Disk space for storage of content directly uploaded to course via Content Editor', '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 %staticdefaults = ( + coursequota => 20, + uploadquota => 500, + ); + my %settings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota','internal.coursecode'], + $cdom,$cnum); my $coursequota = $settings{'internal.coursequota'}; + my $uploadquota = $settings{'internal.uploadquota'}; if ($coursequota eq '') { - $coursequota = 20; + $coursequota = $staticdefaults{'coursequota'}; + } + if ($uploadquota eq '') { + my %domdefs = &Apache::lonnet::get_domain_defaults($cdom); + my $quotatype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings); + $uploadquota = $domdefs{$quotatype.'quota'}; + if ($uploadquota eq '') { + $uploadquota = $staticdefaults{'uploadquota'}; + } } &print_header($r,$type); my $hidden_elements = &hidden_form_elements(); - my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_Quota'); + my $porthelpitem = &Apache::loncommon::help_open_topic('Modify_Course_Quota'); + my $uploadhelpitem = &Apache::loncommon::help_open_topic('Modify_Course_Upload_Quota'); $r->print(< -

$lt{'cquo'} $cdesc

+

$headline

+

+$porthelpitem $lt{'gpqu'}: MB + +
+ +$uploadhelpitem $lt{'upqu'}: MB + +

-$helpitem $lt{'gpqu'}: Mb     

$hidden_elements @@ -547,7 +634,7 @@ sub print_catsettings { } sub print_course_modification_page { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$crstype) = @_; my %lt=&Apache::lonlocal::texthash( 'actv' => "Active", 'inac' => "Inactive", @@ -557,17 +644,28 @@ sub print_course_modification_page { 'stus' => "Status", 'nocc' => 'There is currently no owner set for this course.', 'gobt' => "Save", + 'sett' => 'Setting', + 'domd' => 'Domain default', + 'whom' => 'Who configures', ); my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname); my %enrollvar = &get_enrollment_settings($cdom,$cnum); - if ($type eq 'Community') { + my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook', + 'internal.selfenrollmgrdc','internal.selfenrollmgrcc'], + $cdom,$cnum); + my $type = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype,\%settings); + my @specific_managebydc = split(/,/,$settings{'internal.selfenrollmgrdc'}); + my @specific_managebycc = split(/,/,$settings{'internal.selfenrollmgrcc'}); + my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom); + my @default_managebydc = split(/,/,$domdefaults{$type.'selfenrolladmdc'}); + if ($crstype eq 'Community') { $ccrole = 'co'; $lt{'nocc'} = &mt('There is currently no owner set for this community.'); } else { $ccrole ='cc'; ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar); } - $ccname = &Apache::lonnet::plaintext($ccrole,$type); + $ccname = &Apache::lonnet::plaintext($ccrole,$crstype); my %roleshash = &Apache::lonnet::get_my_roles($cnum,$cdom,'','',[$ccrole]); my (@local_ccs,%cc_status,%pname); foreach my $item (keys(%roleshash)) { @@ -620,14 +718,14 @@ sub print_course_modification_page { } $ownertable .= &Apache::loncommon::end_data_table(); } - &print_header($r,$type,$javascript_validations); + &print_header($r,$crstype,$javascript_validations); my $dctitle = &Apache::lonnet::plaintext('dc'); - my $mainheader = &modifiable_only_title($type); + my $mainheader = &modifiable_only_title($crstype); my $hidden_elements = &hidden_form_elements(); $r->print(''."\n". '

'.$mainheader.' '.$cdesc.'

'. &Apache::lonhtmlcommon::start_pick_box()); - if ($type eq 'Community') { + if ($crstype eq 'Community') { $r->print(&Apache::lonhtmlcommon::row_title( &Apache::loncommon::help_open_topic('Modify_Community_Owner'). ' '.&mt('Community Owner'))."\n"); @@ -635,29 +733,141 @@ sub print_course_modification_page { $r->print(&Apache::lonhtmlcommon::row_title( &Apache::loncommon::help_open_topic('Modify_Course_Instcode'). ' '.&mt('Course Code'))."\n". - ''. - &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title( - &Apache::loncommon::help_open_topic('Modify_Course_Defaultauth'). - ' '.&mt('Default Authentication method'))."\n". - $authenitems."\n". - &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title( - &Apache::loncommon::help_open_topic('Modify_Course_Owner'). + ''. + &Apache::lonhtmlcommon::row_closure()); + if (&showcredits($cdom)) { + $r->print(&Apache::lonhtmlcommon::row_title( + &Apache::loncommon::help_open_topic('Modify_Course_Credithours'). + ' '.&mt('Credits (students)'))."\n". + ''. + &Apache::lonhtmlcommon::row_closure()); + } + $r->print(&Apache::lonhtmlcommon::row_title( + &Apache::loncommon::help_open_topic('Modify_Course_Defaultauth'). + ' '.&mt('Default Authentication method'))."\n". + $authenitems."\n". + &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title( + &Apache::loncommon::help_open_topic('Modify_Course_Owner'). ' '.&mt('Course Owner'))."\n"); } - $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure(1). + my ($cctitle,$rolename,$currmanages,$ccchecked,$dcchecked,$defaultchecked); + my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles(); + if ($type eq 'Community') { + $cctitle = &mt('Community personnel'); + } else { + $cctitle = &mt('Course personnel'); + } + + $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title( + &Apache::loncommon::help_open_topic('Modify_Course_Selfenrolladmin'). + ' '.&mt('Self-enrollment configuration')). + &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row()."\n". + ''.$lt{'sett'}.''. + ''.$lt{'domd'}.''. + ''.$lt{'whom'}.''. + &Apache::loncommon::end_data_table_header_row()."\n"); + my %optionname; + $optionname{''} = &mt('Use domain default'); + $optionname{'0'} = $dctitle; + $optionname{'1'} = $cctitle; + foreach my $item (@{$selfenrollrows}) { + my %checked; + my $default = $cctitle; + if (grep(/^\Q$item\E$/,@default_managebydc)) { + $default = $dctitle; + } + if (grep(/^\Q$item\E$/,@specific_managebydc)) { + $checked{'0'} = ' checked="checked"'; + } elsif (grep(/^\Q$item\E$/,@specific_managebycc)) { + $checked{'1'} = ' checked="checked"'; + } else { + $checked{''} = ' checked="checked"'; + } + $r->print(&Apache::loncommon::start_data_table_row()."\n". + ''.$selfenrolltitles->{$item}.''."\n". + ''.&mt('[_1] configures',$default).''."\n". + ''); + foreach my $option ('','0','1') { + $r->print('
'); + } + $r->print(''."\n". + &Apache::loncommon::end_data_table_row()."\n"); + } + $r->print(&Apache::loncommon::end_data_table()."\n". + '
'.&Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::end_pick_box().'

'.$hidden_elements. 'print('this.form.submit();"'); } else { $r->print('javascript:verify_message(this.form);"'); } - $r->print('value="'.$lt{'gobt'}.'" />

'); + $r->print(' value="'.$lt{'gobt'}.'" />

'); return; } +sub print_selfenrollconfig { + my ($r,$type,$cdesc,$coursehash) = @_; + return unless(ref($coursehash) eq 'HASH'); + my $cnum = $coursehash->{'num'}; + my $cdom = $coursehash->{'domain'}; + my %currsettings = &get_selfenroll_settings($coursehash); + &print_header($r,$type); + $r->print('

'.&mt('Self-enrollment with a student role in: [_1]', + ''.$cdesc.'').'

'."\n"); + &Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'}, + $cdom,$cnum,\%currsettings, + &hidden_form_elements()); + return; +} + +sub modify_selfenrollconfig { + my ($r,$type,$cdesc,$coursehash) = @_; + return unless(ref($coursehash) eq 'HASH'); + my $cnum = $coursehash->{'num'}; + my $cdom = $coursehash->{'domain'}; + my %currsettings = &get_selfenroll_settings($coursehash); + &print_header($r,$type); + $r->print('

'.&mt('Self-enrollment with a student role in: [_1]', + ''.$cdesc.'').'

'."\n"); + $r->print('
'."\n". + &hidden_form_elements().'
'); + &Apache::loncreateuser::update_selfenroll_config($r,$env{'form.pickedcourse'}, + $cdom,$cnum,'domain',$type,\%currsettings); + $r->print('
'); + return; +} + +sub get_selfenroll_settings { + my ($coursehash) = @_; + my %currsettings; + if (ref($coursehash) eq 'HASH') { + %currsettings = ( + selfenroll_types => $coursehash->{'internal.selfenroll_types'}, + selfenroll_registered => $coursehash->{'internal.selfenroll_registered'}, + selfenroll_section => $coursehash->{'internal.selfenroll_section'}, + selfenroll_notifylist => $coursehash->{'internal.selfenroll_notifylist'}, + selfenroll_approval => $coursehash->{'internal.selfenroll_approval'}, + selfenroll_limit => $coursehash->{'internal.selfenroll_limit'}, + selfenroll_cap => $coursehash->{'internal.selfenroll_cap'}, + selfenroll_start_date => $coursehash->{'internal.selfenroll_start_date'}, + selfenroll_end_date => $coursehash->{'internal.selfenroll_end_date'}, + selfenroll_start_access => $coursehash->{'internal.selfenroll_start_access'}, + selfenroll_end_access => $coursehash->{'internal.selfenroll_end_access'}, + default_enrollment_start_date => $coursehash->{'default_enrollment_start_date'}, + default_enrollment_end_date => $coursehash->{'default_enrollment_end_date'}, + uniquecode => $coursehash->{'internal.uniquecode'}, + ); + } + return %currsettings; +} + sub modifiable_only_title { my ($type) = @_; my $dctitle = &Apache::lonnet::plaintext('dc'); @@ -711,16 +921,21 @@ sub modify_course { my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; my %longtype = &course_settings_descrip($type); my @items = ('internal.courseowner','description','internal.co-owners', - 'internal.pendingco-owners'); + 'internal.pendingco-owners','internal.selfenrollmgrdc', + 'internal.selfenrollmgrcc'); + my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles(); unless ($type eq 'Community') { push(@items,('internal.coursecode','internal.authtype','internal.autharg', 'internal.sectionnums','internal.crosslistings')); + if (&showcredits($cdom)) { + push(@items,'internal.defaultcredits'); + } } 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); + my ($ccrole,$response,$chgresponse,$nochgresponse,$reply,%currattr,%newattr, + %cenv,%changed,@changes,@nochanges,@sections,@xlists,@warnings); + my @modifiable_params = &get_dc_settable($type,$cdom); foreach my $param (@modifiable_params) { $currattr{$param} = $settings{'internal.'.$param}; } @@ -739,7 +954,7 @@ sub modify_course { $sections[0] = $settings{'internal.sectionnums'}; } } - unless ($settings{'internal.crosslistings'} eq'') { + unless ($settings{'internal.crosslistings'} eq '') { if ($settings{'internal.crosslistings'} =~ m/,/) { @xlists = split/,/,$settings{'internal.crosslistings'}; } else { @@ -778,7 +993,36 @@ sub modify_course { $changed{'code'} = 1; } } + + if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) { + $newattr{'defaultcredits'} =~ s/[^\d\.]//g; + $newattr{'defaultcredits'}=$env{'form.defaultcredits'}; + } + } + + my @newmgrdc = (); + my @newmgrcc = (); + my @currmgrdc = split(/,/,$currattr{'selfenrollmgrdc'}); + my @currmgrcc = split(/,/,$currattr{'selfenrollmgrcc'}); + + foreach my $item (@{$selfenrollrows}) { + if ($env{'form.selfenrollmgr_'.$item} eq '0') { + push(@newmgrdc,$item); + } elsif ($env{'form.selfenrollmgr_'.$item} eq '1') { + push(@newmgrcc,$item); + } + } + + $newattr{'selfenrollmgrdc'}=join(',',@newmgrdc); + $newattr{'selfenrollmgrcc'}=join(',',@newmgrcc); + + my $cctitle; + if ($type eq 'Community') { + $cctitle = &mt('Community personnel'); + } else { + $cctitle = &mt('Course personnel'); } + my $dctitle = &Apache::lonnet::plaintext('dc'); if ( exists($env{'form.courseowner'}) ) { $newattr{'courseowner'}=$env{'form.courseowner'}; @@ -813,10 +1057,10 @@ sub modify_course { } } if (@changes > 0) { - $chgresponse = &mt("The following settings have been changed: