--- loncom/interface/lonmodifycourse.pm 2011/01/11 22:09:49 1.58 +++ loncom/interface/lonmodifycourse.pm 2016/08/15 18:01:08 1.85 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.58 2011/01/11 22:09:49 raeburn Exp $ +# $Id: lonmodifycourse.pm,v 1.85 2016/08/15 18:01:08 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,23 +34,29 @@ 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','mysqltables'); + 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','autodropfailsafe']; my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date']; return ($internals,$accessdates); } @@ -66,6 +72,13 @@ sub catalog_settable { if ($confhash->{'categorizecomm'} ne 'comm') { push(@settable,'categorize'); } + } elsif ($type eq 'Placement') { + if ($confhash->{'togglecatsplace'} ne 'place') { + push(@settable,'togglecats'); + } + if ($confhash->{'categorizeplace'} ne 'place') { + push(@settable,'categorize'); + } } else { if ($confhash->{'togglecats'} ne 'crs') { push(@settable,'togglecats'); @@ -112,8 +125,13 @@ sub get_enrollment_settings { $enrollvar{$type} =~ s/,/, /g; } elsif ($type eq "authtype" || $type eq "autharg" || $type eq "coursecode" - || $type eq "crosslistings") { + || $type eq "crosslistings" || $type eq "selfenrollmgr" + || $type eq "autodropfailsafe") { $enrollvar{$type} = $settings{$item}; + } elsif ($type eq 'defaultcredits') { + if (&showcredits($cdom)) { + $enrollvar{$type} = $settings{$item}; + } } elsif ($type eq 'courseowner') { if ($settings{$item} =~ /^[^:]+:[^:]+$/) { $enrollvar{$type} = $settings{$item}; @@ -145,10 +163,7 @@ sub print_course_search_page { $type = 'Course'; } &print_header($r,$type); - my $filterlist = ['descriptfilter', - 'instcodefilter','ownerfilter', - 'coursefilter']; - my $filter = {}; + my ($filterlist,$filter) = &get_filters($dom); my ($numtitles,$cctitle,$dctitle,@codetitles); my $ccrole = 'cc'; if ($type eq 'Community') { @@ -156,26 +171,34 @@ sub print_course_search_page { } $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).'

'); + } elsif ($type eq 'Placement') { + $r->print('

'.&mt('Search for a placement test 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', - undef,undef,undef,\@codetitles)); + } + $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:').''); + } elsif ($type eq 'Placement') { + $r->print(&mt('Actions available after searching for a placement test:').''); } else { $r->print(&mt('Actions available after searching for a course:').''); } + return; } sub print_course_selection_page { @@ -187,52 +210,89 @@ 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,@codetitles); - $r->print(&Apache::lonpickcourse::js_changer()); + $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, - undef,undef,undef,undef,\@codetitles)); - $filter{'domainfilter'} = $dom; - my %courses = &Apache::lonpickcourse::search_courses($r,$type,0, - \%filter,$numtitles,undef, - undef,undef,\@codetitles); + $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); + 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 (($type ne 'Placement') && (&showcredits($dom))) { + $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, self-enrollment and table lifetime'; + } else { + $setparams_text = 'View/Modify course owner, institutional code, default authentication, self-enrollment and table lifetime'; + } $cat_text = 'View/Modify catalog settings for course'; } - my $anon_text = 'Responder threshold required to display anonymous survey submissions'; + my $anon_text = &mt('Responder threshold required to display anonymous survey submissions.'); + my $postsubmit_text = &mt('Override defaults for submit button behavior post-submission for this specific course.'); + my $mysqltables_text = &mt('Override default for lifetime of "temporary" MySQL tables containing student performance data.'); 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')" @@ -249,7 +309,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 => '', @@ -275,11 +335,27 @@ sub print_modification_menu { { linktext => 'Display current settings for automated enrollment', url => &phaseurl('viewparms'), - permission => ($type ne 'Community'), + permission => (($type ne 'Community') && ($type ne 'Placement')), #help => '', 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.', + }, + { + linktext => 'View/Modify submit button behavior, post-submission', + icon => 'emblem-readonly.png', + #help => '', + url => &phaseurl('setpostsubmit'), + permission => 1, + linktitle => '', + }, ] }, ); @@ -296,13 +372,21 @@ sub print_modification_menu { } $menu_html .= '

'."\n".'

'. '

'.$lt{'cour'}.'

'.$disp_table.'

'. ''.$lt{'back'}.''."\n". &hidden_form_elements(). @@ -401,28 +489,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 @@ -471,6 +581,98 @@ ENDDOCUMENT return; } +sub print_postsubmit_config { + my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my %lt = &Apache::lonlocal::texthash ( + 'conf' => 'Configure submit button behavior after student makes a submission', + 'disa' => 'Disable submit button/keypress following student submission', + 'nums' => 'Number of seconds submit is disabled', + 'modi' => 'Save', + 'back' => 'Pick another action', + 'yes' => 'Yes', + 'no' => 'No', + ); + my %settings = &Apache::lonnet::get('environment',['internal.postsubmit','internal.postsubtimeout', + 'internal.coursecode','internal.textbook'],$cdom,$cnum); + my $postsubmit = $settings{'internal.postsubmit'}; + if ($postsubmit eq '') { + my %domconfig = + &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); + $postsubmit = 1; + if (ref($domconfig{'coursedefaults'}) eq 'HASH') { + if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') { + if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') { + $postsubmit = 0; + } + } + } + } + my ($checkedon,$checkedoff,$display); + if ($postsubmit) { + $checkedon = 'checked="checked"'; + $display = 'block'; + } else { + $checkedoff = 'checked="checked"'; + $display = 'none'; + } + my $postsubtimeout = $settings{'internal.postsubtimeout'}; + my $default = &domain_postsubtimeout($cdom,$type,\%settings); + my $zero = &mt('(Enter 0 to disable until next page reload, or leave blank to use the domain default: [_1])',$default); + if ($postsubtimeout eq '') { + $postsubtimeout = $default; + } + &print_header($r,$type); + my $hidden_elements = &hidden_form_elements(); + my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config'); + $r->print(< +

$lt{'conf'} ($cdesc)

+

+$helpitem $lt{'disa'}: +   + +

+$lt{'nums'}
+$zero
+
+ +

+$hidden_elements +$lt{'back'} + +ENDDOCUMENT + return; +} + +sub domain_postsubtimeout { + my ($cdom,$type,$settings) = @_; + return unless (ref($settings) eq 'HASH'); + my $lctype = lc($type); + unless (($type eq 'Community') || ($type eq 'Placement')) { + $lctype = 'unofficial'; + if ($settings->{'internal.coursecode'}) { + $lctype = 'official'; + } elsif ($settings->{'internal.textbook'}) { + $lctype = 'textbook'; + } + } + my %domconfig = + &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); + my $postsubtimeout = 60; + if (ref($domconfig{'coursedefaults'}) eq 'HASH') { + if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') { + if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') { + if ($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}{$lctype} ne '') { + $postsubtimeout = $domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}{$lctype}; + } + } + } + } + return $postsubtimeout; +} + sub print_catsettings { my ($r,$cdom,$cnum,$cdesc,$type) = @_; &print_header($r,$type); @@ -507,6 +709,8 @@ sub print_catsettings { '    

'); if ($type eq 'Community') { $r->print(&mt("If a community has been categorized using at least one of the categories defined for communities in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded.")); + } elsif ($type eq 'Placement') { + $r->print(&mt("If a placement test has been categorized using at least one of the categories defined for placement tests in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded.")); } else { $r->print(&mt("Unless excluded, a course will be listed in the domain's publicly accessible Course/Community Catalog, if at least one of the following applies").':