--- loncom/interface/lonmodifycourse.pm 2019/07/26 17:43:54 1.79.2.7 +++ loncom/interface/lonmodifycourse.pm 2016/04/06 17:41:52 1.83 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.79.2.7 2019/07/26 17:43:54 raeburn Exp $ +# $Id: lonmodifycourse.pm,v 1.83 2016/04/06 17:41:52 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,16 +39,12 @@ use Apache::lonpickcourse; use lib '/home/httpd/lib/perl'; use LONCAPA qw(:DEFAULT :match); -my $registered_cleanup; -my $modified_dom; - sub get_dc_settable { my ($type,$cdom) = @_; if ($type eq 'Community') { return ('courseowner','selfenrollmgrdc','selfenrollmgrcc'); } else { - my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc', - 'selfenrollmgrcc','mysqltables'); + my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc'); if (&showcredits($cdom)) { push(@items,'defaultcredits'); } @@ -59,7 +55,7 @@ sub get_dc_settable { sub autoenroll_keys { my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits', 'autoadds','autodrops','autostart','autoend','sectionnums', - 'crosslistings','co-owners','autodropfailsafe']; + 'crosslistings','co-owners']; my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date']; return ($internals,$accessdates); } @@ -75,6 +71,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'); @@ -121,13 +124,14 @@ sub get_enrollment_settings { $enrollvar{$type} =~ s/,/, /g; } elsif ($type eq "authtype" || $type eq "autharg" || $type eq "coursecode" - || $type eq "crosslistings" || $type eq "selfenrollmgr" - || $type eq "autodropfailsafe") { + || $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}; @@ -170,187 +174,42 @@ 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 ($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'); - } 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); - } 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); - } 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,$permission) = @_; + my ($r,$dom,$domdesc) = @_; my $type = $env{'form.type'}; if (!defined($type)) { $type = 'Course'; } &print_header($r,$type); - 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 +# Criteria for course search my ($filterlist,$filter) = &get_filters(); my $action = '/adm/modifycourse'; my $dctitle = &Apache::lonnet::plaintext('dc'); @@ -363,7 +222,7 @@ END 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; } @@ -384,9 +243,10 @@ 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,$cdom,$cnum); + my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text, + $cdom,$cnum); if (ref($coursehash) eq 'HASH') { $cdom = $coursehash->{'domain'}; $cnum = $coursehash->{'num'}; @@ -398,72 +258,36 @@ sub print_modification_menu { } 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') { - 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'; - } + $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.'); + $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 { - 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 { - $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'; - } - } + $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 (($type ne 'Placement') && (&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 = &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; - } - } + 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; } @@ -476,59 +300,59 @@ sub print_modification_menu { ({ categorytitle => $categorytitle, items => [ { - linktext => $linktext{'setparms'}, + linktext => $setparams_text, url => &phaseurl('setparms'), - permission => $permission->{'setparms'}, + permission => 1, #help => '', icon => 'crsconf.png', linktitle => '' }, { - linktext => $linktext{'setquota'}, + 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 => '' }, { - linktext => $linktext{'setanon'}, + linktext => 'View/Modify responders threshold for anonymous survey submissions display', url => &phaseurl('setanon'), - permission => $permission->{'setanon'}, + permission => 1, #help => '', icon => 'anonsurveythreshold.png', linktitle => '' }, { - linktext => $linktext{'catsettings'}, + linktext => $cat_text, url => &phaseurl('catsettings'), - permission => (($permission->{'catsettings'}) && (@additional_params > 0)), + permission => (@additional_params > 0), #help => '', icon => 'ccatconf.png', linktitle => '' }, { - linktext => $linktext{'viewparms'}, + 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 => '' }, { - linktext => $linktext{'selfenroll'}, + linktext => 'View/Modify Self-Enrollment configuration', 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.', }, { - linktext => $linktext{'setpostsubmit'}, + linktext => 'View/Modify submit button behavior, post-submission', icon => 'emblem-readonly.png', #help => '', url => &phaseurl('setpostsubmit'), - permission => $permission->{'setpostsubmit'}, + permission => 1, linktitle => '', }, ] @@ -552,33 +376,27 @@ 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 .= '
  • '.$mysqltables_text.'
    • '."\n". - '
  • '.$setquota_text.'
    • '."\n". + $menu_html .= '
  • '.$setquota_text.'
    • '."\n". '
  • '.$setuploadquota_text.'
    • '."\n". '
  • '.$anon_text.'
    • '."\n". '
  • '.$postsubmit_text.'
    • '."\n"; - my ($categories_link_start,$categories_link_end); - if ($permission->{'catsettings'} eq 'edit') { - $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"; } } } @@ -594,43 +412,18 @@ sub print_modification_menu { return; } -sub print_adhocrole_selected { - my ($r,$type,$permission) = @_; +sub print_ccrole_selected { + my ($r,$type) = @_; &print_header($r,$type); my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); - my ($newrole,$selectrole); - if ($permission->{'adhocrole'} eq 'coord') { - if ($type eq 'Community') { - $newrole = "co./$cdom/$cnum"; - } else { - $newrole = "cc./$cdom/$cnum"; - } - $selectrole = 1; - } elsif ($permission->{'adhocrole'} eq 'custom') { - my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1); - if (ref($okroles) eq 'ARRAY') { - my $possrole = $env{'form.adhocrole'}; - if (($possrole ne '') && (grep(/^\Q$possrole\E$/,@{$okroles}))) { - 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( @@ -671,39 +464,29 @@ 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 { - my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; + my ($r,$cdom,$cnum,$cdesc,$type) = @_; my $lctype = lc($type); my $headline = &mt("Set disk space quotas for $lctype: [_1]", ''.$cdesc.''); @@ -736,25 +519,19 @@ sub print_setquota { my $hidden_elements = &hidden_form_elements(); my $porthelpitem = &Apache::loncommon::help_open_topic('Modify_Course_Quota'); my $uploadhelpitem = &Apache::loncommon::help_open_topic('Modify_Course_Upload_Quota'); - my ($disabled,$submit); - if ($readonly) { - $disabled = ' disabled="disabled"'; - } else { - $submit = ''; - } $r->print(<

    $headline

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

    -$submit +

    $hidden_elements $lt{'back'} @@ -764,7 +541,7 @@ ENDDOCUMENT } sub print_set_anonsurvey_threshold { - my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; + my ($r,$cdom,$cnum,$cdesc,$type) = @_; my %lt = &Apache::lonlocal::texthash( 'resp' => 'Responder threshold for anonymous survey submissions display:', 'sufa' => 'Anonymous survey submissions displayed when responders exceeds', @@ -787,19 +564,13 @@ sub print_set_anonsurvey_threshold { } &print_header($r,$type); my $hidden_elements = &hidden_form_elements(); - my ($disabled,$submit); - if ($readonly) { - $disabled = ' disabled="disabled"'; - } else { - $submit = ''; - } my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold'); $r->print(<

    $lt{'resp'} $cdesc

    -$helpitem $lt{'sufa'}:      -$submit +$helpitem $lt{'sufa'}:      +

    $hidden_elements $lt{'back'} @@ -809,7 +580,7 @@ ENDDOCUMENT } sub print_postsubmit_config { - my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; + 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', @@ -850,27 +621,21 @@ sub print_postsubmit_config { } &print_header($r,$type); my $hidden_elements = &hidden_form_elements(); - my ($disabled,$submit); - if ($readonly) { - $disabled = ' disabled="disabled"'; - } else { - $submit = ''; - } my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config'); $r->print(<

    $lt{'conf'} ($cdesc)

    $helpitem $lt{'disa'}: -

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

    -$submit +

    $hidden_elements $lt{'back'} @@ -883,7 +648,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'; @@ -907,7 +672,7 @@ sub domain_postsubtimeout { } sub print_catsettings { - my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; + my ($r,$cdom,$cnum,$cdesc,$type) = @_; &print_header($r,$type); my %lt = &Apache::lonlocal::texthash( 'back' => 'Pick another action', @@ -928,10 +693,6 @@ sub print_catsettings { my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); my @cat_params = &catalog_settable($domconf{'coursecategories'},$type); if (@cat_params > 0) { - my $disabled; - if ($readonly) { - $disabled = ' disabled="disabled"'; - } my %currsettings = &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum); if (grep(/^togglecats$/,@cat_params)) { @@ -943,9 +704,11 @@ sub print_catsettings { } $r->print('

    '.$lt{'visi'}.'

    '. $lt{'exclude'}. - '    

    '); + '    

    '); 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").':

      '. '
    • '.&mt('Auto-cataloging is enabled and the course is assigned an institutional code.').'
      • '. @@ -960,21 +723,19 @@ sub print_catsettings { if (ref($cathash) eq 'HASH') { $r->print($lt{'assi'}.'

      '. &Apache::loncommon::assign_categories_table($cathash, - $currsettings{'categories'},$type,$disabled)); + $currsettings{'categories'},$type)); } else { $r->print(&mt('No categories defined for this domain')); } } else { $r->print(&mt('No categories defined for this domain')); } - unless ($type eq 'Community') { + unless (($type eq 'Community') || ($type eq 'Placement')) { $r->print('

      '.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses, in addition to receiving a listing under any manually assigned categor(ies).').'

      '); } } - unless ($readonly) { - $r->print('

      '); - } + $r->print('

      '); } else { $r->print(''); if ($type eq 'Community') { @@ -991,7 +752,7 @@ sub print_catsettings { } sub print_course_modification_page { - my ($r,$cdom,$cnum,$cdesc,$crstype,$readonly) = @_; + my ($r,$cdom,$cnum,$cdesc,$crstype) = @_; my %lt=&Apache::lonlocal::texthash( 'actv' => "Active", 'inac' => "Inactive", @@ -1005,11 +766,11 @@ sub print_course_modification_page { 'domd' => 'Domain default', 'whom' => 'Who configures', ); - my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname,$disabled); + my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname); my %enrollvar = &get_enrollment_settings($cdom,$cnum); my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook', - 'internal.selfenrollmgrdc','internal.selfenrollmgrcc', - 'internal.mysqltables'],$cdom,$cnum); + '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'}); @@ -1020,12 +781,9 @@ sub print_course_modification_page { $lt{'nocc'} = &mt('There is currently no owner set for this community.'); } else { $ccrole ='cc'; - ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar,$readonly); + ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar); } $ccname = &Apache::lonnet::plaintext($ccrole,$crstype); - if ($readonly) { - $disabled = ' disabled="disabled"'; - } my %roleshash = &Apache::lonnet::get_my_roles($cnum,$cdom,'','',[$ccrole]); my (@local_ccs,%cc_status,%pname); foreach my $item (keys(%roleshash)) { @@ -1066,9 +824,9 @@ sub print_course_modification_page { foreach my $cc (@local_ccs) { $ownertable .= &Apache::loncommon::start_data_table_row()."\n"; if ($cc eq $enrollvar{'courseowner'}) { - $ownertable .= ''."\n"; + $ownertable .= ''."\n"; } else { - $ownertable .= ''."\n"; + $ownertable .= ''."\n"; } $ownertable .= ''.$pname{$cc}.''."\n". @@ -1093,13 +851,13 @@ 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()); - if (&showcredits($cdom)) { + if (($crstype eq 'Course') && (&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( @@ -1153,35 +911,27 @@ sub print_course_modification_page { 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(). - &Apache::lonhtmlcommon::row_title( - &Apache::loncommon::help_open_topic('Modify_Course_Table_Lifetime'). - ' '.&mt('"Temporary" Tables Lifetime (s)'))."\n". - ''. - &Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::end_pick_box().'

      '.$hidden_elements); - unless ($readonly) { - $r->print('print('this.form.submit();"'); - } else { - $r->print('javascript:verify_message(this.form);"'); - } - $r->print(' value="'.$lt{'gobt'}.'" />'); + '
      '.&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('

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

      '); return; } sub print_selfenrollconfig { - my ($r,$type,$cdesc,$coursehash,$readonly) = @_; + my ($r,$type,$cdesc,$coursehash) = @_; return unless(ref($coursehash) eq 'HASH'); my $cnum = $coursehash->{'num'}; my $cdom = $coursehash->{'domain'}; @@ -1191,7 +941,7 @@ sub print_selfenrollconfig { ''.$cdesc.'').''."\n"); &Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'}, $cdom,$cnum,\%currsettings, - &hidden_form_elements(),$readonly); + &hidden_form_elements()); return; } @@ -1247,7 +997,7 @@ sub modifiable_only_title { } sub gather_authenitems { - my ($cdom,$enrollvar,$readonly) = @_; + my ($cdom,$enrollvar) = @_; my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom); my $curr_authtype = ''; my $curr_authfield = ''; @@ -1271,8 +1021,7 @@ sub gather_authenitems { kerb_def_auth => $krbdef, mode => 'modifycourse', curr_authtype => $curr_authtype, - curr_autharg => $enrollvar->{'autharg'}, - readonly => $readonly, + curr_autharg => $enrollvar->{'autharg'} ); my (%authform,$authenitems); $authform{'krb'} = &Apache::loncommon::authform_kerberos(%param); @@ -1291,9 +1040,9 @@ sub modify_course { my %longtype = &course_settings_descrip($type); my @items = ('internal.courseowner','description','internal.co-owners', 'internal.pendingco-owners','internal.selfenrollmgrdc', - 'internal.selfenrollmgrcc','internal.mysqltables'); + 'internal.selfenrollmgrcc'); my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles(); - unless ($type eq 'Community') { + unless (($type eq 'Community') || ($type eq 'Placement')) { push(@items,('internal.coursecode','internal.authtype','internal.autharg', 'internal.sectionnums','internal.crosslistings')); if (&showcredits($cdom)) { @@ -1362,13 +1111,10 @@ sub modify_course { $changed{'code'} = 1; } } - if ( exists($env{'form.mysqltables'}) ) { - $newattr{'mysqltables'} = $env{'form.mysqltables'}; - $newattr{'mysqltables'} =~ s/\D+//g; - } - if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) { - $newattr{'defaultcredits'}=$env{'form.defaultcredits'}; + + if (($type ne 'Placement') && (&showcredits($cdom) && exists($env{'form.defaultcredits'}))) { $newattr{'defaultcredits'} =~ s/[^\d\.]//g; + $newattr{'defaultcredits'}=$env{'form.defaultcredits'}; } } @@ -1417,18 +1163,6 @@ sub modify_course { my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime'); if ($putres eq 'ok') { &update_coowners($cdom,$cnum,$chome,\%settings,\%newattr); - if ($changed{'code'}) { - &Apache::lonnet::devalidate_cache_new('instcats',$cdom); - # Update cache of self-cataloging courses on institution's server(s). - if (&Apache::lonnet::shared_institution($cdom)) { - unless ($registered_cleanup) { - my $handlers = $r->get_handlers('PerlCleanupHandler'); - $r->set_handlers('PerlCleanupHandler' => [\&devalidate_remote_instcats,@{$handlers}]); - $registered_cleanup=1; - $modified_dom = $cdom; - } - } - } } } } @@ -1472,8 +1206,6 @@ sub modify_course { $shown = &selfenroll_config_status(\@newmgrcc,$selfenrolltitles); } elsif (($attr eq 'defaultcredits') && ($shown eq '')) { $shown = &mt('None'); - } elsif (($attr eq 'mysqltables') && ($shown eq '')) { - $shown = &mt('domain default'); } $chgresponse .= '
    • '.&mt('[_1] now set to: [_2]',$longtype{$attr},$shown).'
      • '; } else { @@ -1484,13 +1216,11 @@ sub modify_course { $shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles); } elsif (($attr eq 'defaultcredits') && ($shown eq '')) { $shown = &mt('None'); - } elsif (($attr eq 'mysqltables') && ($shown eq '')) { - $shown = &mt('domain default'); } $nochgresponse .= '
    • '.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'
      • '; } } - if (($type ne 'Community') && ($changed{'code'} || $changed{'owner'})) { + if (($type ne 'Community') && ($type ne 'Placement') && ($changed{'code'} || $changed{'owner'})) { if ( $newattr{'courseowner'} eq '') { push(@warnings,&mt('There is no owner associated with this LON-CAPA course.'). '
      '.&mt('If automated enrollment at your institution requires validation of course owners, automated enrollment will fail.')); @@ -1557,8 +1287,6 @@ sub modify_course { $shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles); } elsif (($attr eq 'defaultcredits') && ($shown eq '')) { $shown = &mt('None'); - } elsif (($attr eq 'mysqltables') && ($shown eq '')) { - $shown = &mt('domain default'); } $nochgresponse .= '
    • '.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'
      • '; } @@ -2171,7 +1899,13 @@ function changePage(formname,newphase) { if ($phase eq 'setparms') { $js .= $javascript_validations; } elsif ($phase eq 'courselist') { - $js .= <<"ENDJS"; + $js .= qq| + +function gochoose(cname,cdom,cdesc) { + document.courselist.pickedcourse.value = cdom+'_'+cname; + document.courselist.submit(); +} + function hide_searching() { if (document.getElementById('searching')) { document.getElementById('searching').style.display = 'none'; @@ -2179,7 +1913,7 @@ function hide_searching() { return; } -ENDJS +|; } elsif ($phase eq 'setquota') { my $invalid = &mt('The quota you entered contained invalid characters.'); my $alert = &mt('You must enter a number'); @@ -2308,9 +2042,9 @@ ENDSCRIPT } my $starthash; - if ($env{'form.phase'} eq 'adhocrole') { + if ($env{'form.phase'} eq 'ccrole') { $starthash = { - add_entries => {'onload' => "javascript:document.adhocrole.submit();"}, + add_entries => {'onload' => "javascript:document.ccrole.submit();"}, }; } elsif ($phase eq 'courselist') { $starthash = { @@ -2323,6 +2057,8 @@ ENDSCRIPT my $bread_text = "View/Modify Courses/Communities"; if ($type eq 'Community') { $bread_text = 'Community Settings'; + } elsif ($type eq 'Placement') { + $bread_text = 'Placement Test Settings'; } else { $bread_text = 'Course Settings'; } @@ -2377,7 +2113,6 @@ sub course_settings_descrip { 'co-owners' => "Username:domain of each co-owner", 'selfenrollmgrdc' => "Community-specific self-enrollment configuration by Domain Coordinator", 'selfenrollmgrcc' => "Community-specific self-enrollment configuration by Community personnel", - 'mysqltables' => '"Temporary" student performance tables lifetime (seconds)', ); } else { %longtype = &Apache::lonlocal::texthash( @@ -2396,10 +2131,9 @@ sub course_settings_descrip { 'sectionnums' => 'Course section number:LON-CAPA section', 'crosslistings' => 'Crosslisted class:LON-CAPA section', 'defaultcredits' => 'Credits', - 'autodropfailsafe' => "Failsafe section enrollment count", 'selfenrollmgrdc' => "Course-specific self-enrollment configuration by Domain Coordinator", 'selfenrollmgrcc' => "Course-specific self-enrollment configuration by Course personnel", - 'mysqltables' => '"Temporary" student performance tables lifetime (seconds)', + ); } return %longtype; @@ -2412,7 +2146,7 @@ sub hidden_form_elements { 'locarg','krbarg','krbver','counter','hidefromcat','usecategory', 'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota', 'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st', - 'sections','newsec','mysqltables'],['^selfenrollmgr_','^selfenroll_'])."\n". + 'sections','newsec'],['^selfenrollmgr_'])."\n". ''; return $hidden_elements; } @@ -2425,58 +2159,6 @@ sub showcredits { } } -sub get_permission { - my ($dom) = @_; - my ($allowed,%permission); - if (&Apache::lonnet::allowed('ccc',$dom)) { - $allowed = 1; - %permission = ( - setquota => 'edit', - processquota => 'edit', - setanon => 'edit', - processthreshold => 'edit', - setpostsubmit => 'edit', - processpostsubmit => 'edit', - viewparms => 'view', - setparms => 'edit', - processparms => 'edit', - catsettings => 'edit', - processcat => 'edit', - selfenroll => 'edit', - adhocrole => 'coord', - ); - } elsif (&Apache::lonnet::allowed('rar',$dom)) { - $allowed = 1; - %permission = ( - setquota => 'view', - viewparms => 'view', - setanon => 'view', - setpostsubmit => 'view', - setparms => 'view', - catsettings => 'view', - selfenroll => 'view', - adhocrole => 'custom', - ); - } - return ($allowed,\%permission); -} - -sub devalidate_remote_instcats { - if ($modified_dom ne '') { - my %servers = &Apache::lonnet::internet_dom_servers($modified_dom); - my %thismachine; - map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); - if (keys(%servers)) { - foreach my $server (keys(%servers)) { - next if ($thismachine{$server}); - &Apache::lonnet::remote_devalidate_cache($server,['instcats:'.$modified_dom]); - } - } - $modified_dom = ''; - } - return; -} - sub handler { my $r = shift; if ($r->header_only) { @@ -2485,13 +2167,10 @@ sub handler { return OK; } - $registered_cleanup=0; - $modified_dom = ''; - my $dom = $env{'request.role.domain'}; my $domdesc = &Apache::lonnet::domain($dom,'description'); - my ($allowed,$permission) = &get_permission($dom); - if ($allowed) { + + if (&Apache::lonnet::allowed('ccc',$dom)) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -2518,6 +2197,8 @@ sub handler { } if ($type eq 'Community') { $choose_text = "Choose a community"; + } elsif ($type eq 'Placement') { + $choose_text = "Choose a placement test"; } else { $choose_text = "Choose a course"; } @@ -2527,13 +2208,15 @@ sub handler { {href=>"javascript:changePage(document.$phase,'courselist')", text=>$choose_text}); if ($phase eq 'courselist') { - &print_course_selection_page($r,$dom,$domdesc,$permission); + &print_course_selection_page($r,$dom,$domdesc); } else { my ($checked,$cdesc,$coursehash) = &check_course($dom,$domdesc); if ($checked eq 'ok') { my $enter_text; if ($type eq 'Community') { $enter_text = 'Enter community'; + } elsif ($type eq 'Placement') { + $enter_text = 'Enter placement test'; } else { $enter_text = 'Enter course'; } @@ -2542,33 +2225,23 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'menu')", text=>"Pick action"}); &print_modification_menu($r,$cdesc,$domdesc,$dom,$type, - $env{'form.pickedcourse'},$coursehash, - $permission); - } elsif ($phase eq 'adhocrole') { + $env{'form.pickedcourse'},$coursehash); + } elsif ($phase eq 'ccrole') { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:changePage(document.$phase,'adhocrole')", + ({href=>"javascript:changePage(document.$phase,'ccrole')", text=>$enter_text}); - &print_adhocrole_selected($r,$type,$permission); + &print_ccrole_selected($r,$type); } else { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'menu')", text=>"Pick action"}); my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); - my ($readonly,$linktext); - if ($permission->{$phase} eq 'view') { - $readonly = 1; - } - if (($phase eq 'setquota') && ($permission->{'setquota'})) { - if ($permission->{'setquota'} eq 'view') { - $linktext = 'Set quota'; - } else { - $linktext = 'Display quota'; - } + if ($phase eq 'setquota') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>$linktext}); - &print_setquota($r,$cdom,$cnum,$cdesc,$type,$readonly); - } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) { + text=>"Set quota"}); + &print_setquota($r,$cdom,$cnum,$cdesc,$type); + } elsif ($phase eq 'processquota') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setquota')", text=>"Set quota"}); @@ -2576,12 +2249,12 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_quota($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif (($phase eq 'setanon') && ($permission->{'setanon'})) { + } elsif ($phase eq 'setanon') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Threshold for anonymous submissions display"}); - &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type,$readonly); - } elsif (($phase eq 'processthreshold') && ($permission->{'processthreshold'})) { + &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type); + } elsif ($phase eq 'processthreshold') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setanon')", text=>"Threshold for anonymous submissions display"}); @@ -2589,37 +2262,27 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif (($phase eq 'setpostsubmit') && ($permission->{'setpostsubmit'})) { - if ($permission->{'setpostsubmit'} eq 'view') { - $linktext = 'Submit button behavior post-submission'; - } else { - $linktext = 'Configure submit button behavior post-submission'; - } + } elsif ($phase eq 'setpostsubmit') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>$linktext}); - &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type,$readonly); - } elsif (($phase eq 'processpostsubmit') && ($permission->{'processpostsubmit'})) { + text=>"Configure submit button behavior post-submission"}); + &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type); + } elsif ($phase eq 'processpostsubmit') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_postsubmit_config($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif (($phase eq 'viewparms') && ($permission->{'viewparms'})) { + } elsif ($phase eq 'viewparms') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'viewparms')", text=>"Display settings"}); - &print_settings_display($r,$cdom,$cnum,$cdesc,$type,$permission); - } elsif (($phase eq 'setparms') && ($permission->{'setparms'})) { - if ($permission->{'setparms'} eq 'view') { - $linktext = 'Display settings'; - } else { - $linktext = 'Change settings'; - } + &print_settings_display($r,$cdom,$cnum,$cdesc,$type); + } elsif ($phase eq 'setparms') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>$linktext}); - &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type,$readonly); - } elsif (($phase eq 'processparms') && ($permission->{'processparms'})) { + text=>"Change settings"}); + &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type); + } elsif ($phase eq 'processparms') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setparms')", text=>"Change settings"}); @@ -2627,12 +2290,12 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_course($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif (($phase eq 'catsettings') && ($permission->{'catsettings'})) { + } elsif ($phase eq 'catsettings') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Catalog settings"}); - &print_catsettings($r,$cdom,$cnum,$cdesc,$type,$readonly); - } elsif (($phase eq 'processcat') && ($permission->{'processcat'})) { + &print_catsettings($r,$cdom,$cnum,$cdesc,$type); + } elsif ($phase eq 'processcat') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'catsettings')", text=>"Catalog settings"}); @@ -2640,12 +2303,12 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_catsettings($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif (($phase eq 'selfenroll') && ($permission->{'selfenroll'})) { + } elsif ($phase eq 'selfenroll') { &Apache::lonhtmlcommon::add_breadcrumb ({href => "javascript:changePage(document.$phase,'$phase')", text => "Self-enrollment settings"}); if (!exists($env{'form.state'})) { - &print_selfenrollconfig($r,$type,$cdesc,$coursehash,$readonly); + &print_selfenrollconfig($r,$type,$cdesc,$coursehash); } elsif ($env{'form.state'} eq 'done') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", @@ -2658,6 +2321,8 @@ sub handler { $r->print(''); if ($type eq 'Community') { $r->print(&mt('The community you selected is not a valid community in this domain')); + } elsif ($type eq 'Placement') { + $r->print(&mt('The course you selected is not a valid placement test in this domain')); } else { $r->print(&mt('The course you selected is not a valid course in this domain')); }