".&mt('A network error has occured.').'
'); + return; + } + if (!%consumed) { + $r->print("".&mt('Slot [_1] has no reservations.', + $slot_name)."
"); + return; + } + + my @names = map { $consumed{$_}{'name'} } (sort(keys(%consumed))); + my $names = join(' ',@names); + + my $msg = &mt('Remove all of [_1] from slot [_2]?',$names,$slot_name); + &remove_registration_confirmation($r,$msg,['entry','slotname']); +} + +sub remove_registration_user { + my ($r) = @_; + + my $slot_name = $env{'form.slotname'}; + my $name = &Apache::loncommon::plainname($env{'form.uname'}, $env{'form.udom'}); my $title = &Apache::lonnet::gettitle($env{'form.symb'}); + my $msg = &mt('Remove [_1] from slot [_2] for [_3]', + $name,$slot_name,$title); + + &remove_registration_confirmation($r,$msg,['uname','udom','slotname', + 'entry','symb']); +} + +sub remove_registration_confirmation { + my ($r,$msg,$inputs) =@_; + my $hidden_input; - foreach my $parm ('uname','udom','slotname','entry','symb') { + foreach my $parm (@{$inputs}) { $hidden_input .= '&\'').'" />'."\n"; } + my %lt = &Apache::lonlocal::texthash('yes' => 'Yes', + 'no' => 'No',); $r->print(<<"END_CONFIRM"); -Remove $name from slot $env{'form.slotname'} for $title
+$msg
END_CONFIRM } +sub release_all_slot { + my ($r,$mgr)=@_; + + my $slot_name = $env{'form.slotname'}; + + my ($cnum,$cdom)=&get_course(); + + my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, + "^$slot_name\0"); + + $r->print(''.&mt('Releasing reservations').'
'); + + foreach my $entry (sort { $consumed{$a}{'name'} cmp + $consumed{$b}{'name'} } (keys(%consumed))) { + my ($uname,$udom) = split('@',$consumed{$entry}{'name'}); + my ($result,$msg) = + &release_reservation($slot_name,$uname,$udom, + $consumed{$entry}{'symb'},$mgr); + $r->print("$msg
"); + $r->rflush(); + } + $r->print(''. + &mt('Return to slot list').'
'); + &return_link($r); +} + sub release_slot { my ($r,$symb,$slot_name,$inhibit_return_link,$mgr)=@_; if ($slot_name eq '') { $slot_name=$env{'form.slotname'}; } - my ($cnum,$cdom)=&get_course(); my ($uname,$udom) = ($env{'user.name'}, $env{'user.domain'}); if ($mgr eq 'F' @@ -326,14 +426,28 @@ sub release_slot { && defined($env{'form.symb'})) { $symb = $env{'form.symb'}; } + + my ($result,$msg) = + &release_reservation($slot_name,$uname,$udom,$symb,$mgr); + $r->print("$msg
"); + + if ($mgr eq 'F') { + $r->print(''. + &mt('Return to slot list').'
'); + } + + if (!$inhibit_return_link) { &return_link($r); } + return $result; +} + +sub release_reservation { + my ($slot_name,$uname,$udom,$symb,$mgr) = @_; my %slot=&Apache::lonnet::get_slot($slot_name); - my $description=&get_description($env{'form.slotname'},\%slot); + my $description=&get_description($slot_name,\%slot); if ($mgr ne 'F') { if ($slot{'starttime'} < time) { - $r->print("Not allowed to release Reservation: $description, as it has already ended.
"); - &return_link($r); - return 0; + return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description)); } } # get parameter string, check for existance, rebuild string with the slot @@ -347,6 +461,8 @@ sub release_slot { } my $new_param = join(':',@new_slots); + my ($cnum,$cdom)=&get_course(); + # get slot reservations, check if user has one, if so remove reservation my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, "^$slot_name\0"); @@ -362,13 +478,14 @@ sub release_slot { '0_availablestudent', 1, $new_param, 'string', $uname,$udom); - $r->print("Released Reservation: $description
"); + + my $msg; if ($mgr eq 'F') { - $r->print(''. - &mt('Return to slot list').'
'); + $msg = &mt('Released Reservation for user: [_1]',"$uname:$udom"); + } else { + $msg = &mt('Released Reservation: [_1]',$description); } - if (!$inhibit_return_link) { &return_link($r); } - return 1; + return (1,$msg); } sub delete_slot { @@ -497,7 +614,7 @@ STUFF } sub allowed_slot { - my ($slot_name,$slot,$symb,$slots)=@_; + my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_; #already started if ($slot->{'starttime'} < time) { # all open slot to be schedulable @@ -520,7 +637,14 @@ sub allowed_slot { && $slot->{'symb'} ne $symb) { return 0; } - my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots); + # reserve time not yet started + if ($slot->{'startreserve'} > time) { + return 0; + } + &Apache::lonxml::debug("$slot_name reserve good"); + + my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots, + $consumed_uniqueperiods); if ($conflict) { if ($slots->{$conflict}{'starttime'} < time) { return 0; @@ -546,6 +670,7 @@ sub show_choices { my ($cnum,$cdom)=&get_course(); my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); + my $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots); my $available; $r->print('| '.&mt('Show').' | '.&mt('Student Display').' | '.&mt('Open').' | +'.&mt('Slot Name Filter').' | '.&mt('Options').' | |||||
|---|---|---|---|---|---|---|---|---|---|
| '.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order). @@ -769,6 +940,14 @@ sub show_table { | '.&Apache::loncommon::select_form($when,'when',%when_fields). ' | +'.&Apache::loncommon::select_form($name_filter_type,
+ 'name_filter_type',
+ %name_filter_type_fields).
+ ' '. + &Apache::lonhtmlcommon::textbox('name_filter_value', + $env{'form.name_filter_value'}, + 15). + ' |
|