--- loncom/interface/lonmodifycourse.pm 2016/10/23 02:24:51 1.79.2.3 +++ loncom/interface/lonmodifycourse.pm 2017/01/22 19:22:04 1.91 @@ -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.91 2017/01/22 19:22:04 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,6 +174,8 @@ 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).'

'); } @@ -177,6 +186,8 @@ sub print_course_search_page { my ($actiontext,$roleoption,$settingsoption); if ($type eq 'Community') { $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:'); } @@ -184,33 +195,39 @@ sub print_course_search_page { 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) { + 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: [_1].', - join(', ',@adhoc)); + $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: [_1].', - join(', ',@adhoc)); + $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]',$adhoc[0]); + $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]',$adhoc[0]); + $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); } @@ -224,14 +241,131 @@ sub print_course_search_page { } 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 + 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"); + + +
+

$lt{'preamble'}

+
+
+
+ + +
+

$lt{'cancel'}

+
+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'); @@ -267,8 +401,7 @@ sub get_filters { sub print_modification_menu { 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); + my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum); if (ref($coursehash) eq 'HASH') { $cdom = $coursehash->{'domain'}; $cnum = $coursehash->{'num'}; @@ -280,26 +413,59 @@ 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') { - $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, default authentication, credits, self-enrollment and table lifetime'; + 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, default authentication, self-enrollment and table lifetime'; + $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 = &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); @@ -325,7 +491,7 @@ sub print_modification_menu { ({ categorytitle => $categorytitle, items => [ { - linktext => $setparams_text, + linktext => $linktext{'setparms'}, url => &phaseurl('setparms'), permission => $permission->{'setparms'}, #help => '', @@ -333,7 +499,7 @@ sub print_modification_menu { linktitle => '' }, { - linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.', + linktext => $linktext{'setquota'}, url => &phaseurl('setquota'), permission => $permission->{'setquota'}, #help => '', @@ -341,7 +507,7 @@ sub print_modification_menu { linktitle => '' }, { - linktext => 'View/Modify responders threshold for anonymous survey submissions display', + linktext => $linktext{'setanon'}, url => &phaseurl('setanon'), permission => $permission->{'setanon'}, #help => '', @@ -349,7 +515,7 @@ sub print_modification_menu { linktitle => '' }, { - linktext => $cat_text, + linktext => $linktext{'catsettings'}, url => &phaseurl('catsettings'), permission => (($permission->{'catsettings'}) && (@additional_params > 0)), #help => '', @@ -357,15 +523,15 @@ sub print_modification_menu { linktitle => '' }, { - linktext => 'Display current settings for automated enrollment', + linktext => $linktext{'viewparms'}, url => &phaseurl('viewparms'), - permission => ($permission->{'viewparms'} && ($type ne 'Community')), + permission => ($permission->{'viewparms'} && ($type ne 'Community') && ($type ne 'Placement')), #help => '', icon => 'roles.png', linktitle => '' }, { - linktext => 'View/Modify Self-Enrollment configuration', + linktext => $linktext{'selfenroll'}, icon => 'self_enroll.png', #help => 'Course_Self_Enrollment', url => &phaseurl('selfenroll'), @@ -373,7 +539,7 @@ sub print_modification_menu { linktitle => 'Configure user self-enrollment.', }, { - linktext => 'View/Modify submit button behavior, post-submission', + linktext => $linktext{'setpostsubmit'}, icon => 'emblem-readonly.png', #help => '', url => &phaseurl('setpostsubmit'), @@ -401,7 +567,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"; @@ -412,7 +578,7 @@ sub print_modification_menu { '
  • '.$anon_text.'
  • '."\n". '
  • '.$postsubmit_text.'
  • '."\n"; my ($categories_link_start,$categories_link_end); - if ($permission->{'catsettings'}) { + if ($permission->{'catsettings'} eq 'edit') { $categories_link_start = ''; $categories_link_end = ''; } @@ -444,29 +610,25 @@ sub print_modification_menu { } sub print_adhocrole_selected { - my ($r,$type) = @_; + my ($r,$type,$permission) = @_; &print_header($r,$type); my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); my ($newrole,$selectrole); - if (&Apache::lonnet::allowed('ccc',$cdom)) { + if ($permission->{'adhocrole'} eq 'coord') { 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; - } + } 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; } } } @@ -556,7 +718,7 @@ sub print_settings_display { } sub print_setquota { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; my $lctype = lc($type); my $headline = &mt("Set disk space quotas for $lctype: [_1]", ''.$cdesc.''); @@ -589,19 +751,25 @@ 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'} @@ -611,7 +779,7 @@ ENDDOCUMENT } sub print_set_anonsurvey_threshold { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; my %lt = &Apache::lonlocal::texthash( 'resp' => 'Responder threshold for anonymous survey submissions display:', 'sufa' => 'Anonymous survey submissions displayed when responders exceeds', @@ -634,13 +802,19 @@ 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'}:      - +$helpitem $lt{'sufa'}:      +$submit

    $hidden_elements $lt{'back'} @@ -650,7 +824,7 @@ ENDDOCUMENT } sub print_postsubmit_config { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; my %lt = &Apache::lonlocal::texthash ( 'conf' => 'Configure submit button behavior after student makes a submission', 'disa' => 'Disable submit button/keypress following student submission', @@ -691,21 +865,27 @@ 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'} @@ -718,7 +898,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'; @@ -742,7 +922,7 @@ sub domain_postsubtimeout { } sub print_catsettings { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; &print_header($r,$type); my %lt = &Apache::lonlocal::texthash( 'back' => 'Pick another action', @@ -763,6 +943,10 @@ 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)) { @@ -774,9 +958,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.').'
    • '. @@ -791,19 +977,21 @@ sub print_catsettings { if (ref($cathash) eq 'HASH') { $r->print($lt{'assi'}.'

      '. &Apache::loncommon::assign_categories_table($cathash, - $currsettings{'categories'},$type)); + $currsettings{'categories'},$type,$disabled)); } 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).').'

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

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

      '); + } } else { $r->print(''); if ($type eq 'Community') { @@ -820,7 +1008,7 @@ sub print_catsettings { } sub print_course_modification_page { - my ($r,$cdom,$cnum,$cdesc,$crstype) = @_; + my ($r,$cdom,$cnum,$cdesc,$crstype,$readonly) = @_; my %lt=&Apache::lonlocal::texthash( 'actv' => "Active", 'inac' => "Inactive", @@ -834,7 +1022,7 @@ sub print_course_modification_page { 'domd' => 'Domain default', 'whom' => 'Who configures', ); - my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname); + my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname,$disabled); my %enrollvar = &get_enrollment_settings($cdom,$cnum); my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook', 'internal.selfenrollmgrdc','internal.selfenrollmgrcc', @@ -849,9 +1037,12 @@ 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); + ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar,$readonly); } $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)) { @@ -892,9 +1083,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". @@ -919,13 +1110,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( @@ -979,7 +1170,7 @@ sub print_course_modification_page { foreach my $option ('','0','1') { $r->print('
      '); } $r->print(''."\n". @@ -990,21 +1181,24 @@ sub print_course_modification_page { &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. - 'print('this.form.submit();"'); - } else { - $r->print('javascript:verify_message(this.form);"'); + &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'}.'" />'); } - $r->print(' value="'.$lt{'gobt'}.'" />

      '); + $r->print('

      '); return; } sub print_selfenrollconfig { - my ($r,$type,$cdesc,$coursehash) = @_; + my ($r,$type,$cdesc,$coursehash,$readonly) = @_; return unless(ref($coursehash) eq 'HASH'); my $cnum = $coursehash->{'num'}; my $cdom = $coursehash->{'domain'}; @@ -1014,7 +1208,7 @@ sub print_selfenrollconfig { ''.$cdesc.'').''."\n"); &Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'}, $cdom,$cnum,\%currsettings, - &hidden_form_elements()); + &hidden_form_elements(),$readonly); return; } @@ -1070,7 +1264,7 @@ sub modifiable_only_title { } sub gather_authenitems { - my ($cdom,$enrollvar) = @_; + my ($cdom,$enrollvar,$readonly) = @_; my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom); my $curr_authtype = ''; my $curr_authfield = ''; @@ -1094,7 +1288,8 @@ sub gather_authenitems { kerb_def_auth => $krbdef, mode => 'modifycourse', curr_authtype => $curr_authtype, - curr_autharg => $enrollvar->{'autharg'} + curr_autharg => $enrollvar->{'autharg'}, + readonly => $readonly, ); my (%authform,$authenitems); $authform{'krb'} = &Apache::loncommon::authform_kerberos(%param); @@ -1115,7 +1310,7 @@ sub modify_course { 'internal.pendingco-owners','internal.selfenrollmgrdc', 'internal.selfenrollmgrcc','internal.mysqltables'); 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)) { @@ -1188,7 +1383,7 @@ sub modify_course { $newattr{'mysqltables'} = $env{'form.mysqltables'}; $newattr{'mysqltables'} =~ s/\D+//g; } - if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) { + if (($type ne 'Placement') && (&showcredits($cdom) && exists($env{'form.defaultcredits'}))) { $newattr{'defaultcredits'}=$env{'form.defaultcredits'}; $newattr{'defaultcredits'} =~ s/[^\d\.]//g; } @@ -1300,7 +1495,7 @@ sub modify_course { $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.')); @@ -1981,13 +2176,7 @@ function changePage(formname,newphase) { if ($phase eq 'setparms') { $js .= $javascript_validations; } elsif ($phase eq 'courselist') { - $js .= qq| - -function gochoose(cname,cdom,cdesc) { - document.courselist.pickedcourse.value = cdom+'_'+cname; - document.courselist.submit(); -} - + $js .= <<"ENDJS"; function hide_searching() { if (document.getElementById('searching')) { document.getElementById('searching').style.display = 'none'; @@ -1995,7 +2184,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'); @@ -2139,6 +2328,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'; } @@ -2247,23 +2438,31 @@ sub get_permission { if (&Apache::lonnet::allowed('ccc',$dom)) { $allowed = 1; %permission = ( - setquota => 1, - processquota => 1, - setanon => 1, - processthreshold => 1, - setpostsubmit => 1, - processpostsubmit => 1, - viewparms => 1, - setparms => 1, - processparms => 1, - catsettings => 1, - processcat => 1, - selfenroll => 1, + 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 = ( - viewparms => 1, + setquota => 'view', + viewparms => 'view', + setanon => 'view', + setpostsubmit => 'view', + setparms => 'view', + catsettings => 'view', + selfenroll => 'view', + adhocrole => 'custom', ); } return ($allowed,\%permission); @@ -2307,6 +2506,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"; } @@ -2316,13 +2517,15 @@ sub handler { {href=>"javascript:changePage(document.$phase,'courselist')", text=>$choose_text}); if ($phase eq 'courselist') { - &print_course_selection_page($r,$dom,$domdesc); + &print_course_selection_page($r,$dom,$domdesc,$permission); } 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'; } @@ -2337,17 +2540,26 @@ sub handler { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'adhocrole')", text=>$enter_text}); - &print_adhocrole_selected($r,$type); + &print_adhocrole_selected($r,$type,$permission); } 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'; + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Set quota"}); - &print_setquota($r,$cdom,$cnum,$cdesc,$type); + text=>$linktext}); + &print_setquota($r,$cdom,$cnum,$cdesc,$type,$readonly); } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setquota')", @@ -2360,7 +2572,7 @@ sub handler { &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); + &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type,$readonly); } elsif (($phase eq 'processthreshold') && ($permission->{'processthreshold'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setanon')", @@ -2370,10 +2582,15 @@ sub handler { 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'; + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Configure submit button behavior post-submission"}); - &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type); + text=>$linktext}); + &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type,$readonly); } elsif (($phase eq 'processpostsubmit') && ($permission->{'processpostsubmit'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", @@ -2385,10 +2602,15 @@ sub handler { 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'; + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Change settings"}); - &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type); + text=>$linktext}); + &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type,$readonly); } elsif (($phase eq 'processparms') && ($permission->{'processparms'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setparms')", @@ -2401,7 +2623,7 @@ sub handler { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Catalog settings"}); - &print_catsettings($r,$cdom,$cnum,$cdesc,$type); + &print_catsettings($r,$cdom,$cnum,$cdesc,$type,$readonly); } elsif (($phase eq 'processcat') && ($permission->{'processcat'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'catsettings')", @@ -2415,7 +2637,7 @@ sub handler { ({href => "javascript:changePage(document.$phase,'$phase')", text => "Self-enrollment settings"}); if (!exists($env{'form.state'})) { - &print_selfenrollconfig($r,$type,$cdesc,$coursehash); + &print_selfenrollconfig($r,$type,$cdesc,$coursehash,$readonly); } elsif ($env{'form.state'} eq 'done') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", @@ -2428,6 +2650,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')); }