--- loncom/html/adm/helper/newslot.helper	2006/03/07 16:29:14	1.14
+++ loncom/html/adm/helper/newslot.helper	2006/12/18 15:14:37	1.21
@@ -29,8 +29,14 @@
 	  return $slot{$name}{$which};
       }
     </exec>
+	<message>
+	    Help on required attributes
+	</message>
+    <helpicon file="Slot_RequiredAttributes">
+         Required Attributes
+    </helpicon>
     <message>
-        Name: <br />&nbsp;&nbsp;&nbsp;
+        <br />Name: <br />&nbsp;&nbsp;&nbsp;
     </message>
     <string variable="name" size="30">
       <validator>
@@ -64,6 +70,12 @@
       <defaultvalue>
         return &{$helper->{DATA}{origslot}}('endtime');
       </defaultvalue>
+      <validator>
+         if ($val < $helper->{'VARS'}{'starttime'}) {
+	     return 'End time must be later than the start time.';
+         }
+	 return undef;
+      </validator>
     </date>
     <message>
       <br />Type:
@@ -79,6 +91,13 @@
 
 
   <state name="OPTIONAL" title="Specify Optional Attributes">
+	<message>
+	    Help on optional attributes
+	</message>
+    <helpicon file="Slot_OptionalAttributes">
+         Optional Attributes
+    </helpicon>
+  
     <message>
         <p>Description:<br />&nbsp;&nbsp;&nbsp;
     </message>
@@ -96,6 +115,12 @@
         <defaultvalue>
           return &{$helper->{DATA}{origslot}}('startreserve','anytime');
         </defaultvalue>
+        <validator>
+           if (defined($val) && $val > $helper->{'VARS'}{'starttime'}) {
+	       return 'Reservation time must come before the slot has started.';
+           }
+	   return undef;
+        </validator>
       </date>
       <message>
          </p><p>Maxium number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
@@ -128,6 +153,12 @@
           if (ref($default)) { return $default->[1]; }
           return 'anytime';
         </defaultvalue>
+        <validator>
+           if (defined($val) && $val < $helper->{'VARS'}{'startunique'}) {
+	       return 'End time must be later than the start time.';
+           }
+	   return undef;
+        </validator>
       </date>
     </condition>
     <condition>
@@ -139,6 +170,20 @@
         delete($helper->{'VARS'}{'endunique'});
       </exec>
     </condition>
+
+    <message>
+      </p><p>Proctored access:
+    </message>
+    <choices variable="useproctor">
+      <choice computer='no'>No proctor checkin required for access.</choice>
+      <choice computer='yes'>Require proctored checkin for access.</choice>
+      <defaultvalue>
+        my $default=&{$helper->{DATA}{origslot}}('proctor');
+        if ($default) { return 'yes'; }
+        return 'no';
+      </defaultvalue>
+    </choices>
+
     <message>
       </p><p>Secret word proctors use to checkin users:<br />&nbsp;&nbsp;&nbsp;
     </message>
@@ -153,6 +198,10 @@
     <message>
       </p><p>Slot is:
     </message>
+    <helpicon file="Slot_ChoosingResources">
+         Resource Restriction
+    </helpicon>
+
     <choices variable="restricttosymb">
       <choice nextstate="PROCTOR" computer='any'>usable for any resource.</choice>
       <choice nextstate="RESOURCESELECT" computer='resource'>restricted to a specific resource.</choice>
@@ -162,6 +211,7 @@
         return 'any';
       </defaultvalue>
     </choices>
+    
     <message>
 	</p><p>IP restrictions:<br />&nbsp;&nbsp;&nbsp;      
     </message>
@@ -193,12 +243,18 @@
 
   <state name="PROCTOR" title="Specify Proctors">
 
-    <nextstate>FINISH</nextstate>
-
-    <condition>
-       <clause>$helper->{'VARS'}{'type'} eq 'schedulable_student'</clause>
-       <nextstate>RESTRICTUSER</nextstate>
-    </condition>
+    <skip>
+      <clause>$helper->{'VARS'}{'useproctor'} eq 'no'</clause>
+      <nextstate>RESTRICTUSER</nextstate>
+    </skip>
+
+    <nextstate>RESTRICTUSER</nextstate>
+	<message>
+	    Specifying Proctors
+	</message>
+    <helpicon file="Slot_SpecifyProctors">
+         Specifying Proctors
+    </helpicon>
 
     <student variable="proctor" multichoice="1" coursepersonnel="1"
              activeonly="1" emptyallowed="1">
@@ -206,7 +262,6 @@
         my @defaults;
         my $default=&{$helper->{DATA}{origslot}}('proctor');
         if ($default) {
-	    $default=~ tr/@/:/;
 	    @defaults=(split(',',$default)); 
 	}
         return @defaults;
@@ -216,10 +271,18 @@
 
 
   <state name="RESTRICTUSER" title="Restrict slot availability">
+    <skip>
+       <clause>$helper->{'VARS'}{'type'} ne 'schedulable_student'</clause>
+       <nextstate>FINISH</nextstate>
+    </skip>
+
     <nextstate>FINISH</nextstate>
     <message>
       <p>Slots are by default available to all users in a course, if you would like this slot to be restricted to a subset of users you can specify restrictions.</p>
     </message>
+    <helpicon file="Slot_RestrictAvailibility">
+         Restrict Availibility
+    </helpicon>
 
     <message>
       Select sections to limit slot availability to: <br />&nbsp;&nbsp;&nbsp;
@@ -270,13 +333,16 @@
 				     $helper->{'VARS'}{'endunique'}];
 	}
 
-        if ( $helper->{'VARS'}{'proctor'} =~/\S/ ) {
+        if ( $helper->{'VARS'}{'useproctor'} eq 'yes'
+	     && $helper->{'VARS'}{'proctor'} =~/\S/ ) {
 	    my @names;
+	    # just need the username/domain throw away the other data 
+            # that <student> returns
 	    foreach my $user (split(/\|\|\|/, $helper->{'VARS'}{'proctor'})) {
 		my ($uname,$udomain)=split(/:/,$user);
-		push(@names,"$uname\@$udomain");
+		push(@names,"$uname:$udomain");
 	    }
-	    # make sure the usenrmaes are unique
+	    # make sure the usernmaes are unique
 	    my %proctors = map { ($_,1) } @names;
 	    $slot{'proctor'}=join(',',sort(keys(%proctors)));
 	}
@@ -288,8 +354,9 @@
 	}
 
         if ( $helper->{'VARS'}{'allowedusers'} =~/\S/ ) {
-
 	    my @names;
+	    # just need the username/domain throw away the other data 
+            # that <student> returns
 	    foreach my $item (split(/\|\|\|/,
 				    $helper->{'VARS'}{'allowedusers'})) {
 		my ($uname,$udomain)=split(/:/,$item);