[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonnavmaps.pm

[raeburn]

raeburn		Sun Apr 29 15:52:08 2018 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonnavmaps.pm 
  Log:
  - For 2.11
    Backport 1.538
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.509.2.5 loncom/interface/lonnavmaps.pm:1.509.2.6
--- loncom/interface/lonnavmaps.pm:1.509.2.5	Tue Nov 29 15:13:19 2016
+++ loncom/interface/lonnavmaps.pm	Sun Apr 29 15:52:08 2018
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.509.2.5 2016/11/29 15:13:19 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.509.2.6 2018/04/29 15:52:08 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -643,6 +643,9 @@
             } elsif ($slot_status == $res->RESERVABLE) {
                 $slotmsg = &mt('Reservable, reservations close [_1]',
                            timeToHumanString($slot_time,'end'));
+            } elsif ($slot_status == $res->NEEDS_CHECKIN) {
+                $slotmsg = &mt('Reserved, check-in needed - ends [_1]',
+                           timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVABLE_LATER) {
                 $slotmsg = &mt('Reservable, reservations open [_1]',
                            timeToHumanString($slot_time,'start'));
@@ -5542,7 +5545,7 @@
                                 ($checkedin,$checkedinslot) = $self->checkedin();
                                 unless ((grep(/^\Q$checkedin\E/, at proctors)) &&
                                         ($checkedinslot eq $slot_name)) {
-                                    return (NEEDS_CHECKIN,undef,$slot_name); 
+                                    return (NEEDS_CHECKIN,$end,$slot_name); 
                                 }
                             }
                             return (RESERVED,$end,$slot_name);