--- loncom/enrollment/Enrollment.pm 2004/12/26 21:03:34 1.20
+++ loncom/enrollment/Enrollment.pm 2005/04/07 06:56:21 1.22
@@ -1,5 +1,5 @@
# Automated Enrollment manager
-# $Id: Enrollment.pm,v 1.20 2004/12/26 21:03:34 raeburn Exp $
+# $Id: Enrollment.pm,v 1.22 2005/04/07 06:56:21 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -74,6 +74,7 @@ sub update_LC {
my $linefeed = '';
my $addresult = '';
my $dropresult = '';
+ my $switchresult = '';
if ($context eq "updatenow") {
$linefeed = "\n
";
} elsif ($context eq "automated") {
@@ -81,6 +82,7 @@ sub update_LC {
}
my $enrollcount = 0;
my $dropcount = 0;
+ my $switchcount = 0;
# Get role names
my %longroles = ();
@@ -192,7 +194,7 @@ sub update_LC {
}
# Explicitly allow access to creation/modification of students if called as an automated process.
if ($context eq 'automated') {
- $ENV{'allowed.cst'}='F';
+ $env{'allowed.cst'}='F';
}
# Compare IDs with existing LON-CAPA enrollment for this class
@@ -220,7 +222,11 @@ sub update_LC {
my ($auth,$authparam,$first,$middle,$last,$gene,$usec,$end,$start,$emailaddr,$pid,$emailenc);
&prepare_add($authtype,$autharg,$enddate,$startdate,\@stuinfo,\%place,\$dom,\$uname,\$auth,\$authparam,\$first,\$middle,\$last,\$gene,\$usec,\$end,\$start,\$emailaddr,\$pid,\$emailenc);
if ($$currlist{$uname}[$sec] ne $usec) {
- $$logmsg .= "Section for $uname switched from $$currlist{$uname}[$sec] to $usec".$linefeed;
+ $switchresult .= "Section for $uname switched from $$currlist{$uname}[$sec] to ".$usec.$linefeed;
+ if ($context eq 'automated') {
+ $$logmsg .= "Section switch for $uname from $$currlist{$uname}[$sec] to ".$usec.$linefeed; ;
+ }
+ $switchcount ++;
}
&execute_add($context,'switchtype',$uname,$dom,$auth,$authparam,$first,$middle,$last,$gene,$pid,$usec,$end,$start,$emailenc,$cid,\$addresult,\$enrollcount,$linefeed,$logmsg);
}
@@ -259,7 +265,11 @@ sub update_LC {
$access = &showaccess($enddate,$startdate);
}
if ($modify_section_result =~ /^ok/) {
- $$logmsg .= "Section for $uname switched from old section: ".$$currlist{$uname}[$sec] ." to new section: ".$stuinfo[ $place{groupID} ].".".$access.$linefeed;
+ $switchresult .= "Section for $uname switched from old section: ".$$currlist{$uname}[$sec] ." to new section: ".$stuinfo[ $place{groupID} ].".".$access.$linefeed;
+ if ($context eq 'automated') {
+ $$logmsg .= "Section switch for $uname from $$currlist{$uname}[$sec] to $stuinfo[ $place{groupID} ]".$linefeed;
+ }
+ $switchcount ++;
} else {
$$logmsg .= "Error when attempting section change for $uname from old section ".$$currlist{$uname}[$sec]." to new section: ".$stuinfo[ $place{groupID} ]." -error: $modify_section_result".$linefeed;
}
@@ -345,24 +355,32 @@ sub update_LC {
# Terminated explictly allowed access to student creation/modification
if ($context eq 'automated') {
- delete($ENV{'allowed.cst'});
+ delete($env{'allowed.cst'});
}
if ($enrollcount > 0) {
if ($context eq "updatenow") {
$addresult = substr($addresult,0,rindex($addresult,""));
- $addresult = "The following $enrollcount student(s) was/were added to this LON-CAPA course:
";
+ $addresult = "The following $enrollcount student(s) was/were added to this LON-CAPA course:
";
} else {
- $addresult = "The following $enrollcount student(s) was/were added to this LON-CAPA course:\n\n".$addresult."\n\n";
- }
+ $addresult = "The following $enrollcount student(s) was/were added to this LON-CAPA course:\n\n".$addresult."\n\n";
+ }
}
if ($dropcount > 0) {
if ($context eq "updatenow") {
$dropresult = substr($dropresult,0,rindex($dropresult,""));
- $dropresult = "The following $dropcount student(s) was/were expired from this LON-CAPA course:
";
+ $dropresult = "The following $dropcount student(s) was/were expired from this LON-CAPA course:
";
} else {
$dropresult = "The following $dropcount student(s) was/were expired from this LON-CAPA course:\n\n".$dropresult."\n\n";
}
}
+ if ($switchcount > 0) {
+ if ($context eq "updatenow") {
+ $switchresult = substr($switchresult,0,rindex($switchresult,""));
+ $switchresult = "The following $switchcount student(s) switched sections in this LON-CAPA course:
";
+ } else {
+ $switchresult = "The following $switchcount student(s) switched sections in this LON-CAPA course:\n\n".$switchresult."\n\n";
+ }
+ }
if ( ($adds) && ($enrollcount == 0) ) {
$addresult = "There were no new students to add to the course.";
if ($context eq "updatenow") {
@@ -379,8 +397,8 @@ sub update_LC {
$dropresult .="\n";
}
}
- my $changecount = $enrollcount + $dropcount;
- return ($changecount,$addresult.$dropresult);
+ my $changecount = $enrollcount + $dropcount + $switchcount;
+ return ($changecount,$addresult.$dropresult.$switchresult);
}
sub create_newuser {