--- loncom/html/adm/helper/newslot.helper	2010/10/31 15:32:15	1.27
+++ loncom/html/adm/helper/newslot.helper	2015/09/23 23:05:04	1.31
@@ -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'});
@@ -205,11 +220,19 @@
 
     <choices variable="restricttosymb">
       <choice nextstate="PROCTOR" computer='any'>usable for any resource.</choice>
+      <choice nextstate="MAPSELECT" computer='map'>restricted to resources in a specific folder/composite page.</choice>
       <choice nextstate="RESOURCESELECT" computer='resource'>restricted to a specific resource.</choice>
       <defaultvalue>
         my $default=&{$helper->{DATA}{origslot}}('symb');
-        if ($default) { return 'resource'; }
-        return 'any';
+        if ($default) {
+            if ($default =~ /\.(page|sequence)$/) {
+                return 'map';
+            } else {
+                return 'resource';
+            }
+        } else {
+            return 'any';
+        }
       </defaultvalue>
     </choices>
     
@@ -241,6 +264,18 @@
     </resource>    
   </state>
 
+  <state name="MAPSELECT" title="Specify Optional Attributes">
+
+    <nextstate>PROCTOR</nextstate>
+
+    <resource variable="symb">
+      <filterfunc>return $res->is_map()</filterfunc>
+      <valuefunc>return $res->symb()</valuefunc>
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('symb');
+      </defaultvalue>
+    </resource>
+  </state>
 
   <state name="PROCTOR" title="Specify Proctors"
 	 help="Slot_SpecifyProctors">
@@ -299,7 +334,7 @@
   </state>
 
 
-  <state name="FINISH" title="Creating/Modfying Slot">
+  <state name="FINISH" title="Creating/Modifying Slot">
 	    <message> Created Slot  </message>	
     <final>
       <finalcode>
@@ -330,6 +365,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'},
@@ -377,6 +416,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>'.
@@ -395,6 +437,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'}.': '.