--- loncom/interface/lonpopulate.pm 2013/02/11 02:39:11 1.74
+++ loncom/interface/lonpopulate.pm 2013/03/01 05:21:17 1.76
@@ -1,5 +1,5 @@
# automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.74 2013/02/11 02:39:11 raeburn Exp $
+# $Id: lonpopulate.pm,v 1.76 2013/03/01 05:21:17 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -254,7 +254,6 @@ sub print_navmenu {
');
- print STDERR "action is ||$action|| and state is ||$state||\n";
foreach my $task (@{$tasksref}) {
if (($task eq $action) && ($state eq 'choose')) {
$r->print('
@@ -2727,12 +2726,25 @@ sub print_update_result {
my %settings =
&Apache::lonnet::get('environment',
['internal.coursecode','internal.sectionnums','internal.crosslistings',
- 'internal.authtype','internal.autharg','internal.showphoto'],
+ 'internal.authtype','internal.autharg','internal.showphoto','internal.defaultcredits'],
$dom,$crs);
my $coursecode = $settings{'internal.coursecode'};
my $authtype = $settings{'internal.authtype'};
my $autharg = $settings{'internal.autharg'};
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();
if ( exists($env{'form.updateadds'}) ) {
$updateadds = $env{'form.updateadds'};
@@ -2767,7 +2779,7 @@ sub print_update_result {
": ".$outcome);
}
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 {
$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.');
@@ -2812,6 +2824,7 @@ sub print_viewclass_response {
my $secidx=&Apache::loncoursedata::CL_SECTION;
my $typeidx=&Apache::loncoursedata::CL_TYPE;
my $lockedidx=&Apache::loncoursedata::CL_LOCKEDTYPE;
+ my $creditsidx=&Apache::loncoursedata::CL_CREDITS;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['chgauto','chgmanual','lockchg','unlockchg']);
my @typechglist = (&Apache::loncommon::get_env_multiple('form.chgauto'),
@@ -2819,7 +2832,7 @@ sub print_viewclass_response {
my @lockchglist = (&Apache::loncommon::get_env_multiple('form.lockchg'),
&Apache::loncommon::get_env_multiple('form.unlockchg'));
- foreach my $student (sort @typechglist) {
+ foreach my $student (sort(@typechglist)) {
my ($uname,$udom) = split(/:/,$student);
my $sdata = $classlist->{$student};
my $section = $sdata->[$secidx];
@@ -2828,6 +2841,7 @@ sub print_viewclass_response {
my $end = $sdata->[$endidx];
my $type = $sdata->[$typeidx];
my $lock = $sdata->[$lockedidx];
+ my $credits = $sdata->[$creditsidx];
my $newlock = $lock;
$chgtotal ++;
my $newtype = 'auto';
@@ -2844,7 +2858,12 @@ sub print_viewclass_response {
} elsif ($newtype eq '') {
$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') {
$chgok ++;
$chg{$student} = &mt("Changed to $change");
@@ -2866,6 +2885,7 @@ sub print_viewclass_response {
my $end = $sdata->[$endidx];
my $type = $sdata->[$typeidx];
my $lock = $sdata->[$lockedidx];
+ my $credits = $sdata->[$creditsidx];
my $newlock = 1;
my $oldlockname = &mt('unlocked');
my $newlockname = &mt('locked');
@@ -2876,7 +2896,7 @@ sub print_viewclass_response {
$newlockname = &mt('unlocked');
$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') {
$lockok ++;
$lockchg{$student} = &mt('Changed to [_1]',$newlockname);
|