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

Diff for /loncom/interface/lonmodifycourse.pm between versions 1.57 and 1.60

version 1.57, 2010/08/24 13:51:52 version 1.60, 2013/03/01 05:01:26
Line 39  use lib '/home/httpd/lib/perl'; Line 39  use lib '/home/httpd/lib/perl';
 use LONCAPA;  use LONCAPA;
   
 sub get_dc_settable {  sub get_dc_settable {
     my ($type) = @_;      my ($type,$cdom) = @_;
     if ($type eq 'Community') {      if ($type eq 'Community') {
         return ('courseowner');          return ('courseowner');
     } else {      } else {
         return ('courseowner','coursecode','authtype','autharg');          my @items = ('courseowner','coursecode','authtype','autharg');
           if (&showcredits($cdom)) {
               push(@items,'defaultcredits');
           }
           return @items;
     }      }
 }  }
   
 sub autoenroll_keys {  sub autoenroll_keys {
     my $internals = ['coursecode','courseowner','authtype','autharg','autoadds','autodrops',      my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits',
                          'autostart','autoend','sectionnums','crosslistings',                       'autoadds','autodrops','autostart','autoend','sectionnums',
                          'co-owners'];                       'crosslistings','co-owners'];
     my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];      my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];
     return ($internals,$accessdates);      return ($internals,$accessdates);
 }  }
Line 114  sub get_enrollment_settings { Line 118  sub get_enrollment_settings {
                      || $type eq "autharg"    || $type eq "coursecode"                       || $type eq "autharg"    || $type eq "coursecode"
                      || $type eq "crosslistings") {                       || $type eq "crosslistings") {
                 $enrollvar{$type} = $settings{$item};                  $enrollvar{$type} = $settings{$item};
               } elsif ($type eq 'defaultcredits') {
                   if (&showcredits($cdom)) {
                       $enrollvar{$type} = $settings{$item};
                   }
             } elsif ($type eq 'courseowner') {              } elsif ($type eq 'courseowner') {
                 if ($settings{$item} =~ /^[^:]+:[^:]+$/) {                  if ($settings{$item} =~ /^[^:]+:[^:]+$/) {
                     $enrollvar{$type} = $settings{$item};                      $enrollvar{$type} = $settings{$item};
Line 225  sub print_modification_menu { Line 233  sub print_modification_menu {
     } else {      } else {
         $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.');
         $setparams_text = 'View/Modify course owner, institutional code, and default authentication';          if (&showcredits($dom)) {
               $setparams_text = 'View/Modify course owner, institutional code, and default authentication and credits';
           } else {
               $setparams_text = 'View/Modify course owner, institutional code, and default authentication';
           }
         $cat_text = 'View/Modify catalog settings for course';          $cat_text = 'View/Modify catalog settings for course';
     }      }
     my $anon_text = 'Responder threshold required to display anonymous survey submissions';      my $anon_text = 'Responder threshold required to display anonymous survey submissions';
Line 300  sub print_modification_menu { Line 312  sub print_modification_menu {
     } else {      } else {
         $menu_html .=  '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'.          $menu_html .=  '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'.
                        '<li>'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'</li>';                         '<li>'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'</li>';
           if (&showcredits($dom)) {
               $menu_html .= '<li>'.&mt('Default credits earned by student on course completion.').'</li>';
           }
     }      }
     $menu_html .= '<li>'.$setquota_text.'</li>'.      $menu_html .= '<li>'.$setquota_text.'</li>'.
                   '<li>'.$anon_text.'</li>'."\n";                    '<li>'.$anon_text.'</li>'."\n";
Line 357  sub print_settings_display { Line 372  sub print_settings_display {
     }      }
     my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);      my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
     my $dctitle = &Apache::lonnet::plaintext('dc');      my $dctitle = &Apache::lonnet::plaintext('dc');
     my @modifiable_params = &get_dc_settable($type);      my @modifiable_params = &get_dc_settable($type,$cdom);
     my ($internals,$accessdates) = &autoenroll_keys();      my ($internals,$accessdates) = &autoenroll_keys();
     my @items;      my @items;
     if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {      if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
Line 389  sub print_settings_display { Line 404  sub print_settings_display {
               ' <span class="LC_nobreak">'.$cdesc.'</span></h3>'.                ' <span class="LC_nobreak">'.$cdesc.'</span></h3>'.
               '<form action="/adm/modifycourse" method="post" name="viewparms">'."\n".                '<form action="/adm/modifycourse" method="post" name="viewparms">'."\n".
               '<p>'.$lt{'cose'}.'<ul>'.                '<p>'.$lt{'cose'}.'<ul>'.
               '<li>'.&mt('Settings modifiable by a [_1] via the [_2]Automated Enrollment Manager[_3] in a course.',$cctitle,'<a href="'.$escuri.'">','</a>').'</li>'.                '<li>'.&mt('Settings modifiable by a [_1] via the [_2]Automated Enrollment Manager[_3] in a course.',$cctitle,'<a href="'.$escuri.'">','</a>').'</li>');
               '<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, and default authentication[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n".      if (&showcredits($cdom)) {
               '</li></ul></p>'.          $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, and default authentication and credits[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
       } else {
           $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, and default authentication[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
       }
       $r->print('</li></ul></p>'.
               '<p>'.$lt{'cour'}.'</p><p>'.$disp_table.'</p><p>'.                '<p>'.$lt{'cour'}.'</p><p>'.$disp_table.'</p><p>'.
               '<a href="javascript:changePage(document.viewparms,'."'menu'".')">'.$lt{'back'}.'</a>'."\n".                '<a href="javascript:changePage(document.viewparms,'."'menu'".')">'.$lt{'back'}.'</a>'."\n".
               &hidden_form_elements().                &hidden_form_elements().
Line 639  sub print_course_modification_page { Line 658  sub print_course_modification_page {
                       &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="10" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'.                    '<input type="text" size="10" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'.
                   &Apache::lonhtmlcommon::row_closure().                    &Apache::lonhtmlcommon::row_closure());
                   &Apache::lonhtmlcommon::row_title(          if (&showcredits($cdom)) {
                      &Apache::loncommon::help_open_topic('Modify_Course_Defaultauth').              $r->print(&Apache::lonhtmlcommon::row_title(
                      '&nbsp;'.&mt('Default Authentication method'))."\n".                            &Apache::loncommon::help_open_topic('Modify_Course_Credithours').
                   $authenitems."\n".                        '&nbsp;'.&mt('Credits (students)'))."\n".
                   &Apache::lonhtmlcommon::row_closure().                        '<input type="text" size="3" name="defaultcredits" value="'.$enrollvar{'defaultcredits'}.'" />'.
                   &Apache::lonhtmlcommon::row_title(                        &Apache::lonhtmlcommon::row_closure());
                       &Apache::loncommon::help_open_topic('Modify_Course_Owner').           }
            $r->print(&Apache::lonhtmlcommon::row_title(
                          &Apache::loncommon::help_open_topic('Modify_Course_Defaultauth').
                          '&nbsp;'.&mt('Default Authentication method'))."\n".
                      $authenitems."\n".
                      &Apache::lonhtmlcommon::row_closure().
                      &Apache::lonhtmlcommon::row_title(
                      &Apache::loncommon::help_open_topic('Modify_Course_Owner').
                       '&nbsp;'.&mt('Course Owner'))."\n");                        '&nbsp;'.&mt('Course Owner'))."\n");
     }      }
     $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure(1).      $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure(1).
Line 657  sub print_course_modification_page { Line 683  sub print_course_modification_page {
     } else {      } else {
         $r->print('javascript:verify_message(this.form);"');          $r->print('javascript:verify_message(this.form);"');
     }      }
     $r->print('value="'.$lt{'gobt'}.'" /></p></form>');      $r->print(' value="'.$lt{'gobt'}.'" /></p></form>');
     return;      return;
 }  }
   
Line 718  sub modify_course { Line 744  sub modify_course {
     unless ($type eq 'Community') {      unless ($type eq 'Community') {
         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)) {  
               push(@items,'internal.defaultcredits');
           }
     }      }
     my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum);      my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum);
     my $description = $settings{'description'};      my $description = $settings{'description'};
     my ($ccrole,$response,$chgresponse,$nochgresponse,$reply,%currattr,%newattr,%cenv,%changed,      my ($ccrole,$response,$chgresponse,$nochgresponse,$reply,%currattr,%newattr,
         @changes,@nochanges,@sections,@xlists,@warnings);          %cenv,%changed,@changes,@nochanges,@sections,@xlists,@warnings);
     my @modifiable_params = &get_dc_settable($type);      my @modifiable_params = &get_dc_settable($type,$cdom);
     foreach my $param (@modifiable_params) {      foreach my $param (@modifiable_params) {
         $currattr{$param} = $settings{'internal.'.$param};          $currattr{$param} = $settings{'internal.'.$param};
     }      }
Line 742  sub modify_course { Line 771  sub modify_course {
                 $sections[0] = $settings{'internal.sectionnums'};                  $sections[0] = $settings{'internal.sectionnums'};
             }              }
         }          }
         unless ($settings{'internal.crosslistings'} eq'') {          unless ($settings{'internal.crosslistings'} eq '') {
             if ($settings{'internal.crosslistings'} =~ m/,/) {              if ($settings{'internal.crosslistings'} =~ m/,/) {
                 @xlists = split/,/,$settings{'internal.crosslistings'};                  @xlists = split/,/,$settings{'internal.crosslistings'};
             } else {              } else {
Line 781  sub modify_course { Line 810  sub modify_course {
                 $changed{'code'} = 1;                  $changed{'code'} = 1;
             }              }
         }          }
   
           if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) {
               $newattr{'defaultcredits'} =~ s/[^\d\.]//g;
               $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
           }
   
     }      }
   
     if ( exists($env{'form.courseowner'}) ) {      if ( exists($env{'form.courseowner'}) ) {
Line 845  sub modify_course { Line 880  sub modify_course {
             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.'));
                 } else {                  } else {
                       my %crsenv = &Apache::lonnet::get('environment',['internal.co-owners'],$cdom,$cnum);
                       my $coowners = $crsenv{'internal.co-owners'};
             if (@sections > 0) {              if (@sections > 0) {
                         if ($changed{'code'}) {                          if ($changed{'code'}) {
                     foreach my $sec (@sections) {                      foreach my $sec (@sections) {
Line 853  sub modify_course { Line 890  sub modify_course {
                     my $inst_course_id = $newattr{'coursecode'}.$1;                      my $inst_course_id = $newattr{'coursecode'}.$1;
                                     my $course_check = &Apache::lonnet::auto_validate_courseID($cnum,$cdom,$inst_course_id);                                      my $course_check = &Apache::lonnet::auto_validate_courseID($cnum,$cdom,$inst_course_id);
             if ($course_check eq 'ok') {              if ($course_check eq 'ok') {
                                         my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});                                          my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners);
                 unless ($outcome eq 'ok') {                  unless ($outcome eq 'ok') {
                                                                 
             push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).'<br/>');              push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).'<br/>');
Line 870  sub modify_course { Line 907  sub modify_course {
                                 if ($sec =~ m/^(.+):/) {                                  if ($sec =~ m/^(.+):/) {
                                     my $instsec = $1;                                      my $instsec = $1;
                                     my $inst_course_id = $newattr{'coursecode'}.$instsec;                                      my $inst_course_id = $newattr{'coursecode'}.$instsec;
                                     my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});                                      my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners);
                                     unless ($outcome eq 'ok') {                                      unless ($outcome eq 'ok') {
                                         push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome));                                          push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome));
                                     }                                      }
Line 886  sub modify_course { Line 923  sub modify_course {
                 foreach my $xlist (@xlists) {                  foreach my $xlist (@xlists) {
             if ($xlist =~ m/^(.+):/) {              if ($xlist =~ m/^(.+):/) {
                                 my $instxlist = $1;                                  my $instxlist = $1;
                                 my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$instxlist,$newattr{'courseowner'});                                  my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$instxlist,$newattr{'courseowner'},$coowners);
                 unless ($outcome eq 'ok') {                  unless ($outcome eq 'ok') {
             push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for crosslisted class "[_2]" for the following reason: "[_3]".',$description,$instxlist,$outcome));              push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for crosslisted class "[_2]" for the following reason: "[_3]".',$description,$instxlist,$outcome));
                 }                  }
Line 1040  sub update_coowners { Line 1077  sub update_coowners {
             if ($designhash{$cdom.'.autoassign.co-owners'}) {              if ($designhash{$cdom.'.autoassign.co-owners'}) {
                 my @newcoowners = ();                  my @newcoowners = ();
                 if ($settings->{'internal.co-owners'}) {                  if ($settings->{'internal.co-owners'}) {
                     my @currcoown = split(',',$settings->{'internal.coowners'});                      my @currcoown = split(',',$settings->{'internal.co-owners'});
                     my ($updatecoowners,$delcoowners);                      my ($updatecoowners,$delcoowners);
                     foreach my $person (@currcoown) {                      foreach my $person (@currcoown) {
                         my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$person);                          my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$person);
Line 1343  sub print_header { Line 1380  sub print_header {
         $phase = $env{'form.phase'};          $phase = $env{'form.phase'};
     }      }
     my $js = qq|      my $js = qq|
 <script type="text/javascript">  
 function changePage(formname,newphase) {  function changePage(formname,newphase) {
     formname.phase.value = newphase;      formname.phase.value = newphase;
     if (newphase == 'processparms') {      if (newphase == 'processparms') {
Line 1351  function changePage(formname,newphase) { Line 1388  function changePage(formname,newphase) {
     }      }
     formname.submit();      formname.submit();
 }  }
 </script>  
 |;  |;
     if ($phase eq 'setparms') {      if ($phase eq 'setparms') {
  $js .= qq|   $js .= $javascript_validations;
 <script  type="text/javascript">  
 $javascript_validations  
 </script>  
 |;  
     } elsif ($phase eq 'courselist') {      } elsif ($phase eq 'courselist') {
         $js .= qq|          $js .= qq|
 <script type="text/javascript">  
 function gochoose(cname,cdom,cdesc) {  function gochoose(cname,cdom,cdesc) {
     document.courselist.pickedcourse.value = cdom+'_'+cname;      document.courselist.pickedcourse.value = cdom+'_'+cname;
     document.courselist.submit();      document.courselist.submit();
 }  }
 </script>  
   function hide_searching() {
       if (document.getElementById('searching')) {
           document.getElementById('searching').style.display = 'none';
       }
       return;
   }
   
 |;  |;
     } elsif ($phase eq 'setquota') {      } elsif ($phase eq 'setquota') {
         my $invalid = &mt('The quota you entered contained invalid characters.');          my $invalid = &mt('The quota you entered contained invalid characters.');
         my $alert = &mt('You must enter a number');          my $alert = &mt('You must enter a number');
         my $regexp = '/^\s*(\d+\.?\d*|\.\d+)\s*$/';          my $regexp = '/^\s*(\d+\.?\d*|\.\d+)\s*$/';
         $js .= <<"ENDSCRIPT";          $js .= <<"ENDSCRIPT";
 <script type="text/javascript">  
 function verify_quota() {  function verify_quota() {
     var newquota = document.setquota.coursequota.value;       var newquota = document.setquota.coursequota.value; 
     var num_reg = $regexp;      var num_reg = $regexp;
Line 1385  function verify_quota() { Line 1425  function verify_quota() {
     }      }
     return true;      return true;
 }  }
 </script>  
 ENDSCRIPT  ENDSCRIPT
     } elsif ($phase eq 'setanon') {      } elsif ($phase eq 'setanon') {
         my $invalid = &mt('The responder threshold you entered is invalid.');          my $invalid = &mt('The responder threshold you entered is invalid.');
         my $alert = &mt('You must enter a positive integer.');          my $alert = &mt('You must enter a positive integer.');
         my $regexp = ' /^\s*\d+\s*$/';          my $regexp = ' /^\s*\d+\s*$/';
         $js .= <<"ENDSCRIPT";          $js .= <<"ENDSCRIPT";
 <script type="text/javascript">  
 function verify_anon_threshold() {  function verify_anon_threshold() {
     var newthreshold = document.setanon.threshold.value;      var newthreshold = document.setanon.threshold.value;
     var num_reg = $regexp;      var num_reg = $regexp;
Line 1409  function verify_anon_threshold() { Line 1449  function verify_anon_threshold() {
     }      }
     return true;      return true;
 }  }
 </script>  
 ENDSCRIPT  ENDSCRIPT
     }      }
   
     my $starthash;      my $starthash;
     if ($env{'form.phase'} eq 'ccrole') {      if ($env{'form.phase'} eq 'ccrole') {
         $starthash = {          $starthash = {
            add_entries => {'onload' => "javascript:document.ccrole.submit();"},             add_entries => {'onload' => "javascript:document.ccrole.submit();"},
                      };                       };
       } elsif ($phase eq 'courselist') {
           $starthash = {
              add_entries => {'onload' => "hide_searching();"},
                        };
     }      }
     $r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings',      $r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings',
      $js,$starthash));       &Apache::lonhtmlcommon::scripttag($js),
                                                $starthash));
     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';
Line 1495  sub course_settings_descrip { Line 1541  sub course_settings_descrip {
                       'notifylist' => 'Course Coordinators to be notified of enrollment changes',                        'notifylist' => 'Course Coordinators to be notified of enrollment changes',
                       'sectionnums' => 'Course section number:LON-CAPA section',                        'sectionnums' => 'Course section number:LON-CAPA section',
                       'crosslistings' => 'Crosslisted class:LON-CAPA section',                        'crosslistings' => 'Crosslisted class:LON-CAPA section',
                         'defaultcredits' => 'Credits', 
          );           );
     }      }
     return %longtype;      return %longtype;
Line 1505  sub hidden_form_elements { Line 1552  sub hidden_form_elements {
       &Apache::lonhtmlcommon::echo_form_input(['gosearch','updater','coursecode',        &Apache::lonhtmlcommon::echo_form_input(['gosearch','updater','coursecode',
           'prevphase','numlocalcc','courseowner','login','coursequota','intarg',            'prevphase','numlocalcc','courseowner','login','coursequota','intarg',
           'locarg','krbarg','krbver','counter','hidefromcat','usecategory',            'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
           'threshold'])."\n".            'threshold','defaultcredits'])."\n".
           '<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';            '<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';
     return $hidden_elements;      return $hidden_elements;
 }  }
   
   sub showcredits {
       my ($dom) = @_;
       my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
       if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) {
           return 1;
       }
   }
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     if ($r->header_only) {      if ($r->header_only) {
Removed from v.1.57  
changed lines
  Added in v.1.60

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