--- loncom/interface/slotrequest.pm 2005/11/21 18:55:41 1.33 +++ loncom/interface/slotrequest.pm 2006/02/03 18:51:15 1.41 @@ -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.41 2006/02/03 18:51:15 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -89,7 +89,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 +126,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 +154,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 +174,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 +190,17 @@ sub make_reservation { my $value=&Apache::lonnet::EXT("resource.0.availablestudent",$symb, $env{'user.domain'},$env{'user.name'}); &Apache::lonxml::debug("value is $value
"); + if (&network_error($value)) { + return 'error: Unable to determine current status'; + } + foreach my $other_slot (split(/:/, $value)) { if ($other_slot eq $slot_name) { my %consumed=&Apache::lonnet::dump('slot_reservations', $cdom, $cnum, "^$slot_name\0"); - + if (&network_error($value)) { + return 'error: Unable to determine current status'; + } my $me=$env{'user.name'}.'@'.$env{'user.domain'}; foreach my $key (keys(%consumed)) { if ($consumed{$key}->{'name'} eq $me) { @@ -190,7 +215,9 @@ sub make_reservation { if (!defined($max)) { $max=99999; } my (@ids)=&get_reservation_ids($slot_name); - + if (&network_error(@ids)) { + return 'error: Unable to determine current status'; + } my $last=0; foreach my $id (@ids) { my $num=(split('\0',$id))[1]; @@ -275,7 +302,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 +339,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,10 +352,56 @@ 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('

'. + &mt('Return to slot list').'

'); + $r->print('

'. + &mt('Return to last resource').'

'); +} + +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); @@ -340,14 +422,13 @@ STUFF STUFF $r->print(' your reservation from '.$description1.' to '. $description2. - '
or '. - &mt('Return to last resource').'

'); + '
or

'); + &return_link($r); $r->print(< STUFF } else { - $r->print('

'. - &mt('Return to last resource').'

'); + &return_link($r); } return; } @@ -356,17 +437,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", @@ -492,10 +571,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 +657,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 +673,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 +687,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('
'); $r->print('
'); - $r->print('
'.&mt('Show').''.&mt('Open').'
'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order). - ''.&Apache::loncommon::select_form($when,'when',%when_fields). - '
'); + $r->print(' + + + + + + + + +
'.&mt('Show').''.&mt('Open').''.&mt('Options').'
'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order). + ''.&Apache::loncommon::select_form($when,'when',%when_fields). + ' + + + + + + + + +
Deleted slots:
+
'); $r->print('
'); $r->print('

'); my $linkstart='
'; + + my ($tmp)=%consumed; + if ($tmp !~ /^error: /) { + foreach my $entry (sort(keys(%consumed))) { + my (undef,$id)=split("\0",$entry); + my ($uname,$udom) = split('@',$consumed{$entry}{'name'}); + my $name = &Apache::loncommon::plainname($uname,$udom); + $ids.= ''.$name.&remove_link($slot,$entry,$uname,$udom, + $consumed{$entry}{'symb'}) + .'
'; + } } my $start=($slots{$slot}->{'starttime'}? @@ -718,11 +833,16 @@ sub show_table { } my $proctors=join(', ',@proctors); - my $edit=(<Edit EDITLINK - - $r->print("\n$edit\n"); + + my $delete=(<<"DELETELINK"); +Delete +DELETELINK + if ($ids ne '') { undef($delete); } + + $r->print("\n$edit $delete\n"); if (exists($show{'name'})) { $colspan++;$r->print("$slot"); } @@ -1040,6 +1160,8 @@ sub handler { &remove_registration($r); } elsif ($env{'form.command'} eq 'release' && $mgr eq 'F') { &release_slot($r,undef,undef,undef,$mgr); + } elsif ($env{'form.command'} eq 'delete' && $mgr eq 'F') { + &delete_slot($r); } elsif ($env{'form.command'} eq 'uploadstart' && $mgr eq 'F') { &upload_start($r); } elsif ($env{'form.command'} eq 'csvuploadmap' && $mgr eq 'F') { @@ -1058,12 +1180,15 @@ sub handler { } else { my $symb=&Apache::lonnet::unescape($env{'form.symb'}); my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb); - if ($res !~ /\.task$/) { + my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb); + if ($useslots ne 'resource') { &fail($r,'not_valid'); return OK; } $env{'request.symb'}=$symb; - my ($status) = &Apache::lonhomework::check_task_access('0'); + my $type = ($res =~ /\.task$/) ? 'Task' + : 'problem'; + my ($status) = &Apache::lonhomework::check_slot_access('0',$type); if ($status eq 'CAN_ANSWER' || $status eq 'NEEDS_CHECKIN' || $status eq 'WAITING_FOR_GRADE') { @@ -1077,8 +1202,9 @@ sub handler { } elsif ($env{'form.command'} eq 'get') { &get_slot($r,$symb); } elsif ($env{'form.command'} eq 'change') { - &release_slot($r,$symb,$env{'form.releaseslot'},1); - &get_slot($r,$symb); + if (&release_slot($r,$symb,$env{'form.releaseslot'},1)) { + &get_slot($r,$symb); + } } else { $r->print("

Unknown command: ".$env{'form.command'}."

"); }