[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.3 and 1.86

version 1.79.2.3, 2016/10/23 02:24:51 version 1.86, 2016/10/05 13:59:46
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>');
     }      }
     $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,      $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
                                                 \$numtitles,'modifycourse',undef,undef,undef,                                                  \$numtitles,'modifycourse',undef,undef,undef,
                                                 \@codetitles,$dom));                                                  \@codetitles,$dom));
      
     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 197  sub print_course_search_page { Line 211  sub print_course_search_page {
                 if ($type eq 'Community') {                  if ($type eq 'Community') {
                     $roleoption = &mt('Enter the community with one of the available ad hoc roles: [_1].',                      $roleoption = &mt('Enter the community with one of the available ad hoc roles: [_1].',
                                   join(', ',@adhoc));                                    join(', ',@adhoc));
                   } elsif ($type eq 'Placement') {
                       $roleoption = &mt('Enter the placement test with one of the available ad hoc roles: [_1].',
                                     join(', ',@adhoc));
                 } else {                  } else {
                     $roleoption = &mt('Enter the course with one of the available ad hoc roles: [_1].',                      $roleoption = &mt('Enter the course with one of the available ad hoc roles: [_1].',
                                   join(', ',@adhoc));                                    join(', ',@adhoc));
Line 204  sub print_course_search_page { Line 221  sub print_course_search_page {
             } else {              } else {
                 if ($type eq 'Community') {                  if ($type eq 'Community') {
                     $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$adhoc[0]);                      $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$adhoc[0]);
                   } elsif ($type eq 'Placement') {
                       $roleoption = &mt('Enter the placement test with the ad hoc role of: [_1]',$adhoc[0]);
                 } else {                  } else {
                     $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$adhoc[0]);                      $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$adhoc[0]);
                 }                  }
Line 211  sub print_course_search_page { Line 230  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 290  sub print_modification_menu { Line 311  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, self-enrollment and table lifetime';              $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, self-enrollment and table lifetime';
         } else {          } 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, self-enrollment and table lifetime';
Line 311  sub print_modification_menu { Line 332  sub print_modification_menu {
             if (ref($managed_by_dc) eq 'ARRAY') {              if (ref($managed_by_dc) eq 'ARRAY') {
                 if (@{$managed_by_dc}) {                  if (@{$managed_by_dc}) {
                     return 1;                      return 1;
                 }                  } 
             }              }
         }          }
         return 0;          return 0;
Line 359  sub print_modification_menu { Line 380  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 => ($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 401  sub print_modification_menu { Line 422  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 459  sub print_adhocrole_selected { Line 480  sub print_adhocrole_selected {
         my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},          my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
                                                          'adhocroles.'.$cdom);                                                           'adhocroles.'.$cdom);
         if (keys(%adhocroles)) {          if (keys(%adhocroles)) {
             my $possrole = $env{'form.adhocrole'};              my $possrole = $env{'form.adhocrole'}; 
             if ($possrole ne '') {              if ($possrole ne '') {
                 my @adhoc = split(',',$adhocroles{'adhocroles.'.$cdom});                  my @adhoc = split(',',$adhocroles{'adhocroles.'.$cdom});
                 if (grep(/^\Q$possrole\E$/,@adhoc)) {                  if (grep(/^\Q$possrole\E$/,@adhoc)) {
Line 718  sub domain_postsubtimeout { Line 739  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 777  sub print_catsettings { Line 798  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>');                        '&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') {              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 798  sub print_catsettings { Line 821  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 838  sub print_course_modification_page { Line 861  sub print_course_modification_page {
     my %enrollvar = &get_enrollment_settings($cdom,$cnum);      my %enrollvar = &get_enrollment_settings($cdom,$cnum);
     my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook',      my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook',
                                                        'internal.selfenrollmgrdc','internal.selfenrollmgrcc',                                                         'internal.selfenrollmgrdc','internal.selfenrollmgrcc',
                                                        'internal.mysqltables'],$cdom,$cnum);                                                         'internal.mysqltables'],
                                           $cdom,$cnum);
     my $type = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype,\%settings);      my $type = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype,\%settings);
     my @specific_managebydc = split(/,/,$settings{'internal.selfenrollmgrdc'});      my @specific_managebydc = split(/,/,$settings{'internal.selfenrollmgrdc'});
     my @specific_managebycc = split(/,/,$settings{'internal.selfenrollmgrcc'});      my @specific_managebycc = split(/,/,$settings{'internal.selfenrollmgrcc'});
Line 921  sub print_course_modification_page { Line 945  sub print_course_modification_page {
                       '&nbsp;'.&mt('Course Code'))."\n".                        '&nbsp;'.&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').
                       '&nbsp;'.&mt('Credits (students)'))."\n".                        '&nbsp;'.&mt('Credits (students)'))."\n".
Line 1115  sub modify_course { Line 1139  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 1188  sub modify_course { Line 1212  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 1300  sub modify_course { Line 1324  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 2139  ENDSCRIPT Line 2163  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 2307  sub handler { Line 2333  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 2323  sub handler { Line 2351  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 2346  sub handler { Line 2376  sub handler {
                         if (($phase eq 'setquota') && ($permission->{'setquota'})) {                          if (($phase eq 'setquota') && ($permission->{'setquota'})) {
                             &Apache::lonhtmlcommon::add_breadcrumb                              &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'$phase')",                              ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Set quota"});                                text=>"Set quota",});
                             &print_setquota($r,$cdom,$cnum,$cdesc,$type);                              &print_setquota($r,$cdom,$cnum,$cdesc,$type);
                         } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) {                           } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) { 
                             &Apache::lonhtmlcommon::add_breadcrumb                              &Apache::lonhtmlcommon::add_breadcrumb
Line 2428  sub handler { Line 2458  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.3  
changed lines
  Added in v.1.86

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