version 1.141, 2019/06/28 19:46:03
|
version 1.142, 2019/07/07 22:06:04
|
Line 769 sub release_slot {
|
Line 769 sub release_slot {
|
my ($result,$msg) = |
my ($result,$msg) = |
&release_reservation($slot_name,$uname,$udom,$symb,$mgr); |
&release_reservation($slot_name,$uname,$udom,$symb,$mgr); |
if (!$result) { |
if (!$result) { |
$r->print('<p><span class="LC_error">'.&mt($msg).'</span></p>'); |
$r->print('<p class="LC_error">'.&mt($msg).'</p>'); |
} else { |
} else { |
$r->print("<p>$msg</p>"); |
$r->print("<p>$msg</p>"); |
} |
} |
Line 941 sub release_reservation {
|
Line 941 sub release_reservation {
|
} else { |
} else { |
if (keys(%to_delete)) { |
if (keys(%to_delete)) { |
$msg = &mt('Reservation release partially complete for [_1]',$description); |
$msg = &mt('Reservation release partially complete for [_1]',$description); |
} else { |
} else { |
$msg = &mt('No entries found for this user to release for [_1].',$description); |
$msg = &mt('No entries found for this user to release for [_1].',$description); |
} |
} |
return (0,$msg); |
return (0,$msg); |
Line 995 sub release_reservation {
|
Line 995 sub release_reservation {
|
|
|
# |
# |
# If release is *not* because of a reservation change, i.e., this is a "drop" |
# If release is *not* because of a reservation change, i.e., this is a "drop" |
# by a student, or a removal for a single student by an instructor then |
# by a student, or a removal for a single student by an instructor then |
# only remove one entry from slot_reservations.db, where both the user |
# only remove one entry from slot_reservations.db, where both the user |
# and the symb match the current context. If useslots was set to map or |
# and the symb match the current context. If useslots was set to map or |
# map_map, then the symb to match in slot_reservations.db is the symb of |
# map_map, then the symb to match in slot_reservations.db is the symb of |
Line 1006 sub release_reservation {
|
Line 1006 sub release_reservation {
|
if ($parm_level == 2) { |
if ($parm_level == 2) { |
$symb_to_check = $map_symb; |
$symb_to_check = $map_symb; |
} else { |
} else { |
$symb_to_check = $parm_symb; |
$symb_to_check = $parm_symb; |
} |
} |
foreach my $entry (keys(%consumed)) { |
foreach my $entry (keys(%consumed)) { |
if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) { |
if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) { |
Line 1024 sub release_reservation {
|
Line 1024 sub release_reservation {
|
$cnum,$udom,$uname,$context) =~ /^error/) { |
$cnum,$udom,$uname,$context) =~ /^error/) { |
if ($mgr eq 'F') { |
if ($mgr eq 'F') { |
$msg = &mt('Reservation release partially complete for: [_1]',"$uname:$udom").'<br />'. |
$msg = &mt('Reservation release partially complete for: [_1]',"$uname:$udom").'<br />'. |
&mt('Update of availablestudent parameter for [_1] was not completed.',"$uname:$udom"); |
&mt('Update of availablestudent parameter for [_1] was not completed.',"$uname:$udom"); |
} else { |
} else { |
$msg = &mt('Release partially complete for: [_1]',$description); |
$msg = &mt('Release partially complete for: [_1]',$description); |
} |
} |
return (0,$msg); |
return (0,$msg); |
} else { |
} else { |
if ($mgr eq 'F') { |
if ($mgr eq 'F') { |
$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom"); |
$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom"); |
} else { |
} else { |
$msg = '<span style="font-weight: bold;">'.&mt('Released reservation: [_1]',$description).'</span><br /><br />'; |
$msg = '<span style="font-weight: bold;">'.&mt('Released reservation: [_1]',$description).'</span><br /><br />'; |
my $person = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); |
my $person = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); |
my $subject = &mt('Reservation change: [_1]',$description); |
my $subject = &mt('Reservation change: [_1]',$description); |
my $msgbody = &mt('Reservation released by [_1] for [_2].',$person,$description); |
my $msgbody = &mt('Reservation released by [_1] for [_2].',$person,$description); |
Line 1119 sub delete_slot {
|
Line 1119 sub delete_slot {
|
if ($ret eq 'ok') { |
if ($ret eq 'ok') { |
$r->print('<p>'.&mt('Slot [_1] marked as deleted.','<tt>'.$slot_name.'</tt>').'</p>'); |
$r->print('<p>'.&mt('Slot [_1] marked as deleted.','<tt>'.$slot_name.'</tt>').'</p>'); |
} else { |
} else { |
$r->print('<p><span class="LC_error">'.&mt('An error occurred when attempting to delete slot: [_1]','<tt>'.$slot_name.'</tt>')." ($ret)</span></p>"); |
$r->print('<p class="LC_error">'.&mt('An error occurred when attempting to delete slot: [_1]','<tt>'.$slot_name.'</tt>')." ($ret)</p>"); |
} |
} |
} else { |
} else { |
if (%consumed) { |
if (%consumed) { |
Line 1151 sub get_slot {
|
Line 1151 sub get_slot {
|
my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot); |
my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot); |
|
|
if ($slot_name =~ /^error: (.*)/) { |
if ($slot_name =~ /^error: (.*)/) { |
$r->print('<p><span class="LC_error">' |
$r->print('<p class="LC_error">' |
.&mt('An error occurred while attempting to make a reservation. ([_1])',$1) |
.&mt('An error occurred while attempting to make a reservation. ([_1])',$1) |
.'</span></p>'); |
.'</p>'); |
&return_link($r); |
&return_link($r); |
return 0; |
return 0; |
} |
} |
Line 1206 STUFF
|
Line 1206 STUFF
|
if (defined($reserved)) { |
if (defined($reserved)) { |
my $retvalue = 0; |
my $retvalue = 0; |
if ($slot_name =~ /^error: (.*)/) { |
if ($slot_name =~ /^error: (.*)/) { |
$r->print('<p><span class="LC_error">' |
$r->print('<p class="LC_error">' |
.&mt('An error occurred while attempting to make a reservation. ([_1])',$1) |
.&mt('An error occurred while attempting to make a reservation. ([_1])',$1) |
.'</span></p>'); |
.'</p>'); |
} elsif ($reserved > -1) { |
} elsif ($reserved > -1) { |
$r->print('<p style="font-weight: bold;">'.&mt('Successfully signed up: [_1]',$description).'</p>'); |
$r->print('<p style="font-weight: bold;">'.&mt('Successfully signed up: [_1]',$description).'</p>'); |
$retvalue = 1; |
$retvalue = 1; |