--- loncom/interface/lonpopulate.pm	2013/02/11 02:39:11	1.74
+++ loncom/interface/lonpopulate.pm	2013/08/16 03:25:05	1.79
@@ -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.79 2013/08/16 03:25:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -254,7 +254,6 @@ sub print_navmenu {
     <tr class="LC_pick_box_row">
       <td valign="top" class="LC_pick_box_title">
 ');
-    print STDERR "action is ||$action|| and state is ||$state||\n";
     foreach my $task (@{$tasksref}) {
         if (($task eq $action) && ($state eq 'choose')) {
             $r->print(' 
@@ -1357,7 +1356,7 @@ sub print_accessdate_table {
          'fnew' => 'for new students added when you update the class roster',
          'ifad'  => 'If automated adds are enabled, then when students are added their student roles will become active on the date set here for first access, and their roles will become inactive on the date set here for last access.  These default access dates will be overridden for specific students if the institutional classlist data supplied to the automatic enrollment process includes entries for the startdate and enddate fields for those students.',
     );
-    $lt{'ncds'} = &mt('changing default start and end access dates will affect [_1]future enrollments[_2] and also [_1]currently inactive[_2] students (i.e., those for whom access will begin in the future).','<b>','</b>');
+    $lt{'ncds'} = &mt('Changing default start and end access dates will affect [_1]future enrollments[_2] and also [_1]currently inactive[_2] students (i.e., those for whom access will begin in the future).','<b>','</b>');
     $lt{'tcha'} = &mt('To change access dates for [_1]currently active[_2] students, use User Management -> "Manage Course Users" to display currently active students, then use the dropdown menu for "Action to take for selected users:" to choose "Change starting/ending dates", select the students to change, and click "Proceed".','<b>','</b>');
     my $dateshow;
     if ( ($oldendshow eq '') && ($oldstartshow eq '') ) {
@@ -1707,7 +1706,7 @@ sub print_setaccess_response {
                 '<br />'.
                 &mt('Any change in access dates will only apply to students who are not currently active, i.e., those who currently have access start dates in the future, and to those added by future automated enrollment.').
                 '<br /><br />'.
-                 &mt('To change access dates for any currently active students, use User Management -> "Manage Users" to display currently active students, then use the dropdown menu for "Action to take for selected users:" to choose "Change starting/ending dates", select the students to change, and click "Proceed".').
+                 &mt('To change access dates for [_1]currently active[_2] students, use User Management -> "Manage course users" to display currently active students, then use the dropdown menu for "Action to take for selected users:" to choose "Change starting/ending dates", select the students to change, and click "Proceed".','<b>','</b>').
                 '<br />';
 
 # Generate message in case where old first access date was later than today, but new first access date is now today or earlier.
@@ -1921,7 +1920,7 @@ sub print_crosslistings_menu {
 	if ($numcross) {
 	    $response .= 
                 &mt('You indicated that you wish to add an additional [quant,_1,crosslisting].',$numcross).' '.
-                &mt('For each new crosslisting enter the insititutional course section code (e.g., fs03zol101001, for section 001 of zol101 for fs03 semester), and the LON-CAPA section ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in the crosslisted course section.').' '.
+                &mt('For each new crosslisting enter the institutional course section code (e.g., fs03zol101001, for section 001 of zol101 for fs03 semester), and the LON-CAPA section ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in the crosslisted course section.').' '.
                 &mt('The LON-CAPA section ID can be left blank, if you do not wish to tie a section ID to this crosslisting.').' '.
                 &mt("The institutional course section code should only contain letters and/or numbers, and must be consistent with the scheme adopted by your Domain Coordinator to map course codes (and section numbers) to your institution's student information system.").
                 '<br /><br />
@@ -2251,7 +2250,7 @@ sub print_sections_menu {
 	if ($numsec > 0) {
 	    $response .= 
                 &mt('You indicated that you wish to incorporate student enrollment in your LON-CAPA course from an additional [quant,_1,section].',$numsec).' '.
-               &mt('For each new section enter the insititutional section code (e.g., 004), and the LON-CAPA section ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in this particular section.').' '.
+               &mt('For each new section enter the institutional section code (e.g., 004), and the LON-CAPA section ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in this particular section.').' '.
                &mt('The LON-CAPA section ID can be left blank, if you do not wish to designate a section ID for this course section.').' '.
                &mt("The institutional section code should only contain letters and/or numbers, and must be consistent with the scheme adopted by your Domain Coordinator to map course section numbers to your institution's student information system.").'
                <br /><br />
@@ -2357,7 +2356,7 @@ sub print_sections_response {
 	}
     }
 
-    if ($putreply ne 'ok') {
+    if ($putreply eq 'ok') {
 	$response = &mt('Students enrolling in the sections listed below will be automatically added to the class roster for LON-CAPA course [_1], if you have chosen to enable a nightly automated enrollment update.',
                         "$realm ($coursecode)").'<br /><ul>'."\n";
 	foreach my $section (@allsections) {
@@ -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);
@@ -3014,7 +3034,7 @@ sub warning_message {
     unless ( $caller eq 'chgsettings') {
         if ( (!$curradds) && (!$currdrops) ) {
             $warning .= '<li>'.
-                &mt('You [_1]must[_2] now use [_3]Automated adds/drops[_4] to enable automated adds and/or drops if you want automatic enrollment updates to occur in this course.','<b>','</b>','<a href="/adm/populate?action=chgsettings">').'</li>';
+                &mt('You [_1]must[_2] now use [_3]Automated adds/drops[_4] to enable automated adds and/or drops if you want automatic enrollment updates to occur in this course.','<b>','</b>','<a href="/adm/populate?action=chgsettings">','</a>').'</li>';
         }
     }
     if ($warning) {