--- loncom/interface/lonmodifycourse.pm 2016/10/23 02:24:51 1.79.2.3 +++ 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.79.2.3 2016/10/23 02:24:51 raeburn Exp $ +# $Id: lonmodifycourse.pm,v 1.85 2016/08/15 18:01:08 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -72,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'); @@ -167,59 +174,30 @@ 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') { - $actiontext = &mt('Actions available after searching for a community:'); - } 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); - } 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)); - } 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]); - } 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); - } else { - $settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle); - } - } - $r->print($actiontext.''); return; } @@ -244,7 +222,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, - $dom,undef,%courses); + undef,undef,%courses); return; } @@ -265,7 +243,7 @@ sub get_filters { } sub print_modification_menu { - my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_; + my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_; &print_header($r,$type); my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text, $cdom,$cnum); @@ -290,7 +268,7 @@ 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)) { + 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'; @@ -305,14 +283,12 @@ sub print_modification_menu { 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; - } - } + 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; } @@ -327,7 +303,7 @@ sub print_modification_menu { { linktext => $setparams_text, url => &phaseurl('setparms'), - permission => $permission->{'setparms'}, + permission => 1, #help => '', icon => 'crsconf.png', linktitle => '' @@ -335,7 +311,7 @@ sub print_modification_menu { { linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.', url => &phaseurl('setquota'), - permission => $permission->{'setquota'}, + permission => 1, #help => '', icon => 'groupportfolioquota.png', linktitle => '' @@ -343,7 +319,7 @@ sub print_modification_menu { { linktext => 'View/Modify responders threshold for anonymous survey submissions display', url => &phaseurl('setanon'), - permission => $permission->{'setanon'}, + permission => 1, #help => '', icon => 'anonsurveythreshold.png', linktitle => '' @@ -351,7 +327,7 @@ sub print_modification_menu { { linktext => $cat_text, url => &phaseurl('catsettings'), - permission => (($permission->{'catsettings'}) && (@additional_params > 0)), + permission => (@additional_params > 0), #help => '', icon => 'ccatconf.png', linktitle => '' @@ -359,7 +335,7 @@ sub print_modification_menu { { linktext => 'Display current settings for automated enrollment', url => &phaseurl('viewparms'), - permission => ($permission->{'viewparms'} && ($type ne 'Community')), + permission => (($type ne 'Community') && ($type ne 'Placement')), #help => '', icon => 'roles.png', linktitle => '' @@ -369,7 +345,7 @@ sub print_modification_menu { icon => 'self_enroll.png', #help => 'Course_Self_Enrollment', url => &phaseurl('selfenroll'), - permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash,$permission), + permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash), linktitle => 'Configure user self-enrollment.', }, { @@ -377,7 +353,7 @@ sub print_modification_menu { icon => 'emblem-readonly.png', #help => '', url => &phaseurl('setpostsubmit'), - permission => $permission->{'setpostsubmit'}, + permission => 1, linktitle => '', }, ] @@ -401,7 +377,7 @@ 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"; @@ -411,23 +387,18 @@ sub print_modification_menu { '
  • '.$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).',$categories_link_start,$categories_link_end).'
    • '."\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).','','').'
    • '."\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).',$categories_link_start,$categories_link_end).'
    • '."\n"; + $menu_html .= '
  • '.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','','').'
    • '."\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).',$categories_link_start,$categories_link_end).'
    • '."\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).','','').'
    • '."\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).',$categories_link_start,$categories_link_end).'
    • '."\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).','','').'
    • '."\n"; } } } @@ -443,47 +414,18 @@ sub print_modification_menu { return; } -sub print_adhocrole_selected { +sub print_ccrole_selected { my ($r,$type) = @_; &print_header($r,$type); my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); - 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('
    - - + $r->print(' + +
    '); - } else { - $r->print('
    '. - '
    '); - } - return; } sub print_settings_display { - my ($r,$cdom,$cnum,$cdesc,$type,$permission) = @_; + my ($r,$cdom,$cnum,$cdesc,$type) = @_; my %enrollvar = &get_enrollment_settings($cdom,$cnum); my %longtype = &course_settings_descrip($type); my %lt = &Apache::lonlocal::texthash( @@ -524,35 +466,25 @@ sub print_settings_display { } $disp_table .= &Apache::loncommon::end_data_table()."\n"; &print_header($r,$type); - 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 = ''; - } + my $newrole = $ccrole.'./'.$cdom.'/'.$cnum; + my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole. + '=1&destinationurl=/adm/populate','&<>"'); $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 { @@ -718,7 +650,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'; @@ -777,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").':