--- loncom/interface/lonmodifycourse.pm 2014/02/27 11:44:40 1.67 +++ loncom/interface/lonmodifycourse.pm 2017/04/08 14:58:11 1.92 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.67 2014/02/27 11:44:40 bisitz Exp $ +# $Id: lonmodifycourse.pm,v 1.92 2017/04/08 14:58:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,16 +34,18 @@ 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,$cdom) = @_; if ($type eq 'Community') { - return ('courseowner'); + return ('courseowner','selfenrollmgrdc','selfenrollmgrcc'); } else { - my @items = ('courseowner','coursecode','authtype','autharg'); + my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc', + 'selfenrollmgrcc','mysqltables'); if (&showcredits($cdom)) { push(@items,'defaultcredits'); } @@ -54,7 +56,7 @@ sub get_dc_settable { sub autoenroll_keys { my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits', 'autoadds','autodrops','autostart','autoend','sectionnums', - 'crosslistings','co-owners']; + 'crosslistings','co-owners','autodropfailsafe']; my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date']; return ($internals,$accessdates); } @@ -70,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'); @@ -116,7 +125,8 @@ 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)) { @@ -153,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') { @@ -164,89 +171,320 @@ 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)); + + my ($actiontext,$roleoption,$settingsoption); if ($type eq 'Community') { - $r->print(&mt('Actions available after searching for a community:').''); - } else { - $r->print(&mt('Actions available after searching for a course:').''); + $actiontext = &mt('Actions available after searching for a community:'); + } elsif ($type eq 'Placement') { + $actiontext = &mt('Actions available after searching for a placement test:') + } else { + $actiontext = &mt('Actions available after searching for a course:'); + } + if (&Apache::lonnet::allowed('ccc',$dom)) { + if ($type eq 'Community') { + $roleoption = &mt('Enter the community with the role of [_1]',$cctitle); + $settingsoption = &mt('View or modify community settings which only a [_1] may modify.',$dctitle); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with the role of [_1]',$cctitle); + $settingsoption = &mt('View or modify placement test settings which only a [_1] may modify.',$dctitle); + } else { + $roleoption = &mt('Enter the course with the role of [_1]',$cctitle); + $settingsoption = &mt('View or modify course settings which only a [_1] may modify.',$dctitle); + } + } elsif (&Apache::lonnet::allowed('rar',$dom)) { + my ($roles_by_num,$description,$accessref,$accessinfo) = &Apache::lonnet::get_all_adhocroles($dom); + if ((ref($roles_by_num) eq 'ARRAY') && (ref($description) eq 'HASH')) { + if (@{$roles_by_num} > 1) { + if ($type eq 'Community') { + $roleoption = &mt('Enter the community with one of the available ad hoc roles'); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with one of the available ad hoc roles.'); + } else { + $roleoption = &mt('Enter the course with one of the available ad hoc roles.'); + } + } else { + my $rolename = $description->{$roles_by_num->[0]}; + if ($type eq 'Community') { + $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$rolename); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with the ad hoc role of: [_1]',$rolename); + } else { + $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$rolename); + } + } + } + if ($type eq 'Community') { + $settingsoption = &mt('View community settings which only a [_1] may modify.',$dctitle); + } elsif ($type eq 'Placement') { + $settingsoption = &mt('View placement test settings which only a [_1] may modify.',$dctitle); + } else { + $settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle); + } + } + $r->print($actiontext.''); + return; } sub print_course_selection_page { - my ($r,$dom,$domdesc) = @_; + my ($r,$dom,$domdesc,$permission) = @_; 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; + if ($permission->{'adhocrole'} eq 'custom') { + my %lt = &Apache::lonlocal::texthash( + title => 'Ad hoc role selection', + preamble => 'Please choose an ad hoc role in the course.', + cancel => 'Click "OK" to enter the course, or "Cancel" to choose a different course.', + ); + my %jslt = &Apache::lonlocal::texthash ( + none => 'You are not eligible to use an ad hoc role for the selected course', + ok => 'OK', + exit => 'Cancel', + ); + &js_escape(\%jslt); + $r->print(<<"END"); + + + +END + } elsif ($permission->{'adhocrole'} eq 'coord') { + $r->print(<<"END"); + +END + } + +# Criteria for course search + 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); + $dom,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,$permission) = @_; &print_header($r,$type); - my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text); + my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_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'; } + my %linktext; + if ($permission->{'setparms'} eq 'edit') { + %linktext = ( + 'setquota' => 'View/Modify quotas for group portfolio files, and for uploaded content', + 'setanon' => 'View/Modify responders threshold for anonymous survey submissions display', + 'selfenroll' => 'View/Modify Self-Enrollment configuration', + 'setpostsubmit' => 'View/Modify submit button behavior, post-submission', + ); + } else { + %linktext = ( + 'setquota' => 'View quotas for group portfolio files, and for uploaded content', + 'setanon' => 'View responders threshold for anonymous survey submissions display', + 'selfenroll' => 'View Self-Enrollment configuration', + 'setpostsubmit' => 'View submit button behavior, post-submission', + ); + } if ($type eq 'Community') { - $categorytitle = 'View/Modify Community Settings'; + if ($permission->{'setparms'} eq 'edit') { + $categorytitle = 'View/Modify Community Settings'; + $linktext{'setparms'} = 'View/Modify community owner'; + $linktext{'catsettings'} = 'View/Modify catalog settings for community'; + } else { + $categorytitle = 'View Community Settings'; + $linktext{'setparms'} = 'View community owner'; + $linktext{'catsettings'} = 'View catalog settings for community'; + } $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.'); - $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, and default authentication and credits'; + if ($permission->{'setparms'} eq 'edit') { + $categorytitle = 'View/Modify Course Settings'; + $linktext{'catsettings'} = 'View/Modify catalog settings for course'; + if (($type ne 'Placement') && (&showcredits($dom))) { + $linktext{'setparms'} = 'View/Modify course owner, institutional code, default authentication, credits, self-enrollment and table lifetime'; + } else { + $linktext{'setparms'} = 'View/Modify course owner, institutional code, default authentication, self-enrollment and table lifetime'; + } } else { - $setparams_text = 'View/Modify course owner, institutional code, and default authentication'; + $categorytitle = 'View Course Settings'; + $linktext{'catsettings'} = 'View catalog settings for course'; + if (($type ne 'Placement') && (&showcredits($dom))) { + $linktext{'setparms'} = 'View course owner, institutional code, default authentication, credits, self-enrollment and table lifetime'; + } else { + $linktext{'setparms'} = 'View course owner, institutional code, default authentication, self-enrollment and table lifetime'; + } } - $cat_text = 'View/Modify catalog settings for course'; + $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.'); + $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.'); } - 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.'); + $linktext{'viewparms'} = 'Display current settings for automated enrollment'; 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,$permission) = @_; + if ($permission->{'selfenroll'}) { + 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')" @@ -255,45 +493,61 @@ sub print_modification_menu { ({ categorytitle => $categorytitle, items => [ { - linktext => $setparams_text, + linktext => $linktext{'setparms'}, url => &phaseurl('setparms'), - permission => 1, + permission => $permission->{'setparms'}, #help => '', icon => 'crsconf.png', linktitle => '' }, { - linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.', + linktext => $linktext{'setquota'}, url => &phaseurl('setquota'), - permission => 1, + permission => $permission->{'setquota'}, #help => '', icon => 'groupportfolioquota.png', linktitle => '' }, { - linktext => 'View/Modify responders threshold for anonymous survey submissions display', + linktext => $linktext{'setanon'}, url => &phaseurl('setanon'), - permission => 1, + permission => $permission->{'setanon'}, #help => '', icon => 'anonsurveythreshold.png', linktitle => '' }, { - linktext => $cat_text, + linktext => $linktext{'catsettings'}, url => &phaseurl('catsettings'), - permission => (@additional_params > 0), + permission => (($permission->{'catsettings'}) && (@additional_params > 0)), #help => '', icon => 'ccatconf.png', linktitle => '' }, { - linktext => 'Display current settings for automated enrollment', + linktext => $linktext{'viewparms'}, url => &phaseurl('viewparms'), - permission => ($type ne 'Community'), + permission => ($permission->{'viewparms'} && ($type ne 'Community') && ($type ne 'Placement')), #help => '', icon => 'roles.png', linktitle => '' }, + { + linktext => $linktext{'selfenroll'}, + icon => 'self_enroll.png', + #help => 'Course_Self_Enrollment', + url => &phaseurl('selfenroll'), + permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash,$permission), + linktitle => 'Configure user self-enrollment.', + }, + { + linktext => $linktext{'setpostsubmit'}, + icon => 'emblem-readonly.png', + #help => '', + url => &phaseurl('setpostsubmit'), + permission => $permission->{'setpostsubmit'}, + linktitle => '', + }, ] }, ); @@ -310,29 +564,38 @@ sub print_modification_menu { } $menu_html .= '

'."\n".'