--- loncom/interface/slotrequest.pm 2005/11/21 18:55:41 1.33 +++ loncom/interface/slotrequest.pm 2006/02/03 17:07:20 1.39 @@ -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.33 2005/11/21 18:55:41 albertel Exp $ +# $Id: slotrequest.pm,v 1.39 2006/02/03 17:07:20 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -275,7 +275,17 @@ sub release_slot { && 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.
"); + $r->print(''. + &mt('Return to last resource').'
'); + return 0; + } + } # get parameter string, check for existance, rebuild string with the slot my @slots = split(/:/,&Apache::lonnet::EXT("resource.0.availablestudent", $symb,$udom,$uname)); @@ -302,7 +312,6 @@ sub release_slot { '0_availablestudent', 1, $new_param, 'string', $uname,$udom); - my %slot=&Apache::lonnet::get_slot($slot_name); my $description=&get_description($env{'form.slotname'},\%slot); $r->print("Released Reservation: $description
"); if ($mgr eq 'F') { @@ -316,6 +325,40 @@ sub release_slot { 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(''); + $r->print(''); +} + sub get_slot { my ($r,$symb)=@_; @@ -492,10 +535,15 @@ STUFF } sub to_show { - my ($when,$slot) = @_; + my ($slot,$when,$deleted) = @_; my $time=time; my $week=60*60*24*7; - if ($when eq 'now') { + 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; @@ -573,10 +621,11 @@ sub show_table { $r->print(''); } - my %Saveable_Parameters = ('show' => 'array', - 'when' => 'scalar', - 'order' => 'scalar'); - + my %Saveable_Parameters = ('show' => 'array', + 'when' => 'scalar', + 'order' => 'scalar', + 'deleted' => 'scalar', + ); &Apache::loncommon::store_course_settings('slotrequest',\%Saveable_Parameters); &Apache::loncommon::restore_course_settings('slotrequest',\%Saveable_Parameters); @@ -588,7 +637,7 @@ sub show_table { 'endtime' => 'End Time', 'startreserve' => 'Time students can start reserving', 'secret' => 'Secret Word', - 'maxspace' => 'Maxium # of students', + 'maxspace' => 'Maximum # of students', 'ip' => 'IP or DNS restrictions', 'symb' => 'Resource slot is restricted to.', 'uniqueperiod' => 'Period of time slot is unique', @@ -602,22 +651,48 @@ sub show_table { my %show = map { $_ => 1 } (@show); my %when_fields=&Apache::lonlocal::texthash( - 'now' => 'Open now', + 'now' => 'Open now', 'nextweek' => 'Open within the next week', 'lastweek' => 'Were open last week', 'willopen' => 'Will open later', - 'wereopen' => 'Were open'); - my @when_order=('now','nextweek','lastweek','willopen','wereopen'); + 'wereopen' => 'Were open', + 'any' => 'Anytime', + ); + my @when_order=('any','now','nextweek','lastweek','willopen','wereopen'); $when_fields{'select_form_order'} = \@when_order; my $when = (exists($env{'form.when'})) ? $env{'form.when'} : 'now'; + my $hide_radio = + &Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide'); + my $show_radio = + &Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'show'); + $r->print('