--- loncom/interface/lonmodifycourse.pm	2016/09/17 16:03:36	1.79.2.2
+++ loncom/interface/lonmodifycourse.pm	2016/04/04 01:12:11	1.82
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # handler for DC-only modifiable course settings
 #
-# $Id: lonmodifycourse.pm,v 1.79.2.2 2016/09/17 16:03:36 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.82 2016/04/04 01:12:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,11 +41,10 @@ use LONCAPA qw(:DEFAULT :match);
 
 sub get_dc_settable {
     my ($type,$cdom) = @_;
-    if ($type eq 'Community') {
+    if (($type eq 'Community') || ($type eq 'Placement')) {
         return ('courseowner','selfenrollmgrdc','selfenrollmgrcc');
     } else {
-        my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc',
-                     'selfenrollmgrcc','mysqltables');
+        my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc');
         if (&showcredits($cdom)) {
             push(@items,'defaultcredits');
         }
@@ -56,7 +55,7 @@ sub get_dc_settable {
 sub autoenroll_keys {
     my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits',
                      'autoadds','autodrops','autostart','autoend','sectionnums',
-                     'crosslistings','co-owners','autodropfailsafe'];
+                     'crosslistings','co-owners'];
     my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];
     return ($internals,$accessdates);
 }
@@ -72,6 +71,13 @@ sub catalog_settable {
             if ($confhash->{'categorizecomm'} ne 'comm') {
                 push(@settable,'categorize');
             }
+        } elsif ($type eq 'Placement') {
+            if ($confhash->{'togglecatsplace'} ne 'place') {
+                push(@settable,'togglecats');
+            }
+            if ($confhash->{'categorizeplace'} ne 'place') {
+                push(@settable,'categorize');
+            }
         } else {
             if ($confhash->{'togglecats'} ne 'crs') {
                 push(@settable,'togglecats');
@@ -118,13 +124,14 @@ sub get_enrollment_settings {
                 $enrollvar{$type} =~ s/,/, /g;
             } elsif ($type eq "authtype"
                      || $type eq "autharg"    || $type eq "coursecode"
-                     || $type eq "crosslistings" || $type eq "selfenrollmgr"
-+                    || $type eq "autodropfailsafe") {
+                     || $type eq "crosslistings") {
                 $enrollvar{$type} = $settings{$item};
             } elsif ($type eq 'defaultcredits') {
                 if (&showcredits($cdom)) {
                     $enrollvar{$type} = $settings{$item};
                 }
+            } elsif ($type eq 'selfenrollmgr') {
+                $enrollvar{$type} = $settings{$item};    
             } elsif ($type eq 'courseowner') {
                 if ($settings{$item} =~ /^[^:]+:[^:]+$/) {
                     $enrollvar{$type} = $settings{$item};
@@ -167,6 +174,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>');
     }
@@ -178,6 +187,11 @@ sub print_course_search_page {
                   '<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>'."\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 {
         $r->print(&mt('Actions available after searching for a course:').'<ul>'.
                   '<li>'.&mt('Enter the course with the role of [_1]',$cctitle).'</li>'."\n".
@@ -254,10 +268,12 @@ sub print_modification_menu {
         $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 ($type eq 'Placement') {
+            $setparams_text = 'View/Modify course owner and self-enrollment';
+        } elsif (&showcredits($dom)) {
+            $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, and self-enrollment';
         } else {
-            $setparams_text = 'View/Modify course owner, institutional code, default authentication, self-enrollment and table lifetime';
+            $setparams_text = 'View/Modify course owner, institutional code, default authentication, and self-enrollment';
         }
         $cat_text = 'View/Modify catalog settings for course';
     }
@@ -320,7 +336,7 @@ sub print_modification_menu {
             {
                 linktext => 'Display current settings for automated enrollment',
                 url => &phaseurl('viewparms'),
-                permission => ($type ne 'Community'),
+                permission => (($type ne 'Community') && ($type ne 'Placement')),
                 #help => '',
                 icon => 'roles.png',
                 linktitle => ''
@@ -359,16 +375,19 @@ sub print_modification_menu {
     if ($type eq 'Community') {
         $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";
+    } elsif ($type eq 'Placement') {
+        $menu_html .= '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'."\n".
+                      '<li>'.&mt('Override defaults for who configures self-enrollment for this specific course.').'</li>'."\n";
+
     } 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";
     }
-    $menu_html .= '<li>'.$mysqltables_text.'</li>'."\n".
-                  '<li>'.$setquota_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";
@@ -635,7 +654,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';
@@ -694,6 +713,8 @@ sub print_catsettings {
                       '&nbsp;<label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.' />'.&mt('Yes').'</label>&nbsp;&nbsp;&nbsp;<label><input name="hidefromcat" type="radio" value="" '.$excludeoff.' />'.&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>'.
@@ -715,7 +736,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>');
             }
         }
@@ -754,8 +775,8 @@ sub print_course_modification_page {
     my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname);
     my %enrollvar = &get_enrollment_settings($cdom,$cnum);
     my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook',
-                                                       'internal.selfenrollmgrdc','internal.selfenrollmgrcc',
-                                                       'internal.mysqltables'],$cdom,$cnum);
+                                                       'internal.selfenrollmgrdc','internal.selfenrollmgrcc'],
+                                        $cdom,$cnum);
     my $type = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype,\%settings);
     my @specific_managebydc = split(/,/,$settings{'internal.selfenrollmgrdc'});
     my @specific_managebycc = split(/,/,$settings{'internal.selfenrollmgrcc'});
@@ -832,6 +853,10 @@ sub print_course_modification_page {
         $r->print(&Apache::lonhtmlcommon::row_title(
                   &Apache::loncommon::help_open_topic('Modify_Community_Owner').
                   '&nbsp;'.&mt('Community Owner'))."\n");
+    } elsif ($crstype eq 'Placement') {
+         $r->print(&Apache::lonhtmlcommon::row_title(
+                   &Apache::loncommon::help_open_topic('Modify_Course_Owner').
+                      '&nbsp;'.&mt('Course Owner'))."\n");
     } else {
         $r->print(&Apache::lonhtmlcommon::row_title(
                       &Apache::loncommon::help_open_topic('Modify_Course_Instcode').
@@ -903,15 +928,10 @@ sub print_course_modification_page {
                   &Apache::loncommon::end_data_table_row()."\n");
     }
     $r->print(&Apache::loncommon::end_data_table()."\n".
-              '<br />'.&Apache::lonhtmlcommon::row_closure().
-              &Apache::lonhtmlcommon::row_title(
-              &Apache::loncommon::help_open_topic('Modify_Course_Table_Lifetime').
-              '&nbsp;'.&mt('"Temporary" Tables Lifetime (s)'))."\n".
-              '<input type="text" size="10" name="mysqltables" value="'.$settings{'internal.mysqltables'}.'" />'.
-              &Apache::lonhtmlcommon::row_closure(1).
+              '<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 ($crstype eq 'Community') {
+    if (($crstype eq 'Community') || ($crstype eq 'Placement')) {
         $r->print('this.form.submit();"');
     } else {
         $r->print('javascript:verify_message(this.form);"');
@@ -1030,9 +1050,9 @@ sub modify_course {
     my %longtype = &course_settings_descrip($type);
     my @items = ('internal.courseowner','description','internal.co-owners',
                  'internal.pendingco-owners','internal.selfenrollmgrdc',
-                 'internal.selfenrollmgrcc','internal.mysqltables');
+                 'internal.selfenrollmgrcc');
     my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
-    unless ($type eq 'Community') {
+    unless (($type eq 'Community') || ($type eq 'Placement')) {
         push(@items,('internal.coursecode','internal.authtype','internal.autharg',
                      'internal.sectionnums','internal.crosslistings'));
         if (&showcredits($cdom)) {  
@@ -1050,6 +1070,9 @@ sub modify_course {
     if ($type eq 'Community') {
         %changed = ( owner  => 0 );
         $ccrole = 'co';
+    } elsif ($type eq 'Placement') {
+        %changed = ( owner  => 0 );
+        $ccrole = 'cc';
     } else {
         %changed = ( code  => 0,
                      owner => 0,
@@ -1101,13 +1124,10 @@ sub modify_course {
                 $changed{'code'} = 1;
             }
         }
-        if ( exists($env{'form.mysqltables'}) ) {
-            $newattr{'mysqltables'} = $env{'form.mysqltables'};
-            $newattr{'mysqltables'} =~ s/\D+//g;
-        }
+
         if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) {
-            $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
             $newattr{'defaultcredits'} =~ s/[^\d\.]//g;
+            $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
         }
     }
 
@@ -1199,8 +1219,6 @@ sub modify_course {
                         $shown = &selfenroll_config_status(\@newmgrcc,$selfenrolltitles);
                     } elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
                         $shown = &mt('None');
-                    } elsif (($attr eq 'mysqltables') && ($shown eq '')) {
-                        $shown = &mt('domain default');
                     }
                     $chgresponse .= '<li>'.&mt('[_1] now set to: [_2]',$longtype{$attr},$shown).'</li>';
                 } else {
@@ -1211,13 +1229,11 @@ sub modify_course {
                         $shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles);
                     } elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
                         $shown = &mt('None');
-                    } elsif (($attr eq 'mysqltables') && ($shown eq '')) {
-                        $shown = &mt('domain default');
                     }
                     $nochgresponse .= '<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.'));
@@ -1284,8 +1300,6 @@ sub modify_course {
                 $shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles);
             } elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
                 $shown = &mt('None');
-            }  elsif (($attr eq 'mysqltables') && ($shown eq '')) {
-                $shown = &mt('domain default');
             }
             $nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
         }
@@ -2056,6 +2070,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';
     }
@@ -2128,10 +2144,8 @@ sub course_settings_descrip {
                       'sectionnums' => 'Course section number:LON-CAPA section',
                       'crosslistings' => 'Crosslisted class:LON-CAPA section',
                       'defaultcredits' => 'Credits',
-                      'autodropfailsafe' => "Failsafe section enrollment count",
                       'selfenrollmgrdc'  => "Course-specific self-enrollment configuration by Domain Coordinator",
                       'selfenrollmgrcc'  => "Course-specific self-enrollment configuration by Course personnel",
-                      'mysqltables'      => '"Temporary" student performance tables lifetime (seconds)',
 
          );
     }
@@ -2145,7 +2159,7 @@ sub hidden_form_elements {
           'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
           'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota',
           'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st',
-          'sections','newsec','mysqltables'],['^selfenrollmgr_','^selfenroll_'])."\n".
+          'sections','newsec'],['^selfenrollmgr_'])."\n".
           '<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';
     return $hidden_elements;
 }
@@ -2196,6 +2210,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";
             } 
@@ -2212,6 +2228,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';
                     }
@@ -2316,6 +2334,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'));
                     }