--- loncom/interface/lonmodifycourse.pm 2015/06/09 21:22:56 1.78 +++ loncom/interface/lonmodifycourse.pm 2016/10/27 21:01:01 1.87 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.78 2015/06/09 21:22:56 damieng Exp $ +# $Id: lonmodifycourse.pm,v 1.87 2016/10/27 21:01:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,7 +44,8 @@ sub get_dc_settable { if ($type eq 'Community') { return ('courseowner','selfenrollmgrdc','selfenrollmgrcc'); } else { - my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc'); + my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc', + 'selfenrollmgrcc','mysqltables'); if (&showcredits($cdom)) { push(@items,'defaultcredits'); } @@ -55,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); } @@ -71,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'); @@ -117,14 +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 'selfenrollmgr') { - $enrollvar{$type} = $settings{$item}; } elsif ($type eq 'courseowner') { if ($settings{$item} =~ /^[^:]+:[^:]+$/) { $enrollvar{$type} = $settings{$item}; @@ -167,23 +174,73 @@ sub print_course_search_page { $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::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 %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'}, + 'adhocroles.'.$dom); + if (keys(%adhocroles)) { + my @adhoc = split(',',$adhocroles{'adhocroles.'.$dom}); + if (@adhoc > 1) { + if ($type eq 'Community') { + $roleoption = &mt('Enter the community with one of the available ad hoc roles: [_1].', + join(', ',@adhoc)); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with one of the available ad hoc roles: [_1].', + join(', ',@adhoc)); + } else { + $roleoption = &mt('Enter the course with one of the available ad hoc roles: [_1].', + join(', ',@adhoc)); + } + } else { + if ($type eq 'Community') { + $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$adhoc[0]); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with the ad hoc role of: [_1]',$adhoc[0]); + } else { + $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$adhoc[0]); + } + } + } + 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; } @@ -208,7 +265,7 @@ sub print_course_selection_page { 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, - undef,undef,%courses); + $dom,undef,%courses); return; } @@ -229,7 +286,7 @@ sub get_filters { } sub print_modification_menu { - my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_; + my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_; &print_header($r,$type); my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text, $cdom,$cnum); @@ -254,26 +311,29 @@ sub print_modification_menu { $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, default authentication, credits, and self-enrollment'; + 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, and self-enrollment'; + $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 = &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; - } + 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; } @@ -288,7 +348,7 @@ sub print_modification_menu { { linktext => $setparams_text, url => &phaseurl('setparms'), - permission => 1, + permission => $permission->{'setparms'}, #help => '', icon => 'crsconf.png', linktitle => '' @@ -296,7 +356,7 @@ sub print_modification_menu { { linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.', url => &phaseurl('setquota'), - permission => 1, + permission => $permission->{'setquota'}, #help => '', icon => 'groupportfolioquota.png', linktitle => '' @@ -304,7 +364,7 @@ sub print_modification_menu { { linktext => 'View/Modify responders threshold for anonymous survey submissions display', url => &phaseurl('setanon'), - permission => 1, + permission => $permission->{'setanon'}, #help => '', icon => 'anonsurveythreshold.png', linktitle => '' @@ -312,7 +372,7 @@ sub print_modification_menu { { linktext => $cat_text, url => &phaseurl('catsettings'), - permission => (@additional_params > 0), + permission => (($permission->{'catsettings'}) && (@additional_params > 0)), #help => '', icon => 'ccatconf.png', linktitle => '' @@ -320,7 +380,7 @@ sub print_modification_menu { { linktext => 'Display current settings for automated enrollment', url => &phaseurl('viewparms'), - permission => ($type ne 'Community'), + permission => ($permission->{'viewparms'} && ($type ne 'Community') && ($type ne 'Placement')), #help => '', icon => 'roles.png', linktitle => '' @@ -330,7 +390,7 @@ sub print_modification_menu { icon => 'self_enroll.png', #help => 'Course_Self_Enrollment', url => &phaseurl('selfenroll'), - permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash), + permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash,$permission), linktitle => 'Configure user self-enrollment.', }, { @@ -338,7 +398,7 @@ sub print_modification_menu { icon => 'emblem-readonly.png', #help => '', url => &phaseurl('setpostsubmit'), - permission => 1, + permission => $permission->{'setpostsubmit'}, linktitle => '', }, ] @@ -362,27 +422,33 @@ sub print_modification_menu { } else { $menu_html .= '
  • '.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'
    • '."\n". '
  • '.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'
    • '."\n"; - if (&showcredits($dom)) { + if (($type ne 'Placement') && &showcredits($dom)) { $menu_html .= '
  • '.&mt('Default credits earned by student on course completion.').'
    • '."\n"; } $menu_html .= '
  • '.&mt('Override defaults for who configures self-enrollment for this specific course.').'
    • '."\n"; } - $menu_html .= '
  • '.$setquota_text.'
    • '."\n". + $menu_html .= '
  • '.$mysqltables_text.'
    • '."\n". + '
  • '.$setquota_text.'
    • '."\n". '
  • '.$setuploadquota_text.'
    • '."\n". '
  • '.$anon_text.'
    • '."\n". '
  • '.$postsubmit_text.'
    • '."\n"; + my ($categories_link_start,$categories_link_end); + if ($permission->{'catsettings'}) { + $categories_link_start = ''; + $categories_link_end = ''; + } foreach my $item (@additional_params) { 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).','','').'
    • '."\n"; + $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).',$categories_link_start,$categories_link_end).'
    • '."\n"; } elsif ($item eq 'categorize') { - $menu_html .= '
  • '.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','','').'
    • '."\n"; + $menu_html .= '
  • '.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).'
    • '."\n"; } } else { if ($item eq 'togglecats') { - $menu_html .= '
  • '.&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).','','').'
    • '."\n"; + $menu_html .= '
  • '.&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).',$categories_link_start,$categories_link_end).'
    • '."\n"; } elsif ($item eq 'categorize') { - $menu_html .= '
  • '.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','','').'
    • '."\n"; + $menu_html .= '
  • '.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).',$categories_link_start,$categories_link_end).'
    • '."\n"; } } } @@ -398,18 +464,47 @@ sub print_modification_menu { return; } -sub print_ccrole_selected { +sub print_adhocrole_selected { my ($r,$type) = @_; &print_header($r,$type); my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); - $r->print('
    - - + my ($newrole,$selectrole); + if (&Apache::lonnet::allowed('ccc',$cdom)) { + if ($type eq 'Community') { + $newrole = "co./$cdom/$cnum"; + } else { + $newrole = "cc./$cdom/$cnum"; + } + $selectrole = 1; + } elsif (&Apache::lonnet::allowed('rar',$cdom)) { + my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'}, + 'adhocroles.'.$cdom); + if (keys(%adhocroles)) { + my $possrole = $env{'form.adhocrole'}; + if ($possrole ne '') { + my @adhoc = split(',',$adhocroles{'adhocroles.'.$cdom}); + if (grep(/^\Q$possrole\E$/,@adhoc)) { + my $confname = &Apache::lonnet::get_domainconfiguser($cdom); + $newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum"; + $selectrole = 1; + } + } + } + } + if ($selectrole) { + $r->print(' + +
    '); + } else { + $r->print('
    '. + '
    '); + } + return; } sub print_settings_display { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$type,$permission) = @_; my %enrollvar = &get_enrollment_settings($cdom,$cnum); my %longtype = &course_settings_descrip($type); my %lt = &Apache::lonlocal::texthash( @@ -450,25 +545,35 @@ sub print_settings_display { } $disp_table .= &Apache::loncommon::end_data_table()."\n"; &print_header($r,$type); - my $newrole = $ccrole.'./'.$cdom.'/'.$cnum; - my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole. - '=1&destinationurl=/adm/populate','&<>"'); + my ($enroll_link_start,$enroll_link_end,$setparms_link_start,$setparms_link_end); + if (&Apache::lonnet::allowed('ccc',$cdom)) { + my $newrole = $ccrole.'./'.$cdom.'/'.$cnum; + my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole. + '=1&destinationurl=/adm/populate','&<>"'); + $enroll_link_start = ''; + $enroll_link_end = ''; + } + if ($permission->{'setparms'}) { + $setparms_link_start = ''; + $setparms_link_end = ''; + } $r->print('

    '.&mt('Current automated enrollment settings for:'). ' '.$cdesc.'

    '. '
    '."\n". '

    '.$lt{'cose'}.'

    '. '

    '.$lt{'cour'}.'

    '.$disp_table.'

    '. ''.$lt{'back'}.''."\n". &hidden_form_elements(). '

    ' - ); + ); } sub print_setquota { @@ -634,7 +739,7 @@ sub domain_postsubtimeout { my ($cdom,$type,$settings) = @_; return unless (ref($settings) eq 'HASH'); my $lctype = lc($type); - unless ($type eq 'Community') { + unless (($type eq 'Community') || ($type eq 'Placement')) { $lctype = 'unofficial'; if ($settings->{'internal.coursecode'}) { $lctype = 'official'; @@ -693,6 +798,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").':