[LON-CAPA-cvs] cvs: loncom /enrollment Enrollment.pm

[raeburn]

raeburn		Thu Feb  3 17:37:57 2022 EDT

  Modified files:              
    /loncom/enrollment	Enrollment.pm 
  Log:
  - Message logged depends on context in which max drop threshold exceeded.
  
  
Index: loncom/enrollment/Enrollment.pm
diff -u loncom/enrollment/Enrollment.pm:1.57 loncom/enrollment/Enrollment.pm:1.58
--- loncom/enrollment/Enrollment.pm:1.57	Tue Dec 28 02:04:35 2021
+++ loncom/enrollment/Enrollment.pm	Thu Feb  3 17:37:57 2022
@@ -1,5 +1,5 @@
 # Automated Enrollment manager
-# $Id: Enrollment.pm,v 1.57 2021/12/28 02:04:35 raeburn Exp $
+# $Id: Enrollment.pm,v 1.58 2022/02/03 17:37:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -488,7 +488,11 @@
             foreach my $class (keys(%delaydrops)) {
                 if (ref($delaydrops{$class}) eq 'ARRAY') {
                     if ($autofailsafe < scalar(@{$delaydrops{$class}})) {
-                        $$logmsg .= &mt('The following students were not expired from the old section [_1] because the enrollment count retrieved for that institutional section was zero, and the number of students with roles to expire exceeded the failsafe threshold of [_2]:',$class,$autofailsafe);
+                        if ($failsafe eq 'any') {
+                            $$logmsg .= &mt('The following students were not expired from the old section [_1] because the number of students with roles to expire exceeded the failsafe threshold of [_2], set to apply when the enrollment retrieved for an institutional section is zero or greater:',$class,$autofailsafe);
+                        } else {
+                            $$logmsg .= &mt('The following students were not expired from the old section [_1] because the enrollment count retrieved for that institutional section was zero, and the number of students with roles to expire exceeded the failsafe threshold of [_2]:',$class,$autofailsafe);
+                        }
                         if ($context eq "updatenow") {
                             $$logmsg .= '<br />'.join('<br />',@{$delaydrops{$class}}).$linefeed; 
                         } elsif ($context eq "automated") {
@@ -575,7 +579,7 @@
     my $pid = $args->{'pid'};
     my $first = $args->{'first'};
     my $middle = $args->{'middle'};
-    my $last = $args->{'last'} ;
+    my $last = $args->{'last'};
     my $gene = $args->{'gene'};
     my $usec = $args->{'usec'};
     my $end = $args->{'end'};