|
version 1.39, 2006/02/03 17:07:20
|
version 1.48.2.3, 2006/03/30 05:13:38
|
|
Line 34 use Apache::Constants qw(:common :http :
|
Line 34 use Apache::Constants qw(:common :http :
|
| use Apache::loncommon(); |
use Apache::loncommon(); |
| use Apache::lonlocal; |
use Apache::lonlocal; |
| use Apache::lonnet; |
use Apache::lonnet; |
| |
use Apache::lonnavmaps(); |
| use Date::Manip; |
use Date::Manip; |
| |
|
| sub fail { |
sub fail { |
|
Line 47 sub fail {
|
Line 48 sub fail {
|
| $r->print('<p>'.&mt('Failed.').'</p>'); |
$r->print('<p>'.&mt('Failed.').'</p>'); |
| } |
} |
| |
|
| $r->print('<p><a href="/adm/flip?postdata=return:">'. |
&return_link($r); |
| &mt('Return to last resource').'</a></p>'); |
|
| &end_page($r); |
&end_page($r); |
| } |
} |
| |
|
|
Line 89 sub get_reservation_ids {
|
Line 89 sub get_reservation_ids {
|
| |
|
| my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
| "^$slot_name\0"); |
"^$slot_name\0"); |
| |
if (&network_error(%consumed)) { |
| |
return 'error: Unable to determine current status'; |
| |
} |
| my ($tmp)=%consumed; |
my ($tmp)=%consumed; |
| if ($tmp=~/^error: 2 / ) { |
if ($tmp=~/^error: 2 / ) { |
| return 0; |
return 0; |
|
Line 111 sub space_available {
|
Line 113 sub space_available {
|
| } |
} |
| |
|
| sub check_for_reservation { |
sub check_for_reservation { |
| my ($symb)=@_; |
my ($symb,$mode)=@_; |
| my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb, |
my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb, |
| $env{'user.domain'}, $env{'user.name'}); |
$env{'user.domain'}, $env{'user.name'}); |
| |
|
|
Line 124 sub check_for_reservation {
|
Line 126 sub check_for_reservation {
|
| my ($cnum,$cdom)=&get_course(); |
my ($cnum,$cdom)=&get_course(); |
| my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); |
my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); |
| |
|
| foreach my $slot_name (@slots) { |
if (&network_error($student) || &network_error($course) || |
| |
&network_error(%slots)) { |
| |
return 'error: Unable to determine current status'; |
| |
} |
| |
my @got; |
| |
foreach my $slot_name (sort { |
| |
if (ref($slots{$a}) && ref($slots{$b})) { |
| |
return $slots{$a}{'starttime'} <=> $slots{$b}{'starttime'} |
| |
} |
| |
if (ref($slots{$a})) { return -1;} |
| |
if (ref($slots{$b})) { return 1;} |
| |
return 0; |
| |
} @slots) { |
| next if (!defined($slots{$slot_name}) || |
next if (!defined($slots{$slot_name}) || |
| !ref($slots{$slot_name})); |
!ref($slots{$slot_name})); |
| &Apache::lonxml::debug(time." $slot_name ". |
&Apache::lonxml::debug(time." $slot_name ". |
|
Line 133 sub check_for_reservation {
|
Line 147 sub check_for_reservation {
|
| if ($slots{$slot_name}->{'endtime'} > time && |
if ($slots{$slot_name}->{'endtime'} > time && |
| $slots{$slot_name}->{'startreserve'} < time) { |
$slots{$slot_name}->{'startreserve'} < time) { |
| # between start of reservation times and end of slot |
# between start of reservation times and end of slot |
| return($slot_name, $slots{$slot_name}); |
if ($mode eq 'allslots') { |
| |
push(@got,$slot_name); |
| |
} else { |
| |
return($slot_name, $slots{$slot_name}); |
| |
} |
| } |
} |
| } |
} |
| |
if ($mode eq 'allslots' && @got) { |
| |
return @got; |
| |
} |
| return (undef,undef); |
return (undef,undef); |
| } |
} |
| |
|
| |
sub get_consumed_uniqueperiods { |
| |
my ($slots) = @_; |
| |
my $navmap=Apache::lonnavmaps::navmap->new; |
| |
my @problems = $navmap->retrieveResources(undef, |
| |
sub { $_[0]->is_problem() },1,0); |
| |
my %used_slots; |
| |
foreach my $problem (@problems) { |
| |
my $symb = $problem->symb(); |
| |
my $student = &Apache::lonnet::EXT("resource.0.availablestudent", |
| |
$symb, $env{'user.domain'}, |
| |
$env{'user.name'}); |
| |
my $course = &Apache::lonnet::EXT("resource.0.available", |
| |
$symb, $env{'user.domain'}, |
| |
$env{'user.name'}); |
| |
if (&network_error($student) || &network_error($course)) { |
| |
return 'error: Unable to determine current status'; |
| |
} |
| |
foreach my $slot (split(/:/,$student), split(/:/, $course)) { |
| |
$used_slots{$slot}=1; |
| |
} |
| |
} |
| |
|
| |
if (!ref($slots)) { |
| |
my ($cnum,$cdom)=&get_course(); |
| |
my %slots=&Apache::lonnet::get('slots', [keys(%used_slots)], $cdom, $cnum); |
| |
if (&network_error(%slots)) { |
| |
return 'error: Unable to determine current status'; |
| |
} |
| |
$slots = \%slots; |
| |
} |
| |
|
| |
my %consumed_uniqueperiods; |
| |
foreach my $slot_name (keys(%used_slots)) { |
| |
next if (!defined($slots->{$slot_name}) || |
| |
!ref($slots->{$slot_name})); |
| |
|
| |
next if (!defined($slots->{$slot_name}{'uniqueperiod'}) || |
| |
!ref($slots->{$slot_name}{'uniqueperiod'})); |
| |
$consumed_uniqueperiods{$slot_name} = |
| |
$slots->{$slot_name}{'uniqueperiod'}; |
| |
} |
| |
return \%consumed_uniqueperiods; |
| |
} |
| |
|
| sub check_for_conflict { |
sub check_for_conflict { |
| my ($symb,$new_slot_name)=@_; |
my ($symb,$new_slot_name,$new_slot,$slots,$consumed_uniqueperiods)=@_; |
| my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb, |
|
| $env{'user.domain'}, $env{'user.name'}); |
|
| my $course = &Apache::lonnet::EXT("resource.0.available", $symb, |
|
| $env{'user.domain'}, $env{'user.name'}); |
|
| my @slots = (split(/:/,$student), split(/:/, $course)); |
|
| my ($cnum,$cdom)=&get_course(); |
|
| my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); |
|
| foreach my $slot_name (@slots) { |
|
| next if (!defined($slots{$slot_name}) || |
|
| !ref($slots{$slot_name})); |
|
| |
|
| next if (!defined($slots{$slot_name}->{'uniqueperiod'}) || |
if (!defined($new_slot->{'uniqueperiod'})) { return undef; } |
| !ref($slots{$slot_name}->{'uniqueperiod'})); |
|
| my ($start,$end)=@{$slots{$slot_name}->{'uniqueperiod'}}; |
if (!ref($consumed_uniqueperiods)) { |
| if ($start<time && time < $end) { |
$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots); |
| |
if (&network_error(%$consumed_uniqueperiods)) { |
| |
return 'error: Unable to determine current status'; |
| |
} |
| |
} |
| |
|
| |
my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}}; |
| |
foreach my $slot_name (keys(%$consumed_uniqueperiods)) { |
| |
my ($start,$end)=@{$consumed_uniqueperiods->{$slot_name}}; |
| |
if (! |
| |
($start < $new_uniq_start && $end < $new_uniq_start) || |
| |
($start > $new_uniq_end && $end > $new_uniq_end )) { |
| return $slot_name; |
return $slot_name; |
| } |
} |
| } |
} |
|
Line 163 sub check_for_conflict {
|
Line 229 sub check_for_conflict {
|
| |
|
| } |
} |
| |
|
| |
sub network_error { |
| |
my ($result) = @_; |
| |
if ($result =~ /^(con_lost|no_such_host|error: [^2])/) { |
| |
return 1; |
| |
} |
| |
return 0; |
| |
} |
| |
|
| sub make_reservation { |
sub make_reservation { |
| my ($slot_name,$slot,$symb)=@_; |
my ($slot_name,$slot,$symb)=@_; |
| |
|
|
Line 171 sub make_reservation {
|
Line 245 sub make_reservation {
|
| my $value=&Apache::lonnet::EXT("resource.0.availablestudent",$symb, |
my $value=&Apache::lonnet::EXT("resource.0.availablestudent",$symb, |
| $env{'user.domain'},$env{'user.name'}); |
$env{'user.domain'},$env{'user.name'}); |
| &Apache::lonxml::debug("value is $value<br />"); |
&Apache::lonxml::debug("value is $value<br />"); |
| |
if (&network_error($value)) { |
| |
return 'error: Unable to determine current status'; |
| |
} |
| |
|
| foreach my $other_slot (split(/:/, $value)) { |
foreach my $other_slot (split(/:/, $value)) { |
| if ($other_slot eq $slot_name) { |
if ($other_slot eq $slot_name) { |
| my %consumed=&Apache::lonnet::dump('slot_reservations', $cdom, |
my %consumed=&Apache::lonnet::dump('slot_reservations', $cdom, |
| $cnum, "^$slot_name\0"); |
$cnum, "^$slot_name\0"); |
| |
if (&network_error($value)) { |
| |
return 'error: Unable to determine current status'; |
| |
} |
| my $me=$env{'user.name'}.'@'.$env{'user.domain'}; |
my $me=$env{'user.name'}.'@'.$env{'user.domain'}; |
| foreach my $key (keys(%consumed)) { |
foreach my $key (keys(%consumed)) { |
| if ($consumed{$key}->{'name'} eq $me) { |
if ($consumed{$key}->{'name'} eq $me) { |
|
Line 190 sub make_reservation {
|
Line 270 sub make_reservation {
|
| if (!defined($max)) { $max=99999; } |
if (!defined($max)) { $max=99999; } |
| |
|
| my (@ids)=&get_reservation_ids($slot_name); |
my (@ids)=&get_reservation_ids($slot_name); |
| |
if (&network_error(@ids)) { |
| |
return 'error: Unable to determine current status'; |
| |
} |
| my $last=0; |
my $last=0; |
| foreach my $id (@ids) { |
foreach my $id (@ids) { |
| my $num=(split('\0',$id))[1]; |
my $num=(split('\0',$id))[1]; |
|
Line 233 sub make_reservation {
|
Line 315 sub make_reservation {
|
| |
|
| sub remove_registration { |
sub remove_registration { |
| my ($r) = @_; |
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("<p>".&mt('A network error has occured.').'</p>'); |
| |
return; |
| |
} |
| |
if (!%consumed) { |
| |
$r->print("<p>".&mt('Slot <tt>[_1]</tt> has no reservations.', |
| |
$slot_name)."</p>"); |
| |
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'}, |
my $name = &Apache::loncommon::plainname($env{'form.uname'}, |
| $env{'form.udom'}); |
$env{'form.udom'}); |
| |
|
| my $title = &Apache::lonnet::gettitle($env{'form.symb'}); |
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; |
my $hidden_input; |
| foreach my $parm ('uname','udom','slotname','entry','symb') { |
foreach my $parm (@{$inputs}) { |
| $hidden_input .= |
$hidden_input .= |
| '<input type="hidden" name="'.$parm.'" value="' |
'<input type="hidden" name="'.$parm.'" value="' |
| .&HTML::Entities::encode($env{'form.'.$parm},'"<>&\'').'" />'."\n"; |
.&HTML::Entities::encode($env{'form.'.$parm},'"<>&\'').'" />'."\n"; |
| } |
} |
| |
my %lt = &Apache::lonlocal::texthash('yes' => 'Yes', |
| |
'no' => 'No',); |
| $r->print(<<"END_CONFIRM"); |
$r->print(<<"END_CONFIRM"); |
| <p> Remove $name from slot $env{'form.slotname'} for $title</p> |
<p> $msg </p> |
| <form action="/adm/slotrequest" method="POST"> |
<form action="/adm/slotrequest" method="POST"> |
| <input type="hidden" name="command" value="release" /> |
<input type="hidden" name="command" value="release" /> |
| |
<input type="hidden" name="button" value="yes" /> |
| $hidden_input |
$hidden_input |
| <input type="submit" name="Yes" value="yes" /> |
<input type="submit" value="$lt{'yes'}" /> |
| </form> |
</form> |
| <form action="/adm/slotrequest" method="POST"> |
<form action="/adm/slotrequest" method="POST"> |
| <input type="hidden" name="command" value="showslots" /> |
<input type="hidden" name="command" value="showslots" /> |
| <input type="submit" name="No" value="no" /> |
<input type="submit" value="$lt{'no'}" /> |
| </form> |
</form> |
| END_CONFIRM |
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('<p>'.&mt('Releasing reservations').'</p>'); |
| |
|
| |
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("<p>$msg</p>"); |
| |
$r->rflush(); |
| |
} |
| |
$r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
| |
&mt('Return to slot list').'</a></p>'); |
| |
&return_link($r); |
| |
} |
| |
|
| sub release_slot { |
sub release_slot { |
| my ($r,$symb,$slot_name,$inhibit_return_link,$mgr)=@_; |
my ($r,$symb,$slot_name,$inhibit_return_link,$mgr)=@_; |
| |
|
| if ($slot_name eq '') { $slot_name=$env{'form.slotname'}; } |
if ($slot_name eq '') { $slot_name=$env{'form.slotname'}; } |
| my ($cnum,$cdom)=&get_course(); |
|
| |
|
| my ($uname,$udom) = ($env{'user.name'}, $env{'user.domain'}); |
my ($uname,$udom) = ($env{'user.name'}, $env{'user.domain'}); |
| if ($mgr eq 'F' |
if ($mgr eq 'F' |
|
Line 275 sub release_slot {
|
Line 426 sub release_slot {
|
| && defined($env{'form.symb'})) { |
&& defined($env{'form.symb'})) { |
| $symb = $env{'form.symb'}; |
$symb = $env{'form.symb'}; |
| } |
} |
| |
|
| |
my ($result,$msg) = |
| |
&release_reservation($slot_name,$uname,$udom,$symb,$mgr); |
| |
$r->print("<p>$msg</p>"); |
| |
|
| |
if ($mgr eq 'F') { |
| |
$r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
| |
&mt('Return to slot list').'</a></p>'); |
| |
} |
| |
|
| |
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 %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 ($mgr ne 'F') { |
| if ($slot{$slot_name}{'starttime'} < time) { |
if ($slot{'starttime'} < time) { |
| $r->print("<p>Not allowed to release Reservation: $description, as it has already ended.</p>"); |
return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description)); |
| $r->print('<p><a href="/adm/flip?postdata=return:">'. |
|
| &mt('Return to last resource').'</a></p>'); |
|
| return 0; |
|
| } |
} |
| } |
} |
| # get parameter string, check for existance, rebuild string with the slot |
# get parameter string, check for existance, rebuild string with the slot |
|
Line 297 sub release_slot {
|
Line 461 sub release_slot {
|
| } |
} |
| my $new_param = join(':',@new_slots); |
my $new_param = join(':',@new_slots); |
| |
|
| |
my ($cnum,$cdom)=&get_course(); |
| |
|
| # get slot reservations, check if user has one, if so remove reservation |
# get slot reservations, check if user has one, if so remove reservation |
| my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
| "^$slot_name\0"); |
"^$slot_name\0"); |
|
Line 312 sub release_slot {
|
Line 478 sub release_slot {
|
| '0_availablestudent', |
'0_availablestudent', |
| 1, $new_param, 'string', |
1, $new_param, 'string', |
| $uname,$udom); |
$uname,$udom); |
| my $description=&get_description($env{'form.slotname'},\%slot); |
|
| $r->print("<p>Released Reservation: $description</p>"); |
my $msg; |
| if ($mgr eq 'F') { |
if ($mgr eq 'F') { |
| $r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom"); |
| &mt('Return to slot list').'</a></p>'); |
} else { |
| } |
$msg = &mt('Released Reservation: [_1]',$description); |
| if (!$inhibit_return_link) { |
|
| $r->print('<p><a href="/adm/flip?postdata=return:">'. |
|
| &mt('Return to last resource').'</a></p>'); |
|
| } |
} |
| return 1; |
return (1,$msg); |
| } |
} |
| |
|
| sub delete_slot { |
sub delete_slot { |
|
Line 355 sub delete_slot {
|
Line 518 sub delete_slot {
|
| } |
} |
| $r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
$r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
| &mt('Return to slot list').'</a></p>'); |
&mt('Return to slot list').'</a></p>'); |
| |
&return_link($r); |
| |
} |
| |
|
| |
sub return_link { |
| |
my ($r) = @_; |
| $r->print('<p><a href="/adm/flip?postdata=return:">'. |
$r->print('<p><a href="/adm/flip?postdata=return:">'. |
| &mt('Return to last resource').'</a></p>'); |
&mt('Return to last resource').'</a></p>'); |
| } |
} |
|
Line 362 sub delete_slot {
|
Line 530 sub delete_slot {
|
| sub get_slot { |
sub get_slot { |
| my ($r,$symb)=@_; |
my ($r,$symb)=@_; |
| |
|
| my $slot_name=&check_for_conflict($symb,$env{'form.slotname'}); |
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("<p>An error occured while attempting to make a reservation. ($1)</p>"); |
| |
&return_link($r); |
| |
return; |
| |
} |
| if ($slot_name) { |
if ($slot_name) { |
| my %slot=&Apache::lonnet::get_slot($slot_name); |
my %slot=&Apache::lonnet::get_slot($slot_name); |
| my $description1=&get_description($slot_name,\%slot); |
my $description1=&get_description($slot_name,\%slot); |
|
Line 383 STUFF
|
Line 558 STUFF
|
| STUFF |
STUFF |
| $r->print(' your reservation from <b>'.$description1.'</b> to <b>'. |
$r->print(' your reservation from <b>'.$description1.'</b> to <b>'. |
| $description2. |
$description2. |
| '</b> <br />or <a href="/adm/flip?postdata=return:">'. |
'</b> <br />or </p>'); |
| &mt('Return to last resource').'</a></p>'); |
&return_link($r); |
| $r->print(<<STUFF); |
$r->print(<<STUFF); |
| </form> |
</form> |
| STUFF |
STUFF |
| } else { |
} else { |
| $r->print('<p><a href="/adm/flip?postdata=return:">'. |
&return_link($r); |
| &mt('Return to last resource').'</a></p>'); |
|
| } |
} |
| return; |
return; |
| } |
} |
| my %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
|
| my $reserved=&make_reservation($env{'form.slotname'}, |
my $reserved=&make_reservation($env{'form.slotname'}, |
| \%slot,$symb); |
\%slot,$symb); |
| my $description=&get_description($env{'form.slotname'},\%slot); |
my $description=&get_description($env{'form.slotname'},\%slot); |
| if (defined($reserved)) { |
if (defined($reserved)) { |
| if ($reserved > -1) { |
if ($slot_name =~ /^error: (.*)/) { |
| |
$r->print("<p>An error occured while attempting to make a reservation. ($1)</p>"); |
| |
} elsif ($reserved > -1) { |
| $r->print("<p>Success: $description</p>"); |
$r->print("<p>Success: $description</p>"); |
| $r->print('<p><a href="/adm/flip?postdata=return:">'. |
|
| &mt('Return to last resource').'</a></p>'); |
|
| return; |
|
| } elsif ($reserved < 0) { |
} elsif ($reserved < 0) { |
| $r->print("<p>Already reserved: $description</p>"); |
$r->print("<p>Already reserved: $description</p>"); |
| $r->print('<p><a href="/adm/flip?postdata=return:">'. |
|
| &mt('Return to last resource').'</a></p>'); |
|
| return; |
|
| } |
} |
| |
&return_link($r); |
| |
return; |
| } |
} |
| |
|
| my %lt=('request'=>"Availibility list", |
my %lt=('request'=>"Availibility list", |
|
Line 436 or
|
Line 608 or
|
| </p> |
</p> |
| or |
or |
| STUFF |
STUFF |
| $r->print('<p><a href="/adm/flip?postdata=return:">'. |
|
| &mt('Return to last resource').'</a></p>'); |
&return_link($r); |
| return; |
return; |
| } |
} |
| |
|
| sub allowed_slot { |
sub allowed_slot { |
| my ($slot_name,$slot,$symb)=@_; |
my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_; |
| #already started |
#already started |
| if ($slot->{'starttime'} < time) { |
if ($slot->{'starttime'} < time) { |
| # all open slot to be schedulable |
# all open slot to be schedulable |
|
Line 465 sub allowed_slot {
|
Line 637 sub allowed_slot {
|
| && $slot->{'symb'} ne $symb) { |
&& $slot->{'symb'} ne $symb) { |
| return 0; |
return 0; |
| } |
} |
| |
# 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; |
| |
} |
| |
} |
| &Apache::lonxml::debug("$slot_name symb good"); |
&Apache::lonxml::debug("$slot_name symb good"); |
| return 1; |
return 1; |
| } |
} |
|
Line 485 sub show_choices {
|
Line 670 sub show_choices {
|
| |
|
| my ($cnum,$cdom)=&get_course(); |
my ($cnum,$cdom)=&get_course(); |
| my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
| |
my $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots); |
| my $available; |
my $available; |
| $r->print('<table border="1">'); |
$r->print('<table border="1">'); |
| &Apache::lonxml::debug("Checking Slots"); |
&Apache::lonxml::debug("Checking Slots"); |
| my ($got_slot)=&check_for_reservation($symb); |
my @got_slots=&check_for_reservation($symb,'allslots'); |
| foreach my $slot (sort |
foreach my $slot (sort |
| { return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} } |
{ return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} } |
| (keys(%slots))) { |
(keys(%slots))) { |
| |
|
| &Apache::lonxml::debug("Checking Slot $slot"); |
&Apache::lonxml::debug("Checking Slot $slot"); |
| next if (!&allowed_slot($slot,$slots{$slot})); |
next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots, |
| |
$consumed_uniqueperiods)); |
| |
|
| $available++; |
$available++; |
| |
|
| my $description=&get_description($slot,$slots{$slot}); |
my $description=&get_description($slot,$slots{$slot}); |
| |
|
| my $form=&mt('Unavailable'); |
my $form=&mt('Unavailable'); |
| if (($slot eq $got_slot) || |
if ((grep(/^\Q$slot\E$/,@got_slots)) || |
| &space_available($slot,$slots{$slot},$symb)) { |
&space_available($slot,$slots{$slot},$symb)) { |
| my $text=&mt('Select'); |
my $text=&mt('Select'); |
| my $command='get'; |
my $command='get'; |
| if ($slot eq $got_slot) { |
if (grep(/^\Q$slot\E$/,@got_slots)) { |
| $text=&mt('Free Reservation'); |
$text=&mt('Free Reservation'); |
| $command='release'; |
$command='release'; |
| |
} else { |
| |
my $conflict = &check_for_conflict($symb,$slot,$slots{$slot}, |
| |
\%slots, |
| |
$consumed_uniqueperiods); |
| |
if ($conflict) { |
| |
$text=&mt('Change Reservation'); |
| |
$command='get'; |
| |
} |
| } |
} |
| my $escsymb=&Apache::lonnet::escape($symb); |
my $escsymb=&Apache::lonnet::escape($symb); |
| $form=<<STUFF; |
$form=<<STUFF; |
|
Line 535 STUFF
|
Line 730 STUFF
|
| } |
} |
| |
|
| sub to_show { |
sub to_show { |
| my ($slot,$when,$deleted) = @_; |
my ($slotname,$slot,$when,$deleted,$name) = @_; |
| my $time=time; |
my $time=time; |
| my $week=60*60*24*7; |
my $week=60*60*24*7; |
| |
|
| if ($deleted eq 'hide' && $slot->{'type'} eq 'deleted') { |
if ($deleted eq 'hide' && $slot->{'type'} eq 'deleted') { |
| return 0; |
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') { |
if ($when eq 'any') { |
| return 1; |
return 1; |
| } elsif ($when eq 'now') { |
} elsif ($when eq 'now') { |
|
Line 585 sub to_show {
|
Line 795 sub to_show {
|
| sub remove_link { |
sub remove_link { |
| my ($slotname,$entry,$uname,$udom,$symb) = @_; |
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); |
$slotname = &Apache::lonnet::escape($slotname); |
| $entry = &Apache::lonnet::escape($entry); |
$entry = &Apache::lonnet::escape($entry); |
| $uname = &Apache::lonnet::escape($uname); |
$uname = &Apache::lonnet::escape($uname); |
| $udom = &Apache::lonnet::escape($udom); |
$udom = &Apache::lonnet::escape($udom); |
| $symb = &Apache::lonnet::escape($symb); |
$symb = &Apache::lonnet::escape($symb); |
| |
|
| my $remove= &mt('Remove'); |
|
| |
|
| return <<"END_LINK"; |
return <<"END_LINK"; |
| <a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb" |
<a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb" |
| >($remove)</a> |
>($remove)</a> |
|
Line 621 sub show_table {
|
Line 837 sub show_table {
|
| $r->print('</div>'); |
$r->print('</div>'); |
| } |
} |
| |
|
| my %Saveable_Parameters = ('show' => 'array', |
my %Saveable_Parameters = ('show' => 'array', |
| 'when' => 'scalar', |
'when' => 'scalar', |
| 'order' => 'scalar', |
'order' => 'scalar', |
| 'deleted' => 'scalar', |
'deleted' => 'scalar', |
| |
'name_filter_type' => 'scalar', |
| |
'name_filter_value' => 'scalar', |
| ); |
); |
| &Apache::loncommon::store_course_settings('slotrequest',\%Saveable_Parameters); |
&Apache::loncommon::store_course_settings('slotrequest', |
| &Apache::loncommon::restore_course_settings('slotrequest',\%Saveable_Parameters); |
\%Saveable_Parameters); |
| |
&Apache::loncommon::restore_course_settings('slotrequest', |
| |
\%Saveable_Parameters); |
| |
&Apache::grades::init_perm(); |
| |
my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all'); |
| |
&Apache::grades::reset_perm(); |
| |
|
| |
# what to display filtering |
| my %show_fields=&Apache::lonlocal::texthash( |
my %show_fields=&Apache::lonlocal::texthash( |
| 'name' => 'Slot Name', |
'name' => 'Slot Name', |
| 'description' => 'Description', |
'description' => 'Description', |
|
Line 641 sub show_table {
|
Line 865 sub show_table {
|
| 'ip' => 'IP or DNS restrictions', |
'ip' => 'IP or DNS restrictions', |
| 'symb' => 'Resource slot is restricted to.', |
'symb' => 'Resource slot is restricted to.', |
| 'uniqueperiod' => 'Period of time slot is unique', |
'uniqueperiod' => 'Period of time slot is unique', |
| |
'scheduled' => 'Scheduled Students', |
| 'proctor' => 'List of proctors'); |
'proctor' => 'List of proctors'); |
| my @show_order=('name','description','type','starttime','endtime', |
my @show_order=('name','description','type','starttime','endtime', |
| 'startreserve','secret','maxspace','ip','symb', |
'startreserve','secret','maxspace','ip','symb', |
| 'uniqueperiod','proctor'); |
'uniqueperiod','scheduled','proctor'); |
| my @show = |
my @show = |
| (exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show') |
(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show') |
| : keys(%show_fields); |
: keys(%show_fields); |
| my %show = map { $_ => 1 } (@show); |
my %show = map { $_ => 1 } (@show); |
| |
|
| |
#when filtering setup |
| my %when_fields=&Apache::lonlocal::texthash( |
my %when_fields=&Apache::lonlocal::texthash( |
| 'now' => 'Open now', |
'now' => 'Open now', |
| 'nextweek' => 'Open within the next week', |
'nextweek' => 'Open within the next week', |
|
Line 663 sub show_table {
|
Line 889 sub show_table {
|
| my $when = (exists($env{'form.when'})) ? $env{'form.when'} |
my $when = (exists($env{'form.when'})) ? $env{'form.when'} |
| : 'now'; |
: 'now'; |
| |
|
| |
#display of students setup |
| |
my %stu_display_fields= |
| |
&Apache::lonlocal::texthash('username' => 'User name', |
| |
'fullname' => 'Full name', |
| |
); |
| |
my @stu_display_order=('fullname','username'); |
| |
my @stu_display = |
| |
(exists($env{'form.studisplay'})) ? &Apache::loncommon::get_env_multiple('form.studisplay') |
| |
: 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 = |
my $hide_radio = |
| &Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide'); |
&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide'); |
| my $show_radio = |
my $show_radio = |
|
Line 673 sub show_table {
|
Line 926 sub show_table {
|
| $r->print('<div>'); |
$r->print('<div>'); |
| $r->print('<table class="inline"> |
$r->print('<table class="inline"> |
| <tr><th>'.&mt('Show').'</th> |
<tr><th>'.&mt('Show').'</th> |
| |
<th>'.&mt('Student Display').'</th> |
| <th>'.&mt('Open').'</th> |
<th>'.&mt('Open').'</th> |
| |
<th>'.&mt('Slot Name Filter').'</th> |
| <th>'.&mt('Options').'</th> |
<th>'.&mt('Options').'</th> |
| </tr> |
</tr> |
| <tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order). |
<tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order). |
| '</td> |
'</td> |
| |
<td> |
| |
'.&Apache::loncommon::multiple_select_form('studisplay',\@stu_display, |
| |
6,\%stu_display_fields, |
| |
\@stu_display_order).' |
| |
</td> |
| <td>'.&Apache::loncommon::select_form($when,'when',%when_fields). |
<td>'.&Apache::loncommon::select_form($when,'when',%when_fields). |
| '</td> |
'</td> |
| |
<td>'.&Apache::loncommon::select_form($name_filter_type, |
| |
'name_filter_type', |
| |
%name_filter_type_fields). |
| |
'<br />'. |
| |
&Apache::lonhtmlcommon::textbox('name_filter_value', |
| |
$env{'form.name_filter_value'}, |
| |
15). |
| |
'</td> |
| <td> |
<td> |
| <table> |
<table> |
| <tr> |
<tr> |
|
Line 704 sub show_table {
|
Line 972 sub show_table {
|
| $r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>'); |
$r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>'); |
| } |
} |
| } |
} |
| $r->print('<th>Scheduled Students</th></tr>'); |
|
| |
|
| my %name_cache; |
my %name_cache; |
| my $slotsort = sub { |
my $slotsort = sub { |
|
Line 734 sub show_table {
|
Line 1001 sub show_table {
|
| return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'}; |
return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'}; |
| }; |
}; |
| foreach my $slot (sort $slotsort (keys(%slots))) { |
foreach my $slot (sort $slotsort (keys(%slots))) { |
| if (!&to_show($slots{$slot},$when,$env{'form.deleted'})) { next; } |
if (!&to_show($slot,$slots{$slot},$when, |
| |
$env{'form.deleted'},$name_filter)) { next; } |
| if (defined($slots{$slot}->{'type'}) |
if (defined($slots{$slot}->{'type'}) |
| && $slots{$slot}->{'type'} ne 'schedulable_student') { |
&& $slots{$slot}->{'type'} ne 'schedulable_student') { |
| #next; |
#next; |
| } |
} |
| my $description=&get_description($slot,$slots{$slot}); |
my $description=&get_description($slot,$slots{$slot}); |
| my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
|
| "^$slot\0"); |
|
| my $ids; |
my $ids; |
| |
if (exists($show{'scheduled'})) { |
| my ($tmp)=%consumed; |
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
| if ($tmp !~ /^error: /) { |
"^$slot\0"); |
| foreach my $entry (sort(keys(%consumed))) { |
my ($tmp)=%consumed; |
| my (undef,$id)=split("\0",$entry); |
if ($tmp !~ /^error: /) { |
| my ($uname,$udom) = split('@',$consumed{$entry}{'name'}); |
foreach my $entry (sort { $consumed{$a}{name} cmp |
| my $name = &Apache::loncommon::plainname($uname,$udom); |
$consumed{$b}{name} } |
| $ids.= '<nobr>'.$name.&remove_link($slot,$entry,$uname,$udom, |
(keys(%consumed))) { |
| $consumed{$entry}{'symb'}) |
my (undef,$id)=split("\0",$entry); |
| .'</nobr><br />'; |
my ($uname,$udom) = split('@',$consumed{$entry}{'name'}); |
| |
$ids.= '<nobr>'; |
| |
foreach my $item (@stu_display_order) { |
| |
if ($stu_display{$item}) { |
| |
if ($item eq 'fullname') { |
| |
$ids.=$fullname->{"$uname:$udom"}.' '; |
| |
} elsif ($item eq 'username') { |
| |
$ids.="<tt>$uname\@$udom</tt> "; |
| |
} |
| |
} |
| |
} |
| |
$ids.=&remove_link($slot,$entry,$uname,$udom, |
| |
$consumed{$entry}{'symb'}).'</nobr><br />'; |
| |
} |
| } |
} |
| } |
} |
| |
|
|
Line 804 EDITLINK
|
Line 1083 EDITLINK
|
| my $delete=(<<"DELETELINK"); |
my $delete=(<<"DELETELINK"); |
| <a href="/adm/slotrequest?command=delete&slotname=$slot">Delete</a> |
<a href="/adm/slotrequest?command=delete&slotname=$slot">Delete</a> |
| DELETELINK |
DELETELINK |
| |
|
| |
my $remove_all=&remove_link($slot,'remove all').'<br />'; |
| |
|
| if ($ids ne '') { undef($delete); } |
if ($ids ne '') { undef($delete); } |
| |
if ($slots{$slot}{'type'} ne 'schedulable_student' |
| |
|| $ids eq '') { |
| |
undef($remove_all); |
| |
} |
| |
|
| $r->print("<tr>\n<td rowspan=\"$rowspan\">$edit $delete</td>\n"); |
$r->print("<tr>\n<td rowspan=\"$rowspan\">$edit $delete</td>\n"); |
| if (exists($show{'name'})) { |
if (exists($show{'name'})) { |
|
Line 840 DELETELINK
|
Line 1126 DELETELINK
|
| if (exists($show{'uniqueperiod'})) { |
if (exists($show{'uniqueperiod'})) { |
| $colspan++;$r->print("<td>$unique</td>\n"); |
$colspan++;$r->print("<td>$unique</td>\n"); |
| } |
} |
| $colspan++;$r->print("<td>$ids</td>\n</tr>\n"); |
if (exists($show{'scheduled'})) { |
| |
$colspan++;$r->print("<td>$remove_all $ids</td>\n</tr>\n"); |
| |
} |
| if (exists($show{'proctor'})) { |
if (exists($show{'proctor'})) { |
| $r->print(<<STUFF); |
$r->print(<<STUFF); |
| <tr> |
<tr> |
|
Line 1123 sub handler {
|
Line 1411 sub handler {
|
| } elsif ($env{'form.command'} eq 'remove_registration' && $mgr eq 'F') { |
} elsif ($env{'form.command'} eq 'remove_registration' && $mgr eq 'F') { |
| &remove_registration($r); |
&remove_registration($r); |
| } elsif ($env{'form.command'} eq 'release' && $mgr eq 'F') { |
} elsif ($env{'form.command'} eq 'release' && $mgr eq 'F') { |
| &release_slot($r,undef,undef,undef,$mgr); |
if ($env{'form.entry'} eq 'remove all') { |
| |
&release_all_slot($r,$mgr); |
| |
} else { |
| |
&release_slot($r,undef,undef,undef,$mgr); |
| |
} |
| } elsif ($env{'form.command'} eq 'delete' && $mgr eq 'F') { |
} elsif ($env{'form.command'} eq 'delete' && $mgr eq 'F') { |
| &delete_slot($r); |
&delete_slot($r); |
| } elsif ($env{'form.command'} eq 'uploadstart' && $mgr eq 'F') { |
} elsif ($env{'form.command'} eq 'uploadstart' && $mgr eq 'F') { |
![[BACK]](/icons/back.gif){kind=icon}
Return to slotrequest.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface