--- loncom/html/adm/helper/newslot.helper	2005/10/17 18:21:26	1.4
+++ loncom/html/adm/helper/newslot.helper	2006/02/03 22:40:46	1.12
@@ -1,121 +1,204 @@
 <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->{VARS}{'origname'}=$env{'form.name'};
+	      $helper->{DATA}{copy} = 1;
+	  }
+      }
+      $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}{'origname'};
+	  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;
-      </message_text>
+        Name: <br />&nbsp;&nbsp;&nbsp;
     </message>
     <string variable="name" size="30">
       <validator>
           if ($val=~/^\s*$/) { return 'Must specify a name'; }
-          if ($val=~/\s$/) { return 'Must not contain spaces'; }
+          if ($val=~/\s/) { return 'Must not contain spaces'; }
+          if ($val=~/\W/) { return 'Must contain only letters, numbers and _'; }
           return undef;
       </validator>
+      <defaultvalue>
+        return $helper->{'VARS'}{'name'};
+      </defaultvalue>
     </string>
+    <condition>
+      <clause>$helper->{DATA}{copy}</clause>
+      <message nextstate="OPTIONAL">
+	<p>Changing the Name will create a new slot with the new name, and not rename the existing slot.</p>
+      </message>
+    </condition>
     <message>
-      <message_text><br />Start time:<br />&nbsp;&nbsp;&nbsp;</message_text>
+      <br />Start time:<br />&nbsp;&nbsp;&nbsp;
     </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>
+      <br />End time:<br />&nbsp;&nbsp;&nbsp;
     </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>
+      <br />Type:
     </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>
 
   <state name="OPTIONAL" title="Specify Optional Attributes">
     <message>
-      <message_text>
-          <p>Description:<br />&nbsp;&nbsp;&nbsp;
-      </message_text>
-    </message>
-    <string variable="description" size="60"></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>
-    </date>
-    <message>
-      <message_text>
-          </p><p>Maxium number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
-      </message_text>
+        <p>Description:<br />&nbsp;&nbsp;&nbsp;
     </message>
-    <string variable="maxspace" size="4">
-      <validator>
-          if ($val ne '' && $val=~/\D/) { return 'Must be numeric.'; }
-          return undef;
-      </validator>
+    <string variable="description" size="60">
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('description');
+      </defaultvalue>
     </string>
+    <condition>
+      <clause>$helper->{'VARS'}{'type'} eq 'schedulable_student'</clause>
+      <message>
+        </p><p>Time students can start reserving:<br />&nbsp;&nbsp;&nbsp;
+      </message>
+      <date variable="startreserve" hoursminutes="1" anytime="1">
+        <defaultvalue>
+          return &{$helper->{DATA}{origslot}}('startreserve','anytime');
+        </defaultvalue>
+      </date>
+      <message>
+         </p><p>Maxium number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
+      </message>
+      <string variable="maxspace" size="4">
+        <validator>
+            if ($val ne '' && $val=~/\D/) { return 'Must be numeric.'; }
+            return undef;
+        </validator>
+        <defaultvalue>
+          return &{$helper->{DATA}{origslot}}('maxspace');
+        </defaultvalue>
+      </string>
+      <message>
+         </p><p>Period of time in which this slot is can only be uniquely chosen:<br />&nbsp;&nbsp;&nbsp;Start:
+      </message>
+      <date variable="startunique" hoursminutes="1" anytime="1">
+        <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><br />&nbsp;&nbsp;&nbsp;End: </message>
+      <date variable="endunique" hoursminutes="1" anytime="1">
+        <defaultvalue>
+          my $default=&{$helper->{DATA}{origslot}}('uniqueperiod','anytime');
+          if ($default eq 'anytime') { return 'anytime' };
+          if (ref($default)) { return $default->[1]; }
+          return 'anytime';
+        </defaultvalue>
+      </date>
+    </condition>
+    <condition>
+      <clause>$helper->{'VARS'}{'type'} eq 'preassigned'</clause>
+      <exec>
+        delete($helper->{'VARS'}{'startreserve'});
+        delete($helper->{'VARS'}{'maxspace'});
+        delete($helper->{'VARS'}{'startunique'});
+        delete($helper->{'VARS'}{'endunique'});
+      </exec>
+    </condition>
     <message>
-      <message_text>
-          </p><p>Secret word proctors use to checkin users:<br />&nbsp;&nbsp;&nbsp;
-      </message_text>
+      </p><p>Secret word proctors use to checkin users:<br />&nbsp;&nbsp;&nbsp;
     </message>
     <string variable="secret" size="12">
       <validator>
           return undef;
       </validator>
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('secret');
+      </defaultvalue>
     </string>
     <message>
-      <message_text>
-          </p><p>Period of time in which this slot is can only be uniquely chosen:<br />&nbsp;&nbsp;&nbsp;Start:
-      </message_text>
-    </message>
-    <date variable="startunique" hoursminutes="1" anytime="1">
-	<defaultvalue>'anytime'</defaultvalue>
-    </date>
-    <message><message_text><br />&nbsp;&nbsp;&nbsp;End: </message_text></message>
-    <date variable="endunique" hoursminutes="1" anytime="1">
-	<defaultvalue>'anytime'</defaultvalue>
-    </date>
-    <message>
-      <message_text>
-          </p><p>Slot is:
-      </message_text>
+      </p><p>Slot is:
     </message>
     <choices variable="restricttosymb">
       <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> 
+       
 	</p><p>IP restrictions:<br />&nbsp;&nbsp;&nbsp;
-      </message_text>
+      
     </message>
     <string variable="ip" size="30">
       <validator>
           return undef;
       </validator>
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('ip');
+      </defaultvalue>
     </string>
-    <message> <message_text> </p> </message_text> </message>
+    <message>  </p>  </message>
   </state>
   <state name="RESOURCESELECT" title="Specify Optional Attributes">
     <resource variable="symb">
       <filterfunc>return $res->is_problem()</filterfunc>
       <valuefunc>return $res->symb()</valuefunc>
       <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>	
+	    <message> Created Slot  </message>	
     <final>
       <finalcode>
         my $result;
@@ -130,6 +213,9 @@
 		$slot{$which} = $helper->{'VARS'}{$which};
 	    }
 	}
+	if ( $helper->{'VARS'}{'startreserve'} > 0) {
+		$slot{'startreserve'} = $helper->{'VARS'}{'startreserve'};
+	}
 	if ( $helper->{'VARS'}{'startunique'} > 0 &&
 	     $helper->{'VARS'}{'endunique'} > 0 ) {
 	    $slot{'uniqueperiod'} = [$helper->{'VARS'}{'startunique'},
@@ -141,7 +227,9 @@
 		my ($uname,$udomain)=split(/:/,$user);
 		push(@names,"$uname\@$udomain");
 	    }
-	    $slot{'proctor'}=join(',',@names);
+	    # make sure the usenrmaes are unique
+	    my %proctors = map { ($_,1) } @names;
+	    $slot{'proctor'}=join(',',sort(keys(%proctors)));
 	}
         my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
         my $cdom  = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -149,19 +237,28 @@
         my $ret = &Apache::lonnet::cput('slots',
 					{$helper->{'VARS'}{'name'} => \%slot},
 					$cdom,$cname);
-        $result.="\n$ret ".'Name: '.&HTML::Entities::encode($helper->{'VARS'}{'name'}).'</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{'startreserve'})) {
+	    $result.="\n".'<li> '.$labels{'startreserve'}.': '.
+		    &Apache::lonlocal::locallocaltime($slot{'startreserve'}).'</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'}.': '.