--- loncom/html/adm/helper/newslot.helper	2009/01/27 20:53:53	1.25
+++ loncom/html/adm/helper/newslot.helper	2015/10/05 02:35:51	1.33
@@ -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">
@@ -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'});
@@ -191,11 +220,25 @@
 
     <choices variable="restricttosymb">
       <choice nextstate="PROCTOR" computer='any'>usable for any resource.</choice>
-      <choice nextstate="RESOURCESELECT" computer='resource'>restricted to a specific resource.</choice>
+      <choice nextstate="MAPSELECT" computer='map'>restricted to resources in specific folder(s)/composite page(s).</choice>
+      <choice nextstate="RESOURCESELECT" computer='resource'>restricted to specific resource(s).</choice>
       <defaultvalue>
         my $default=&{$helper->{DATA}{origslot}}('symb');
-        if ($default) { return 'resource'; }
-        return 'any';
+        if ($default) {
+            my @symbs;
+            if ($default =~ /,/) {
+                @symbs = split(/\s*,\s*/,$default);
+            } else {
+                @symbs = ($default);
+            }
+            if (grep(/\.(page|sequence)$/,@symbs)) {
+                return 'map';
+            } else {
+                return 'resource';
+            }
+        } else {
+            return 'any';
+        }
       </defaultvalue>
     </choices>
     
@@ -210,6 +253,21 @@
         return &{$helper->{DATA}{origslot}}('ip');
       </defaultvalue>
     </string>
+
+    <message>
+      </p><p>Does each student need to use a unique IP address to access a resource with this slot?</p>
+    </message>
+    <choices variable="iptied">
+      <choice computer='no'>No. The student's IP address is not tied for later access to the same resource. </choice>
+      <choice computer='yes'>Yes. The IP address on a student's first access to a resource is tied for later access.</choice>
+      <choice computer='answer'>Yes. The IP address on a student's first access to a resource is tied for later access (including post-answer date).</choice>
+      <defaultvalue>
+        my $default=&{$helper->{DATA}{origslot}}('iptied');
+        if ($default eq 'yes') { return 'yes'; }
+        if ($default eq 'answer') { return 'answer'; }
+        return 'no';
+      </defaultvalue>
+    </choices>
     <message>  </p>  </message>
   </state>
 
@@ -218,15 +276,38 @@
 
     <nextstate>PROCTOR</nextstate>
 
-    <resource variable="symb">
-      <filterfunc>return $res->is_problem()</filterfunc>
+    <resource variable="symb" multichoice="1">
+      <filterfunc>return $res->is_map() || $res->is_problem()</filterfunc>
+      <choicefunc>return $res->is_problem()</choicefunc>
       <valuefunc>return $res->symb()</valuefunc>
       <defaultvalue>
-        return &{$helper->{DATA}{origslot}}('symb');
+        my @defaults;
+        my $default=&{$helper->{DATA}{origslot}}('symb');
+        if ($default) {
+            @defaults=(split(/\s*,\s*/,$default));
+        }
+        return @defaults;
       </defaultvalue>
     </resource>    
   </state>
 
+  <state name="MAPSELECT" title="Specify Optional Attributes">
+
+    <nextstate>PROCTOR</nextstate>
+
+    <resource variable="symb" multichoice="1">
+      <filterfunc>return $res->is_map()</filterfunc>
+      <valuefunc>return $res->symb()</valuefunc>
+      <defaultvalue>
+        my @defaults;
+        my $default=&{$helper->{DATA}{origslot}}('symb');
+        if ($default) {
+            @defaults=(split(/\s*,\s*/,$default));
+        }
+        return @defaults;
+      </defaultvalue>
+    </resource>
+  </state>
 
   <state name="PROCTOR" title="Specify Proctors"
 	 help="Slot_SpecifyProctors">
@@ -265,16 +346,16 @@
     </message>
 
     <message>
-      Select sections to limit slot availability to: <br />&nbsp;&nbsp;&nbsp;
+      <h3>Select sections to limit slot availability to: </h3>&nbsp;&nbsp;&nbsp;
     </message>
     <section variable="allowedsections" multichoice="1" allowempty="1">
       <defaultvalue>
-        return join('|||',
+	return join('|||',
 		    split(',',&{$helper->{DATA}{origslot}}('allowedsections')));
       </defaultvalue>
     </section>
     <message>
-      Select users to limit slot availability to: <br />&nbsp;&nbsp;&nbsp;
+      <br /><h3>Select users to limit slot availability to: </h3>&nbsp;&nbsp;&nbsp;
     </message>
     <student variable="allowedusers" multichoice="1" coursepersonnel="1"
              activeonly="1" emptyallowed="1">
@@ -285,7 +366,7 @@
   </state>
 
 
-  <state name="FINISH" title="Creating/Modfying Slot">
+  <state name="FINISH" title="Creating/Modifying Slot">
 	    <message> Created Slot  </message>	
     <final>
       <finalcode>
@@ -297,22 +378,50 @@
 	    $slot{$which} = $helper->{'VARS'}{$which};
 	}
 
-	foreach my $which ('ip','description','maxspace','secret','symb') {
+	foreach my $which ('ip','description','maxspace','secret') {
 	    if ( $helper->{'VARS'}{$which} =~/\S/ ) {
 		$slot{$which} = $helper->{'VARS'}{$which};
 	    }
 	}
 
+        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'}{'restricttosymb'} =~ /^(map|resource)$/) && 
+            ($helper->{'VARS'}{'symb'} =~ /\S/)) {
+            my @symbs;
+            foreach my $symb (split(/\|\|\|/, $helper->{'VARS'}{'symb'})) {
+                push(@symbs,$symb);
+            }
+            # make sure the symbs are unique
+            my %symbs = map { ($_,1) } @symbs;
+            $slot{'symb'}=join(',',sort(keys(%symbs)));
+        }
+
 	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'}{'iptied'} =~ /^(yes|answer)$/ ) {
+            $slot{'iptied'} = lc($helper->{'VARS'}{'iptied'});
+        }
+
         if ( $helper->{'VARS'}{'useproctor'} eq 'yes'
 	     && $helper->{'VARS'}{'proctor'} =~/\S/ ) {
 	    my @names;
@@ -322,7 +431,7 @@
 		my ($uname,$udomain)=split(/:/,$user);
 		push(@names,"$uname:$udomain");
 	    }
-	    # make sure the usernmaes are unique
+	    # make sure the usernames are unique
 	    my %proctors = map { ($_,1) } @names;
 	    $slot{'proctor'}=join(',',sort(keys(%proctors)));
 	}
@@ -354,23 +463,60 @@
         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>'.
                  "\n".'<li> Type: '.$slot{'type'}.'</li>';
         my %labels =
              map {($_->[0],$_->[1])} &Apache::slotrequest::csvupload_fields();
-        foreach my $which ('ip','description','maxspace','secret','symb',
+        foreach my $which ('ip','description','maxspace','secret',
 			   'allowedsections','allowedusers') {
 	    if (exists($slot{$which})) {
 		$result.="\n".'<li> '.$labels{$which}.': '.
 		    &HTML::Entities::encode($slot{$which}).'</li>';
 	    }
 	}
+        if (exists($slot{'iptied'})) {
+            $result.="\n".'<li> '.$labels{'iptied'}.': ';
+            if ($slot{'iptied'} eq 'yes') {
+                $result.=&Apache::lonlocal::mt('yes');
+            } elsif ($slot{'iptied'} eq 'answer') {
+                $result.=&Apache::lonlocal::mt('yes, including post-answer date');
+            }
+            $result.='</li>';
+        }
+        if (exists($slot{'symb'})) {
+            $result.="\n".'<li> '.$labels{'symb'}.': ';
+            if ($slot{'symb'} =~ /,/) {
+                $result.='<ul>';
+                foreach my $symb (split(/\s*,\s*/,$slot{'symb'})) {
+                    $result.='<li>'.&HTML::Entities::encode($symb).'</li>';
+                }
+                $result.='</ul>';
+            } else {
+                $result.=&HTML::Entities::encode($slot{'symb'});
+            }
+            $result.='</li>';
+        }
 	if (exists($slot{'startreserve'})) {
 	    $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;