--- loncom/enrollment/Enrollment.pm	2010/08/20 21:44:59	1.43
+++ loncom/enrollment/Enrollment.pm	2013/03/01 05:20:01	1.44
@@ -1,5 +1,5 @@
 # Automated Enrollment manager
-# $Id: Enrollment.pm,v 1.43 2010/08/20 21:44:59 raeburn Exp $
+# $Id: Enrollment.pm,v 1.44 2013/03/01 05:20:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,7 +38,9 @@ use lib '/home/httpd/lib/perl';
 use strict;
 
 sub update_LC {
-    my ($dom,$crs,$adds,$drops,$startdate,$enddate,$authtype,$autharg,$classesref,$groupref,$logmsg,$newusermsg,$context,$phototypes) = @_; 
+    my ($dom,$crs,$adds,$drops,$startdate,$enddate,$authtype,$autharg,
+        $showcredits,$defaultcredits,$classesref,$groupref,$logmsg,$newusermsg,
+        $context,$phototypes) = @_;
 # Get institutional code and title of this class
     my %courseinfo = ();
     &get_courseinfo($dom,$crs,\%courseinfo);
@@ -53,6 +55,7 @@ sub update_LC {
     my $status=&Apache::loncoursedata::CL_STATUS;
     my $type=&Apache::loncoursedata::CL_TYPE;
     my $lockedtype=&Apache::loncoursedata::CL_LOCKEDTYPE;
+    my $credidx=&Apache::loncoursedata::CL_CREDITS;
     my @localstudents = ();
     my @futurestudents = ();
     my @activestudents = ();
@@ -203,7 +206,16 @@ sub update_LC {
         unless ($uname eq '') {
             my %uidhash=&Apache::lonnet::idrget($dom,$uname);
             my @stuinfo = @{$enrollinfo{$uname}};
-            my $access = '';
+            my ($access,$added,$inststatus);
+            my $credits;
+            if ($showcredits) {
+                $credits = $stuinfo[$place{'credits'}];
+                $credits =~ s/[^\d\.]//g;
+                if ($credits eq $defaultcredits) {
+                    undef($credits);
+                }
+            }
+            $inststatus = $stuinfo[$place{inststatus}];
             if (grep/^$uname$/,@localstudents) {
 # Check for studentID changes
                 if ( ($uidhash{$uname}) && ($uidhash{$uname} !~ /error\:/) )  {
@@ -231,25 +243,31 @@ sub update_LC {
                             if ($usec eq '') {
                                 $showsec = &mt('none');
                             }
-                            $switchresult .= &mt("Section for [_1] switched from '[_2]' to '[_3]'.",$uname,$showoldsec,$showsec).$linefeed;
+                            $switchresult .= &mt('Section for [_1] switched from [_2] to [_3].',$uname,$showoldsec,$showsec).$linefeed;
                             if ($context eq 'automated') {
-                                $$logmsg .= &mt("Section switch for [_1] from '[_2]' to '[_3]'.",$uname,$showoldsec,$usec).$linefeed;
+                                $$logmsg .= &mt('Section switch for [_1] from [_2] to [_3].',$uname,$showoldsec,$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);
+                        &execute_add($context,'switchtype',$uname,$dom,$auth,
+                                     $authparam,$first,$middle,$last,$gene,
+                                     $pid,$usec,$end,$start,$emailenc,
+                                     $credits,$cid,\$addresult,\$enrollcount,
+                                     $linefeed,$logmsg);
+                        $added = 1;
                     }
-                } 
+                }
 # Check for section changes
                 if ($$currlist{$uname}[$sec] eq $stuinfo[ $place{groupID} ]) {
 # Check for access date changes for students with access starting in the future.
                     if ( (grep/^$uname$/,@futurestudents) && ($$currlist{$uname}[$type] eq "auto") && ($adds == 1) ) {
                         my $datechange = &datechange_check($$currlist{$uname}[$cstart],$$currlist{$uname}[$cend],$startdate,$enddate);
                         if ($datechange) {
-                            my $modify_access_result = &Apache::lonnet::modify_student_enrollment($dom,$uname,undef,undef,undef,undef,undef,$stuinfo[ $place{groupID} ],$enddate,$startdate,'auto','',$cid,'',$context);
+                            my $modify_access_result = &Apache::lonnet::modify_student_enrollment($dom,$uname,undef,undef,undef,undef,undef,$stuinfo[ $place{groupID} ],$enddate,$startdate,'auto','',$cid,'',$context,$credits);
                             $access = &showaccess($enddate,$startdate);
                             if ($modify_access_result =~ /^ok/) {
                                 $$logmsg .= &mt('Change in access dates for [_1].',$uname).$access.$linefeed;
+                                $added = 1;
                             } else {
                                 $$logmsg .= &mt('Error when attempting to change start and/or end access dates for [_1] in section: [_2] -error [_3].',$uname,$stuinfo[$place{groupID}],$modify_access_result).$linefeed;
                             }
@@ -268,15 +286,16 @@ sub update_LC {
                         if ($expire_role_result eq 'ok') {
                             my $modify_section_result;
                             if (grep/^$uname$/,@activestudents) {
-                                $modify_section_result = &Apache::lonnet::modify_student_enrollment($dom,$uname,undef,undef,undef,undef,undef,$stuinfo[ $place{groupID} ],$$currlist{$uname}[$cend],$$currlist{$uname}[$cstart],'auto','',$cid,'',$context);
+                                $modify_section_result = &Apache::lonnet::modify_student_enrollment($dom,$uname,undef,undef,undef,undef,undef,$stuinfo[ $place{groupID} ],$$currlist{$uname}[$cend],$$currlist{$uname}[$cstart],'auto','',$cid,'',$context,$credits);
                             } else {
-                                $modify_section_result =  &Apache::lonnet::modify_student_enrollment($dom,$uname,undef,undef,undef,undef,undef,$stuinfo[ $place{groupID} ],$enddate,$startdate,'auto','',$cid,'',$context);
+                                $modify_section_result =  &Apache::lonnet::modify_student_enrollment($dom,$uname,undef,undef,undef,undef,undef,$stuinfo[ $place{groupID} ],$enddate,$startdate,'auto','',$cid,'',$context,$credits);
                                 $access =  &showaccess($enddate,$startdate);
                             }
                             if ($modify_section_result =~ /^ok/) {
-                                $switchresult .= &mt("Section for [_1] switched from old section: '[_2]' to new section: '[_3]'.",$uname,$$currlist{$uname}[$sec],$stuinfo[ $place{groupID} ]).$access.$linefeed;
+                                $switchresult .= &mt('Section for [_1] switched from old section: [_2] to new section: [_3].',$uname,$$currlist{$uname}[$sec],$stuinfo[ $place{groupID} ]).$access.$linefeed;
+                                $added = 1;
                                 if ($context eq 'automated') {
-                                    $$logmsg .= &mt('Section switch for [_1] from [_2] to [_3]',$uname,$$currlist{$uname}[$sec],$stuinfo[ $place{groupID} ]).$linefeed;
+                                    $$logmsg .= &mt('Section switch for [_1] from [_2] to [_3].',$uname,$$currlist{$uname}[$sec],$stuinfo[ $place{groupID} ]).$linefeed;
                                 }
                                 $switchcount ++;
                             } else {
@@ -287,6 +306,21 @@ sub update_LC {
                         }
                     }
                 }
+# Check for credits changes
+                if (($showcredits) && 
+                    ($$currlist{$uname}[$credidx] ne $credits) && (!$added)) {
+                    my $modify_credits_result =
+                        &Apache::lonnet::modify_student_enrollment($dom,$uname,undef,undef,undef,undef,undef,$stuinfo[ $place{groupID} ],$enddate,$startdate,'auto','',$cid,'',$context,$credits);
+                    if ($modify_credits_result =~ /^ok/) {
+                        if ($credits ne '') {
+                            $$logmsg .= &mt('Credits change for [_1] from [_2] to [_3].',$uname,$$currlist{$uname}[$credidx],$credits).$linefeed;
+                        } else {
+                            $$logmsg .= &mt('Credits change for [_1] from [_2] to course default [_3].',$uname,$$currlist{$uname}[$credidx],$defaultcredits).$linefeed;
+                        }
+                    } else {
+                        $$logmsg .= &mt('Error when attempting to change credits for [_1] in section: [_2] -error [_3].',$uname,$stuinfo[$place{groupID}],$modify_credits_result).$linefeed;
+                    }
+                }
             } else {
 # Check for changed usernames by checking studentIDs
                 if ( ($stuinfo[ $place{studentID} ] ne '') && (grep/^$stuinfo[ $place{studentID} ]$/,@LCids) ) {
@@ -302,7 +336,7 @@ sub update_LC {
                         $$logmsg .= &mt('Because of this student/employee ID conflict, the new username - [_1] - has not been added to the LON-CAPA classlist',$uname).$linefeed;
                     }
                 } elsif ($adds == 1) {
-                    my ($auth,$authparam,$first,$middle,$last,$gene,$usec,$end,$start,$emailaddr,$pid,$emailenc);
+                    my ($auth,$authparam,$first,$middle,$last,$gene,$usec,$end,$start,$emailaddr,$pid,$emailenc,$credithours);
                     &prepare_add($authtype,$autharg,$enddate,$startdate,\@stuinfo,\%place,\$dom,\$uname,\$auth,\$authparam,\$first,\$middle,\$last,\$gene,\$usec,\$end,\$start,\$emailaddr,\$pid,\$emailenc);
 # Check for existing account in this LON-CAPA domain for this username
                     my $uhome=&Apache::lonnet::homeserver($uname,$dom);
@@ -326,11 +360,19 @@ sub update_LC {
                                     'cdom' => $dom,
                                     'context' => $context,
                                     'linefeed' => $linefeed,
-                                    'role' => 'st'
+                                    'inststatus' => $inststatus,
+                                    'role' => 'st',
                                    };
+                        if ($credits) {
+                            $args->{'credits'} = $credits;
+                        }
                         my $outcome = &create_newuser($args,$logmsg,$newusermsg,\$enrollcount,\$addresult,\%longroles,\%courseinfo,$context);
                     } else {
-                        &execute_add($context,'newstudent',$uname,$dom,$auth,$authparam,$first,$middle,$last,$gene,$pid,$usec,$end,$start,$emailenc,$cid,\$addresult,\$enrollcount,$linefeed,$logmsg);
+                        &execute_add($context,'newstudent',$uname,$dom,$auth,
+                                     $authparam,$first,$middle,$last,$gene,$pid,
+                                     $usec,$end,$start,$emailenc,$credits,
+                                     $cid,\$addresult,\$enrollcount,$linefeed,
+                                     $logmsg);
                     }
                     if ($courseinfo{'showphoto'}) {
                         my ($result,$resulttype) = 
@@ -473,6 +515,8 @@ sub create_newuser {
     my $context = $args->{'context'};
     my $linefeed = $args->{'linefeed'};
     my $role = $args->{'role'};
+    my $inststatus = $args->{'inststatus'};
+    my $credits = $args->{'credits'};
     my $create_passwd = 0;
     my $authchk = '';
     my $outcome;
@@ -517,7 +561,7 @@ sub create_newuser {
                 $outcome = $result;
             }
         } else {
-            $outcome=&Apache::lonnet::modifystudent($udom,$uname,$pid,$auth,$authparam,$first,$middle,$last,$gene,$usec,$end,$start,'',undef,$emailaddr,'auto','',$cid,'',$called_context);
+            $outcome=&Apache::lonnet::modifystudent($udom,$uname,$pid,$auth,$authparam,$first,$middle,$last,$gene,$usec,$end,$start,'',undef,$emailaddr,'auto','',$cid,'',$called_context,$inststatus,$credits);
         }
         if ($outcome eq 'ok') {
             my $access = &showaccess($end,$start);
@@ -631,9 +675,11 @@ sub prepare_add {
 }
 
 sub execute_add {
-    my ($context,$caller,$uname,$dom,$auth,$authparam,$first,$middle,$last,$gene,$pid,$usec,$end,$start,$emailenc,$cid,$addresult,$enrollcount,$linefeed,$logmsg) = @_;
+    my ($context,$caller,$uname,$dom,$auth,$authparam,$first,$middle,$last,
+        $gene,$pid,$usec,$end,$start,$emailenc,$credits,$cid,$addresult,
+        $enrollcount,$linefeed,$logmsg) = @_;
 # Get the user's information and authentication
-    my %userenv = &Apache::lonnet::get('environment',['firstname','middlename','lastname','generation','id','critnotification','notification','permanentemail'],$dom,$uname);
+    my %userenv = &Apache::lonnet::get('environment',['firstname','middlename','lastname','generation','id','critnotification','notification','permanentemail','inststatus'],$dom,$uname);
     my ($tmp) = keys(%userenv);
     if ($tmp =~ /^(con_lost|error)/i) {
         %userenv = ();
@@ -702,7 +748,11 @@ sub execute_add {
     }
                                                                                   
 # Assign the role of student in the course.
-    my $classlist_reply = &Apache::lonnet::modify_student_enrollment($dom,$uname,$pid,$first,$middle,$last,$gene,$usec,$end,$start,'auto','',$cid,'',$context);
+    my $classlist_reply = 
+        &Apache::lonnet::modify_student_enrollment($dom,$uname,$pid,$first,$middle,
+                                                   $last,$gene,$usec,$end,$start,
+                                                   'auto','',$cid,'',$context,
+                                                   $credits);
     if ($classlist_reply eq 'ok') {
         my $access = &showaccess($end,$start);
         my $showsec = $usec;
@@ -765,7 +815,7 @@ sub parse_classlist {
     my $xmlfile = $tmpdir."/tmp/".$dom."_".$crs."_".$class."_classlist.xml";
     my $uname = '';
     my @state;
-    my @items = ('autharg','authtype','email','firstname','generation','lastname','middlename','studentID');
+    my @items = ('autharg','authtype','email','firstname','generation','lastname','middlename','studentID','credits','inststatus');
     my $p = HTML::Parser->new
     (
         xml_mode => 1,
@@ -856,7 +906,7 @@ sub get_courseinfo {
     my ($dom,$crs,$courseinfo) = @_;
     my $owner;
     if (defined($dom) && defined($crs)) {
-        my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.showphoto','description'],$dom,$crs);
+        my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.showphoto','description','internal.defaultcredits'],$dom,$crs);
         if ( defined($settings{'internal.coursecode'}) ) {
             $$courseinfo{'inst_code'} = $settings{'internal.coursecode'};
         }
@@ -866,6 +916,9 @@ sub get_courseinfo {
         if ( defined($settings{'internal.showphoto'}) ) {
             $$courseinfo{'showphoto'} = $settings{'internal.showphoto'};
         }
+        if ( defined($settings{'internal.credithours'}) ) {
+            $$courseinfo{'defaultcredits'} = $settings{'internal.defaultcredits'};
+        }
     }
     return;
 }
@@ -883,6 +936,8 @@ sub place_hash {
                   middlename => 8,
                   startdate  => 9,
                   studentID  => 10,
+                  credits    => 11,
+                  inststatus => 12,
                 );
     return %place;
 }