version 1.44, 2006/02/03 23:53:30
|
version 1.70, 2006/10/29 16:22:13
|
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; |
|
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
|
|
sub fail { |
sub fail { |
my ($r,$code)=@_; |
my ($r,$code)=@_; |
if ($code eq 'not_valid') { |
if ($code eq 'not_valid') { |
$r->print('<p>'.&mt('Unable to understand what resource you wanted to sign up for.').'</p>'); |
$r->print('<p>'.&mt('Unable to understand what resource you wanted to sign up for.').'</p>'); |
|
} elsif ($code eq 'not_available') { |
|
$r->print('<p>'.&mt('No slots are available.').'</p>'); |
} elsif ($code eq 'not_allowed') { |
} elsif ($code eq 'not_allowed') { |
$r->print('<p>'.&mt('Not allowed to sign up or change reservations at this time.').'</p>'); |
$r->print('<p>'.&mt('Not allowed to sign up or change reservations at this time.').'</p>'); |
} else { |
} else { |
Line 53 sub fail {
|
Line 57 sub fail {
|
|
|
sub start_page { |
sub start_page { |
my ($r,$title)=@_; |
my ($r,$title)=@_; |
my $html=&Apache::lonxml::xmlbegin(); |
$r->print(&Apache::loncommon::start_page($title)); |
$r->print($html.'<head><title>'.&mt($title).'</title></head>'); |
|
$r->print(&Apache::loncommon::bodytag($title)); |
|
} |
} |
|
|
sub end_page { |
sub end_page { |
my ($r)=@_; |
my ($r)=@_; |
$r->print(&Apache::loncommon::endbodytag().'</html>'); |
$r->print(&Apache::loncommon::end_page()); |
} |
} |
|
|
=pod |
=pod |
Line 75 sub end_page {
|
Line 77 sub end_page {
|
=cut |
=cut |
|
|
sub get_course { |
sub get_course { |
(undef,my $courseid)=&Apache::lonxml::whichuser(); |
(undef,my $courseid)=&Apache::lonnet::whichuser(); |
my $cdom=$env{'course.'.$courseid.'.domain'}; |
my $cdom=$env{'course.'.$courseid.'.domain'}; |
my $cnum=$env{'course.'.$courseid.'.num'}; |
my $cnum=$env{'course.'.$courseid.'.num'}; |
return ($cnum,$cdom); |
return ($cnum,$cdom); |
Line 88 sub get_reservation_ids {
|
Line 90 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)) { |
if (&Apache::lonnet::error(%consumed)) { |
return 'error: Unable to determine current status'; |
return 'error: Unable to determine current status'; |
} |
} |
my ($tmp)=%consumed; |
my ($tmp)=%consumed; |
Line 125 sub check_for_reservation {
|
Line 127 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); |
|
|
if (&network_error($student) || &network_error($course) || |
if (&Apache::lonnet::error($student) |
&network_error(%slots)) { |
|| &Apache::lonnet::error($course) |
|
|| &Apache::lonnet::error(%slots)) { |
return 'error: Unable to determine current status'; |
return 'error: Unable to determine current status'; |
} |
} |
my @got; |
my @got; |
Line 159 sub check_for_reservation {
|
Line 162 sub check_for_reservation {
|
return (undef,undef); |
return (undef,undef); |
} |
} |
|
|
sub check_for_conflict { |
sub get_consumed_uniqueperiods { |
my ($symb,$new_slot_name,$new_slot,$slots)=@_; |
my ($slots) = @_; |
|
my $navmap=Apache::lonnavmaps::navmap->new; |
if (!defined($new_slot->{'uniqueperiod'})) { return undef; } |
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 (&Apache::lonnet::error($student) |
|
|| &Apache::lonnet::error($course)) { |
|
return 'error: Unable to determine current status'; |
|
} |
|
foreach my $slot (split(/:/,$student), split(/:/, $course)) { |
|
$used_slots{$slot}=1; |
|
} |
|
} |
|
|
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(); |
|
if (!ref($slots)) { |
if (!ref($slots)) { |
my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); |
my ($cnum,$cdom)=&get_course(); |
|
my %slots=&Apache::lonnet::get('slots', [keys(%used_slots)], $cdom, $cnum); |
|
if (&Apache::lonnet::error(%slots)) { |
|
return 'error: Unable to determine current status'; |
|
} |
$slots = \%slots; |
$slots = \%slots; |
} |
} |
|
|
if (&network_error($student) || &network_error($course) || |
my %consumed_uniqueperiods; |
&network_error(%$slots)) { |
foreach my $slot_name (keys(%used_slots)) { |
return 'error: Unable to determine current status'; |
|
} |
|
|
|
my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}}; |
|
foreach my $slot_name (@slots) { |
|
next if (!defined($slots->{$slot_name}) || |
next if (!defined($slots->{$slot_name}) || |
!ref($slots->{$slot_name})); |
!ref($slots->{$slot_name})); |
|
|
next if (!defined($slots->{$slot_name}{'uniqueperiod'}) || |
next if (!defined($slots->{$slot_name}{'uniqueperiod'}) || |
!ref($slots->{$slot_name}{'uniqueperiod'})); |
!ref($slots->{$slot_name}{'uniqueperiod'})); |
my ($start,$end)=@{$slots->{$slot_name}{'uniqueperiod'}}; |
$consumed_uniqueperiods{$slot_name} = |
|
$slots->{$slot_name}{'uniqueperiod'}; |
|
} |
|
return \%consumed_uniqueperiods; |
|
} |
|
|
|
sub check_for_conflict { |
|
my ($symb,$new_slot_name,$new_slot,$slots,$consumed_uniqueperiods)=@_; |
|
|
|
if (!defined($new_slot->{'uniqueperiod'})) { return undef; } |
|
|
|
if (!ref($consumed_uniqueperiods)) { |
|
$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots); |
|
if (&Apache::lonnet::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 (! |
if (! |
($start < $new_uniq_start && $end < $new_uniq_start) || |
($start < $new_uniq_start && $end < $new_uniq_start) || |
($start > $new_uniq_end && $end > $new_uniq_end )) { |
($start > $new_uniq_end && $end > $new_uniq_end )) { |
Line 198 sub check_for_conflict {
|
Line 232 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 214 sub make_reservation {
|
Line 240 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)) { |
|
|
my $use_slots = &Apache::lonnet::EXT("resource.0.useslots"); |
|
&Apache::lonxml::debug("use_slots is $use_slots<br />"); |
|
|
|
if (&Apache::lonnet::error($value) |
|
|| &Apache::lonnet::error($use_slots)) { |
return 'error: Unable to determine current status'; |
return 'error: Unable to determine current status'; |
} |
} |
|
|
|
my $parm_symb = $symb; |
|
my $parm_level = 1; |
|
if ($use_slots eq 'map' || $use_slots eq 'map_map') { |
|
my ($map) = &Apache::lonnet::decode_symb($symb); |
|
$parm_symb = &Apache::lonnet::symbread($map); |
|
$parm_level = 2; |
|
} |
|
|
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)) { |
if (&Apache::lonnet::error($value)) { |
return 'error: Unable to determine current status'; |
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) { |
my $num=(split('\0',$key))[1]; |
my $num=(split('\0',$key))[1]; |
Line 239 sub make_reservation {
|
Line 278 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)) { |
if (&Apache::lonnet::error(@ids)) { |
return 'error: Unable to determine current status'; |
return 'error: Unable to determine current status'; |
} |
} |
my $last=0; |
my $last=0; |
Line 255 sub make_reservation {
|
Line 294 sub make_reservation {
|
return undef; |
return undef; |
} |
} |
|
|
my %reservation=('name' => $env{'user.name'}.'@'.$env{'user.domain'}, |
my %reservation=('name' => $env{'user.name'}.':'.$env{'user.domain'}, |
'timestamp' => time, |
'timestamp' => time, |
'symb' => $symb); |
'symb' => $parm_symb); |
|
|
my $success=&Apache::lonnet::newput('slot_reservations', |
my $success=&Apache::lonnet::newput('slot_reservations', |
{"$slot_name\0$wanted" => |
{"$slot_name\0$wanted" => |
Line 271 sub make_reservation {
|
Line 310 sub make_reservation {
|
} |
} |
my $result=&Apache::lonparmset::storeparm_by_symb($symb, |
my $result=&Apache::lonparmset::storeparm_by_symb($symb, |
'0_availablestudent', |
'0_availablestudent', |
1, $new_value, 'string', |
$parm_level, $new_value, |
|
'string', |
$env{'user.name'}, |
$env{'user.name'}, |
$env{'user.domain'}); |
$env{'user.domain'}); |
&Apache::lonxml::debug("hrrm $result"); |
&Apache::lonxml::debug("hrrm $result"); |
Line 284 sub make_reservation {
|
Line 324 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 (&Apache::lonnet::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 326 sub release_slot {
|
Line 435 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{'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)); |
&return_link($r); |
|
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 347 sub release_slot {
|
Line 470 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"); |
foreach my $entry (keys(%consumed)) { |
foreach my $entry (keys(%consumed)) { |
if ( $consumed{$entry}->{'name'} eq ($uname.'@'.$udom) ) { |
if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) { |
&Apache::lonnet::del('slot_reservations',[$entry], |
&Apache::lonnet::del('slot_reservations',[$entry], |
$cdom,$cnum); |
$cdom,$cnum); |
} |
} |
} |
} |
|
|
|
my $use_slots = &Apache::lonnet::EXT("resource.0.useslots"); |
|
&Apache::lonxml::debug("use_slots is $use_slots<br />"); |
|
|
|
if (&Apache::lonnet::error($use_slots)) { |
|
return (0,'error: Unable to determine current status'); |
|
} |
|
|
|
my $parm_level = 1; |
|
if ($use_slots eq 'map' || $use_slots eq 'map_map') { |
|
$parm_level = 2; |
|
} |
# store new parameter string |
# store new parameter string |
my $result=&Apache::lonparmset::storeparm_by_symb($symb, |
my $result=&Apache::lonparmset::storeparm_by_symb($symb, |
'0_availablestudent', |
'0_availablestudent', |
1, $new_param, 'string', |
$parm_level, $new_param, |
$uname,$udom); |
'string', $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) { &return_link($r); } |
return (1,$msg); |
return 1; |
|
} |
} |
|
|
sub delete_slot { |
sub delete_slot { |
Line 430 sub get_slot {
|
Line 566 sub get_slot {
|
$r->print("<p>Already have a reservation: $description1</p>"); |
$r->print("<p>Already have a reservation: $description1</p>"); |
if ($slot_name ne $env{'form.slotname'}) { |
if ($slot_name ne $env{'form.slotname'}) { |
$r->print(<<STUFF); |
$r->print(<<STUFF); |
<form method="POST" action="/adm/slotrequest"> |
<form method="post" action="/adm/slotrequest"> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
<input type="hidden" name="slotname" value="$env{'form.slotname'}" /> |
<input type="hidden" name="slotname" value="$env{'form.slotname'}" /> |
<input type="hidden" name="releaseslot" value="$slot_name" /> |
<input type="hidden" name="releaseslot" value="$slot_name" /> |
Line 452 STUFF
|
Line 588 STUFF
|
} |
} |
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); |
Line 475 STUFF
|
Line 611 STUFF
|
$r->print(<<STUFF); |
$r->print(<<STUFF); |
<p> <font color="red">Failed</font> to reserve a spot for $description. </p> |
<p> <font color="red">Failed</font> to reserve a spot for $description. </p> |
<p> |
<p> |
<form method="POST" action="/adm/slotrequest"> |
<form method="post" action="/adm/slotrequest"> |
<input type="submit" name="Try Again" value="$lt{'try'}" /> |
<input type="submit" name="Try Again" value="$lt{'try'}" /> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
<input type="hidden" name="slotname" value="$env{'form.slotname'}" /> |
<input type="hidden" name="slotname" value="$env{'form.slotname'}" /> |
Line 485 STUFF
|
Line 621 STUFF
|
</p> |
</p> |
<p> |
<p> |
or |
or |
<form method="POST" action="/adm/slotrequest"> |
<form method="post" action="/adm/slotrequest"> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
<input type="submit" name="requestattempt" value="$lt{'request'}" /> |
<input type="submit" name="requestattempt" value="$lt{'request'}" /> |
</form> |
</form> |
Line 498 STUFF
|
Line 634 STUFF
|
} |
} |
|
|
sub allowed_slot { |
sub allowed_slot { |
my ($slot_name,$slot,$symb,$slots)=@_; |
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 |
#return 0; |
#return 0; |
} |
} |
&Apache::lonxml::debug("$slot_name starttime good"); |
&Apache::lonxml::debug("$slot_name starttime good"); |
|
|
#already ended |
#already ended |
if ($slot->{'endtime'} < time) { |
if ($slot->{'endtime'} < time) { |
return 0; |
return 0; |
} |
} |
&Apache::lonxml::debug("$slot_name endtime good"); |
&Apache::lonxml::debug("$slot_name endtime good"); |
|
|
# not allowed to pick this one |
# not allowed to pick this one |
if (defined($slot->{'type'}) |
if (defined($slot->{'type'}) |
&& $slot->{'type'} ne 'schedulable_student') { |
&& $slot->{'type'} ne 'schedulable_student') { |
return 0; |
return 0; |
} |
} |
&Apache::lonxml::debug("$slot_name type good"); |
&Apache::lonxml::debug("$slot_name type good"); |
|
|
|
# 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; |
|
} |
|
if (defined($env{'request.course.groups'})) { |
|
my @groups = split(/:/,$env{'request.course.groups'}); |
|
my @allowed_sec = split(',',$slot->{'allowedsections'}); |
|
foreach my $group (@groups) { |
|
if (grep {$_ eq $group} (@allowed_sec)) { |
|
$userallowed=1; |
|
last; |
|
} |
|
} |
|
} |
|
} |
|
&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 |
# not allowed for this resource |
if (defined($slot->{'symb'}) |
if (defined($slot->{'symb'}) |
&& $slot->{'symb'} ne $symb) { |
&& $slot->{'symb'} ne $symb) { |
return 0; |
return 0; |
} |
} |
my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots); |
|
|
my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots, |
|
$consumed_uniqueperiods); |
if ($conflict) { |
if ($conflict) { |
if ($slots->{$conflict}{'starttime'} < time) { |
if ($slots->{$conflict}{'starttime'} < time) { |
return 0; |
return 0; |
Line 547 sub show_choices {
|
Line 736 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"); |
Line 556 sub show_choices {
|
Line 746 sub show_choices {
|
(keys(%slots))) { |
(keys(%slots))) { |
|
|
&Apache::lonxml::debug("Checking Slot $slot"); |
&Apache::lonxml::debug("Checking Slot $slot"); |
next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots)); |
next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots, |
|
$consumed_uniqueperiods)); |
|
|
$available++; |
$available++; |
|
|
Line 568 sub show_choices {
|
Line 759 sub show_choices {
|
my $text=&mt('Select'); |
my $text=&mt('Select'); |
my $command='get'; |
my $command='get'; |
if (grep(/^\Q$slot\E$/,@got_slots)) { |
if (grep(/^\Q$slot\E$/,@got_slots)) { |
$text=&mt('Free Reservation'); |
$text=&mt('Drop Reservation'); |
$command='release'; |
$command='release'; |
} else { |
} else { |
my $conflict = &check_for_conflict($symb,$slot,$slots{$slot}, |
my $conflict = &check_for_conflict($symb,$slot,$slots{$slot}, |
\%slots); |
\%slots, |
|
$consumed_uniqueperiods); |
if ($conflict) { |
if ($conflict) { |
$text=&mt('Change Reservation'); |
$text=&mt('Change Reservation'); |
$command='get'; |
$command='get'; |
} |
} |
} |
} |
my $escsymb=&Apache::lonnet::escape($symb); |
my $escsymb=&escape($symb); |
$form=<<STUFF; |
$form=<<STUFF; |
<form method="POST" action="/adm/slotrequest"> |
<form method="post" action="/adm/slotrequest"> |
<input type="submit" name="Select" value="$text" /> |
<input type="submit" name="Select" value="$text" /> |
<input type="hidden" name="symb" value="$escsymb" /> |
<input type="hidden" name="symb" value="$escsymb" /> |
<input type="hidden" name="slotname" value="$slot" /> |
<input type="hidden" name="slotname" value="$slot" /> |
Line 604 STUFF
|
Line 796 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 654 sub to_show {
|
Line 861 sub to_show {
|
sub remove_link { |
sub remove_link { |
my ($slotname,$entry,$uname,$udom,$symb) = @_; |
my ($slotname,$entry,$uname,$udom,$symb) = @_; |
|
|
$slotname = &Apache::lonnet::escape($slotname); |
my $remove = &mt('Remove'); |
$entry = &Apache::lonnet::escape($entry); |
|
$uname = &Apache::lonnet::escape($uname); |
if ($entry eq 'remove all') { |
$udom = &Apache::lonnet::escape($udom); |
$remove = &mt('Remove All'); |
$symb = &Apache::lonnet::escape($symb); |
undef($uname); |
|
undef($udom); |
|
} |
|
|
my $remove= &mt('Remove'); |
$slotname = &escape($slotname); |
|
$entry = &escape($entry); |
|
$uname = &escape($uname); |
|
$udom = &escape($udom); |
|
$symb = &escape($symb); |
|
|
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> |
END_LINK |
END_LINK |
|
|
Line 680 sub show_table {
|
Line 893 sub show_table {
|
my $available; |
my $available; |
if ($mgr eq 'F') { |
if ($mgr eq 'F') { |
$r->print('<div>'); |
$r->print('<div>'); |
$r->print('<form method="POST" action="/adm/slotrequest"> |
$r->print('<form method="post" action="/adm/slotrequest"> |
<input type="hidden" name="command" value="uploadstart" /> |
<input type="hidden" name="command" value="uploadstart" /> |
<input type="submit" name="start" value="'.&mt('Upload Slot List').'" /> |
<input type="submit" name="start" value="'.&mt('Upload Slot List').'" /> |
</form>'); |
</form>'); |
$r->print('<form method="POST" action="/adm/helper/newslot.helper"> |
$r->print('<form method="post" action="/adm/helper/newslot.helper"> |
<input type="submit" name="newslot" value="'.&mt('Create a New Slot').'" /> |
<input type="submit" name="newslot" value="'.&mt('Create a New Slot').'" /> |
</form>'); |
</form>'); |
$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', |
'type' => 'Type', |
'type' => 'Type', |
'starttime' => 'Start time', |
'starttime' => 'Start time', |
'endtime' => 'End Time', |
'endtime' => 'End Time', |
'startreserve' => 'Time students can start reserving', |
'startreserve' => 'Time students can start reserving', |
'secret' => 'Secret Word', |
'secret' => 'Secret Word', |
'maxspace' => 'Maximum # of students', |
'maxspace' => 'Maximum # of students', |
'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', |
'allowedsections' => 'Sections slot is restricted to.', |
'proctor' => 'List of proctors'); |
'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', |
my @show_order=('name','description','type','starttime','endtime', |
'startreserve','secret','maxspace','ip','symb', |
'startreserve','secret','maxspace','ip','symb', |
'uniqueperiod','proctor'); |
'allowedsections','allowedusers','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 732 sub show_table {
|
Line 958 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 |
|
#default to hide if no value |
|
$env{'form.deleted'} ||= 'hide'; |
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 = |
&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'show'); |
&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'show'); |
|
|
$r->print('<form method="POST" action="/adm/slotrequest"> |
$r->print('<form method="post" action="/adm/slotrequest"> |
<input type="hidden" name="command" value="showslots" />'); |
<input type="hidden" name="command" value="showslots" />'); |
$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 765 sub show_table {
|
Line 1036 sub show_table {
|
$r->print('</div>'); |
$r->print('</div>'); |
$r->print('<p><input type="submit" name="start" value="'.&mt('Update Display').'" /></p>'); |
$r->print('<p><input type="submit" name="start" value="'.&mt('Update Display').'" /></p>'); |
my $linkstart='<a href="/adm/slotrequest?command=showslots&order='; |
my $linkstart='<a href="/adm/slotrequest?command=showslots&order='; |
$r->print('<table class="thinborder"> |
$r->print(&Apache::loncommon::start_data_table(). |
<tr> |
&Apache::loncommon::start_data_table_header_row().' |
<th></th>'); |
<th></th>'); |
foreach my $which (@show_order) { |
foreach my $which (@show_order) { |
if ($which ne 'proctor' && exists($show{$which})) { |
if ($which ne 'proctor' && exists($show{$which})) { |
$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>'); |
$r->print(&Apache::loncommon::end_data_table_header_row()); |
|
|
my %name_cache; |
my %name_cache; |
my $slotsort = sub { |
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'}}) |
if (lc($slots{$a}->{$env{'form.order'}}) |
ne lc($slots{$b}->{$env{'form.order'}})) { |
ne lc($slots{$b}->{$env{'form.order'}})) { |
return (lc($slots{$a}->{$env{'form.order'}}) |
return (lc($slots{$a}->{$env{'form.order'}}) |
Line 803 sub show_table {
|
Line 1074 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 834 sub show_table {
|
Line 1117 sub show_table {
|
|
|
my $unique; |
my $unique; |
if (ref($slots{$slot}{'uniqueperiod'})) { |
if (ref($slots{$slot}{'uniqueperiod'})) { |
$unique=localtime($slots{$slot}{'uniqueperiod'}[0]).','. |
$unique=localtime($slots{$slot}{'uniqueperiod'}[0]).', '. |
localtime($slots{$slot}{'uniqueperiod'}[1]); |
localtime($slots{$slot}{'uniqueperiod'}[1]); |
} |
} |
|
|
Line 847 sub show_table {
|
Line 1130 sub show_table {
|
$title='<a href="'.$res.'?symb='.$slots{$slot}{'symb'}.'">'.$title.'</a>'; |
$title='<a href="'.$res.'?symb='.$slots{$slot}{'symb'}.'">'.$title.'</a>'; |
} |
} |
|
|
|
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 @proctors; |
my $rowspan=1; |
my $rowspan=1; |
my $colspan=1; |
my $colspan=1; |
if (exists($show{'proctor'})) { |
if (exists($show{'proctor'})) { |
$rowspan=2; |
$rowspan=2; |
@proctors= map { |
@proctors= map { |
my ($uname,$udom)=split(/@/,$_); |
my ($uname,$udom)=split(/:/,$_); |
my $fullname=$name_cache{$_}; |
my $fullname=$name_cache{$_}; |
if (!defined($fullname)) { |
if (!defined($fullname)) { |
&Apache::lonnet::logthis("Gettign $uname $udom"); |
|
$fullname = &Apache::loncommon::plainname($uname,$udom); |
$fullname = &Apache::loncommon::plainname($uname,$udom); |
$fullname =~s/\s/ /g; |
$fullname =~s/\s/ /g; |
$name_cache{$_} = $fullname; |
$name_cache{$_} = $fullname; |
Line 871 sub show_table {
|
Line 1175 sub show_table {
|
EDITLINK |
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"); |
my $row_start=&Apache::loncommon::start_data_table_row(); |
|
my $row_end=&Apache::loncommon::end_data_table_row(); |
|
$r->print($row_start. |
|
"\n<td rowspan=\"$rowspan\">$edit $delete</td>\n"); |
if (exists($show{'name'})) { |
if (exists($show{'name'})) { |
$colspan++;$r->print("<td>$slot</td>"); |
$colspan++;$r->print("<td>$slot</td>"); |
} |
} |
Line 906 DELETELINK
|
Line 1220 DELETELINK
|
if (exists($show{'symb'})) { |
if (exists($show{'symb'})) { |
$colspan++;$r->print("<td>$title</td>\n"); |
$colspan++;$r->print("<td>$title</td>\n"); |
} |
} |
|
if (exists($show{'allowedsections'})) { |
|
$colspan++;$r->print("<td>$allowedsections</td>\n"); |
|
} |
|
if (exists($show{'allowedusers'})) { |
|
$colspan++;$r->print("<td>$allowedusers</td>\n"); |
|
} |
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"); |
|
} |
|
$r->print("$row_end\n"); |
if (exists($show{'proctor'})) { |
if (exists($show{'proctor'})) { |
$r->print(<<STUFF); |
$r->print(<<STUFF); |
<tr> |
$row_start |
<td colspan="$colspan">$proctors</td> |
<td colspan="$colspan">$proctors</td> |
</tr> |
$row_end |
STUFF |
STUFF |
} |
} |
} |
} |
$r->print('</table>'); |
$r->print('</table></form>'); |
} |
} |
|
|
sub upload_start { |
sub upload_start { |
Line 1090 sub csvupload_fields {
|
Line 1413 sub csvupload_fields {
|
['maxspace','Maximum number of reservations'], |
['maxspace','Maximum number of reservations'], |
['symb','Resource Restriction'], |
['symb','Resource Restriction'], |
['uniqueperiod','Date range of slot exclusion'], |
['uniqueperiod','Date range of slot exclusion'], |
['secret','Secret word proctor uses to validate']); |
['secret','Secret word proctor uses to validate'], |
|
['allowedsections','Sections slot is restricted to'], |
|
['allowedusers','Users slot is restricted to'], |
|
); |
} |
} |
|
|
sub csv_upload_assign { |
sub csv_upload_assign { |
Line 1137 sub csv_upload_assign {
|
Line 1463 sub csv_upload_assign {
|
if ($entries{$fields{'endtime'}}) { |
if ($entries{$fields{'endtime'}}) { |
$slot{'endtime'}=&UnixDate($entries{$fields{'endtime'}},"%s"); |
$slot{'endtime'}=&UnixDate($entries{$fields{'endtime'}},"%s"); |
} |
} |
|
|
|
# start/endtime must be defined and greater than zero |
|
if (!$slot{'starttime'}) { |
|
push(@errors,"$name not created -- Invalid start time"); |
|
next; |
|
} |
|
if (!$slot{'endtime'}) { |
|
push(@errors,"$name not created -- Invalid end time"); |
|
next; |
|
} |
|
if ($slot{'starttime'} > $slot{'endtime'}) { |
|
push(@errors,"$name not created -- Slot starts after it ends"); |
|
next; |
|
} |
|
|
if ($entries{$fields{'startreserve'}}) { |
if ($entries{$fields{'startreserve'}}) { |
$slot{'startreserve'}= |
$slot{'startreserve'}= |
&UnixDate($entries{$fields{'startreserve'}},"%s"); |
&UnixDate($entries{$fields{'startreserve'}},"%s"); |
} |
} |
|
if (defined($slot{'startreserve'}) |
|
&& $slot{'startreserve'} > $slot{'starttime'}) { |
|
push(@errors,"$name not created -- Slot's reservation start time is after the slot's start time."); |
|
next; |
|
} |
|
|
foreach my $key ('ip','proctor','description','maxspace', |
foreach my $key ('ip','proctor','description','maxspace', |
'secret','symb') { |
'secret','symb') { |
if ($entries{$fields{$key}}) { |
if ($entries{$fields{$key}}) { |
$slot{$key}=$entries{$fields{$key}}; |
$slot{$key}=$entries{$fields{$key}}; |
} |
} |
} |
} |
|
|
if ($entries{$fields{'uniqueperiod'}}) { |
if ($entries{$fields{'uniqueperiod'}}) { |
my ($start,$end)=split(',',$entries{$fields{'uniqueperiod'}}); |
my ($start,$end)=split(',',$entries{$fields{'uniqueperiod'}}); |
my @times=(&UnixDate($start,"%s"), |
my @times=(&UnixDate($start,"%s"), |
&UnixDate($end,"%s")); |
&UnixDate($end,"%s")); |
$slot{'uniqueperiod'}=\@times; |
$slot{'uniqueperiod'}=\@times; |
} |
} |
|
if (defined($slot{'uniqueperiod'}) |
|
&& $slot{'uniqueperiod'}[0] > $slot{'uniqueperiod'}[1]) { |
|
push(@errors,"$name not created -- Slot's unique period start time is later than the unique period's end time."); |
|
next; |
|
} |
|
|
&Apache::lonnet::cput('slots',{$name=>\%slot},$cdom,$cname); |
&Apache::lonnet::cput('slots',{$name=>\%slot},$cdom,$cname); |
$r->print('.'); |
$r->print('.'); |
Line 1192 sub handler {
|
Line 1545 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') { |
Line 1211 sub handler {
|
Line 1568 sub handler {
|
&csv_upload_map($r); |
&csv_upload_map($r); |
} |
} |
} else { |
} else { |
my $symb=&Apache::lonnet::unescape($env{'form.symb'}); |
my $symb=&unescape($env{'form.symb'}); |
|
if (!defined($symb)) { |
|
&fail($r,'not_valid'); |
|
return OK; |
|
} |
my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb); |
my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb); |
my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb); |
my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb); |
if ($useslots ne 'resource') { |
if ($useslots ne 'resource' |
&fail($r,'not_valid'); |
&& $useslots ne 'map' |
|
&& $useslots ne 'map_map') { |
|
&fail($r,'not_available'); |
return OK; |
return OK; |
} |
} |
$env{'request.symb'}=$symb; |
$env{'request.symb'}=$symb; |