--- loncom/interface/lonmodifycourse.pm 2013/07/19 18:24:16 1.62
+++ loncom/interface/lonmodifycourse.pm 2016/08/07 01:32:52 1.79.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.62 2013/07/19 18:24:16 bisitz Exp $
+# $Id: lonmodifycourse.pm,v 1.79.2.1 2016/08/07 01:32:52 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,16 +34,17 @@ use Apache::loncommon;
use Apache::lonhtmlcommon;
use Apache::lonlocal;
use Apache::lonuserutils;
+use Apache::loncreateuser;
use Apache::lonpickcourse;
use lib '/home/httpd/lib/perl';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
sub get_dc_settable {
my ($type,$cdom) = @_;
if ($type eq 'Community') {
- return ('courseowner');
+ return ('courseowner','selfenrollmgrdc','selfenrollmgrcc');
} else {
- my @items = ('courseowner','coursecode','authtype','autharg');
+ my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc');
if (&showcredits($cdom)) {
push(@items,'defaultcredits');
}
@@ -54,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'];
+ 'crosslistings','co-owners','autodropfailsafe'];
my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];
return ($internals,$accessdates);
}
@@ -116,7 +117,8 @@ sub get_enrollment_settings {
$enrollvar{$type} =~ s/,/, /g;
} elsif ($type eq "authtype"
|| $type eq "autharg" || $type eq "coursecode"
- || $type eq "crosslistings") {
+ || $type eq "crosslistings" || $type eq "selfenrollmgr"
++ || $type eq "autodropfailsafe") {
$enrollvar{$type} = $settings{$item};
} elsif ($type eq 'defaultcredits') {
if (&showcredits($cdom)) {
@@ -153,10 +155,7 @@ sub print_course_search_page {
$type = 'Course';
}
&print_header($r,$type);
- my $filterlist = ['descriptfilter',
- 'instcodefilter','ownerfilter',
- 'coursefilter'];
- my $filter = {};
+ my ($filterlist,$filter) = &get_filters($dom);
my ($numtitles,$cctitle,$dctitle,@codetitles);
my $ccrole = 'cc';
if ($type eq 'Community') {
@@ -164,15 +163,15 @@ sub print_course_search_page {
}
$cctitle = &Apache::lonnet::plaintext($ccrole,$type);
$dctitle = &Apache::lonnet::plaintext('dc');
- $r->print(&Apache::lonpickcourse::js_changer());
+ $r->print(&Apache::loncommon::js_changer());
if ($type eq 'Community') {
$r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>');
} else {
$r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>');
- }
- $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
- undef,undef,$filter,$action,\$numtitles,'modifycourse',
- undef,undef,undef,\@codetitles));
+ }
+ $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
+ \$numtitles,'modifycourse',undef,undef,undef,
+ \@codetitles,$dom));
if ($type eq 'Community') {
$r->print(&mt('Actions available after searching for a community:').'<ul>'.
'<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".
@@ -184,6 +183,7 @@ sub print_course_search_page {
'<li>'.&mt('View or modify course settings which only a [_1] may modify.',$dctitle).
'</li>'."\n".'</ul>');
}
+ return;
}
sub print_course_selection_page {
@@ -195,31 +195,49 @@ sub print_course_selection_page {
&print_header($r,$type);
# Criteria for course search
- my $filterlist = ['descriptfilter',
- 'instcodefilter','ownerfilter',
- 'ownerdomfilter','coursefilter'];
- my %filter;
+ my ($filterlist,$filter) = &get_filters();
my $action = '/adm/modifycourse';
my $dctitle = &Apache::lonnet::plaintext('dc');
my ($numtitles,@codetitles);
- $r->print(&Apache::lonpickcourse::js_changer());
+ $r->print(&Apache::loncommon::js_changer());
$r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br />');
- $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
- undef,undef,\%filter,$action,\$numtitles,
- undef,undef,undef,undef,\@codetitles));
- $filter{'domainfilter'} = $dom;
- my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,
- \%filter,$numtitles,undef,
- undef,undef,\@codetitles);
+ $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
+ \$numtitles,'modifycourse',undef,undef,undef,
+ \@codetitles,$dom,$env{'form.form'}));
+ 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,
- %courses);
+ undef,undef,%courses);
return;
}
+sub get_filters {
+ my ($dom) = @_;
+ my @filterlist = ('descriptfilter','instcodefilter','ownerfilter',
+ 'ownerdomfilter','coursefilter','sincefilter');
+ # created filter
+ my $loncaparev = &Apache::lonnet::get_server_loncaparev($dom);
+ if ($loncaparev ne 'unknown_cmd') {
+ push(@filterlist,'createdfilter');
+ }
+ my %filter;
+ foreach my $item (@filterlist) {
+ $filter{$item} = $env{'form.'.$item};
+ }
+ return (\@filterlist,\%filter);
+}
+
sub print_modification_menu {
- my ($r,$cdesc,$domdesc,$dom,$type) = @_;
+ my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_;
&print_header($r,$type);
- my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text);
+ my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text,
+ $cdom,$cnum);
+ if (ref($coursehash) eq 'HASH') {
+ $cdom = $coursehash->{'domain'};
+ $cnum = $coursehash->{'num'};
+ } else {
+ ($cdom,$cnum) = split(/_/,$cid);
+ }
if ($type eq 'Community') {
$ccrole = 'co';
} else {
@@ -236,17 +254,29 @@ sub print_modification_menu {
$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, and default authentication and credits';
+ $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, and self-enrollment';
} else {
- $setparams_text = 'View/Modify course owner, institutional code, and default authentication';
+ $setparams_text = 'View/Modify course owner, institutional code, default authentication, and self-enrollment';
}
$cat_text = 'View/Modify catalog settings for course';
}
- my $anon_text = 'Responder threshold required to display anonymous survey submissions';
+ 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 %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
my @additional_params = &catalog_settable($domconf{'coursecategories'},$type);
+ sub manage_selfenrollment {
+ my ($cdom,$cnum,$type,$coursehash) = @_;
+ my ($managed_by_cc,$managed_by_dc) = &Apache::lonuserutils::selfenrollment_administration($cdom,$cnum,$type,$coursehash);
+ if (ref($managed_by_dc) eq 'ARRAY') {
+ if (@{$managed_by_dc}) {
+ return 1;
+ }
+ }
+ return 0;
+ }
+
sub phaseurl {
my $phase = shift;
return "javascript:changePage(document.menu,'$phase')"
@@ -294,6 +324,22 @@ sub print_modification_menu {
icon => 'roles.png',
linktitle => ''
},
+ {
+ linktext => 'View/Modify Self-Enrollment configuration',
+ icon => 'self_enroll.png',
+ #help => 'Course_Self_Enrollment',
+ url => &phaseurl('selfenroll'),
+ permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash),
+ linktitle => 'Configure user self-enrollment.',
+ },
+ {
+ linktext => 'View/Modify submit button behavior, post-submission',
+ icon => 'emblem-readonly.png',
+ #help => '',
+ url => &phaseurl('setpostsubmit'),
+ permission => 1,
+ linktitle => '',
+ },
]
},
);
@@ -310,17 +356,20 @@ sub print_modification_menu {
}
$menu_html .= '</p>'."\n".'<ul>';
if ($type eq 'Community') {
- $menu_html .= '<li>'.&mt('Community owner (permitted to assign Coordinator roles in the community).').'</li>';
+ $menu_html .= '<li>'.&mt('Community owner (permitted to assign Coordinator roles in the community).').'</li>'."\n".
+ '<li>'.&mt('Override defaults for who configures self-enrollment for this specific community').'</li>'."\n";
} else {
- $menu_html .= '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'.
- '<li>'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'</li>';
+ $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)) {
- $menu_html .= '<li>'.&mt('Default credits earned by student on course completion.').'</li>';
+ $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";
}
- $menu_html .= '<li>'.$setquota_text.'</li>'.
- '<li>'.$setuploadquota_text.'</li>'.
- '<li>'.$anon_text.'</li>'."\n";
+ $menu_html .= '<li>'.$setquota_text.'</li>'."\n".
+ '<li>'.$setuploadquota_text.'</li>'."\n".
+ '<li>'.$anon_text.'</li>'."\n".
+ '<li>'.$postsubmit_text.'</li>'."\n";
foreach my $item (@additional_params) {
if ($type eq 'Community') {
if ($item eq 'togglecats') {
@@ -409,9 +458,9 @@ sub print_settings_display {
'<p>'.$lt{'cose'}.'<ul>'.
'<li>'.&mt('Settings modifiable by a [_1] via the [_2]Automated Enrollment Manager[_3] in a course.',$cctitle,'<a href="'.$escuri.'">','</a>').'</li>');
if (&showcredits($cdom)) {
- $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, and default authentication and credits[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
+ $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, credits, and self-enrollment[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
} else {
- $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, and default authentication[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
+ $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, and self-enrollment[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
}
$r->print('</li></ul></p>'.
'<p>'.$lt{'cour'}.'</p><p>'.$disp_table.'</p><p>'.
@@ -436,7 +485,7 @@ sub print_setquota {
coursequota => 20,
uploadquota => 500,
);
- my %settings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota','internal.instcode'],
+ my %settings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota','internal.coursecode'],
$cdom,$cnum);
my $coursequota = $settings{'internal.coursequota'};
my $uploadquota = $settings{'internal.uploadquota'};
@@ -445,13 +494,8 @@ sub print_setquota {
}
if ($uploadquota eq '') {
my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
- if ($type eq 'Community') {
- $uploadquota = $domdefs{$lctype.'quota'};
- } elsif ($settings{'internal.instcode'}) {
- $uploadquota = $domdefs{'officialquota'};
- } else {
- $uploadquota = $domdefs{'unofficialquota'};
- }
+ my $quotatype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings);
+ $uploadquota = $domdefs{$quotatype.'quota'};
if ($uploadquota eq '') {
$uploadquota = $staticdefaults{'uploadquota'};
}
@@ -520,6 +564,98 @@ ENDDOCUMENT
return;
}
+sub print_postsubmit_config {
+ 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',
+ 'nums' => 'Number of seconds submit is disabled',
+ 'modi' => 'Save',
+ 'back' => 'Pick another action',
+ 'yes' => 'Yes',
+ 'no' => 'No',
+ );
+ my %settings = &Apache::lonnet::get('environment',['internal.postsubmit','internal.postsubtimeout',
+ 'internal.coursecode','internal.textbook'],$cdom,$cnum);
+ my $postsubmit = $settings{'internal.postsubmit'};
+ if ($postsubmit eq '') {
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
+ $postsubmit = 1;
+ if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+ if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+ if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') {
+ $postsubmit = 0;
+ }
+ }
+ }
+ }
+ my ($checkedon,$checkedoff,$display);
+ if ($postsubmit) {
+ $checkedon = 'checked="checked"';
+ $display = 'block';
+ } else {
+ $checkedoff = 'checked="checked"';
+ $display = 'none';
+ }
+ my $postsubtimeout = $settings{'internal.postsubtimeout'};
+ my $default = &domain_postsubtimeout($cdom,$type,\%settings);
+ my $zero = &mt('(Enter 0 to disable until next page reload, or leave blank to use the domain default: [_1])',$default);
+ if ($postsubtimeout eq '') {
+ $postsubtimeout = $default;
+ }
+ &print_header($r,$type);
+ my $hidden_elements = &hidden_form_elements();
+ my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config');
+ $r->print(<<ENDDOCUMENT);
+<form action="/adm/modifycourse" method="post" name="setpostsubmit" onsubmit="return verify_postsubmit();">
+<h3>$lt{'conf'} <span class="LC_nobreak">($cdesc)</span></h3>
+<p>
+$helpitem $lt{'disa'}:
+<label><input type="radio" name="postsubmit" $checkedon onclick="togglePostsubmit('studentsubmission');" value="1" />
+$lt{'yes'}</label>
+<label><input type="radio" name="postsubmit" $checkedoff onclick="togglePostsubmit('studentsubmission');" value="0" />
+$lt{'no'}</label>
+<div id="studentsubmission" style="display: $display">
+$lt{'nums'} <input type="text" name="postsubtimeout" value="$postsubtimeout" /><br />
+$zero</div>
+<br />
+<input type="submit" value="$lt{'modi'}" />
+</p>
+$hidden_elements
+<a href="javascript:changePage(document.setpostsubmit,'menu')">$lt{'back'}</a>
+</form>
+ENDDOCUMENT
+ return;
+}
+
+sub domain_postsubtimeout {
+ my ($cdom,$type,$settings) = @_;
+ return unless (ref($settings) eq 'HASH');
+ my $lctype = lc($type);
+ unless ($type eq 'Community') {
+ $lctype = 'unofficial';
+ if ($settings->{'internal.coursecode'}) {
+ $lctype = 'official';
+ } elsif ($settings->{'internal.textbook'}) {
+ $lctype = 'textbook';
+ }
+ }
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
+ my $postsubtimeout = 60;
+ if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+ if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+ if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
+ if ($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}{$lctype} ne '') {
+ $postsubtimeout = $domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}{$lctype};
+ }
+ }
+ }
+ }
+ return $postsubtimeout;
+}
+
sub print_catsettings {
my ($r,$cdom,$cnum,$cdesc,$type) = @_;
&print_header($r,$type);
@@ -599,7 +735,7 @@ sub print_catsettings {
}
sub print_course_modification_page {
- my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$crstype) = @_;
my %lt=&Apache::lonlocal::texthash(
'actv' => "Active",
'inac' => "Inactive",
@@ -609,17 +745,28 @@ sub print_course_modification_page {
'stus' => "Status",
'nocc' => 'There is currently no owner set for this course.',
'gobt' => "Save",
+ 'sett' => 'Setting',
+ 'domd' => 'Domain default',
+ 'whom' => 'Who configures',
);
my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname);
my %enrollvar = &get_enrollment_settings($cdom,$cnum);
- if ($type eq 'Community') {
+ my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook',
+ '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'});
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+ my @default_managebydc = split(/,/,$domdefaults{$type.'selfenrolladmdc'});
+ if ($crstype eq 'Community') {
$ccrole = 'co';
$lt{'nocc'} = &mt('There is currently no owner set for this community.');
} else {
$ccrole ='cc';
($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar);
}
- $ccname = &Apache::lonnet::plaintext($ccrole,$type);
+ $ccname = &Apache::lonnet::plaintext($ccrole,$crstype);
my %roleshash = &Apache::lonnet::get_my_roles($cnum,$cdom,'','',[$ccrole]);
my (@local_ccs,%cc_status,%pname);
foreach my $item (keys(%roleshash)) {
@@ -672,14 +819,14 @@ sub print_course_modification_page {
}
$ownertable .= &Apache::loncommon::end_data_table();
}
- &print_header($r,$type,$javascript_validations);
+ &print_header($r,$crstype,$javascript_validations);
my $dctitle = &Apache::lonnet::plaintext('dc');
- my $mainheader = &modifiable_only_title($type);
+ my $mainheader = &modifiable_only_title($crstype);
my $hidden_elements = &hidden_form_elements();
$r->print('<form action="/adm/modifycourse" method="post" name="'.$env{'form.phase'}.'">'."\n".
'<h3>'.$mainheader.' <span class="LC_nobreak">'.$cdesc.'</span></h3><p>'.
&Apache::lonhtmlcommon::start_pick_box());
- if ($type eq 'Community') {
+ if ($crstype eq 'Community') {
$r->print(&Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Community_Owner').
' '.&mt('Community Owner'))."\n");
@@ -687,7 +834,7 @@ sub print_course_modification_page {
$r->print(&Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Course_Instcode').
' '.&mt('Course Code'))."\n".
- '<input type="text" size="10" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'.
+ '<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'.
&Apache::lonhtmlcommon::row_closure());
if (&showcredits($cdom)) {
$r->print(&Apache::lonhtmlcommon::row_title(
@@ -705,10 +852,59 @@ sub print_course_modification_page {
&Apache::loncommon::help_open_topic('Modify_Course_Owner').
' '.&mt('Course Owner'))."\n");
}
- $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure(1).
+ my ($cctitle,$rolename,$currmanages,$ccchecked,$dcchecked,$defaultchecked);
+ my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
+ if ($type eq 'Community') {
+ $cctitle = &mt('Community personnel');
+ } else {
+ $cctitle = &mt('Course personnel');
+ }
+
+ $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_title(
+ &Apache::loncommon::help_open_topic('Modify_Course_Selfenrolladmin').
+ ' '.&mt('Self-enrollment configuration')).
+ &Apache::loncommon::start_data_table()."\n".
+ &Apache::loncommon::start_data_table_header_row()."\n".
+ '<th>'.$lt{'sett'}.'</th>'.
+ '<th>'.$lt{'domd'}.'</th>'.
+ '<th>'.$lt{'whom'}.'</th>'.
+ &Apache::loncommon::end_data_table_header_row()."\n");
+ my %optionname;
+ $optionname{''} = &mt('Use domain default');
+ $optionname{'0'} = $dctitle;
+ $optionname{'1'} = $cctitle;
+ foreach my $item (@{$selfenrollrows}) {
+ my %checked;
+ my $default = $cctitle;
+ if (grep(/^\Q$item\E$/,@default_managebydc)) {
+ $default = $dctitle;
+ }
+ if (grep(/^\Q$item\E$/,@specific_managebydc)) {
+ $checked{'0'} = ' checked="checked"';
+ } elsif (grep(/^\Q$item\E$/,@specific_managebycc)) {
+ $checked{'1'} = ' checked="checked"';
+ } else {
+ $checked{''} = ' checked="checked"';
+ }
+ $r->print(&Apache::loncommon::start_data_table_row()."\n".
+ '<td>'.$selfenrolltitles->{$item}.'</td>'."\n".
+ '<td>'.&mt('[_1] configures',$default).'</td>'."\n".
+ '<td>');
+ foreach my $option ('','0','1') {
+ $r->print('<span class="LC_nobreak"><label>'.
+ '<input type="radio" name="selfenrollmgr_'.$item.'" '.
+ 'value="'.$option.'"'.$checked{$option}.' />'.
+ $optionname{$option}.'</label></span><br />');
+ }
+ $r->print('</td>'."\n".
+ &Apache::loncommon::end_data_table_row()."\n");
+ }
+ $r->print(&Apache::loncommon::end_data_table()."\n".
+ '<br />'.&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box().'</p><p>'.$hidden_elements.
'<input type="button" onclick="javascript:changePage(this.form,'."'processparms'".');');
- if ($type eq 'Community') {
+ if ($crstype eq 'Community') {
$r->print('this.form.submit();"');
} else {
$r->print('javascript:verify_message(this.form);"');
@@ -717,6 +913,62 @@ sub print_course_modification_page {
return;
}
+sub print_selfenrollconfig {
+ my ($r,$type,$cdesc,$coursehash) = @_;
+ return unless(ref($coursehash) eq 'HASH');
+ my $cnum = $coursehash->{'num'};
+ my $cdom = $coursehash->{'domain'};
+ my %currsettings = &get_selfenroll_settings($coursehash);
+ &print_header($r,$type);
+ $r->print('<h3>'.&mt('Self-enrollment with a student role in: [_1]',
+ '<span class="LC_nobreak">'.$cdesc.'</span>').'</h3>'."\n");
+ &Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'},
+ $cdom,$cnum,\%currsettings,
+ &hidden_form_elements());
+ return;
+}
+
+sub modify_selfenrollconfig {
+ my ($r,$type,$cdesc,$coursehash) = @_;
+ return unless(ref($coursehash) eq 'HASH');
+ my $cnum = $coursehash->{'num'};
+ my $cdom = $coursehash->{'domain'};
+ my %currsettings = &get_selfenroll_settings($coursehash);
+ &print_header($r,$type);
+ $r->print('<h3>'.&mt('Self-enrollment with a student role in: [_1]',
+ '<span class="LC_nobreak">'.$cdesc.'</span>').'</h3>'."\n");
+ $r->print('<form action="/adm/modifycourse" method="post" name="selfenroll">'."\n".
+ &hidden_form_elements().'<br />');
+ &Apache::loncreateuser::update_selfenroll_config($r,$env{'form.pickedcourse'},
+ $cdom,$cnum,'domain',$type,\%currsettings);
+ $r->print('</form>');
+ return;
+}
+
+sub get_selfenroll_settings {
+ my ($coursehash) = @_;
+ my %currsettings;
+ if (ref($coursehash) eq 'HASH') {
+ %currsettings = (
+ selfenroll_types => $coursehash->{'internal.selfenroll_types'},
+ selfenroll_registered => $coursehash->{'internal.selfenroll_registered'},
+ selfenroll_section => $coursehash->{'internal.selfenroll_section'},
+ selfenroll_notifylist => $coursehash->{'internal.selfenroll_notifylist'},
+ selfenroll_approval => $coursehash->{'internal.selfenroll_approval'},
+ selfenroll_limit => $coursehash->{'internal.selfenroll_limit'},
+ selfenroll_cap => $coursehash->{'internal.selfenroll_cap'},
+ selfenroll_start_date => $coursehash->{'internal.selfenroll_start_date'},
+ selfenroll_end_date => $coursehash->{'internal.selfenroll_end_date'},
+ selfenroll_start_access => $coursehash->{'internal.selfenroll_start_access'},
+ selfenroll_end_access => $coursehash->{'internal.selfenroll_end_access'},
+ default_enrollment_start_date => $coursehash->{'default_enrollment_start_date'},
+ default_enrollment_end_date => $coursehash->{'default_enrollment_end_date'},
+ uniquecode => $coursehash->{'internal.uniquecode'},
+ );
+ }
+ return %currsettings;
+}
+
sub modifiable_only_title {
my ($type) = @_;
my $dctitle = &Apache::lonnet::plaintext('dc');
@@ -770,7 +1022,9 @@ sub modify_course {
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
my %longtype = &course_settings_descrip($type);
my @items = ('internal.courseowner','description','internal.co-owners',
- 'internal.pendingco-owners');
+ 'internal.pendingco-owners','internal.selfenrollmgrdc',
+ 'internal.selfenrollmgrcc');
+ my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
unless ($type eq 'Community') {
push(@items,('internal.coursecode','internal.authtype','internal.autharg',
'internal.sectionnums','internal.crosslistings'));
@@ -845,9 +1099,32 @@ sub modify_course {
$newattr{'defaultcredits'} =~ s/[^\d\.]//g;
$newattr{'defaultcredits'}=$env{'form.defaultcredits'};
}
+ }
+ my @newmgrdc = ();
+ my @newmgrcc = ();
+ my @currmgrdc = split(/,/,$currattr{'selfenrollmgrdc'});
+ my @currmgrcc = split(/,/,$currattr{'selfenrollmgrcc'});
+
+ foreach my $item (@{$selfenrollrows}) {
+ if ($env{'form.selfenrollmgr_'.$item} eq '0') {
+ push(@newmgrdc,$item);
+ } elsif ($env{'form.selfenrollmgr_'.$item} eq '1') {
+ push(@newmgrcc,$item);
+ }
}
+ $newattr{'selfenrollmgrdc'}=join(',',@newmgrdc);
+ $newattr{'selfenrollmgrcc'}=join(',',@newmgrcc);
+
+ my $cctitle;
+ if ($type eq 'Community') {
+ $cctitle = &mt('Community personnel');
+ } else {
+ $cctitle = &mt('Course personnel');
+ }
+ my $dctitle = &Apache::lonnet::plaintext('dc');
+
if ( exists($env{'form.courseowner'}) ) {
$newattr{'courseowner'}=$env{'form.courseowner'};
unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) {
@@ -898,11 +1175,32 @@ sub modify_course {
}
$response .= '<br/>'.&mt('Error: ').$putreply.'</p>';
} else {
+ if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') {
+ my %newenv;
+ map { $newenv{'course.'.$cdom.'_'.$cnum.'.internal.'.$_} = $newattr{$_}; } @changes;
+ &Apache::lonnet::appenv(\%newenv);
+ }
foreach my $attr (@modifiable_params) {
if (grep/^\Q$attr\E$/,@changes) {
- $chgresponse .= '<li>'.$longtype{$attr}.' '.&mt('now set to:').' "'.$newattr{$attr}.'".</li>';
+ my $shown = $newattr{$attr};
+ if ($attr eq 'selfenrollmgrdc') {
+ $shown = &selfenroll_config_status(\@newmgrdc,$selfenrolltitles);
+ } elsif ($attr eq 'selfenrollmgrcc') {
+ $shown = &selfenroll_config_status(\@newmgrcc,$selfenrolltitles);
+ } elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
+ $shown = &mt('None');
+ }
+ $chgresponse .= '<li>'.&mt('[_1] now set to: [_2]',$longtype{$attr},$shown).'</li>';
} else {
- $nochgresponse .= '<li>'.$longtype{$attr}.' '.&mt('still set to:').' "'.$currattr{$attr}.'".</li>';
+ my $shown = $currattr{$attr};
+ if ($attr eq 'selfenrollmgrdc') {
+ $shown = &selfenroll_config_status(\@currmgrdc,$selfenrolltitles);
+ } elsif ($attr eq 'selfenrollmgrcc') {
+ $shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles);
+ } elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
+ $shown = &mt('None');
+ }
+ $nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
}
}
if (($type ne 'Community') && ($changed{'code'} || $changed{'owner'})) {
@@ -965,7 +1263,15 @@ sub modify_course {
}
} else {
foreach my $attr (@modifiable_params) {
- $nochgresponse .= '<li>'.$longtype{$attr}.' '.&mt('still set to').' "'.$currattr{$attr}.'".</li>';
+ my $shown = $currattr{$attr};
+ if ($attr eq 'selfenrollmgrdc') {
+ $shown = &selfenroll_config_status(\@currmgrdc,$selfenrolltitles);
+ } elsif ($attr eq 'selfenrollmgrcc') {
+ $shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles);
+ } elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
+ $shown = &mt('None');
+ }
+ $nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
}
}
@@ -994,22 +1300,40 @@ sub modify_course {
$reply = '<h3>'.$mainheader.' <span class="LC_nobreak">'.$cdesc.'</span></h3>'."\n".
'<p>'.$reply.'</p>'."\n".
'<form action="/adm/modifycourse" method="post" name="processparms">'.
- &hidden_form_elements().
- '<a href="javascript:changePage(document.processparms,'."'menu'".')">'.
- &mt('Pick another action').'</a>';
+ &hidden_form_elements();
+ my @actions =
+ ('<a href="javascript:changePage(document.processparms,'."'menu'".')">'.
+ &mt('Pick another action').'</a>');
if ($numwarnings) {
my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
'=1&destinationurl=/adm/populate','&<>"');
- $reply .= '<br /><a href="'.$escuri.'">'.
- &mt('Go to Automated Enrollment Manager for course').'</a>';
+ push(@actions, '<a href="'.$escuri.'">'.
+ &mt('Go to Automated Enrollment Manager for course').'</a>');
}
- $reply .= '</form>';
+ $reply .= &Apache::lonhtmlcommon::actionbox(\@actions).'</form>';
$r->print($reply);
return;
}
+sub selfenroll_config_status {
+ my ($items,$selfenrolltitles) = @_;
+ my $shown;
+ if ((ref($items) eq 'ARRAY') && (ref($selfenrolltitles) eq 'HASH')) {
+ if (@{$items} > 0) {
+ $shown = '<ul>';
+ foreach my $item (@{$items}) {
+ $shown .= '<li>'.$selfenrolltitles->{$item}.'</li>';
+ }
+ $shown .= '</ul>';
+ } else {
+ $shown = &mt('None');
+ }
+ }
+ return $shown;
+}
+
sub update_coowners {
my ($cdom,$cnum,$chome,$settings,$newattr) = @_;
return unless ((ref($settings) eq 'HASH') && (ref($newattr) eq 'HASH'));
@@ -1238,10 +1562,10 @@ sub modify_quota {
}
$r->print('<p>');
if ($type eq 'Community') {
- $r->print(&mt('Disk usage [_1] exceeds the quota for this community.',$newoverquota).' '.
+ $r->print(&mt("Disk usage $newoverquota exceeds the quota for this community.").' '.
&mt('Upload of new portfolio files and assignment of a non-zero MB quota to new groups in the community will not be possible until some files have been deleted, and total usage is below community quota.'));
} else {
- $r->print(&mt('Disk usage [_1] exceeds the quota for this course.',$newoverquota).' '.
+ $r->print(&mt("Disk usage $newoverquota exceeds the quota for this course.").' '.
&mt('Upload of new portfolio files and assignment of a non-zero MB quota to new groups in the course will not be possible until some files have been deleted, and total usage is below course quota.'));
}
$r->print('</p>');
@@ -1252,7 +1576,7 @@ sub modify_quota {
'<b>'.$updatedsettings{'internal.uploadquota'}.'</b>').'<br />');
}
} else {
- $r->print(&mt('An error occurred storing the quota(s) for group portfolio files and/or uploaded content.').
+ $r->print(&mt('An error occurred storing the quota(s) for group portfolio files and/or uploaded content: ').
$putreply);
}
}
@@ -1295,6 +1619,12 @@ sub modify_anonsurvey_threshold {
);
my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,
$cnum);
+ if ($putreply eq 'ok') {
+ if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') {
+ &Apache::lonnet::appenv(
+ {'course.'.$cdom.'_'.$cnum.'.internal.anonsurvey_threshold' => $env{'form.threshold'}});
+ }
+ }
if (($oldsettings{'internal.anonsurvey_threshold'} eq '') &&
($env{'form.threshold'} == $defaultthreshold)) {
$r->print(&mt('The responder threshold for display of anonymous survey submissions is the default for this domain: [_1].',$defaultthreshold));
@@ -1314,7 +1644,83 @@ sub modify_anonsurvey_threshold {
}
$r->print('<p>'.
'<a href="javascript:changePage(document.processthreshold,'."'menu'".')">'.
- &mt('Pick another action').'</a>');
+ &mt('Pick another action').'</a></p>');
+ $r->print(&hidden_form_elements().'</form>');
+ return;
+}
+
+sub modify_postsubmit_config {
+ my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
+ &print_header($r,$type);
+ my %lt = &Apache::lonlocal::texthash(
+ subb => 'Submit button behavior after student makes a submission:',
+ unch => 'Post submission behavior of the Submit button is unchanged.',
+ erro => 'An error occurred when saving your proposed changes.',
+ inva => 'An invalid response was recorded.',
+ pick => 'Pick another action',
+ );
+ $r->print('<form action="/adm/modifycourse" method="post" name="processpostsubmit">'."\n".
+ '<h3>'.$lt{'subb'}.' <span class="LC_nobreak">('.$cdesc.')</span></h3><br />');
+ my %oldsettings =
+ &Apache::lonnet::get('environment',['internal.postsubmit','internal.postsubtimeout','internal.coursecode','internal.textbook'],$cdom,$cnum);
+ my $postsubmit = $env{'form.postsubmit'};
+ if ($postsubmit eq '1') {
+ my $postsubtimeout = $env{'form.postsubtimeout'};
+ $postsubtimeout =~ s/[^\d\.]+//g;
+ if (($oldsettings{'internal.postsubmit'} eq $postsubmit) && ($oldsettings{'internal.postsubtimeout'} eq $postsubtimeout)) {
+ $r->print($lt{'unch'});
+ } else {
+ my %cenv = (
+ 'internal.postsubmit' => $postsubmit,
+ );
+ if ($postsubtimeout eq '') {
+ my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
+ if ($putreply eq 'ok') {
+ my $defaulttimeout = &domain_postsubtimeout($cdom,$type,\%oldsettings);
+ $r->print(&mt('The proposed duration for disabling the Submit button post-submission was blank, so the domain default of [quant,_1,second] will be used.',$defaulttimeout));
+ if (exists($oldsettings{'internal.postsubtimeout'})) {
+ &Apache::lonnet::del('environment',['internal.postsubtimeout'],$cdom,$cnum);
+ }
+ } else {
+ $r->print($lt{'erro'});
+ }
+ } else {
+ $cenv{'internal.postsubtimeout'} = $postsubtimeout;
+ my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
+ if ($putreply eq 'ok') {
+ if ($postsubtimeout eq '0') {
+ $r->print(&mt('Submit button will be disabled after student submission until page is reloaded.'));
+ } else {
+ $r->print(&mt('Submit button will be disabled after student submission for [quant,_1,second].',$postsubtimeout));
+ }
+ } else {
+ $r->print($lt{'erro'});
+ }
+ }
+ }
+ } elsif ($postsubmit eq '0') {
+ if ($oldsettings{'internal.postsubmit'} eq $postsubmit) {
+ $r->print($lt{'unch'});
+ } else {
+ if (exists($oldsettings{'internal.postsubtimeout'})) {
+ &Apache::lonnet::del('environment',['internal.postsubtimeout'],$cdom,$cnum);
+ }
+ my %cenv = (
+ 'internal.postsubmit' => $postsubmit,
+ );
+ my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
+ if ($putreply eq 'ok') {
+ $r->print(&mt('Submit button will not be disabled after student submission'));
+ } else {
+ $r->print($lt{'erro'});
+ }
+ }
+ } else {
+ $r->print($lt{'inva'}.' '.$lt{'unch'});
+ }
+ $r->print('<p>'.
+ '<a href="javascript:changePage(document.processpostsubmit,'."'menu'".')">'.
+ &mt('Pick another action').'</a></p>');
$r->print(&hidden_form_elements().'</form>');
return;
}
@@ -1405,6 +1811,13 @@ sub modify_catsettings {
if (@changes > 0) {
my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
if ($putreply eq 'ok') {
+ if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') {
+ my %newenvhash;
+ foreach my $item (@changes) {
+ $newenvhash{'course.'.$cdom.'_'.$cnum.'.'.$item} = $cenv{$item};
+ }
+ &Apache::lonnet::appenv(\%newenvhash);
+ }
my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',
$cnum,undef,undef,'.');
if (ref($crsinfo{$env{'form.pickedcourse'}}) eq 'HASH') {
@@ -1487,6 +1900,8 @@ function hide_searching() {
} elsif ($phase eq 'setquota') {
my $invalid = &mt('The quota you entered contained invalid characters.');
my $alert = &mt('You must enter a number');
+ &js_escape(\$invalid);
+ &js_escape(\$alert);
my $regexp = '/^\s*(\d+\.?\d*|\.\d+)\s*$/';
$js .= <<"ENDSCRIPT";
@@ -1506,6 +1921,8 @@ ENDSCRIPT
} elsif ($phase eq 'setanon') {
my $invalid = &mt('The responder threshold you entered is invalid.');
my $alert = &mt('You must enter a positive integer.');
+ &js_escape(\$invalid);
+ &js_escape(\$alert);
my $regexp = ' /^\s*\d+\s*$/';
$js .= <<"ENDSCRIPT";
@@ -1527,8 +1944,86 @@ function verify_anon_threshold() {
}
ENDSCRIPT
+ } elsif ($phase eq 'setpostsubmit') {
+ my $invalid = &mt('The choice entered for disabling the submit button is invalid.');
+ my $invalidtimeout = &mt('The timeout you entered for disabling the submit button is invalid.');
+ my $alert = &mt('Enter one of: a positive integer, 0 (for no timeout), or leave blank to use domain default');
+ &js_escape(\$invalid);
+ &js_escape(\$invalidtimeout);
+ &js_escape(\$alert);
+ my $regexp = ' /^\s*\d+\s*$/';
+
+ $js .= <<"ENDSCRIPT";
+
+function verify_postsubmit() {
+ var optionsElement = document.setpostsubmit.postsubmit;
+ var verified = '';
+ if (optionsElement.length) {
+ var currval;
+ for (var i=0; i<optionsElement.length; i++) {
+ if (optionsElement[i].checked) {
+ currval = optionsElement[i].value;
+ }
+ }
+ if (currval == 1) {
+ var newtimeout = document.setpostsubmit.postsubtimeout.value;
+ if (newtimeout == '') {
+ verified = 'ok';
+ } else {
+ var num_reg = $regexp;
+ if (num_reg.test(newtimeout)) {
+ if (newtimeout>= 0) {
+ verified = 'ok';
+ } else {
+ alert("$invalidtimeout\\n$alert");
+ return false;
+ }
+ } else {
+ alert("$invalid\\n$alert");
+ return false;
+ }
+ }
+ } else {
+ if (currval == 0) {
+ verified = 'ok';
+ } else {
+ alert('$invalid');
+ return false;
+ }
+ }
+ if (verified == 'ok') {
+ changePage(document.setpostsubmit,'processpostsubmit');
+ return true;
+ }
}
+ return false;
+}
+function togglePostsubmit(caller) {
+ var optionsElement = document.setpostsubmit.postsubmit;
+ if (document.getElementById(caller)) {
+ var divitem = document.getElementById(caller);
+ var optionsElement = document.setpostsubmit.postsubmit;
+ if (optionsElement.length) {
+ var currval;
+ for (var i=0; i<optionsElement.length; i++) {
+ if (optionsElement[i].checked) {
+ currval = optionsElement[i].value;
+ }
+ }
+ if (currval == 1) {
+ divitem.style.display = 'block';
+ } else {
+ divitem.style.display = 'none';
+ }
+ }
+ }
+ return;
+}
+
+ENDSCRIPT
+
+ }
my $starthash;
if ($env{'form.phase'} eq 'ccrole') {
$starthash = {
@@ -1536,7 +2031,7 @@ ENDSCRIPT
};
} elsif ($phase eq 'courselist') {
$starthash = {
- add_entries => {'onload' => "hide_searching();"},
+ add_entries => {'onload' => "hide_searching(); courseSet(document.filterpicker.official, 'load');"},
};
}
$r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings',
@@ -1559,38 +2054,35 @@ sub print_footer {
}
sub check_course {
- my ($r,$dom,$domdesc) = @_;
- my ($ok_course,$description,$instcode,$owner);
- my %args = (
- one_time => 1,
- );
- my %coursehash =
- &Apache::lonnet::coursedescription($env{'form.pickedcourse'},\%args);
- my $cnum = $coursehash{'num'};
- my $cdom = $coursehash{'domain'};
- if ($cdom eq $dom) {
- my $description;
- my %courseIDs = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',
- $cnum,undef,undef,'.');
- if (keys(%courseIDs) > 0) {
- $ok_course = 'ok';
- my ($instcode,$owner);
- if (ref($courseIDs{$cdom.'_'.$cnum}) eq 'HASH') {
- $description = $courseIDs{$cdom.'_'.$cnum}{'description'};
- $instcode = $courseIDs{$cdom.'_'.$cnum}{'inst_code'};
- $owner = $courseIDs{$cdom.'_'.$cnum}{'owner'};
- } else {
- ($description,$instcode,$owner) =
- split(/:/,$courseIDs{$cdom.'_'.$cnum});
+ my ($dom,$domdesc) = @_;
+ my ($ok_course,$description,$instcode);
+ my %coursehash;
+ if ($env{'form.pickedcourse'} =~ /^$match_domain\_$match_courseid$/) {
+ my %args;
+ unless ($env{'course.'.$env{'form.pickedcourse'}.'.description'}) {
+ %args = (
+ 'one_time' => 1,
+ 'freshen_cache' => 1,
+ );
+ }
+ %coursehash =
+ &Apache::lonnet::coursedescription($env{'form.pickedcourse'},\%args);
+ my $cnum = $coursehash{'num'};
+ my $cdom = $coursehash{'domain'};
+ $description = $coursehash{'description'};
+ $instcode = $coursehash{'internal.coursecode'};
+ if ($instcode) {
+ $description .= " ($instcode)";
+ }
+ if (($cdom eq $dom) && ($cnum =~ /^$match_courseid$/)) {
+ my %courseIDs = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',
+ $cnum,undef,undef,'.');
+ if ($courseIDs{$cdom.'_'.$cnum}) {
+ $ok_course = 'ok';
}
- $description = &unescape($description);
- $instcode = &unescape($instcode);
- if ($instcode) {
- $description .= " ($instcode)";
- }
- return ($ok_course,$description);
}
}
+ return ($ok_course,$description,\%coursehash);
}
sub course_settings_descrip {
@@ -1598,8 +2090,10 @@ sub course_settings_descrip {
my %longtype;
if ($type eq 'Community') {
%longtype = &Apache::lonlocal::texthash(
- 'courseowner' => "Username:domain of community owner",
- 'co-owners' => "Username:domain of each co-owner",
+ 'courseowner' => "Username:domain of community owner",
+ '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",
);
} else {
%longtype = &Apache::lonlocal::texthash(
@@ -1617,7 +2111,11 @@ sub course_settings_descrip {
'notifylist' => 'Course Coordinators to be notified of enrollment changes',
'sectionnums' => 'Course section number:LON-CAPA section',
'crosslistings' => 'Crosslisted class:LON-CAPA section',
- 'defaultcredits' => 'Credits',
+ '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",
+
);
}
return %longtype;
@@ -1628,7 +2126,9 @@ sub hidden_form_elements {
&Apache::lonhtmlcommon::echo_form_input(['gosearch','updater','coursecode',
'prevphase','numlocalcc','courseowner','login','coursequota','intarg',
'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
- 'threshold','defaultcredits','uploadquota'])."\n".
+ 'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota',
+ 'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st',
+ 'sections','newsec'],['^selfenrollmgr_'])."\n".
'<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';
return $hidden_elements;
}
@@ -1636,7 +2136,7 @@ sub hidden_form_elements {
sub showcredits {
my ($dom) = @_;
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
- if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) {
+ if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) {
return 1;
}
}
@@ -1648,8 +2148,10 @@ sub handler {
$r->send_http_header;
return OK;
}
+
my $dom = $env{'request.role.domain'};
my $domdesc = &Apache::lonnet::domain($dom,'description');
+
if (&Apache::lonnet::allowed('ccc',$dom)) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -1688,7 +2190,7 @@ sub handler {
if ($phase eq 'courselist') {
&print_course_selection_page($r,$dom,$domdesc);
} else {
- my ($checked,$cdesc) = &check_course($r,$dom,$domdesc);
+ my ($checked,$cdesc,$coursehash) = &check_course($dom,$domdesc);
if ($checked eq 'ok') {
my $enter_text;
if ($type eq 'Community') {
@@ -1700,7 +2202,8 @@ sub handler {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'menu')",
text=>"Pick action"});
- &print_modification_menu($r,$cdesc,$domdesc,$dom,$type);
+ &print_modification_menu($r,$cdesc,$domdesc,$dom,$type,
+ $env{'form.pickedcourse'},$coursehash);
} elsif ($phase eq 'ccrole') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'ccrole')",
@@ -1729,7 +2232,6 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Threshold for anonymous submissions display"});
&print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type);
-
} elsif ($phase eq 'processthreshold') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setanon')",
@@ -1738,6 +2240,16 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$domdesc,$type);
+ } elsif ($phase eq 'setpostsubmit') {
+ &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);
+ } 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') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'viewparms')",
@@ -1769,14 +2281,26 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_catsettings($r,$cdom,$cnum,$cdesc,$domdesc,$type);
+ } 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);
+ } elsif ($env{'form.state'} eq 'done') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:changePage(document.$phase,'$phase')",
+ text=>"Result"});
+ &modify_selfenrollconfig($r,$type,$cdesc,$coursehash);
+ }
}
}
} else {
$r->print('<span class="LC_error">');
if ($type eq 'Community') {
- $r->print(&mt('The course you selected is not a valid course in this domain'));
- } else {
$r->print(&mt('The community you selected is not a valid community in this domain'));
+ } else {
+ $r->print(&mt('The course you selected is not a valid course in this domain'));
}
$r->print(" ($domdesc)</span>");
}