--- loncom/html/adm/helper/newslot.helper	2005/10/14 22:17:33	1.3
+++ loncom/html/adm/helper/newslot.helper	2005/11/02 21:58:14	1.6
@@ -1,5 +1,29 @@
 <helper title="Slot Creation" requiredpriv="mgq">
   <state name="START" title="Specify Required Attributes">
+    <exec>
+      if (!exists($helper->{'VARS'}{'name'}) ||
+	  $helper->{'VARS'}{'name'} !~ /\S/) {
+	  &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+	  if (exists($env{'form.name'}) ||
+	      $env{'form.name'} =~ /\S/) {
+	      $helper->{'VARS'}{'name'}=$env{'form.name'};
+	  }
+      }
+      $helper->{DATA}{origslot} = sub {
+	  my ($which,$default)=@_;
+	  if (!exists($helper->{'VARS'}{'name'}) ||
+	      $helper->{'VARS'}{'name'} !~ /\S/) {
+	      return $default;
+	  }
+	  my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+	  my $cdom  = $env{'course.'.$env{'request.course.id'}.'.domain'};
+	  my $name=$helper->{'VARS'}{'name'};
+	  my %slot=&Apache::lonnet::get('slots', [$name], $cdom, $cnum);
+	  if (!ref($slot{$name})) { return $default; }
+	  if (!exists($slot{$name}{$which})) { return $default; }
+	  return $slot{$name}{$which};
+      }
+    </exec>
     <message nextstate="OPTIONAL">
       <message_text>
           Name: <br />&nbsp;&nbsp;&nbsp;
@@ -11,23 +35,34 @@
           if ($val=~/\s$/) { return 'Must not contain spaces'; }
           return undef;
       </validator>
+      <defaultvalue>
+        return $helper->{'VARS'}{'name'};
+      </defaultvalue>
     </string>
     <message>
       <message_text><br />Start time:<br />&nbsp;&nbsp;&nbsp;</message_text>
     </message>
-    <date variable="starttime" hoursminutes="1"></date>
+    <date variable="starttime" hoursminutes="1">
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('starttime');
+      </defaultvalue>
+    </date>
     <message>
       <message_text><br />End time:<br />&nbsp;&nbsp;&nbsp;</message_text>
     </message>
-    <date variable="endtime" hoursminutes="1"></date>
+    <date variable="endtime" hoursminutes="1">
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('endtime');
+      </defaultvalue>
+    </date>
     <message>
       <message_text><br />Type:</message_text>
     </message>
     <choices variable="type">
       <choice computer='preassigned'>Instructor asssignable.</choice>
-      <choice computer='student_schedulable'>Student selectable.</choice>
+      <choice computer='schedulable_student'>Student selectable.</choice>
       <defaultvalue>
-         return 'preassigned';
+        return &{$helper->{DATA}{origslot}}('type','preassigned');
       </defaultvalue>
     </choices>
   </state>
@@ -38,14 +73,20 @@
           <p>Description:<br />&nbsp;&nbsp;&nbsp;
       </message_text>
     </message>
-    <string variable="description" size="60"></string>
+    <string variable="description" size="60">
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('description');
+      </defaultvalue>
+    </string>
     <message>
       <message_text>
           </p><p>Time students can start reserving:<br />&nbsp;&nbsp;&nbsp;
       </message_text>
     </message>
     <date variable="startreserve" hoursminutes="1" anytime="1">
-	<defaultvalue>'anytime'</defaultvalue>
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('startreserve','anytime');
+      </defaultvalue>
     </date>
     <message>
       <message_text>
@@ -57,6 +98,9 @@
           if ($val ne '' && $val=~/\D/) { return 'Must be numeric.'; }
           return undef;
       </validator>
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('maxspace');
+      </defaultvalue>
     </string>
     <message>
       <message_text>
@@ -67,6 +111,9 @@
       <validator>
           return undef;
       </validator>
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('secret');
+      </defaultvalue>
     </string>
     <message>
       <message_text>
@@ -74,11 +121,21 @@
       </message_text>
     </message>
     <date variable="startunique" hoursminutes="1" anytime="1">
-	<defaultvalue>'anytime'</defaultvalue>
+      <defaultvalue>
+        my $default=&{$helper->{DATA}{origslot}}('uniqueperiod','anytime');
+        if ($default eq 'anytime') { return 'anytime' };
+        if (ref($default)) { return $default->[0]; }
+        return 'anytime';
+      </defaultvalue>
     </date>
     <message><message_text><br />&nbsp;&nbsp;&nbsp;End: </message_text></message>
     <date variable="endunique" hoursminutes="1" anytime="1">
-	<defaultvalue>'anytime'</defaultvalue>
+      <defaultvalue>
+        my $default=&{$helper->{DATA}{origslot}}('uniqueperiod','anytime');
+        if ($default eq 'anytime') { return 'anytime' };
+        if (ref($default)) { return $default->[1]; }
+        return 'anytime';
+      </defaultvalue>
     </date>
     <message>
       <message_text>
@@ -86,9 +143,13 @@
       </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>
+      <defaultvalue>
+        my $default=&{$helper->{DATA}{origslot}}('symb');
+        if ($default) { return 'resource'; }
+        return 'any';
+      </defaultvalue>
     </choices>
     <message>
       <message_text> 
@@ -99,6 +160,9 @@
       <validator>
           return undef;
       </validator>
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('ip');
+      </defaultvalue>
     </string>
     <message> <message_text> </p> </message_text> </message>
   </state>
@@ -106,9 +170,26 @@
     <resource variable="symb">
       <filterfunc>return $res->is_problem()</filterfunc>
       <valuefunc>return $res->symb()</valuefunc>
-      <nextstate>FINISH</nextstate>
+      <nextstate>PROCTOR</nextstate>
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('symb');
+      </defaultvalue>
     </resource>    
   </state>
+  <state name="PROCTOR" title="Specify Proctors">
+    <student variable="proctor" multichoice="1" coursepersonnel="1"
+             nextstate="FINISH" activeonly="1" emptyallowed="1">
+      <defaultvalue>
+        my @defaults;
+        my $default=&{$helper->{DATA}{origslot}}('proctor');
+        if ($default) {
+	    $default=~ tr/@/:/;
+	    @defaults=(split(',',$default)); 
+	}
+        return @defaults;
+      </defaultvalue>
+    </student>
+  </state>
   <state name="FINISH" title="Creating/Modfying Slot">
 	    <message> <message_text> Created Slot </message_text> </message>	
     <final>
@@ -119,7 +200,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,25 +211,38 @@
 	    $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 ".'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();
-        foreach my $which ('ip','proctor','description','maxspace',
-			   'secret','symb') {
+        foreach my $which ('ip','description','maxspace','secret','symb') {
 	    if (exists($slot{$which})) {
 		$result.="\n".'<li> '.$labels{$which}.': '.
 		    &HTML::Entities::encode($slot{$which}).'</li>';
 	    }
 	}
+        if (exists($slot{'proctor'})) {
+	    my $proctors = $slot{'proctor'};
+	    $proctors =~ s/,/, /g;
+	    $result.="\n".'<li> '.$labels{'proctor'}.': '.
+		&HTML::Entities::encode($proctors).'</li>';
+	}
         if (exists($slot{'uniqueperiod'})) {
 	    $result.=
                  "\n".'<li> '.$labels{'uniqueperiod'}.': '.
@@ -159,7 +253,7 @@
 	}
         return $result;
       </finalcode>
-      <exitpage>/adm/flip?postdata=return:</exitpage>
+      <exitpage>/adm/slotrequest?command=showslots</exitpage>
     </final>
   </state>
 </helper>