[LON-CAPA-cvs] cvs: loncom /homework structuretags.pm
raeburn
raeburn at source.lon-capa.org
Tue Dec 20 17:46:40 EST 2011
raeburn Tue Dec 20 22:46:40 2011 EDT
Modified files:
/loncom/homework structuretags.pm
Log:
- Appropriate messages displayed for RESERVABLE, RESERVABLE_LATER, and NOTRESERVABLE
statuses.
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.498 loncom/homework/structuretags.pm:1.499
--- loncom/homework/structuretags.pm:1.498 Sat Dec 10 17:53:45 2011
+++ loncom/homework/structuretags.pm Tue Dec 20 22:46:40 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.498 2011/12/10 17:53:45 raeburn Exp $
+# $Id: structuretags.pm,v 1.499 2011/12/20 22:46:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1132,6 +1132,9 @@
( $status eq 'BANNED') ||
( $status eq 'UNAVAILABLE') ||
( $status eq 'NOT_IN_A_SLOT') ||
+ ( $status eq 'NOTRESERVABLE') ||
+ ( $status eq 'RESERVABLE') ||
+ ( $status eq 'RESERVABLE_LATER') ||
( $status eq 'INVALID_ACCESS')) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
$style);
@@ -1141,9 +1144,12 @@
$msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
} elsif ($status eq 'NOT_IN_A_SLOT') {
$msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
+ } elsif (($status eq 'RESERVABLE') || ($status eq 'RESERVABLE_LATER') ||
+ ($status eq 'NOTRESERVABLE')) {
+ $msg.='<h1>'.&mt('Access requires reservation to work at specific time/place.').'</h1>';
} elsif ($status ne 'NOT_YET_VIEWED') {
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
- }
+ }
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
$msg.=&mt('The problem ').$accessmsg;
} elsif ($status eq 'UNCHECKEDOUT') {
@@ -1152,6 +1158,16 @@
$msg.=&firstaccess_msg($accessmsg,$symb);
} elsif ($status eq 'NOT_IN_A_SLOT') {
$msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
+ } elsif ($status eq 'RESERVABLE') {
+ $msg.=&mt('Available to make a reservation.').' '.&mt('Reservation window closes [_1].',
+ &Apache::lonnavmaps::timeToHumanString($accessmsg,'end')).
+ '<br />'.
+ &Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
+ } elsif ($status eq 'RESERVABLE_LATER') {
+ $msg.=&mt('Window to make a reservation will open [_1].',
+ &Apache::lonnavmaps::timeToHumanString($accessmsg,'start'));
+ } elsif ($status eq 'NOTRESERVABLE') {
+ $msg.=&mt('Not available to make a reservation.');
}
$result.=$msg.'<br />';
} elsif ($target eq 'tex') {
More information about the LON-CAPA-cvs
mailing list