--- loncom/interface/slotrequest.pm 2005/09/06 20:53:36 1.10 +++ loncom/interface/slotrequest.pm 2005/09/09 18:27:56 1.13 @@ -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.10 2005/09/06 20:53:36 albertel Exp $ +# $Id: slotrequest.pm,v 1.13 2005/09/09 18:27:56 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -473,7 +473,7 @@ sub show_table { (keys(%slots))) { if (defined($slots{$slot}->{'type'}) && $slots{$slot}->{'type'} ne 'schedulable_student') { - next; + #next; } my $description=&get_description($slot,$slots{$slot}); my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, @@ -514,27 +514,29 @@ sub handler { return OK; } $env{'request.symb'}=$symb; - my ($status) = &Apache::lonhomework::check_task_access('0'); - if ($status eq 'CAN_ANSWER' || - $status eq 'NEEDS_CHECKIN' || - $status eq 'WAITING_FOR_GRADE') { - &fail($r,'not_allowed'); - return OK; - } my $vgr=&Apache::lonnet::allowed('vgr',$env{'request.course.id'}); if ($env{'form.command'} eq 'showslots' && $vgr eq 'F') { &show_table($r,$symb); - } elsif ($env{'form.requestattempt'}) { - &show_choices($r,$symb); - } elsif ($env{'form.command'} eq 'release') { - &release_slot($r,$symb); - } 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); } else { - $r->print("

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

"); + my ($status) = &Apache::lonhomework::check_task_access('0'); + if ($status eq 'CAN_ANSWER' || + $status eq 'NEEDS_CHECKIN' || + $status eq 'WAITING_FOR_GRADE') { + &fail($r,'not_allowed'); + return OK; + } + if ($env{'form.requestattempt'}) { + &show_choices($r,$symb); + } elsif ($env{'form.command'} eq 'release') { + &release_slot($r,$symb); + } 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); + } else { + $r->print("

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

"); + } } &end_page($r); return OK;