--- loncom/html/adm/helper/newslot.helper	2005/10/14 22:17:33	1.3
+++ loncom/html/adm/helper/newslot.helper	2005/10/17 18:21:26	1.4
@@ -86,7 +86,7 @@
       </message_text>
     </message>
     <choices variable="restricttosymb">
-      <choice nextstate="FINISH" computer='any'>usable for any resource.</choice>
+      <choice nextstate="PROCTOR" computer='any'>usable for any resource.</choice>
       <choice nextstate="RESOURCESELECT" computer='resource'>restricted to a specific resource.</choice>
       <defaultvalue>'any'</defaultvalue>
     </choices>
@@ -106,9 +106,14 @@
     <resource variable="symb">
       <filterfunc>return $res->is_problem()</filterfunc>
       <valuefunc>return $res->symb()</valuefunc>
-      <nextstate>FINISH</nextstate>
+      <nextstate>PROCTOR</nextstate>
     </resource>    
   </state>
+  <state name="PROCTOR" title="Specify Proctors">
+    <student variable="proctor" multichoice="1" coursepersonnel="1"
+             nextstate="FINISH" activeonly="1" emptyallowed="1">
+    </student>
+  </state>
   <state name="FINISH" title="Creating/Modfying Slot">
 	    <message> <message_text> Created Slot </message_text> </message>	
     <final>
@@ -119,7 +124,7 @@
 	foreach my $which ('type','starttime','endtime') {
 	    $slot{$which} = $helper->{'VARS'}{$which};
 	}
-	foreach my $which ('ip','proctor','description','maxspace',
+	foreach my $which ('ip','description','maxspace',
 			   'secret','symb') {
 	    if ( $helper->{'VARS'}{$which} =~/\S/ ) {
 		$slot{$which} = $helper->{'VARS'}{$which};
@@ -130,15 +135,23 @@
 	    $slot{'uniqueperiod'} = [$helper->{'VARS'}{'startunique'},
 				     $helper->{'VARS'}{'endunique'}];
 	}
+        if ( $helper->{'VARS'}{'proctor'} =~/\S/ ) {
+	    my @names;
+	    foreach my $user (split(/\|\|\|/, $helper->{'VARS'}{'proctor'})) {
+		my ($uname,$udomain)=split(/:/,$user);
+		push(@names,"$uname\@$udomain");
+	    }
+	    $slot{'proctor'}=join(',',@names);
+	}
         my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
         my $cdom  = $env{'course.'.$env{'request.course.id'}.'.domain'};
 
         my $ret = &Apache::lonnet::cput('slots',
 					{$helper->{'VARS'}{'name'} => \%slot},
 					$cdom,$cname);
-        $result.="\n".'<li> Name: '.&HTML::Entities::encode($slot{name}).'</li>'.
-    "\n".'<li> Starts: '.&Apache::lonlocal::locallocaltime($slot{start}).'</li>'.
-                 "\n".'<li> Ends: '.&Apache::lonlocal::locallocaltime($slot{end}).'</li>'.
+        $result.="\n$ret ".'Name: '.&HTML::Entities::encode($helper->{'VARS'}{'name'}).'</li>'.
+    "\n".'<li> Starts: '.&Apache::lonlocal::locallocaltime($slot{'starttime'}).'</li>'.
+                 "\n".'<li> Ends: '.&Apache::lonlocal::locallocaltime($slot{'endtime'}).'</li>'.
                  "\n".'<li> Type: '.$slot{'type'}.'</li>';
         my %labels =
              map {($_->[0],$_->[1])} &Apache::slotrequest::csvupload_fields();
@@ -159,7 +172,7 @@
 	}
         return $result;
       </finalcode>
-      <exitpage>/adm/flip?postdata=return:</exitpage>
+      <exitpage>/adm/slotrequest?command=showslots</exitpage>
     </final>
   </state>
 </helper>