--- loncom/interface/slotrequest.pm 2006/03/30 05:13:38 1.48.2.3 +++ loncom/interface/slotrequest.pm 2006/03/30 04:34:32 1.54 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for requesting to have slots added to a students record # -# $Id: slotrequest.pm,v 1.48.2.3 2006/03/30 05:13:38 albertel Exp $ +# $Id: slotrequest.pm,v 1.54 2006/03/30 04:34:32 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -54,14 +54,12 @@ sub fail { sub start_page { my ($r,$title)=@_; - my $html=&Apache::lonxml::xmlbegin(); - $r->print($html.''.&mt($title).''); - $r->print(&Apache::loncommon::bodytag($title)); + $r->print(&Apache::loncommon::start_page($title)); } sub end_page { my ($r)=@_; - $r->print(&Apache::loncommon::endbodytag().''); + $r->print(&Apache::loncommon::end_page()); } =pod @@ -315,106 +313,37 @@ sub make_reservation { sub remove_registration { my ($r) = @_; - if ($env{'form.entry'} ne 'remove all') { - return &remove_registration_user($r); - } - my $slot_name = $env{'form.slotname'}; - my %slot=&Apache::lonnet::get_slot($slot_name); - - my ($cnum,$cdom)=&get_course(); - my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, - "^$slot_name\0"); - if (&network_error(%consumed)) { - $r->print("

".&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

- $hidden_input - +
- +
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 +355,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 +376,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 +391,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 +527,70 @@ 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) { - return 0; - } + # reserve time not yet started if ($slot->{'startreserve'} > time) { return 0; } &Apache::lonxml::debug("$slot_name reserve good"); + my $userallowed=0; + # its for a different set of users + if (defined($slot->{'allowedsections'})) { + if (!defined($env{'request.role.sec'}) + && grep(/^No section assigned$/, + split(',',$slot->{'allowedsections'}))) { + $userallowed=1; + } + if (defined($env{'request.role.sec'}) + && grep(/^\Q$env{'request.role.sec'}\E$/, + split(',',$slot->{'allowedsections'}))) { + $userallowed=1; + } + } + &Apache::lonxml::debug("$slot_name sections is $userallowed"); + + # its for a different set of users + if (defined($slot->{'allowedusers'}) + && grep(/^\Q$env{'user.name'}:$env{'user.domain'}\E$/, + split(',',$slot->{'allowedusers'}))) { + $userallowed=1; + } + + if (!defined($slot->{'allowedusers'}) + && !defined($slot->{'allowedsections'})) { + $userallowed=1; + } + + &Apache::lonxml::debug("$slot_name user is $userallowed"); + return 0 if (!$userallowed); + + # 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) { @@ -795,20 +743,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) @@ -854,22 +796,25 @@ sub show_table { # 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); @@ -975,7 +920,7 @@ sub show_table { my %name_cache; my $slotsort = sub { - if ($env{'form.order'}=~/^(type|description|endtime|startreserve|maxspace|ip|symb)$/) { + if ($env{'form.order'}=~/^(type|description|endtime|startreserve|maxspace|ip|symb|allowedsections|allowedusers)$/) { if (lc($slots{$a}->{$env{'form.order'}}) ne lc($slots{$b}->{$env{'form.order'}})) { return (lc($slots{$a}->{$env{'form.order'}}) @@ -1057,6 +1002,28 @@ sub show_table { $title=''.$title.''; } + my $allowedsections; + if (exists($show{'allowedsections'})) { + $allowedsections = + join(', ',sort(split(/\s*,\s*/, + $slots{$slot}->{'allowedsections'}))); + } + + my @allowedusers; + if (exists($show{'allowedusers'})) { + @allowedusers= map { + my ($uname,$udom)=split(/:/,$_); + my $fullname=$name_cache{$_}; + if (!defined($fullname)) { + $fullname = &Apache::loncommon::plainname($uname,$udom); + $fullname =~s/\s/ /g; + $name_cache{$_} = $fullname; + } + &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom); + } (sort(split(/\s*,\s*/,$slots{$slot}->{'allowedusers'}))); + } + my $allowedusers=join(', ',@allowedusers); + my @proctors; my $rowspan=1; my $colspan=1; @@ -1066,7 +1033,6 @@ sub show_table { my ($uname,$udom)=split(/@/,$_); my $fullname=$name_cache{$_}; if (!defined($fullname)) { - &Apache::lonnet::logthis("Gettign $uname $udom"); $fullname = &Apache::loncommon::plainname($uname,$udom); $fullname =~s/\s/ /g; $name_cache{$_} = $fullname; @@ -1083,14 +1049,7 @@ EDITLINK my $delete=(<<"DELETELINK"); Delete DELETELINK - - my $remove_all=&remove_link($slot,'remove all').'
'; - if ($ids ne '') { undef($delete); } - if ($slots{$slot}{'type'} ne 'schedulable_student' - || $ids eq '') { - undef($remove_all); - } $r->print("\n$edit $delete\n"); if (exists($show{'name'})) { @@ -1123,11 +1082,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\n"); + $colspan++;$r->print("$ids\n\n"); } if (exists($show{'proctor'})) { $r->print(<