'.
@@ -464,9 +490,25 @@ sub release_reservation {
return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description));
}
}
+
+ # if the reservation symb is for a map get a resource in that map
+ # to check slot parameters on
+ my $navmap=Apache::lonnavmaps::navmap->new;
+ if (!defined($navmap)) {
+ return (0,'error: Unable to determine current status');
+ }
+ my $passed_resource = $navmap->getBySymb($symb);
+ if ($passed_resource->is_map()) {
+ my ($a_resource) =
+ $navmap->retrieveResources($passed_resource,
+ sub {$_[0]->is_problem()},0,1);
+ $symb = $a_resource->symb();
+ }
+
# get parameter string, check for existance, rebuild string with the slot
- my @slots = split(/:/,&Apache::lonnet::EXT("resource.0.availablestudent",
- $symb,$udom,$uname));
+ my $student = &Apache::lonnet::EXT("resource.0.availablestudent",
+ $symb,$udom,$uname);
+ my @slots = split(/:/,$student);
my @new_slots;
foreach my $exist_slot (@slots) {
@@ -484,13 +526,22 @@ sub release_reservation {
if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) {
&Apache::lonnet::del('slot_reservations',[$entry],
$cdom,$cnum);
+ my %storehash = (
+ symb => $symb,
+ slot => $slot_name,
+ action => 'release',
+ context => $env{'form.context'},
+ );
+ &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
+ 1,$uname,$udom,$cnum,$cdom);
}
}
- my $use_slots = &Apache::lonnet::EXT("resource.0.useslots");
+ my $use_slots = &Apache::lonnet::EXT("resource.0.useslots",
+ $symb,$udom,$uname);
&Apache::lonxml::debug("use_slots is $use_slots
");
- if (&network_error($use_slots)) {
+ if (&Apache::lonnet::error($use_slots)) {
return (0,'error: Unable to determine current status');
}
@@ -503,7 +554,6 @@ sub release_reservation {
'0_availablestudent',
$parm_level, $new_param,
'string', $uname, $udom);
-
my $msg;
if ($mgr eq 'F') {
$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom");
@@ -530,15 +580,15 @@ sub delete_slot {
my $ret = &Apache::lonnet::cput('slots', {$slot_name => \%slot},
$cdom, $cnum);
if ($ret eq 'ok') {
- $r->print("Slot $slot_name marked as deleted.
");
+ $r->print(''.&mt('Slot [_1] marked as deleted.',''.$slot_name.'').'
');
} else {
- $r->print(" An error ($ret) occurse when attempting to delete Slot $slot_name.
");
+ $r->print(''.&mt('An error occurred when attempting to delete slot: [_1]',''.$slot_name.'')." ($ret)
");
}
} else {
if (%consumed) {
- $r->print("Slot $slot_name has active reservations.
");
+ $r->print(''.&mt('Slot [_1] has active reservations.',''.$slot_name.'').'
');
} else {
- $r->print("Slot $slot_name does not exist.
");
+ $r->print(''.&mt('Slot [_1] does not exist.',''.$slot_name.'').'
');
}
}
$r->print(''.
@@ -553,22 +603,24 @@ sub return_link {
}
sub get_slot {
- my ($r,$symb)=@_;
+ my ($r,$symb,$conflictable_slot,$inhibit_return_link)=@_;
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot);
if ($slot_name =~ /^error: (.*)/) {
- $r->print("An error occured while attempting to make a reservation. ($1)
");
+ $r->print(''
+ .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
+ .'
');
&return_link($r);
- return;
+ return 0;
}
- if ($slot_name) {
+ if ($slot_name && $slot_name ne $conflictable_slot) {
my %slot=&Apache::lonnet::get_slot($slot_name);
my $description1=&get_description($slot_name,\%slot);
%slot=&Apache::lonnet::get_slot($env{'form.slotname'});
my $description2=&get_description($env{'form.slotname'},\%slot);
- $r->print("Already have a reservation: $description1
");
+ $r->print(''.&mt('Already have a reservation: [_1].',$description1).'
');
if ($slot_name ne $env{'form.slotname'}) {
$r->print(<
@@ -577,13 +629,14 @@ sub get_slot {
STUFF
- $r->print("You can either ");
- $r->print(<
-STUFF
- $r->print(' your reservation from '.$description1.' to '.
- $description2.
- '
or
');
+ $r->print(''
+ .&mt('You can either [_1]Change[_2] your reservation from [_3] to [_4] or'
+ ,''
+ ,''.$description1.''
+ ,''.$description2.'')
+ .'
'
+ );
&return_link($r);
$r->print(<
@@ -591,51 +644,65 @@ STUFF
} else {
&return_link($r);
}
- return;
+ return 0;
}
+ my ($cnum,$cdom)=&get_course();
my $reserved=&make_reservation($env{'form.slotname'},
- \%slot,$symb);
+ \%slot,$symb,$cnum,$cdom);
my $description=&get_description($env{'form.slotname'},\%slot);
if (defined($reserved)) {
+ my $retvalue = 0;
if ($slot_name =~ /^error: (.*)/) {
- $r->print("An error occured while attempting to make a reservation. ($1)
");
+ $r->print(''
+ .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
+ .'
');
} elsif ($reserved > -1) {
- $r->print("Success: $description
");
+ $r->print(''.&mt('Success: [_1]',$description).'
');
+ $retvalue = 1;
} elsif ($reserved < 0) {
- $r->print("Already reserved: $description
");
+ $r->print(''.&mt('Already reserved: [_1]',$description).'
');
}
- &return_link($r);
- return;
+ if (!$inhibit_return_link) { &return_link($r); }
+ return 1;
}
- my %lt=('request'=>"Availibility list",
- 'try' =>'Try again');
- %lt=&Apache::lonlocal::texthash(%lt);
+ my %lt = &Apache::lonlocal::texthash(
+ 'request' => 'Availibility list',
+ 'try' => 'Try again?',
+ 'or' => 'or',
+ );
+
+ my $extra_input;
+ if ($conflictable_slot) {
+ $extra_input='';
+ }
+ $r->print(''.&mt('[_1]Failed[_2] to reserve a slot for [_3].','','',$description).'
');
$r->print(< Failed to reserve a spot for $description.
-?