Diff for /loncom/interface/lonpopulate.pm between versions 1.75 and 1.76

version 1.75, 2013/03/01 05:10:09 version 1.76, 2013/03/01 05:21:17
Line 2726  sub print_update_result { Line 2726  sub print_update_result {
     my %settings =       my %settings = 
         &Apache::lonnet::get('environment',          &Apache::lonnet::get('environment',
             ['internal.coursecode','internal.sectionnums','internal.crosslistings',              ['internal.coursecode','internal.sectionnums','internal.crosslistings',
              'internal.authtype','internal.autharg','internal.showphoto'],               'internal.authtype','internal.autharg','internal.showphoto','internal.defaultcredits'],
             $dom,$crs);              $dom,$crs);
     my $coursecode = $settings{'internal.coursecode'};      my $coursecode = $settings{'internal.coursecode'};
     my $authtype = $settings{'internal.authtype'};      my $authtype = $settings{'internal.authtype'};
     my $autharg = $settings{'internal.autharg'};      my $autharg = $settings{'internal.autharg'};
     my $showphotos = $settings{'internal.showphoto'};      my $showphotos = $settings{'internal.showphoto'};
       my ($showcredits,$defaultcredits);
       my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
       if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) {
           $showcredits = 1;
           $defaultcredits = $settings{'internal.defaultcredits'};
           if ($defaultcredits eq '') {
               if ($coursecode ne '') {
                   $defaultcredits = $domdefaults{'officialcredits'};   
               } else {
                   $defaultcredits = $domdefaults{'unofficialcredits'};
               }
           }
       }
     my ($startaccess,$endaccess) = &get_dates_from_form();      my ($startaccess,$endaccess) = &get_dates_from_form();
     if ( exists($env{'form.updateadds'}) ) {      if ( exists($env{'form.updateadds'}) ) {
         $updateadds = $env{'form.updateadds'};          $updateadds = $env{'form.updateadds'};
Line 2766  sub print_update_result { Line 2779  sub print_update_result {
                                  ": ".$outcome);                                   ": ".$outcome);
             }              }
     if ($reply{$crs} > 0) {      if ($reply{$crs} > 0) {
  ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$startaccess,$endaccess,$authtype,$autharg,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow",\%phototypes);   ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$startaccess,$endaccess,$authtype,$autharg,$showcredits,$defaultcredits,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow",\%phototypes);
     } else {      } else {
  $response = &mt('There was a problem retrieving institutional class list data for the course sections and crosslisted courses which contribute enrollment to this course.').' '.   $response = &mt('There was a problem retrieving institutional class list data for the course sections and crosslisted courses which contribute enrollment to this course.').' '.
                             &mt('No updates have been carried out, and the roster remains unchanged.');                              &mt('No updates have been carried out, and the roster remains unchanged.');
Line 2811  sub print_viewclass_response { Line 2824  sub print_viewclass_response {
     my $secidx=&Apache::loncoursedata::CL_SECTION;      my $secidx=&Apache::loncoursedata::CL_SECTION;
     my $typeidx=&Apache::loncoursedata::CL_TYPE;      my $typeidx=&Apache::loncoursedata::CL_TYPE;
     my $lockedidx=&Apache::loncoursedata::CL_LOCKEDTYPE;      my $lockedidx=&Apache::loncoursedata::CL_LOCKEDTYPE;
       my $creditsidx=&Apache::loncoursedata::CL_CREDITS;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                ['chgauto','chgmanual','lockchg','unlockchg']);                                 ['chgauto','chgmanual','lockchg','unlockchg']);
     my @typechglist = (&Apache::loncommon::get_env_multiple('form.chgauto'),      my @typechglist = (&Apache::loncommon::get_env_multiple('form.chgauto'),
Line 2818  sub print_viewclass_response { Line 2832  sub print_viewclass_response {
     my @lockchglist = (&Apache::loncommon::get_env_multiple('form.lockchg'),      my @lockchglist = (&Apache::loncommon::get_env_multiple('form.lockchg'),
        &Apache::loncommon::get_env_multiple('form.unlockchg'));         &Apache::loncommon::get_env_multiple('form.unlockchg'));
   
     foreach my $student (sort @typechglist) {      foreach my $student (sort(@typechglist)) {
         my ($uname,$udom) = split(/:/,$student);          my ($uname,$udom) = split(/:/,$student);
         my $sdata    = $classlist->{$student};          my $sdata    = $classlist->{$student};
         my $section  = $sdata->[$secidx];          my $section  = $sdata->[$secidx];
Line 2827  sub print_viewclass_response { Line 2841  sub print_viewclass_response {
         my $end      = $sdata->[$endidx];          my $end      = $sdata->[$endidx];
         my $type     = $sdata->[$typeidx];          my $type     = $sdata->[$typeidx];
         my $lock   = $sdata->[$lockedidx];          my $lock   = $sdata->[$lockedidx];
           my $credits = $sdata->[$creditsidx];
         my $newlock = $lock;          my $newlock = $lock;
         $chgtotal ++;          $chgtotal ++;
         my $newtype = 'auto';          my $newtype = 'auto';
Line 2843  sub print_viewclass_response { Line 2858  sub print_viewclass_response {
             } elsif ($newtype eq '') {              } elsif ($newtype eq '') {
                 $newlock = '1';                  $newlock = '1';
             }              }
             my $modreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$newtype,$newlock,$cid,'','chgtype');              my $modreply = 
                   &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'',
                                                              '','','',$section,$end,
                                                              $start,$newtype,
                                                              $newlock,$cid,'',
                                                              'chgtype',$credits);
             if ($modreply eq 'ok') {              if ($modreply eq 'ok') {
                 $chgok ++;                  $chgok ++;
                 $chg{$student} = &mt("Changed to $change");                  $chg{$student} = &mt("Changed to $change");
Line 2865  sub print_viewclass_response { Line 2885  sub print_viewclass_response {
         my $end      = $sdata->[$endidx];          my $end      = $sdata->[$endidx];
         my $type     = $sdata->[$typeidx];          my $type     = $sdata->[$typeidx];
         my $lock   = $sdata->[$lockedidx];          my $lock   = $sdata->[$lockedidx];
           my $credits = $sdata->[$creditsidx];
         my $newlock = 1;          my $newlock = 1;
         my $oldlockname = &mt('unlocked');          my $oldlockname = &mt('unlocked');
         my $newlockname = &mt('locked');          my $newlockname = &mt('locked');
Line 2875  sub print_viewclass_response { Line 2896  sub print_viewclass_response {
                 $newlockname = &mt('unlocked');                  $newlockname = &mt('unlocked');
                 $oldlockname = &mt('locked');                   $oldlockname = &mt('locked'); 
             }              }
             my $lockreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$type,$newlock,$cid,'','chgtype');              my $lockreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$type,$newlock,$cid,'','chgtype',$credits);
             if ($lockreply eq 'ok') {              if ($lockreply eq 'ok') {
                 $lockok ++;                  $lockok ++;
                 $lockchg{$student} = &mt('Changed to [_1]',$newlockname);                  $lockchg{$student} = &mt('Changed to [_1]',$newlockname);

Removed from v.1.75  
changed lines
  Added in v.1.76


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