".&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 (@{$inputs}) { + foreach my $parm ('uname','udom','slotname','entry','symb') { $hidden_input .= '&\'').'" />'."\n"; } - my %lt = &Apache::lonlocal::texthash('yes' => 'Yes', - 'no' => 'No',); $r->print(<<"END_CONFIRM"); -$msg
+Remove $name from slot $env{'form.slotname'} for $title
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' @@ -426,28 +357,14 @@ 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($slot_name,\%slot); + my $description=&get_description($env{'form.slotname'},\%slot); if ($mgr ne 'F') { if ($slot{'starttime'} < time) { - return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description)); + $r->print("Not allowed to release Reservation: $description, as it has already ended.
"); + &return_link($r); + return 0; } } # get parameter string, check for existance, rebuild string with the slot @@ -461,8 +378,6 @@ sub release_reservation { } 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"); @@ -478,14 +393,13 @@ sub release_reservation { '0_availablestudent', 1, $new_param, 'string', $uname,$udom); - - my $msg; + $r->print("Released Reservation: $description
"); if ($mgr eq 'F') { - $msg = &mt('Released Reservation for user: [_1]',"$uname:$udom"); - } else { - $msg = &mt('Released Reservation: [_1]',$description); + $r->print(''. + &mt('Return to slot list').'
'); } - return (1,$msg); + if (!$inhibit_return_link) { &return_link($r); } + return 1; } sub delete_slot { @@ -615,34 +529,46 @@ STUFF sub allowed_slot { my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_; + #already started if ($slot->{'starttime'} < time) { # all open slot to be schedulable #return 0; } &Apache::lonxml::debug("$slot_name starttime good"); + #already ended if ($slot->{'endtime'} < time) { return 0; } &Apache::lonxml::debug("$slot_name endtime good"); + # not allowed to pick this one if (defined($slot->{'type'}) && $slot->{'type'} ne 'schedulable_student') { return 0; } &Apache::lonxml::debug("$slot_name type good"); - # not allowed for this resource - if (defined($slot->{'symb'}) - && $slot->{'symb'} ne $symb) { + + # its for a different set of users + if (defined($slot->{'allowedsection'})) { + return 0; } - # reserve time not yet started - if ($slot->{'startreserve'} > time) { + &Apache::lonxml::debug("$slot_name type good"); + + # its for a different set of users + if (defined($slot->{'allowedusers'})) { + return 0; } - &Apache::lonxml::debug("$slot_name reserve good"); + &Apache::lonxml::debug("$slot_name type good"); + # not allowed for this resource + if (defined($slot->{'symb'}) + && $slot->{'symb'} ne $symb) { + return 0; + } my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots, $consumed_uniqueperiods); if ($conflict) { @@ -730,27 +656,12 @@ STUFF } sub to_show { - my ($slotname,$slot,$when,$deleted,$name) = @_; + my ($slot,$when,$deleted) = @_; my $time=time; my $week=60*60*24*7; - if ($deleted eq 'hide' && $slot->{'type'} eq 'deleted') { return 0; } - - if ($name && $name->{'value'} =~ /\w/) { - if ($name->{'type'} eq 'substring') { - if ($slotname !~ /\Q$name->{'value'}\E/) { - return 0; - } - } - if ($name->{'type'} eq 'exact') { - if ($slotname eq $name->{'value'}) { - return 0; - } - } - } - if ($when eq 'any') { return 1; } elsif ($when eq 'now') { @@ -795,20 +706,14 @@ sub to_show { sub remove_link { my ($slotname,$entry,$uname,$udom,$symb) = @_; - my $remove = &mt('Remove'); - - if ($entry eq 'remove all') { - $remove = &mt('Remove All'); - undef($uname); - undef($udom); - } - $slotname = &Apache::lonnet::escape($slotname); $entry = &Apache::lonnet::escape($entry); $uname = &Apache::lonnet::escape($uname); $udom = &Apache::lonnet::escape($udom); $symb = &Apache::lonnet::escape($symb); + my $remove= &mt('Remove'); + return <<"END_LINK"; ($remove) @@ -837,12 +742,10 @@ sub show_table { $r->print(''); } - my %Saveable_Parameters = ('show' => 'array', - 'when' => 'scalar', - 'order' => 'scalar', - 'deleted' => 'scalar', - 'name_filter_type' => 'scalar', - 'name_filter_value' => 'scalar', + my %Saveable_Parameters = ('show' => 'array', + 'when' => 'scalar', + 'order' => 'scalar', + 'deleted' => 'scalar', ); &Apache::loncommon::store_course_settings('slotrequest', \%Saveable_Parameters); @@ -852,30 +755,31 @@ sub show_table { my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all'); &Apache::grades::reset_perm(); - # what to display filtering my %show_fields=&Apache::lonlocal::texthash( - 'name' => 'Slot Name', - 'description' => 'Description', - 'type' => 'Type', - 'starttime' => 'Start time', - 'endtime' => 'End Time', - 'startreserve' => 'Time students can start reserving', - 'secret' => 'Secret Word', - 'maxspace' => 'Maximum # of students', - 'ip' => 'IP or DNS restrictions', - 'symb' => 'Resource slot is restricted to.', - 'uniqueperiod' => 'Period of time slot is unique', - 'scheduled' => 'Scheduled Students', - 'proctor' => 'List of proctors'); + 'name' => 'Slot Name', + 'description' => 'Description', + 'type' => 'Type', + 'starttime' => 'Start time', + 'endtime' => 'End Time', + 'startreserve' => 'Time students can start reserving', + 'secret' => 'Secret Word', + 'maxspace' => 'Maximum # of students', + 'ip' => 'IP or DNS restrictions', + 'symb' => 'Resource slot is restricted to.', + 'allowedsections' => 'Sections slot is restricted to.', + 'allowedusers' => 'Users slot is restricted to.', + 'uniqueperiod' => 'Period of time slot is unique', + 'scheduled' => 'Scheduled Students', + 'proctor' => 'List of proctors'); my @show_order=('name','description','type','starttime','endtime', - 'startreserve','secret','maxspace','ip','symb', - 'uniqueperiod','scheduled','proctor'); + 'startreserve','secret','maxspace','ip','symb', + 'allowedsections','allowedusers','uniqueperiod', + 'scheduled','proctor'); my @show = (exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show') : keys(%show_fields); my %show = map { $_ => 1 } (@show); - #when filtering setup my %when_fields=&Apache::lonlocal::texthash( 'now' => 'Open now', 'nextweek' => 'Open within the next week', @@ -889,7 +793,6 @@ sub show_table { my $when = (exists($env{'form.when'})) ? $env{'form.when'} : 'now'; - #display of students setup my %stu_display_fields= &Apache::lonlocal::texthash('username' => 'User name', 'fullname' => 'Full name', @@ -900,22 +803,6 @@ sub show_table { : keys(%stu_display_fields); my %stu_display = map { $_ => 1 } (@stu_display); - #name filtering setup - my %name_filter_type_fields= - &Apache::lonlocal::texthash('substring' => 'Substring', - 'exact' => 'Exact', - #'reg' => 'Regular Expression', - ); - my @name_filter_type_order=('substring','exact'); - - $name_filter_type_fields{'select_form_order'} = \@name_filter_type_order; - my $name_filter_type = - (exists($env{'form.name_filter_type'})) ? $env{'form.name_filter_type'} - : 'substring'; - my $name_filter = {'type' => $name_filter_type, - 'value' => $env{'form.name_filter_value'},}; - - #deleted slot filtering my $hide_radio = &Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide'); my $show_radio = @@ -928,7 +815,6 @@ sub show_table {| $edit $delete | \n"); if (exists($show{'name'})) { @@ -1123,11 +1012,14 @@ DELETELINK if (exists($show{'symb'})) { $colspan++;$r->print("$title | \n"); } - if (exists($show{'uniqueperiod'})) { - $colspan++;$r->print("$unique | \n"); + if (exists($show{'allowedsections'})) { + $colspan++;$r->print("$allowedsections | \n"); + } + if (exists($show{'allowedusers'})) { + $colspan++;$r->print("$allowedusers | \n"); } if (exists($show{'scheduled'})) { - $colspan++;$r->print("$remove_all $ids | \n$ids | \n