[prev in list] [next in list] [prev in thread] [next in thread]
List: lon-capa-cvs
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonnavmaps.pm
From: raeburn <raeburn () source ! lon-capa ! org>
Date: 2017-12-21 3:50:58
Message-ID: cvsraeburn1513828258 () cvsserver
[Download RAW message or body]
raeburn Thu Dec 21 03:50:58 2017 EDT
Modified files:
/loncom/interface lonnavmaps.pm
Log:
- Course contents includes information for resource with reservation, if
past the start time, and proctor check-in of the user stilll needed.
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.537 loncom/interface/lonnavmaps.pm:1.538
--- loncom/interface/lonnavmaps.pm:1.537 Mon Dec 18 23:13:53 2017
+++ loncom/interface/lonnavmaps.pm Thu Dec 21 03:50:57 2017
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.537 2017/12/18 23:13:53 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.538 2017/12/21 03:50:57 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -658,6 +658,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'));
@@ -5836,7 +5839,7 @@
($checkedin,$checkedinslot) = $self->checkedin();
unless ((grep(/^\Q$checkedin\E/,@proctors)) &&
($checkedinslot eq $slot_name)) {
- return (NEEDS_CHECKIN,undef,$slot_name);
+ return (NEEDS_CHECKIN,$end,$slot_name);
}
}
return (RESERVED,$end,$slot_name);
_______________________________________________
LON-CAPA-cvs mailing list
LON-CAPA-cvs@mail.lon-capa.org
http://mail.lon-capa.org/mailman/listinfo/lon-capa-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic