[BACK]Return to lonmodifycourse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmodifycourse.pm between versions 1.79.2.6 and 1.90

version 1.79.2.6, 2017/04/08 19:05:44 version 1.90, 2017/01/05 16:17:11
Line 72  sub catalog_settable { Line 72  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 167  sub print_course_search_page { Line 174  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 177  sub print_course_search_page { Line 186  sub print_course_search_page {
     my ($actiontext,$roleoption,$settingsoption);      my ($actiontext,$roleoption,$settingsoption);
     if ($type eq 'Community') {      if ($type eq 'Community') {
         $actiontext = &mt('Actions available after searching for a 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 {      } else {
         $actiontext = &mt('Actions available after searching for a course:');          $actiontext = &mt('Actions available after searching for a course:');
     }      }
Line 184  sub print_course_search_page { Line 195  sub print_course_search_page {
        if ($type eq 'Community') {         if ($type eq 'Community') {
            $roleoption = &mt('Enter the community with the role of [_1]',$cctitle);             $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);             $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 {         } else {
            $roleoption = &mt('Enter the course with the role of [_1]',$cctitle);             $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);             $settingsoption = &mt('View or modify course settings which only a [_1] may modify.',$dctitle);
Line 194  sub print_course_search_page { Line 208  sub print_course_search_page {
             if (@{$roles_by_num} > 1) {              if (@{$roles_by_num} > 1) {
                 if ($type eq 'Community') {                  if ($type eq 'Community') {
                     $roleoption = &mt('Enter the community with one of the available ad hoc roles');                      $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 {                  } else {
                     $roleoption = &mt('Enter the course with one of the available ad hoc roles.');                      $roleoption = &mt('Enter the course with one of the available ad hoc roles.');
                 }                  }
Line 201  sub print_course_search_page { Line 217  sub print_course_search_page {
                 my $rolename = $description->{$roles_by_num->[0]};                  my $rolename = $description->{$roles_by_num->[0]};
                 if ($type eq 'Community') {                  if ($type eq 'Community') {
                     $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$rolename);                      $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 {                  } else {
                     $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$rolename);                      $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$rolename);
                 }                  }
Line 208  sub print_course_search_page { Line 226  sub print_course_search_page {
         }          }
         if ($type eq 'Community') {          if ($type eq 'Community') {
             $settingsoption = &mt('View community settings which only a [_1] may modify.',$dctitle);              $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 {          } else {
             $settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle);              $settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle);
         }          }
Line 269  function gochoose(cname,cdom,cdesc) { Line 289  function gochoose(cname,cdom,cdesc) {
                         document.courselist.submit();                          document.courselist.submit();
                     } else {                      } else {
                         var str = '';                          var str = '';
                         \$("#LC_choose_adhoc").empty();  
                         for (var i=0; i<data.roles.length; i++) {                          for (var i=0; i<data.roles.length; i++) {
                             \$("<label><input type='radio' value='"+data.roles[i].name+"' name='LC_get_role' id='LC_get_role_"+i+"' />"+data.roles[i].desc+"</label><span>&nbsp;&nbsp;</span>")                              \$("<label><input type='radio' value='"+data.roles[i].name+"' name='LC_get_role' id='LC_get_role_"+i+"' />"+data.roles[i].desc+"</label><span>&nbsp;&nbsp;</span>")
                             .appendTo("#LC_choose_adhoc");                              .appendTo("#LC_choose_adhoc");
                         }                          }
                         \$( "#LC_adhocrole_chooser" ).toggle( true );  
                         \$( "#LC_get_role_0").prop("checked", true);                          \$( "#LC_get_role_0").prop("checked", true);
                         \$( "#LC_adhocrole_chooser" ).dialog({ autoOpen: false });                          \$( "#LC_adhocrole_chooser" ).dialog({ autoOpen: false });
                         \$( "#LC_adhocrole_chooser" ).dialog("open");                          \$( "#LC_adhocrole_chooser" ).dialog("open");
Line 320  function gochoose(cname,cdom,cdesc) { Line 338  function gochoose(cname,cdom,cdesc) {
 // ]]>  // ]]>
 </script>  </script>
   
 <div id="LC_adhocrole_chooser" title="$lt{'title'}" style="display:none">  <div id="LC_adhocrole_chooser" title="$lt{'title'}">
   <p>$lt{'preamble'}</p>    <p>$lt{'preamble'}</p>
   <form name="LChelpdeskadhoc" id="LChelpdeskpicker" action="">    <form name="LChelpdeskadhoc" id="LChelpdeskpicker" action="">
     <div id="LC_choose_adhoc">      <div id="LC_choose_adhoc">
Line 412  sub print_modification_menu { Line 430  sub print_modification_menu {
                     );                      );
     }      }
     if ($type eq 'Community') {      if ($type eq 'Community') {
         if ($permission->{'setparms'} eq 'edit') {          if ($permission->{'setparms'} eq 'edit') { 
             $categorytitle = 'View/Modify Community Settings';              $categorytitle = 'View/Modify Community Settings';
             $linktext{'setparms'} = 'View/Modify community owner';              $linktext{'setparms'} = 'View/Modify community owner';
             $linktext{'catsettings'} = 'View/Modify catalog settings for community';              $linktext{'catsettings'} = 'View/Modify catalog settings for community';
Line 422  sub print_modification_menu { Line 440  sub print_modification_menu {
             $linktext{'catsettings'} = 'View catalog settings for community';              $linktext{'catsettings'} = 'View catalog settings for community';
         }          }
         $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.');          $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.');
         $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.');          $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.'); 
     } else {      } else {
         if ($permission->{'setparms'} eq 'edit') {          if ($permission->{'setparms'} eq 'edit') {
             $categorytitle = 'View/Modify Course Settings';              $categorytitle = 'View/Modify Course Settings';
Line 507  sub print_modification_menu { Line 525  sub print_modification_menu {
             {              {
                 linktext => $linktext{'viewparms'},                  linktext => $linktext{'viewparms'},
                 url => &phaseurl('viewparms'),                  url => &phaseurl('viewparms'),
                 permission => ($permission->{'viewparms'} && ($type ne 'Community')),                  permission => ($permission->{'viewparms'} && ($type ne 'Community') && ($type ne 'Placement')),
                 #help => '',                  #help => '',
                 icon => 'roles.png',                  icon => 'roles.png',
                 linktitle => ''                  linktitle => ''
Line 549  sub print_modification_menu { Line 567  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 604  sub print_adhocrole_selected { Line 622  sub print_adhocrole_selected {
         }          }
         $selectrole = 1;          $selectrole = 1;
     } elsif ($permission->{'adhocrole'} eq 'custom') {      } elsif ($permission->{'adhocrole'} eq 'custom') {
         my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);          my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);      
         if (ref($okroles) eq 'ARRAY') {          if (ref($okroles) eq 'ARRAY') {
             my $possrole = $env{'form.adhocrole'};              my $possrole = $env{'form.adhocrole'}; 
             if (($possrole ne '') && (grep(/^\Q$possrole\E$/,@{$okroles}))) {              if (($possrole ne '') && (grep(/^\Q$possrole\E$/,@{$okroles}))) {
                 my $confname = &Apache::lonnet::get_domainconfiguser($cdom);                  my $confname = &Apache::lonnet::get_domainconfiguser($cdom);
                 $newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum";                  $newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum";
Line 786  sub print_set_anonsurvey_threshold { Line 804  sub print_set_anonsurvey_threshold {
     my $hidden_elements = &hidden_form_elements();      my $hidden_elements = &hidden_form_elements();
     my ($disabled,$submit);      my ($disabled,$submit);
     if ($readonly) {      if ($readonly) {
         $disabled = ' disabled="disabled"';          $disabled = ' disabled="disabled"'; 
     } else {      } else {
         $submit = '<input type="submit" value="'.$lt{'modi'}.'" />';          $submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
     }      }
Line 880  sub domain_postsubtimeout { Line 898  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 943  sub print_catsettings { Line 961  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><br /><p>');                        '&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><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 964  sub print_catsettings { Line 984  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 1063  sub print_course_modification_page { Line 1083  sub print_course_modification_page {
         foreach my $cc (@local_ccs) {          foreach my $cc (@local_ccs) {
             $ownertable .= &Apache::loncommon::start_data_table_row()."\n";              $ownertable .= &Apache::loncommon::start_data_table_row()."\n";
             if ($cc eq $enrollvar{'courseowner'}) {              if ($cc eq $enrollvar{'courseowner'}) {
                   $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked"'.$disabled.' /></td>'."\n";                  $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked"'.$disabled.' /></td>'."\n";
             } else {              } else {
                 $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'"'.$disabled.' /></td>'."\n";                  $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'"'.$disabled.' /></td>'."\n";
             }              }
Line 1090  sub print_course_modification_page { Line 1110  sub print_course_modification_page {
         $r->print(&Apache::lonhtmlcommon::row_title(          $r->print(&Apache::lonhtmlcommon::row_title(
                       &Apache::loncommon::help_open_topic('Modify_Course_Instcode').                        &Apache::loncommon::help_open_topic('Modify_Course_Instcode').
                       '&nbsp;'.&mt('Course Code'))."\n".                        '&nbsp;'.&mt('Course Code'))."\n".
                   '<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'"'.$disabled.' />'.                    '<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'"'.$disabled.'/>'.
                   &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').
                       '&nbsp;'.&mt('Credits (students)'))."\n".                        '&nbsp;'.&mt('Credits (students)'))."\n".
Line 1290  sub modify_course { Line 1310  sub modify_course {
                  'internal.pendingco-owners','internal.selfenrollmgrdc',                   'internal.pendingco-owners','internal.selfenrollmgrdc',
                  'internal.selfenrollmgrcc','internal.mysqltables');                   'internal.selfenrollmgrcc','internal.mysqltables');
     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 1363  sub modify_course { Line 1383  sub modify_course {
             $newattr{'mysqltables'} = $env{'form.mysqltables'};              $newattr{'mysqltables'} = $env{'form.mysqltables'};
             $newattr{'mysqltables'} =~ s/\D+//g;              $newattr{'mysqltables'} =~ s/\D+//g;
         }          }
         if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) {          if (($type ne 'Placement') && (&showcredits($cdom) && exists($env{'form.defaultcredits'}))) {
             $newattr{'defaultcredits'}=$env{'form.defaultcredits'};              $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
             $newattr{'defaultcredits'} =~ s/[^\d\.]//g;              $newattr{'defaultcredits'} =~ s/[^\d\.]//g;
         }          }
Line 1475  sub modify_course { Line 1495  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 2308  ENDSCRIPT Line 2328  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 2484  sub handler { Line 2506  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 2500  sub handler { Line 2524  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 2522  sub handler { Line 2548  sub handler {
                         my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});                          my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
                         my ($readonly,$linktext);                          my ($readonly,$linktext);
                         if ($permission->{$phase} eq 'view') {                          if ($permission->{$phase} eq 'view') {
                            $readonly = 1;                             $readonly = 1; 
                         }                          }
                         if (($phase eq 'setquota') && ($permission->{'setquota'})) {                          if (($phase eq 'setquota') && ($permission->{'setquota'})) {
                             if ($permission->{'setquota'} eq 'view') {                              if ($permission->{'setquota'} eq 'view') {
                                 $linktext = 'Set quota';                                  $linktext = 'Set quota'; 
                             } else {                              } else {
                                 $linktext = 'Display quota';                                  $linktext = 'Display quota';
                             }                              }
Line 2624  sub handler { Line 2650  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'));
                     }                      }
Removed from v.1.79.2.6  
changed lines
  Added in v.1.90

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>