--- loncom/html/adm/helper/newslot.helper	2010/10/31 15:32:15	1.27
+++ loncom/html/adm/helper/newslot.helper	2011/12/18 17:15:08	1.28
@@ -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">
@@ -168,6 +182,7 @@
       <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'});
@@ -330,6 +345,10 @@
 		$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'},
@@ -395,6 +414,11 @@
 		    &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'}.': '.