--- loncom/html/adm/helper/newslot.helper	2008/12/21 16:51:28	1.24
+++ loncom/html/adm/helper/newslot.helper	2013/07/24 18:21:46	1.30
@@ -76,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');
@@ -112,6 +112,20 @@
         </validator>
       </date>
       <message>
+        </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">
@@ -124,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>
@@ -149,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'});
@@ -285,7 +314,7 @@
   </state>
 
 
-  <state name="FINISH" title="Creating/Modfying Slot">
+  <state name="FINISH" title="Creating/Modifying Slot">
 	    <message> Created Slot  </message>	
     <final>
       <finalcode>
@@ -303,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'},
@@ -354,6 +396,9 @@
         my $ret = &Apache::lonnet::cput('slots',
 					{$helper->{'VARS'}{'name'} => \%slot},
 					$cdom,$cname);
+        if ($ret eq 'ok') {
+            &Apache::lonnet::devalidate_slots_cache($cname,$cdom);
+        }
         $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>'.
@@ -371,6 +416,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;