--- loncom/html/adm/helper/newslot.helper	2005/11/02 21:58:14	1.6
+++ loncom/html/adm/helper/newslot.helper	2006/02/03 22:40:46	1.12
@@ -7,6 +7,8 @@
 	  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 {
@@ -17,7 +19,7 @@
 	  }
 	  my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
 	  my $cdom  = $env{'course.'.$env{'request.course.id'}.'.domain'};
-	  my $name=$helper->{'VARS'}{'name'};
+	  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; }
@@ -25,22 +27,27 @@
       }
     </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">
       <defaultvalue>
@@ -48,7 +55,7 @@
       </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">
       <defaultvalue>
@@ -56,7 +63,7 @@
       </defaultvalue>
     </date>
     <message>
-      <message_text><br />Type:</message_text>
+      <br />Type:
     </message>
     <choices variable="type">
       <choice computer='preassigned'>Instructor asssignable.</choice>
@@ -69,43 +76,67 @@
 
   <state name="OPTIONAL" title="Specify Optional Attributes">
     <message>
-      <message_text>
-          <p>Description:<br />&nbsp;&nbsp;&nbsp;
-      </message_text>
+        <p>Description:<br />&nbsp;&nbsp;&nbsp;
     </message>
     <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>Time students can start reserving:<br />&nbsp;&nbsp;&nbsp;
-      </message_text>
-    </message>
-    <date variable="startreserve" hoursminutes="1" anytime="1">
-      <defaultvalue>
-        return &{$helper->{DATA}{origslot}}('startreserve','anytime');
-      </defaultvalue>
-    </date>
-    <message>
-      <message_text>
-          </p><p>Maxium number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
-      </message_text>
-    </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>
-      <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>
@@ -116,31 +147,7 @@
       </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>
-        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>
-        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>
-          </p><p>Slot is:
-      </message_text>
+      </p><p>Slot is:
     </message>
     <choices variable="restricttosymb">
       <choice nextstate="PROCTOR" computer='any'>usable for any resource.</choice>
@@ -152,9 +159,9 @@
       </defaultvalue>
     </choices>
     <message>
-      <message_text> 
+       
 	</p><p>IP restrictions:<br />&nbsp;&nbsp;&nbsp;
-      </message_text>
+      
     </message>
     <string variable="ip" size="30">
       <validator>
@@ -164,7 +171,7 @@
         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">
@@ -191,7 +198,7 @@
     </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;
@@ -206,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'},
@@ -217,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'};
@@ -237,6 +249,10 @@
 		    &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;