--- loncom/interface/slotrequest.pm	2005/08/15 19:54:26	1.8
+++ loncom/interface/slotrequest.pm	2005/09/06 20:54:58	1.11
@@ -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.8 2005/08/15 19:54:26 albertel Exp $
+# $Id: slotrequest.pm,v 1.11 2005/09/06 20:54:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -456,7 +456,18 @@ sub show_table {
     my ($cnum,$cdom)=&get_course();
     my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
     my $available;
-    $r->print('<table border="1">');
+    $r->print('<table border="1">
+<tr>
+  <th>Slot name</th>
+  <th>Type</th>
+  <th>Description</th>
+  <th>Start Time</th>
+  <th>End Time</th>
+  <th>Max space</th>
+  <th>Scheduled Students</th>
+  <th>Proctors</th>
+  <th>Unique Period</th>
+</tr>');
     foreach my $slot (sort 
 		      { return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
 		      (keys(%slots)))  {
@@ -477,11 +488,14 @@ sub show_table {
 	$r->print(<<STUFF);
 <tr>
  <td>$slot</td>
+ <td>$slots{$slot}->{'type'}</td>
  <td>$description</td>
  <td>$start</td>
  <td>$end</td>
  <td>$slots{$slot}->{'maxspace'}</td>
  <td>$ids</td>
+ <td>$slots{$slot}->{'proctor'}</td>
+ <td>$slots{$slot}->{'uniqueperiod'}</td>
 </tr>
 STUFF
     }
@@ -500,32 +514,30 @@ 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("<p>Unknown command: ".$env{'form.command'}."</p>");
+	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.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("<p>Unknown command: ".$env{'form.command'}."</p>");
+	}
     }
-    $r->print('<p>1'.$symb.'</p>');
-    $r->print('<p>2'.&Apache::lonnet::symbread().'</p>');
-    $r->print(&check_for_reservation($symb));
-    $r->print( &Apache::lonhomework::check_task_access('0'));
     &end_page($r);
     return OK;
 }