'.&mt('Failed.').'
'); } - $r->print(''. - &mt('Return to last resource').'
'); + &return_link($r); &end_page($r); } @@ -89,7 +88,9 @@ sub get_reservation_ids { my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, "^$slot_name\0"); - + if (&network_error(%consumed)) { + return 'error: Unable to determine current status'; + } my ($tmp)=%consumed; if ($tmp=~/^error: 2 / ) { return 0; @@ -124,6 +125,10 @@ sub check_for_reservation { my ($cnum,$cdom)=&get_course(); my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); + if (&network_error($student) || &network_error($course) || + &network_error(%slots)) { + return 'error: Unable to determine current status'; + } foreach my $slot_name (@slots) { next if (!defined($slots{$slot_name}) || !ref($slots{$slot_name})); @@ -148,6 +153,11 @@ sub check_for_conflict { my @slots = (split(/:/,$student), split(/:/, $course)); my ($cnum,$cdom)=&get_course(); my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); + + if (&network_error($student) || &network_error($course) || + &network_error(%slots)) { + return 'error: Unable to determine current status'; + } foreach my $slot_name (@slots) { next if (!defined($slots{$slot_name}) || !ref($slots{$slot_name})); @@ -163,6 +173,14 @@ 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 { my ($slot_name,$slot,$symb)=@_; @@ -171,11 +189,17 @@ sub make_reservation { my $value=&Apache::lonnet::EXT("resource.0.availablestudent",$symb, $env{'user.domain'},$env{'user.name'}); &Apache::lonxml::debug("value is $valueRemove $name from slot $env{'form.slotname'} for $title
+ + +END_CONFIRM + +} + sub release_slot { - my ($r,$symb,$slot_name,$inhibit_return_link)=@_; + 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' + && defined($env{'form.uname'}) && defined($env{'form.udom'})) { + ($uname,$udom) = ($env{'form.uname'}, $env{'form.udom'}); + } + + if ($mgr eq 'F' + && defined($env{'form.symb'})) { + $symb = $env{'form.symb'}; + } + my %slot=&Apache::lonnet::get_slot($slot_name); + my $description=&get_description($env{'form.slotname'},\%slot); + + if ($mgr ne 'F') { + if ($slot{$slot_name}{'starttime'} < time) { + $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 - my @slots = split(/:/,&Apache::lonnet::EXT("resource.0.availablestudent", - $symb,$env{'user.domain'}, - $env{'user.name'})); + $symb,$udom,$uname)); + my @new_slots; foreach my $exist_slot (@slots) { if ($exist_slot eq $slot_name) { next; } @@ -253,32 +326,76 @@ sub release_slot { my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, "^$slot_name\0"); foreach my $entry (keys(%consumed)) { - if ( $consumed{$entry}->{'name'} eq - ($env{'user.name'}.'@'.$env{'user.domain'}) ) { + if ( $consumed{$entry}->{'name'} eq ($uname.'@'.$udom) ) { &Apache::lonnet::del('slot_reservations',[$entry], $cdom,$cnum); } } + # store new parameter string my $result=&Apache::lonparmset::storeparm_by_symb($symb, '0_availablestudent', 1, $new_param, 'string', - $env{'user.name'}, - $env{'user.domain'}); - my %slot=&Apache::lonnet::get_slot($slot_name); + $uname,$udom); my $description=&get_description($env{'form.slotname'},\%slot); $r->print("Released Reservation: $description
"); - if (!$inhibit_return_link) { - $r->print(''. - &mt('Return to last resource').'
'); + if ($mgr eq 'F') { + $r->print(''. + &mt('Return to slot list').'
'); } + if (!$inhibit_return_link) { &return_link($r); } return 1; } +sub delete_slot { + my ($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"); + my ($tmp) = %consumed; + if ($tmp =~ /error: 2/) { undef(%consumed); } + + if (%slot && !%consumed) { + $slot{'type'} = 'deleted'; + my $ret = &Apache::lonnet::cput('slots', {$slot_name => \%slot}, + $cdom, $cnum); + if ($ret eq 'ok') { + $r->print("Slot $slot_name marked as deleted.
"); + } else { + $r->print("An error ($ret) occurse when attempting to delete Slot $slot_name.
"); + } + } else { + if (%consumed) { + $r->print("Slot $slot_name has active reservations.
"); + } else { + $r->print("Slot $slot_name does not exist.
"); + } + } + $r->print(''. + &mt('Return to slot list').'
'); + &return_link($r); +} + +sub return_link { + my ($r) = @_; + $r->print(''. + &mt('Return to last resource').'
'); +} + sub get_slot { my ($r,$symb)=@_; my $slot_name=&check_for_conflict($symb,$env{'form.slotname'}); + + if ($slot_name =~ /^error: (.*)/) { + $r->print("An error occured while attempting to make a reservation. ($1)
"); + &return_link($r); + return; + } if ($slot_name) { my %slot=&Apache::lonnet::get_slot($slot_name); my $description1=&get_description($slot_name,\%slot); @@ -299,14 +416,13 @@ STUFF STUFF $r->print(' your reservation from '.$description1.' to '. $description2. - ''. - &mt('Return to last resource').'
'); + &return_link($r); } return; } @@ -315,17 +431,15 @@ STUFF \%slot,$symb); my $description=&get_description($env{'form.slotname'},\%slot); if (defined($reserved)) { - if ($reserved > -1) { + if ($slot_name =~ /^error: (.*)/) { + $r->print("An error occured while attempting to make a reservation. ($1)
"); + } elsif ($reserved > -1) { $r->print("Success: $description
"); - $r->print(''. - &mt('Return to last resource').'
'); - return; } elsif ($reserved < 0) { $r->print("Already reserved: $description
"); - $r->print(''. - &mt('Return to last resource').'
'); - return; } + &return_link($r); + return; } my %lt=('request'=>"Availibility list", @@ -352,8 +466,8 @@ or or STUFF - $r->print(''. - &mt('Return to last resource').'
'); + + &return_link($r); return; } @@ -450,6 +564,72 @@ STUFF $r->print(''); } +sub to_show { + my ($slot,$when,$deleted) = @_; + my $time=time; + my $week=60*60*24*7; + if ($deleted eq 'hide' && $slot->{'type'} eq 'deleted') { + return 0; + } + if ($when eq 'any') { + return 1; + } elsif ($when eq 'now') { + if ($time > $slot->{'starttime'} && + $time < $slot->{'endtime'}) { + return 1; + } + return 0; + } elsif ($when eq 'nextweek') { + if ( ($time < $slot->{'starttime'} && + ($time+$week) > $slot->{'starttime'}) + || + ($time < $slot->{'endtime'} && + ($time+$week) > $slot->{'endtime'}) ) { + return 1; + } + return 0; + } elsif ($when eq 'lastweek') { + if ( ($time > $slot->{'starttime'} && + ($time-$week) < $slot->{'starttime'}) + || + ($time > $slot->{'endtime'} && + ($time-$week) < $slot->{'endtime'}) ) { + return 1; + } + return 0; + } elsif ($when eq 'willopen') { + if ($time < $slot->{'starttime'}) { + return 1; + } + return 0; + } elsif ($when eq 'wereopen') { + if ($time > $slot->{'endtime'}) { + return 1; + } + return 0; + } + + return 1; +} + +sub remove_link { + my ($slotname,$entry,$uname,$udom,$symb) = @_; + + $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) +END_LINK + +} + sub show_table { my ($r,$mgr)=@_; @@ -460,6 +640,7 @@ sub show_table { } my $available; if ($mgr eq 'F') { + $r->print('