--- loncom/interface/lonmodifycourse.pm	2024/08/26 10:48:59	1.79.2.9.2.7
+++ loncom/interface/lonmodifycourse.pm	2023/12/23 02:17:38	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # handler for DC-only modifiable course settings
 #
-# $Id: lonmodifycourse.pm,v 1.79.2.9.2.7 2024/08/26 10:48:59 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.104 2023/12/23 02:17:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,6 +79,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 +182,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 +194,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 +203,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 +216,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 +225,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 +234,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);
         }
@@ -413,7 +433,7 @@ sub print_modification_menu {
                       'setpostsubmit' => 'View/Modify submit button behavior, post-submission',
                       'setltiauth'    => 'View/Modify re-authentication requirement for LTI launch of deep-linked item',
                       'setexttool'    => 'View/Modify External Tools permissions',
-                      'setcrseditors' => 'View/Modify permitted course resource editors',
+                      'setcrsauthor'  => 'View/Modify In-course Authoring permissions',
                     );
     } else {
         %linktext = (
@@ -423,7 +443,7 @@ sub print_modification_menu {
                       'setpostsubmit' => 'View submit button behavior, post-submission',
                       'setltiauth'    => 'View re-authentication requirement for LTI launch of deep-linked item',
                       'setexttool'    => 'View External Tools permissions',
-                      'setcrseditors' => 'View permitted course resource editors',
+                      'setcrsauthor'  => 'View In-course Authoring permissions',
                     );
     }
     if ($type eq 'Community') {
@@ -527,7 +547,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 => ''
@@ -565,11 +585,11 @@ sub print_modification_menu {
                 linktitle => '',
             },
             {
-                linktext => $linktext{'setcrseditors'},
-                icon => 'crseditors.png',
+                linktext => $linktext{'setcrsauthor'},
+                icon => 'crsauthor.png',
                 #help => '',
-                url => &phaseurl('setcrseditors'),
-                permission => $permission->{'setcrseditors'},
+                url => &phaseurl('setcrsauthor'),
+                permission => $permission->{'setcrsauthor'},
                 linktitle => '',
             },
         ]
@@ -943,7 +963,7 @@ sub domain_postsubtimeout {
 sub get_lctype {
     my ($type,$settings) = @_;
     my $lctype = lc($type);
-    unless ($type eq 'Community') {
+    unless (($type eq 'Community') || ($type eq 'Placement')) {
         $lctype = 'unofficial';
         if (ref($settings) eq 'HASH') {
             if ($settings->{'internal.coursecode'}) {
@@ -998,6 +1018,8 @@ sub print_catsettings {
                       '&nbsp;<label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.$disabled.' />'.&mt('Yes').'</label>&nbsp;&nbsp;&nbsp;<label><input name="hidefromcat" type="radio" value="" '.$excludeoff.$disabled.' />'.&mt('No').'</label></p><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.").'</p>');
+            } 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.").'</p>');
             } 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").':</p><ul>'.
                           '<li>'.&mt('Auto-cataloging is enabled and the course is assigned an institutional code.').'</li>'.
@@ -1030,7 +1052,7 @@ sub print_catsettings {
                           '<p>'.&mt('No categories defined for this domain.'));
                 $shownsave = 1;
             }
-            if ($type eq 'Community') {
+            if (($type eq 'Community') || ($type eq 'Placement')) {
                 $r->print('</p>');
             } elsif ($shownsave) {
                 $r->print('<br />'.&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.').'</p>');
@@ -1292,13 +1314,12 @@ sub print_selfenrollconfig {
 sub print_default_overrides {
     my ($r,$cdom,$cnum,$cdesc,$type,$readonly,$item) = @_;
     my (%titles,$checkeddom,$checkedcrs,$divsty,$currcrsval,$crsdefault,%crschecked,
-        $helpfile,$title,$crselements,@currcrseditors);
+        $helpfile,$title,$crselements);
     %titles = &default_overrides_titles($type);
     my ($title,$domdefdisplay,$settings,$optiontext,$options) =
         &default_overrides_common($item,$cdom,$cnum,$type,\%titles);
     $checkeddom = ' checked="checked"';
     $divsty = 'display:none';
-
     if ($item eq 'ltiauth') {
         $helpfile = 'Modify_Course_LTI_Authen';
         $crsdefault = 0;
@@ -1309,9 +1330,6 @@ sub print_default_overrides {
         } elsif ($item eq 'crsauthor') {
             $helpfile = 'Modify_Course_Crsauthor';
             $crsdefault = 1;
-        } elsif ($item eq 'crseditors') {
-            $helpfile = 'Modify_Course_Resource_Editors';
-            $crsdefault = 'edit,xml';
         }
     }
     $currcrsval = $settings->{'internal.'.$item};
@@ -1319,55 +1337,33 @@ sub print_default_overrides {
         $checkedcrs = $checkeddom;
         $checkeddom = '';
         $divsty = 'display:inline-block';
-        if ($item eq 'crseditors') {
-            @currcrseditors = split(/,/,$currcrsval);
-        }
         foreach my $option (@{$options}) {
-            if ($item eq 'crseditors') {
-                if (grep(/^\Q$option\E$/,@currcrseditors)) {
-                    $crschecked{$option} = ' checked="checked"';
-                }
-            } elsif ($currcrsval eq $option) {
+            if ($currcrsval eq $option) {
                 $crschecked{$option} = ' checked="checked"';
             } else {
                 $crschecked{$option} = '';
             }
         }
     } else {
-        if ($item eq 'crseditors') {
-            my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
-            @currcrseditors = split(/,/,$domdefs{'crseditors'});
-        }
         foreach my $option (@{$options}) {
-            if ($item eq 'crseditors') {
-                if (grep(/^\Q$option\E$/,@currcrseditors)) {
-                    $crschecked{$option} = ' checked="checked"';
-                }
-            } elsif ($crsdefault eq $option) {
+            if ($crsdefault eq $option) {
                 $crschecked{$option} = ' checked="checked"';
             } else {
                 $crschecked{$option} = '';
             }
         }
     }
-    my ($disabled,$submit,$inputtype,$separator);
+    my ($disabled,$submit);
     if ($readonly) {
         $disabled = ' disabled="disabled"';
     } else {
         $submit = '<input type="button" onclick="javascript:changePage(this.form,'."'process${item}'".');" value="'.$titles{'modi'}.'" />';
     }
-    if ($item eq 'crseditors') {
-        $inputtype = 'checkbox';
-        $separator = '&nbsp;'x2;
-    } else {
-        $inputtype = 'radio';
-        $separator = '<br />';
-    }
     foreach my $option (@{$options}) {
         $crselements .= '<span class="LC_nobreak">'.
-                        '<label><input type="'.$inputtype.'" name="'.$item.'" value="'.$option.'"'.
+                        '<label><input type="radio" name="'.$item.'" value="'.$option.'"'.
                         $crschecked{$option}.$disabled.' />'.$optiontext->{$option}.'</label>'.
-                        '</span>'.$separator."\n";
+                        '</span><br />'."\n";
     }
     &print_header($r,$type);
     my $hidden_elements = &hidden_form_elements();
@@ -1410,10 +1406,6 @@ sub default_overrides_titles {
                 'dom' => 'Only external tools defined in domain may be used',
                 'both' => 'External tools defined/configured in either domain or course may be used',
                 'stan' => "'In-course' authoring of standard LON-CAPA problems",
-                'perc' => 'Permitted course resource editors',
-                'edit' => 'Standard editor (Edit)',
-                'xml'  => 'Text editor (EditXML)',
-                'daxe' => 'Daxe editor (Daxe)',
                 'on'   => 'In-course authoring available',
                 'off'  => 'In-course authoring unavailable',
                 'used' => 'Use domain default',
@@ -1440,7 +1432,7 @@ sub default_overrides_common {
         $title = $titles->{'requ'};
         $domdef = 0;
         @options = ('0','1');
-        %optiontext = (
+        %optiontext = ( 
                         0 => $titles->{'logi'},
                         1 => $titles->{'link'},
                       );
@@ -1458,21 +1450,16 @@ sub default_overrides_common {
             $title = $titles->{'stan'};
             $domdef = 1;
             @options = ('1','0');
-            %optiontext = (
+            %optiontext = ( 
                             1 => $titles->{'on'},
                             0 => $titles->{'off'},
                           );
-        } elsif ($item eq 'crseditors') {
-            $title = $titles->{'perc'};
-            $domdef = 1;
-            @options = ('edit','xml','daxe');
-            map { $optiontext{$_} = $titles->{$_}; } @options;
         }
     }
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
     if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
-        if (($item eq 'ltiauth') || ($item eq 'crseditors')) {
+        if ($item eq 'ltiauth') {
             $domdef = $domconfig{'coursedefaults'}{$item};
         } else {
             my $lctype = &get_lctype($type,\%settings);
@@ -1512,18 +1499,6 @@ sub default_overrides_common {
         } else {
             $domdefdisplay = $titles->{'off'};
         }
-    } elsif ($item eq 'crseditors') {
-        if (ref($domdef) eq 'ARRAY') {
-            if (@{$domdef} == 0) {
-                $domdefdisplay = &mt('No permitted editors');
-            } elsif (@{$domdef} == 1) {
-                $domdefdisplay = $titles->{$domdef->[0]}.' ('.&mt('only').')';
-            } else {
-                $domdefdisplay = join(', ', map { $titles->{$_}; } @{$domdef});
-            }
-        } else {
-            $domdefdisplay = join(', ', map { $titles->{$_}; } ('edit','xml'));
-        }
     }
     return ($title,$domdefdisplay,\%settings,\%optiontext,\@options);
 }
@@ -1633,7 +1608,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)) {
@@ -1868,7 +1843,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.'));
@@ -2558,12 +2533,6 @@ sub modify_default_overrides {
                                          chg   => 'In-course authoring permissions changed',
                                          nochg => 'In-course authoring permissions unchanged',
                                        );
-    } elsif ($item eq 'crseditors') {
-        %resulttext =
-            &Apache::lonlocal::texthash(
-                                         chg   => 'Permitted course resource editors changed',
-                                         nochg => 'Permitted course resource editors unchanged',
-                                       );
     }
     &print_header($r,$type);
     $r->print('<h3>'.$title.'</h3>'."\n".
@@ -2576,20 +2545,9 @@ sub modify_default_overrides {
             $change = 1;
         }
     } elsif ($env{'form.'.$item.'set'} eq 'course') {
-        if ($item eq 'crseditors') {
-            my @neweditors;
-            my @posseditors = &Apache::loncommon::get_env_multiple('form.'.$item);
-            foreach my $editor (@posseditors) {
-                if (grep(/^\Q$editor\E$/,@{$options})) {
-                    push(@neweditors,$editor);
-                }
-            }
-            $newcrsval = join(',',@neweditors);
-        } else {
-            my $posscrsval = $env{'form.'.$item};
-            if (grep(/^\Q$posscrsval\E$/,@{$options})) {
-                $newcrsval = $posscrsval;
-            }
+        my $posscrsval = $env{'form.'.$item};
+        if (grep(/^\Q$posscrsval\E$/,@{$options})) {
+            $newcrsval = $posscrsval;
         }
         if ($oldcrsval eq $newcrsval) {
             $nochange = 1;
@@ -2631,9 +2589,6 @@ sub modify_default_overrides {
     if ($itemvalue eq '') {
         $status = $titles{'used'}.': '.
                   '<span style="font-style:italic">'.$domdefdisplay.'</span>';
-    } elsif ($item eq 'crseditors') {
-        $status = $titles{'cour'}.': '.
-                  '<span style="font-style:italic">'.join(', ', map { $titles{$_}; } split(/,/,$itemvalue)).'</span>';
     } else {
         $status = $titles{'cour'}.': '.
                   '<span style="font-style:italic">'.$optiontext->{$itemvalue}.'</span>';
@@ -2812,8 +2767,7 @@ function togglePostsubmit(caller) {
 
 ENDSCRIPT
 
-    } elsif (($phase eq 'setltiauth') || ($phase eq 'setexttool') ||
-             ($phase eq 'setcrseditors')) {
+    } elsif (($phase eq 'setltiauth') || ($phase eq 'setexttool') || ($phase eq 'setcrsauthor')) {
         $js .= <<"ENDJS";
 function toggleOptions(form,phase) {
     var radioname;
@@ -2827,9 +2781,6 @@ function toggleOptions(form,phase) {
     } else if (phase == 'setcrsauthor') {
         radioname = 'crsauthorset';
         divid = 'crscrsauthor';
-    } else if (phase == 'setcrseditors') {
-        radioname = 'crseditorsset';
-        divid = 'crscrseditors';
     }
     var num = form.elements[radioname].length;
     if (num) {
@@ -2865,7 +2816,7 @@ ENDJS
         $starthash = {
            add_entries => {'onload' => "hide_searching(); courseSet(document.filterpicker.official, 'load');"},
                      };
-    } elsif ($env{'form.phase'} =~ /^set(ltiauth|exttool|crseditors)$/) {
+    } elsif ($env{'form.phase'} =~ /^set(ltiauth|exttool|crsauthor)$/) {
         $starthash = {
            add_entries => {'onload' => "toggleOptions(document.$env{'form.phase'},'$env{'form.phase'}');"},
                      };
@@ -2876,6 +2827,8 @@ ENDJS
     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';
     }
@@ -2975,8 +2928,8 @@ sub hidden_form_elements {
           'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota',
           'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st',
           'sections','newsec','mysqltables','nopasswdchg','ltiauth','ltiauthset',
-          'exttoolset','exttool','crseditorsset','crseditors'],
-          ['^selfenrollmgr_','^selfenroll_'])."\n".
+          'exttoolset','exttool','crsauthorset','crsauthor'],
+           ['^selfenrollmgr_','^selfenroll_'])."\n".
           '<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';
     return $hidden_elements;
 }
@@ -3013,8 +2966,8 @@ sub get_permission {
             processltiauth    => 'edit',
             setexttool        => 'edit',
             processexttool    => 'edit',
-            setcrseditors     => 'edit',
-            processcrseditors => 'edit',
+            setcrsauthor      => 'edit',
+            processcrsauthor  => 'edit',
         );
         if ($passwdconf{'crsownerchg'}) {
             $permission{passwdchg} = 'edit';
@@ -3032,7 +2985,7 @@ sub get_permission {
             adhocrole     => 'custom',
             setltiauth    => 'view',
             setexttool    => 'view',
-            setcrseditors => 'view',
+            setcrsauthor  => 'view',
         );
         if ($passwdconf{'crsownerchg'}) {
             $permission{passwdchg} = 'view';
@@ -3098,6 +3051,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";
             }
@@ -3114,6 +3069,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';
                     }
@@ -3256,24 +3213,26 @@ sub handler {
                              {href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Result"});
                             &modify_default_overrides($r,$cdom,$cnum,$cdesc,$domdesc,$type,'exttool');
-                        } elsif (($phase eq 'setcrseditors') && ($permission->{'setcrseditors'})) {
+                        } elsif (($phase eq 'setcrsauthor') && ($permission->{'setcrsauthor'})) {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
-                              text=>"Available course resource editors"});
-                            &print_default_overrides($r,$cdom,$cnum,$cdesc,$type,$readonly,'crseditors');
-                        } elsif (($phase eq 'processcrseditors') && ($permission->{'processcrseditors'})) {
+                              text=>"In-course authoring permission"});
+                            &print_default_overrides($r,$cdom,$cnum,$cdesc,$type,$readonly,'crsauthor');
+                        } elsif (($phase eq 'processcrsauthor') && ($permission->{'processcrsauthor'})) {
                             &Apache::lonhtmlcommon::add_breadcrumb
-                            ({href=>"javascript:changePage(document.$phase,'setcrseditors')",
-                              text=>"Available course resource editors"},
+                            ({href=>"javascript:changePage(document.$phase,'setcrsauthor')",
+                              text=>"In-course authoring permission"},
                              {href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Result"});
-                            &modify_default_overrides($r,$cdom,$cnum,$cdesc,$domdesc,$type,'crseditors');
+                            &modify_default_overrides($r,$cdom,$cnum,$cdesc,$domdesc,$type,'crsauthor');
                         }
                     }
                 } else {
                     $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'));
                     }