--- loncom/html/adm/helper/newslot.helper	2006/05/09 19:10:39	1.18
+++ loncom/html/adm/helper/newslot.helper	2011/12/18 17:15:08	1.28
@@ -1,5 +1,6 @@
 <helper title="Slot Creation" requiredpriv="mgq">
-  <state name="START" title="Specify Required Attributes">
+  <state name="START" title="Specify Required Attributes"
+         help="Slot_RequiredAttributes">
 
     <nextstate>OPTIONAL</nextstate>
 
@@ -30,7 +31,7 @@
       }
     </exec>
     <message>
-        Name: <br />&nbsp;&nbsp;&nbsp;
+        <br />Name: <br />&nbsp;&nbsp;&nbsp;
     </message>
     <string variable="name" size="30">
       <validator>
@@ -75,7 +76,7 @@
       <br />Type:
     </message>
     <choices variable="type">
-      <choice computer='preassigned'>Instructor asssignable.</choice>
+      <choice computer='preassigned'>Instructor assignable.</choice>
       <choice computer='schedulable_student'>Student selectable.</choice>
       <defaultvalue>
         return &{$helper->{DATA}{origslot}}('type','preassigned');
@@ -84,7 +85,8 @@
   </state>
 
 
-  <state name="OPTIONAL" title="Specify Optional Attributes">
+  <state name="OPTIONAL" title="Specify Optional Attributes"
+	 help="Slot_OptionalAttributes">
     <message>
         <p>Description:<br />&nbsp;&nbsp;&nbsp;
     </message>
@@ -110,7 +112,21 @@
         </validator>
       </date>
       <message>
-         </p><p>Maxium number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
+        </p><p>Time students can no longer reserve:<br />&nbsp;&nbsp;&nbsp;
+      </message>
+      <date variable="endreserve" hoursminutes="1" anytime="1">
+        <defaultvalue>
+          return &{$helper->{DATA}{origslot}}('endreserve','anytime');
+        </defaultvalue>
+        <validator>
+           if (defined($val) && $val > $helper->{'VARS'}{'starttime'}) {
+               return 'Reservation end time must come before the slot has started.';
+           }
+           return undef;
+        </validator>
+      </date>
+      <message>
+         </p><p>Maximum number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
       </message>
       <string variable="maxspace" size="4">
         <validator>
@@ -122,7 +138,7 @@
         </defaultvalue>
       </string>
       <message>
-         </p><p>Period of time in which this slot is can only be uniquely chosen:<br />&nbsp;&nbsp;&nbsp;Start:
+         </p><p>Period of time when this slot can only be uniquely chosen:<br />&nbsp;&nbsp;&nbsp;Start:
       </message>
       <date variable="startunique" hoursminutes="1" anytime="1">
         <defaultvalue>
@@ -147,16 +163,45 @@
 	   return undef;
         </validator>
       </date>
+      <message>
+        </p><p>Message(s) triggered by reservation change by student 
+      </message>
+    <choices variable="reservationmsg">
+      <choice computer='only_student'>Sent to student</choice>
+      <choice computer='student_and_user_notes_screen'>Sent to student and added to user notes</choice>
+      <choice computer='none'>None sent and no record in user notes</choice>
+      <defaultvalue>
+        my $default=&{$helper->{DATA}{origslot}}('reservationmsg');
+        if ($default eq 'only_student') { return $default; }
+        if ($default eq 'student_and_user_notes_screen') { return $default; }
+        return 'none';
+      </defaultvalue>
+    </choices>
     </condition>
     <condition>
       <clause>$helper->{'VARS'}{'type'} eq 'preassigned'</clause>
       <exec>
         delete($helper->{'VARS'}{'startreserve'});
+        delete($helper->{'VARS'}{'endreserve'});
         delete($helper->{'VARS'}{'maxspace'});
         delete($helper->{'VARS'}{'startunique'});
         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>
@@ -171,6 +216,8 @@
     <message>
       </p><p>Slot is:
     </message>
+    <helpicon file="Slot_ChoosingResources" />
+
     <choices variable="restricttosymb">
       <choice nextstate="PROCTOR" computer='any'>usable for any resource.</choice>
       <choice nextstate="RESOURCESELECT" computer='resource'>restricted to a specific resource.</choice>
@@ -180,6 +227,7 @@
         return 'any';
       </defaultvalue>
     </choices>
+    
     <message>
 	</p><p>IP restrictions:<br />&nbsp;&nbsp;&nbsp;      
     </message>
@@ -209,27 +257,18 @@
   </state>
 
 
-  <state name="PROCTOR" title="Specify Proctors">
+  <state name="PROCTOR" title="Specify Proctors"
+	 help="Slot_SpecifyProctors">
 
-    <nextstate>FINISH</nextstate>
+    <skip>
+      <clause>$helper->{'VARS'}{'useproctor'} eq 'no'</clause>
+      <nextstate>RESTRICTUSER</nextstate>
+    </skip>
 
-    <condition>
-       <clause>$helper->{'VARS'}{'type'} eq 'schedulable_student'</clause>
-       <nextstate>RESTRICTUSER</nextstate>
-    </condition>
-
-    <choices variable="noproctor">
-      <choice computer='no'>No proctor checkin required for access.</choice>
-      <choice computer='yes'>Require proctored access.</choice>
-      <defaultvalue>
-        my $default=&{$helper->{DATA}{origslot}}('proctor');
-        if ($default) { return 'yes'; }
-        return 'no';
-      </defaultvalue>
-    </choices>
+    <nextstate>RESTRICTUSER</nextstate>
 
     <student variable="proctor" multichoice="1" coursepersonnel="1"
-             activeonly="1" emptyallowed="1">
+             activeonly="1" emptyallowed="0">
       <defaultvalue>
         my @defaults;
         my $default=&{$helper->{DATA}{origslot}}('proctor');
@@ -242,7 +281,13 @@
   </state>
 
 
-  <state name="RESTRICTUSER" title="Restrict slot availability">
+  <state name="RESTRICTUSER" title="Restrict slot availability"
+	 help="Slot_RestrictAvailibility">
+    <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>
@@ -287,17 +332,31 @@
 	    }
 	}
 
+        if ($helper->{'VARS'}{'type'} eq 'schedulable_student') {
+            if (($helper->{'VARS'}{'reservationmsg'} eq 'only_student') ||
+               ($helper->{'VARS'}{'reservationmsg'} eq 'student_and_user_notes_screen')) {
+                $slot{'reservationmsg'} = $helper->{'VARS'}{'reservationmsg'}; 
+            } else {
+                $slot{'reservationmsg'} = 'none';
+            }
+        }
+
 	if ( $helper->{'VARS'}{'startreserve'} > 0) {
 		$slot{'startreserve'} = $helper->{'VARS'}{'startreserve'};
 	}
 
+        if ( $helper->{'VARS'}{'endreserve'} > 0) {
+            $slot{'endreserve'} = $helper->{'VARS'}{'endreserve'};
+        }
+
 	if ( $helper->{'VARS'}{'startunique'} > 0 &&
 	     $helper->{'VARS'}{'endunique'} > 0 ) {
 	    $slot{'uniqueperiod'} = [$helper->{'VARS'}{'startunique'},
 				     $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
@@ -354,6 +413,18 @@
 	    $result.="\n".'<li> '.$labels{'startreserve'}.': '.
 		    &Apache::lonlocal::locallocaltime($slot{'startreserve'}).'</li>';
 	}
+
+        if (exists($slot{'endreserve'})) {
+            $result.="\n".'<li> '.$labels{'endreserve'}.': '.
+                    &Apache::lonlocal::locallocaltime($slot{'endreserve'}).'</li>';
+        }
+
+        if (exists($slot{'reservationmsg'})) {
+            my %options = &Apache::slotrequest::slot_reservationmsg_options();
+            $result.="\n".'<li> '.$labels{'reservationmsg'}.': '.
+                          $options{$slot{'reservationmsg'}}.'</li>';
+        }
+
         if (exists($slot{'proctor'})) {
 	    my $proctors = $slot{'proctor'};
 	    $proctors =~ s/,/, /g;