version 1.78, 2015/06/09 21:22:56
|
version 1.84, 2016/07/24 14:34:59
|
Line 55 sub get_dc_settable {
|
Line 55 sub get_dc_settable {
|
sub autoenroll_keys { |
sub autoenroll_keys { |
my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits', |
my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits', |
'autoadds','autodrops','autostart','autoend','sectionnums', |
'autoadds','autodrops','autostart','autoend','sectionnums', |
'crosslistings','co-owners']; |
'crosslistings','co-owners','autodropfailsafe']; |
my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date']; |
my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date']; |
return ($internals,$accessdates); |
return ($internals,$accessdates); |
} |
} |
Line 71 sub catalog_settable {
|
Line 71 sub catalog_settable {
|
if ($confhash->{'categorizecomm'} ne 'comm') { |
if ($confhash->{'categorizecomm'} ne 'comm') { |
push(@settable,'categorize'); |
push(@settable,'categorize'); |
} |
} |
|
} elsif ($type eq 'Placement') { |
|
if ($confhash->{'togglecatsplace'} ne 'place') { |
|
push(@settable,'togglecats'); |
|
} |
|
if ($confhash->{'categorizeplace'} ne 'place') { |
|
push(@settable,'categorize'); |
|
} |
} else { |
} else { |
if ($confhash->{'togglecats'} ne 'crs') { |
if ($confhash->{'togglecats'} ne 'crs') { |
push(@settable,'togglecats'); |
push(@settable,'togglecats'); |
Line 117 sub get_enrollment_settings {
|
Line 124 sub get_enrollment_settings {
|
$enrollvar{$type} =~ s/,/, /g; |
$enrollvar{$type} =~ s/,/, /g; |
} elsif ($type eq "authtype" |
} elsif ($type eq "authtype" |
|| $type eq "autharg" || $type eq "coursecode" |
|| $type eq "autharg" || $type eq "coursecode" |
|| $type eq "crosslistings") { |
|| $type eq "crosslistings" || $type eq "selfenrollmgr" |
|
|| $type eq "autodropfailsafe") { |
$enrollvar{$type} = $settings{$item}; |
$enrollvar{$type} = $settings{$item}; |
} elsif ($type eq 'defaultcredits') { |
} elsif ($type eq 'defaultcredits') { |
if (&showcredits($cdom)) { |
if (&showcredits($cdom)) { |
$enrollvar{$type} = $settings{$item}; |
$enrollvar{$type} = $settings{$item}; |
} |
} |
} elsif ($type eq 'selfenrollmgr') { |
|
$enrollvar{$type} = $settings{$item}; |
|
} elsif ($type eq 'courseowner') { |
} elsif ($type eq 'courseowner') { |
if ($settings{$item} =~ /^[^:]+:[^:]+$/) { |
if ($settings{$item} =~ /^[^:]+:[^:]+$/) { |
$enrollvar{$type} = $settings{$item}; |
$enrollvar{$type} = $settings{$item}; |
Line 167 sub print_course_search_page {
|
Line 173 sub print_course_search_page {
|
$r->print(&Apache::loncommon::js_changer()); |
$r->print(&Apache::loncommon::js_changer()); |
if ($type eq 'Community') { |
if ($type eq 'Community') { |
$r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>'); |
$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 { |
} else { |
$r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>'); |
$r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>'); |
} |
} |
Line 178 sub print_course_search_page {
|
Line 186 sub print_course_search_page {
|
'<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n". |
'<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n". |
'<li>'.&mt('View or modify community settings which only a [_1] may modify.',$dctitle). |
'<li>'.&mt('View or modify community settings which only a [_1] may modify.',$dctitle). |
'</li>'."\n".'</ul>'); |
'</li>'."\n".'</ul>'); |
|
} elsif ($type eq 'Placement') { |
|
$r->print(&mt('Actions available after searching for a placement test:').'<ul>'. |
|
'<li>'.&mt('Enter the placement test with the role of [_1]',$cctitle).'</li>'."\n". |
|
'<li>'.&mt('View or modify placement test settings which only a [_1] may modify.',$dctitle). |
|
'</li>'."\n".'</ul>'); |
} else { |
} else { |
$r->print(&mt('Actions available after searching for a course:').'<ul>'. |
$r->print(&mt('Actions available after searching for a course:').'<ul>'. |
'<li>'.&mt('Enter the course with the role of [_1]',$cctitle).'</li>'."\n". |
'<li>'.&mt('Enter the course with the role of [_1]',$cctitle).'</li>'."\n". |
Line 254 sub print_modification_menu {
|
Line 267 sub print_modification_menu {
|
$categorytitle = 'View/Modify Course Settings'; |
$categorytitle = 'View/Modify Course Settings'; |
$setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a 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.'); |
$setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.'); |
if (&showcredits($dom)) { |
if (($type ne 'Placement') && (&showcredits($dom))) { |
$setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, and self-enrollment'; |
$setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, and self-enrollment'; |
} else { |
} else { |
$setparams_text = 'View/Modify course owner, institutional code, default authentication, and self-enrollment'; |
$setparams_text = 'View/Modify course owner, institutional code, default authentication, and self-enrollment'; |
Line 320 sub print_modification_menu {
|
Line 333 sub print_modification_menu {
|
{ |
{ |
linktext => 'Display current settings for automated enrollment', |
linktext => 'Display current settings for automated enrollment', |
url => &phaseurl('viewparms'), |
url => &phaseurl('viewparms'), |
permission => ($type ne 'Community'), |
permission => (($type ne 'Community') && ($type ne 'Placement')), |
#help => '', |
#help => '', |
icon => 'roles.png', |
icon => 'roles.png', |
linktitle => '' |
linktitle => '' |
Line 362 sub print_modification_menu {
|
Line 375 sub print_modification_menu {
|
} else { |
} else { |
$menu_html .= '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'."\n". |
$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"; |
'<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('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>'.&mt('Override defaults for who configures self-enrollment for this specific course.').'</li>'."\n"; |
Line 634 sub domain_postsubtimeout {
|
Line 647 sub domain_postsubtimeout {
|
my ($cdom,$type,$settings) = @_; |
my ($cdom,$type,$settings) = @_; |
return unless (ref($settings) eq 'HASH'); |
return unless (ref($settings) eq 'HASH'); |
my $lctype = lc($type); |
my $lctype = lc($type); |
unless ($type eq 'Community') { |
unless (($type eq 'Community') || ($type eq 'Placement')) { |
$lctype = 'unofficial'; |
$lctype = 'unofficial'; |
if ($settings->{'internal.coursecode'}) { |
if ($settings->{'internal.coursecode'}) { |
$lctype = 'official'; |
$lctype = 'official'; |
Line 693 sub print_catsettings {
|
Line 706 sub print_catsettings {
|
' <label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.' />'.&mt('Yes').'</label> <label><input name="hidefromcat" type="radio" value="" '.$excludeoff.' />'.&mt('No').'</label><br /><p>'); |
' <label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.' />'.&mt('Yes').'</label> <label><input name="hidefromcat" type="radio" value="" '.$excludeoff.' />'.&mt('No').'</label><br /><p>'); |
if ($type eq 'Community') { |
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.")); |
$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 { |
} 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>'. |
$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>'. |
'<li>'.&mt('Auto-cataloging is enabled and the course is assigned an institutional code.').'</li>'. |
Line 714 sub print_catsettings {
|
Line 729 sub print_catsettings {
|
} else { |
} else { |
$r->print(&mt('No categories defined for this domain')); |
$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>'); |
$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>'); |
} |
} |
} |
} |
Line 837 sub print_course_modification_page {
|
Line 852 sub print_course_modification_page {
|
' '.&mt('Course Code'))."\n". |
' '.&mt('Course Code'))."\n". |
'<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'. |
'<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'. |
&Apache::lonhtmlcommon::row_closure()); |
&Apache::lonhtmlcommon::row_closure()); |
if (&showcredits($cdom)) { |
if (($crstype eq 'Course') && (&showcredits($cdom))) { |
$r->print(&Apache::lonhtmlcommon::row_title( |
$r->print(&Apache::lonhtmlcommon::row_title( |
&Apache::loncommon::help_open_topic('Modify_Course_Credithours'). |
&Apache::loncommon::help_open_topic('Modify_Course_Credithours'). |
' '.&mt('Credits (students)'))."\n". |
' '.&mt('Credits (students)'))."\n". |
'<input type="text" size="3" name="defaultcredits" value="'.$enrollvar{'defaultcredits'}.'" />'. |
'<input type="text" size="3" name="defaultcredits" value="'.$enrollvar{'defaultcredits'}.'" />'. |
&Apache::lonhtmlcommon::row_closure()); |
&Apache::lonhtmlcommon::row_closure()); |
} |
} |
$r->print(&Apache::lonhtmlcommon::row_title( |
$r->print(&Apache::lonhtmlcommon::row_title( |
&Apache::loncommon::help_open_topic('Modify_Course_Defaultauth'). |
&Apache::loncommon::help_open_topic('Modify_Course_Defaultauth'). |
' '.&mt('Default Authentication method'))."\n". |
' '.&mt('Default Authentication method'))."\n". |
$authenitems."\n". |
$authenitems."\n". |
&Apache::lonhtmlcommon::row_closure(). |
&Apache::lonhtmlcommon::row_closure(). |
&Apache::lonhtmlcommon::row_title( |
&Apache::lonhtmlcommon::row_title( |
&Apache::loncommon::help_open_topic('Modify_Course_Owner'). |
&Apache::loncommon::help_open_topic('Modify_Course_Owner'). |
' '.&mt('Course Owner'))."\n"); |
' '.&mt('Course Owner'))."\n"); |
} |
} |
my ($cctitle,$rolename,$currmanages,$ccchecked,$dcchecked,$defaultchecked); |
my ($cctitle,$rolename,$currmanages,$ccchecked,$dcchecked,$defaultchecked); |
my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles(); |
my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles(); |
Line 1026 sub modify_course {
|
Line 1041 sub modify_course {
|
'internal.pendingco-owners','internal.selfenrollmgrdc', |
'internal.pendingco-owners','internal.selfenrollmgrdc', |
'internal.selfenrollmgrcc'); |
'internal.selfenrollmgrcc'); |
my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles(); |
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', |
push(@items,('internal.coursecode','internal.authtype','internal.autharg', |
'internal.sectionnums','internal.crosslistings')); |
'internal.sectionnums','internal.crosslistings')); |
if (&showcredits($cdom)) { |
if (&showcredits($cdom)) { |
Line 1096 sub modify_course {
|
Line 1111 sub modify_course {
|
} |
} |
} |
} |
|
|
if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) { |
if (($type ne 'Placement') && (&showcredits($cdom) && exists($env{'form.defaultcredits'}))) { |
$newattr{'defaultcredits'} =~ s/[^\d\.]//g; |
$newattr{'defaultcredits'} =~ s/[^\d\.]//g; |
$newattr{'defaultcredits'}=$env{'form.defaultcredits'}; |
$newattr{'defaultcredits'}=$env{'form.defaultcredits'}; |
} |
} |
Line 1204 sub modify_course {
|
Line 1219 sub modify_course {
|
$nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>'; |
$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 '') { |
if ( $newattr{'courseowner'} eq '') { |
push(@warnings,&mt('There is no owner associated with this LON-CAPA course.'). |
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.')); |
'<br />'.&mt('If automated enrollment at your institution requires validation of course owners, automated enrollment will fail.')); |
Line 2041 ENDSCRIPT
|
Line 2056 ENDSCRIPT
|
my $bread_text = "View/Modify Courses/Communities"; |
my $bread_text = "View/Modify Courses/Communities"; |
if ($type eq 'Community') { |
if ($type eq 'Community') { |
$bread_text = 'Community Settings'; |
$bread_text = 'Community Settings'; |
|
} elsif ($type eq 'Placement') { |
|
$bread_text = 'Placement Test Settings'; |
} else { |
} else { |
$bread_text = 'Course Settings'; |
$bread_text = 'Course Settings'; |
} |
} |
Line 2113 sub course_settings_descrip {
|
Line 2130 sub course_settings_descrip {
|
'sectionnums' => 'Course section number:LON-CAPA section', |
'sectionnums' => 'Course section number:LON-CAPA section', |
'crosslistings' => 'Crosslisted class: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", |
'selfenrollmgrdc' => "Course-specific self-enrollment configuration by Domain Coordinator", |
'selfenrollmgrcc' => "Course-specific self-enrollment configuration by Course personnel", |
'selfenrollmgrcc' => "Course-specific self-enrollment configuration by Course personnel", |
|
|
Line 2136 sub hidden_form_elements {
|
Line 2154 sub hidden_form_elements {
|
sub showcredits { |
sub showcredits { |
my ($dom) = @_; |
my ($dom) = @_; |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbokcredits'}) { |
if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) { |
return 1; |
return 1; |
} |
} |
} |
} |
Line 2179 sub handler {
|
Line 2197 sub handler {
|
} |
} |
if ($type eq 'Community') { |
if ($type eq 'Community') { |
$choose_text = "Choose a community"; |
$choose_text = "Choose a community"; |
|
} elsif ($type eq 'Placement') { |
|
$choose_text = "Choose a placement test"; |
} else { |
} else { |
$choose_text = "Choose a course"; |
$choose_text = "Choose a course"; |
} |
} |
Line 2195 sub handler {
|
Line 2215 sub handler {
|
my $enter_text; |
my $enter_text; |
if ($type eq 'Community') { |
if ($type eq 'Community') { |
$enter_text = 'Enter community'; |
$enter_text = 'Enter community'; |
|
} elsif ($type eq 'Placement') { |
|
$enter_text = 'Enter placement test'; |
} else { |
} else { |
$enter_text = 'Enter course'; |
$enter_text = 'Enter course'; |
} |
} |
Line 2299 sub handler {
|
Line 2321 sub handler {
|
$r->print('<span class="LC_error">'); |
$r->print('<span class="LC_error">'); |
if ($type eq 'Community') { |
if ($type eq 'Community') { |
$r->print(&mt('The community you selected is not a valid community in this domain')); |
$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 { |
} else { |
$r->print(&mt('The course you selected is not a valid course in this domain')); |
$r->print(&mt('The course you selected is not a valid course in this domain')); |
} |
} |