--- loncom/html/adm/helper/newslot.helper	2006/12/18 15:14:37	1.21
+++ 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>
 
@@ -29,12 +30,6 @@
 	  return $slot{$name}{$which};
       }
     </exec>
-	<message>
-	    Help on required attributes
-	</message>
-    <helpicon file="Slot_RequiredAttributes">
-         Required Attributes
-    </helpicon>
     <message>
         <br />Name: <br />&nbsp;&nbsp;&nbsp;
     </message>
@@ -81,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');
@@ -90,14 +85,8 @@
   </state>
 
 
-  <state name="OPTIONAL" title="Specify Optional Attributes">
-	<message>
-	    Help on optional attributes
-	</message>
-    <helpicon file="Slot_OptionalAttributes">
-         Optional Attributes
-    </helpicon>
-  
+  <state name="OPTIONAL" title="Specify Optional Attributes"
+	 help="Slot_OptionalAttributes">
     <message>
         <p>Description:<br />&nbsp;&nbsp;&nbsp;
     </message>
@@ -123,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>
@@ -135,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>
@@ -160,11 +163,26 @@
 	   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'});
@@ -198,9 +216,7 @@
     <message>
       </p><p>Slot is:
     </message>
-    <helpicon file="Slot_ChoosingResources">
-         Resource Restriction
-    </helpicon>
+    <helpicon file="Slot_ChoosingResources" />
 
     <choices variable="restricttosymb">
       <choice nextstate="PROCTOR" computer='any'>usable for any resource.</choice>
@@ -241,7 +257,8 @@
   </state>
 
 
-  <state name="PROCTOR" title="Specify Proctors">
+  <state name="PROCTOR" title="Specify Proctors"
+	 help="Slot_SpecifyProctors">
 
     <skip>
       <clause>$helper->{'VARS'}{'useproctor'} eq 'no'</clause>
@@ -249,15 +266,9 @@
     </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">
+             activeonly="1" emptyallowed="0">
       <defaultvalue>
         my @defaults;
         my $default=&{$helper->{DATA}{origslot}}('proctor');
@@ -270,7 +281,8 @@
   </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>
@@ -280,9 +292,6 @@
     <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;
@@ -323,10 +332,23 @@
 	    }
 	}
 
+        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'},
@@ -391,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;