--- loncom/interface/lonmodifycourse.pm 2021/06/20 17:27:03 1.79.2.9
+++ loncom/interface/lonmodifycourse.pm 2019/04/29 22:19:24 1.94
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.79.2.9 2021/06/20 17:27:03 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.94 2019/04/29 22:19:24 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,9 +39,6 @@ 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') {
@@ -79,6 +76,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');
@@ -175,6 +179,8 @@ sub print_course_search_page {
$r->print(&Apache::loncommon::js_changer());
if ($type eq 'Community') {
$r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>');
+ } elsif ($type eq 'Placement') {
+ $r->print('<h3>'.&mt('Search for a placement test in the [_1] domain',$domdesc).'</h3>');
} else {
$r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>');
}
@@ -185,6 +191,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:');
}
@@ -192,6 +200,9 @@ 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);
@@ -202,6 +213,8 @@ sub print_course_search_page {
if (@{$roles_by_num} > 1) {
if ($type eq 'Community') {
$roleoption = &mt('Enter the community with one of the available ad hoc roles');
+ } elsif ($type eq 'Placement') {
+ $roleoption = &mt('Enter the placement test with one of the available ad hoc roles.');
} else {
$roleoption = &mt('Enter the course with one of the available ad hoc roles.');
}
@@ -209,6 +222,8 @@ sub print_course_search_page {
my $rolename = $description->{$roles_by_num->[0]};
if ($type eq 'Community') {
$roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$rolename);
+ } elsif ($type eq 'Placement') {
+ $roleoption = &mt('Enter the placement test with the ad hoc role of: [_1]',$rolename);
} else {
$roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$rolename);
}
@@ -216,6 +231,8 @@ sub print_course_search_page {
}
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);
}
@@ -420,7 +437,7 @@ sub print_modification_menu {
);
}
if ($type eq 'Community') {
- if ($permission->{'setparms'} eq 'edit') {
+ if ($permission->{'setparms'} eq 'edit') {
$categorytitle = 'View/Modify Community Settings';
$linktext{'setparms'} = 'View/Modify community owner';
$linktext{'catsettings'} = 'View/Modify catalog settings for community';
@@ -430,7 +447,7 @@ sub print_modification_menu {
$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.');
+ $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.');
} else {
if ($permission->{'setparms'} eq 'edit') {
$categorytitle = 'View/Modify Course Settings';
@@ -515,7 +532,7 @@ sub print_modification_menu {
{
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 => ''
@@ -557,7 +574,7 @@ sub print_modification_menu {
} else {
$menu_html .= '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'."\n".
'<li>'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'</li>'."\n";
- if (&showcredits($dom)) {
+ if (($type ne 'Placement') && &showcredits($dom)) {
$menu_html .= '<li>'.&mt('Default credits earned by student on course completion.').'</li>'."\n";
}
$menu_html .= ' <li>'.&mt('Override defaults for who configures self-enrollment for this specific course.').'</li>'."\n";
@@ -612,9 +629,9 @@ sub print_adhocrole_selected {
}
$selectrole = 1;
} elsif ($permission->{'adhocrole'} eq 'custom') {
- my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);
+ my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);
if (ref($okroles) eq 'ARRAY') {
- my $possrole = $env{'form.adhocrole'};
+ 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";
@@ -664,34 +681,9 @@ sub print_settings_display {
"<th>$lt{'dcon'}</th>\n".
&Apache::loncommon::end_data_table_header_row()."\n";
foreach my $item (@items) {
- my $shown = $enrollvar{$item};
- if ($item eq 'crosslistings') {
- my (@xlists,@lcsecs);
- foreach my $entry (split(/,/,$enrollvar{$item})) {
- my ($xlist,$lc_sec) = split(/:/,$entry);
- push(@xlists,$xlist);
- push(@lcsecs,$lc_sec);
- }
- if (@xlists) {
- my $crskey = $cnum.':'.$enrollvar{'coursecode'};
- my %reformatted =
- &Apache::lonnet::auto_instsec_reformat($cdom,'declutter',
- {$crskey => \@xlists});
- if (ref($reformatted{$crskey}) eq 'ARRAY') {
- my @show;
- my @xlcodes = @{$reformatted{$crskey}};
- for (my $i=0; $i<@xlcodes; $i++) {
- push(@show,$xlcodes[$i].':'.$lcsecs[$i]);
- }
- if (@show) {
- $shown = join(',',@show);
- }
- }
- }
- }
$disp_table .= &Apache::loncommon::start_data_table_row()."\n".
"<td><b>$longtype{$item}</b></td>\n".
- "<td>$shown</td>\n";
+ "<td>$enrollvar{$item}</td>\n";
if (grep(/^\Q$item\E$/,@modifiable_params)) {
$disp_table .= '<td align="right">'.&mt('Yes').'</td>'."\n";
} else {
@@ -819,7 +811,7 @@ sub print_set_anonsurvey_threshold {
my $hidden_elements = &hidden_form_elements();
my ($disabled,$submit);
if ($readonly) {
- $disabled = ' disabled="disabled"';
+ $disabled = ' disabled="disabled"';
} else {
$submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
}
@@ -913,7 +905,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';
@@ -976,6 +968,8 @@ sub print_catsettings {
' <label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.$disabled.' />'.&mt('Yes').'</label> <label><input name="hidefromcat" type="radio" value="" '.$excludeoff.$disabled.' />'.&mt('No').'</label><br /><p>');
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").':<ul>'.
'<li>'.&mt('Auto-cataloging is enabled and the course is assigned an institutional code.').'</li>'.
@@ -997,7 +991,7 @@ sub print_catsettings {
} else {
$r->print(&mt('No categories defined for this domain'));
}
- unless ($type eq 'Community') {
+ unless (($type eq 'Community') || ($type eq 'Placement')) {
$r->print('<p>'.&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).').'</p>');
}
}
@@ -1097,7 +1091,7 @@ sub print_course_modification_page {
foreach my $cc (@local_ccs) {
$ownertable .= &Apache::loncommon::start_data_table_row()."\n";
if ($cc eq $enrollvar{'courseowner'}) {
- $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked"'.$disabled.' /></td>'."\n";
+ $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked"'.$disabled.' /></td>'."\n";
} else {
$ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'"'.$disabled.' /></td>'."\n";
}
@@ -1127,7 +1121,7 @@ sub print_course_modification_page {
' '.&mt('Course Code'))."\n".
'<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'"'.$disabled.' />'.
&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".
@@ -1302,6 +1296,8 @@ sub gather_authenitems {
$curr_authtype = 'int';
} elsif ($enrollvar->{'authtype'} eq 'localauth' ) {
$curr_authtype = 'loc';
+ } elsif ($enrollvar->{'authtype'} eq 'lti' ) {
+ $curr_authtype = 'lti';
}
}
unless ($curr_authtype eq '') {
@@ -1322,7 +1318,8 @@ sub gather_authenitems {
$authform{'krb'} = &Apache::loncommon::authform_kerberos(%param);
$authform{'int'} = &Apache::loncommon::authform_internal(%param);
$authform{'loc'} = &Apache::loncommon::authform_local(%param);
- foreach my $item ('krb','int','loc') {
+ $authform{'lti'} = &Apache::loncommon::authform_lti(%param);
+ foreach my $item ('krb','int','loc','lti') {
if ($authform{$item} ne '') {
$authenitems .= $authform{$item}.'<br />';
}
@@ -1337,7 +1334,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)) {
@@ -1393,6 +1390,8 @@ sub modify_course {
if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
$newattr{'autharg'} = $env{'form.locarg'};
}
+ } elsif ($env{'form.login'} eq 'lti') {
+ $newattr{'authtype'} = 'lti';
}
if ( $newattr{'authtype'}=~ /^krb/) {
if ($newattr{'autharg'} eq '') {
@@ -1485,18 +1484,6 @@ sub modify_course {
my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
if (($putres eq 'ok') && (($changed{'owner'} || $changed{'code'}))) {
&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;
- }
- }
- }
}
}
}
@@ -1570,7 +1557,7 @@ sub modify_course {
$nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
}
}
- 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.').
'<br />'.&mt('If automated enrollment at your institution requires validation of course owners, automated enrollment will fail.'));
@@ -2403,6 +2390,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';
}
@@ -2550,22 +2539,6 @@ sub get_permission {
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) {
@@ -2574,9 +2547,6 @@ 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);
@@ -2607,6 +2577,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";
}
@@ -2623,6 +2595,8 @@ sub handler {
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';
}
@@ -2645,11 +2619,11 @@ sub handler {
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
my ($readonly,$linktext);
if ($permission->{$phase} eq 'view') {
- $readonly = 1;
+ $readonly = 1;
}
if (($phase eq 'setquota') && ($permission->{'setquota'})) {
if ($permission->{'setquota'} eq 'view') {
- $linktext = 'Set quota';
+ $linktext = 'Set quota';
} else {
$linktext = 'Display quota';
}
@@ -2747,6 +2721,8 @@ sub handler {
$r->print('<span class="LC_error">');
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'));
}