--- loncom/interface/slotrequest.pm	2019/06/22 19:18:28	1.125.2.7
+++ loncom/interface/slotrequest.pm	2015/09/23 23:04:53	1.126
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.125.2.7 2019/06/22 19:18:28 raeburn Exp $
+# $Id: slotrequest.pm,v 1.126 2015/09/23 23:04:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -162,24 +162,9 @@ $js
                 var startdate = startm+"/"+startd+"/"+starty;
                 var starttime = new Date(startdate).getTime();
                 starttime = starttime/1000;
-                var starth = form.start_hour.options[form.start_hour.selectedIndex].value;
-                if (numberRegExp.test(starth)) {
-                    starth = parseInt(starth);
-                    if (starth > 0 && starth <= 23) {
-                        starttime += 3600 * starth;
-                    }
-                }
                 var enddate = endm+"/"+endd+"/"+endy;
                 var endtime = new Date(enddate).getTime();
                 endtime = endtime/1000;
-                var endh = form.end_hour.options[form.end_hour.selectedIndex].value;
-                if (numberRegExp.test(endh)) {
-                    endh = parseInt(endh);
-                    if (endh > 0 && endh <= 23) {
-                        endtime += 3600 * endh;
-                    }
-                }
-
                 var shown = 0;
                 for (var i=0; i<$i; i++) {
                     if ((slotstart[i] >= starttime) && (slotend[i] <= endtime)) {
@@ -729,39 +714,13 @@ sub release_reservation {
     }
     my $new_param = join(':',@new_slots);
 
-    # Get value of useslots parameter in effect for this user.
-    # If value is map or map_map, then the parm level is 2 (i.e.,
-    # non-recursive enclosing map/folder level for specific user)
-    # and the symb for this reservation in slot_reservations.db
-    # will be the symb of the map itself.
-
-    my $use_slots = &Apache::lonnet::EXT("resource.0.useslots",
-                                         $symb,$udom,$uname);
-    &Apache::lonxml::debug("use_slots is  $use_slots<br />");
-
-    if (&Apache::lonnet::error($use_slots)) {
-        return (0,'error: Unable to determine current status');
-    }
-
-    my $parm_level = 1;
-    my $parm_symb = $passed_resource->symb();
-    if ($use_slots eq 'map' || $use_slots eq 'map_map') {
-        $parm_level = 2;
-        unless ($passed_resource->is_map()) {
-            my ($map) = &Apache::lonnet::decode_symb($parm_symb);
-            $parm_symb = &Apache::lonnet::symbread($map);
-        }
-    }
-
     my ($cnum,$cdom)=&get_course();
 
-    # get slot reservations, check if user has one for the
-    # correct symb, and if so, remove the reservation
+    # get slot reservations, check if user has one, if so remove reservation
     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
 				       "^$slot_name\0");
     foreach my $entry (keys(%consumed)) {
-        if (($consumed{$entry}->{'name'} eq $uname.':'.$udom) &&
-            ($consumed{$entry}->{'symb'} eq $parm_symb)) {
+	if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) {
 	    &Apache::lonnet::del('slot_reservations',[$entry],
 				 $cdom,$cnum);
             my %storehash = (
@@ -770,13 +729,25 @@ sub release_reservation {
                                action  => 'release',
                                context => $env{'form.context'},
                         );
-            &Apache::lonnet::write_log('course','slotreservationslog',
-                                       \%storehash,1,$uname,$udom,$cnum,$cdom);
-            &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',
-                                       \%storehash,1,$uname,$udom,$uname,$udom);
+            &Apache::lonnet::write_log('slotreservationslog',\%storehash,
+                                       1,$uname,$udom,$cnum,$cdom);
+            &Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+                                       1,$uname,$udom,$uname,$udom);
 	}
     }
 
+    my $use_slots = &Apache::lonnet::EXT("resource.0.useslots",
+					 $symb,$udom,$uname);
+    &Apache::lonxml::debug("use_slots is  $use_slots<br />");
+
+    if (&Apache::lonnet::error($use_slots)) { 
+	return (0,'error: Unable to determine current status');
+    }
+
+    my $parm_level = 1;
+    if ($use_slots eq 'map' || $use_slots eq 'map_map') {
+	$parm_level = 2;
+    }
     # store new parameter string
     my $result=&Apache::lonparmset::storeparm_by_symb($symb,
 						      '0_availablestudent',
@@ -855,15 +826,9 @@ sub get_slot {
     if ($slot_name && $slot_name ne $conflictable_slot) {
 	my %slot=&Apache::lonnet::get_slot($slot_name);
 	my $description1=&get_description($slot_name,\%slot);
-        my $slottype1=$slot{'type'};
 	%slot=&Apache::lonnet::get_slot($env{'form.slotname'});
 	my $description2=&get_description($env{'form.slotname'},\%slot);
-        if ($slottype1 eq 'preassigned') {
-            $r->print('<p>'.&mt('You already have a reservation: "[_1]", assigned by your instructor.',
-                                $description1).'</p>'.
-                      '<p>'.&mt('Your instructor must unassign it before you can make a new reservation.').
-                      '</p>');
-        } elsif ($slot_name ne $env{'form.slotname'}) {
+	if ($slot_name ne $env{'form.slotname'}) {
 	    $r->print(<<STUFF);
 <form method="post" action="/adm/slotrequest">
    <input type="hidden" name="symb" value="$env{'form.symb'}" />
@@ -1035,10 +1000,21 @@ sub allowed_slot {
     return 0 if (!$userallowed);
 
     # not allowed for this resource
-    if (defined($slot->{'symb'})
-	&& $slot->{'symb'} ne $symb) {
-        unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) {
-	    return 0;
+    if (defined($slot->{'symb'})) {
+        my $exclude = 1;
+        my ($slotmap,$slotid,$sloturl) = &Apache::lonnet::decode_symb($slot->{'symb'});
+        if ($sloturl=~/\.(page|sequence)$/) {
+            my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb);
+            if (($map ne '') && ($map eq $slotmap)) {
+                $exclude = 0;
+            }
+        } elsif ($slot->{'symb'} eq $symb) {
+            $exclude = 0;
+        }
+        if ($exclude) {
+            unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) {
+	        return 0;
+            }
         }
     }
 
@@ -1384,7 +1360,7 @@ sub show_table {
 	     'secret'          => 'Secret Word',
 	     'space'           => '# of students/max',
 	     'ip'              => 'IP or DNS restrictions',
-	     'symb'            => 'Resource slot is restricted to.',
+	     'symb'            => 'Resource/Map slot is restricted to.',
 	     'allowedsections' => 'Sections slot is restricted to.',
 	     'allowedusers'    => 'Users slot is restricted to.',
 	     'uniqueperiod'    => 'Period of time slot is unique',
@@ -1496,16 +1472,15 @@ sub show_table {
     $r->print('</div>');
     $r->print('<p><input type="submit" name="start" value="'.&mt('Update Display').'" /></p>');
     my $linkstart='<a href="/adm/slotrequest?command=showslots&amp;order=';
-    my $tableheader = &Apache::loncommon::start_data_table().
-                      &Apache::loncommon::start_data_table_header_row().'
-                      <th></th>';
+    $r->print(&Apache::loncommon::start_data_table().
+	      &Apache::loncommon::start_data_table_header_row().'
+	       <th></th>');
     foreach my $which (@show_order) {
 	if ($which ne 'proctor' && exists($show{$which})) {
-	    $tableheader .= '<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>';
+	    $r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>');
 	}
     }
-    $tableheader .= &Apache::loncommon::end_data_table_header_row();
-    my $shownheader = 0;
+    $r->print(&Apache::loncommon::end_data_table_header_row());
 
     my %name_cache;
     my $slotsort = sub {
@@ -1654,39 +1629,30 @@ sub show_table {
                                                delete => 'Delete',
                                                slotlog => 'History',
         );
-        my ($edit,$delete,$showlog,$remove_all);
-        if ($mgr) {
-	    $edit=(<<"EDITLINK");
+	my $edit=(<<"EDITLINK");
 <a href="/adm/helper/newslot.helper?name=$slot">$lt{'edit'}</a>
 EDITLINK
 
-	    $delete=(<<"DELETELINK");
+	my $delete=(<<"DELETELINK");
 <a href="/adm/slotrequest?command=delete&amp;slotname=$slot">$lt{'delete'}</a>
 DELETELINK
 
-            $remove_all=&remove_link($slot,'remove all').'<br />';
-
-            if ($ids eq '') {
-                undef($remove_all);
-            } else {
-                undef($delete);
-            }
-        }
-
-        $showlog=(<<"LOGLINK");
+        my $showlog=(<<"LOGLINK");
 <a href="/adm/slotrequest?command=slotlog&amp;slotname=$slot">$lt{'slotlog'}</a>
 LOGLINK
 
+        my $remove_all=&remove_link($slot,'remove all').'<br />';
+
+        if ($ids eq '') {
+            undef($remove_all);
+        } else {
+            undef($delete);
+        }
 	if ($slots{$slot}{'type'} ne 'schedulable_student') {
             undef($showlog); 
 	    undef($remove_all);
 	}
 
-        unless ($shownheader) {
-            $r->print($tableheader);
-            $shownheader = 1;
-        }
-
 	my $row_start=&Apache::loncommon::start_data_table_row();
 	my $row_end=&Apache::loncommon::end_data_table_row();
         $r->print($row_start.
@@ -1755,12 +1721,7 @@ $row_end
 STUFF
         }
     }
-    if ($shownheader) {
-        $r->print(&Apache::loncommon::end_data_table());
-    } else {
-        $r->print('<p>'.&mt('No slots meet the criteria for display').'</p>');
-    }
-    $r->print('</form>');
+    $r->print(&Apache::loncommon::end_data_table().'</form>');
     return;
 }
 
@@ -2116,16 +2077,14 @@ sub show_reservations {
     if ($showntablehdr) {
         $r->print(&Apache::loncommon::end_data_table().'<br />');
         if (($curr{'page'} > 1) || ($more_records)) {
-            $r->print('<p>');
+            $r->print('<table><tr>');
             if ($curr{'page'} > 1) {
-                $r->print('<input type="button" onclick="javascript:chgPage('."'previous'".');" value="'.
-                          &mt('Previous [_1] changes',$curr{'show'}).'" />');
+                $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
             }
             if ($more_records) {
-                $r->print('<input type="button" onclick="javascript:chgPage('."'next'".');" value="'.
-                          &mt('Next [_1] changes',$curr{'show'}).'" />');
+                $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
             }
-            $r->print('</p>');
+            $r->print('</tr></table>');
             $r->print(<<"ENDSCRIPT");
 <script type="text/javascript">
 // <![CDATA[
@@ -2329,16 +2288,14 @@ sub show_reservations_log {
     if ($showntablehdr) {
         $r->print(&Apache::loncommon::end_data_table().'<br />');
         if (($curr{'page'} > 1) || ($more_records)) {
-            $r->print('<p>');
+            $r->print('<table><tr>');
             if ($curr{'page'} > 1) {
-                $r->print('<input type="button" onclick="javascript:chgPage('."'previous'".');" value="'.
-                          &mt('Previous [_1] changes',$curr{'show'}).'" />');
+                $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
             }
             if ($more_records) {
-                $r->print('<input type="button" onclick="javascript:chgPage('."'next'".');" value="'.
-                          &mt('Next [_1] changes',$curr{'show'}).'" />');
+                $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
             }
-            $r->print('</p>');
+            $r->print('</tr></table>');
             $r->print(<<"ENDSCRIPT");
 <script type="text/javascript">
 function chgPage(caller) {
@@ -2478,9 +2435,8 @@ sub display_filter {
         }
         $output .= '</select></td>';
     }
-    $output .= '<td>&nbsp;&nbsp;</td></tr></table>'.
-               '<p><input type="submit" value="'.
-               &mt('Update Display').'" /></p>'.
+    $output .= '<td>&nbsp;&nbsp;</td><td valign="middle"><input type="submit" value="'.
+               &mt('Update Display').'" /></tr></table>'.
                '<p class="LC_info">'.
                &mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
                   ,'2.9.0');
@@ -2686,10 +2642,8 @@ sub csv_upload_map {
     if (!$env{'form.datatoken'}) {
 	$datatoken=&Apache::loncommon::upfile_store($r);
     } else {
-        $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
-        if ($datatoken ne '') {
-            &Apache::loncommon::load_tmp_file($r,$datatoken);
-        }
+	$datatoken=$env{'form.datatoken'};
+	&Apache::loncommon::load_tmp_file($r);
     }
     my @records=&Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@records); }
@@ -2729,7 +2683,7 @@ sub csvupload_fields {
 	    ['proctor','List of proctor ids'],
 	    ['description','Slot Description'],
 	    ['maxspace','Maximum number of reservations'],
-	    ['symb','Resource Restriction'],
+	    ['symb','Resource/Map Restriction'],
 	    ['uniqueperiod','Date range of slot exclusion'],
 	    ['secret','Secret word proctor uses to validate'],
 	    ['allowedsections','Sections slot is restricted to'],
@@ -2739,10 +2693,7 @@ sub csvupload_fields {
 
 sub csv_upload_assign {
     my ($r,$mgr)= @_;
-    my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'});
-    if ($datatoken ne '') {
-        &Apache::loncommon::load_tmp_file($r,$datatoken);
-    }
+    &Apache::loncommon::load_tmp_file($r);
     my @slotdata = &Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@slotdata); }
     my %fields=&Apache::grades::get_fields();
@@ -2800,12 +2751,8 @@ sub csv_upload_assign {
 	}
 
 	if ($entries{$fields{'startreserve'}}) {
-            my $date = &UnixDate($entries{$fields{'startreserve'}},"%s");
-            if ($date eq '') {
-                push(@errors,"$name -- No reservation start time set for slot -- value provided had invalid format");
-            } else {
-                $slot{'startreserve'} = $date;
-            }
+	    $slot{'startreserve'}=
+		&UnixDate($entries{$fields{'startreserve'}},"%s");
 	}
 	if (defined($slot{'startreserve'})
 	    && $slot{'startreserve'} > $slot{'starttime'}) {
@@ -2814,12 +2761,8 @@ sub csv_upload_assign {
 	}
 
         if ($entries{$fields{'endreserve'}}) {
-            my $date = &UnixDate($entries{$fields{'endreserve'}},"%s");
-            if ($date eq '') {
-                push(@errors,"$name -- No reservation end time set for slot -- value provided had invalid format");
-            } else {
-                $slot{'endreserve'} = $date;
-            }
+            $slot{'endreserve'}=
+                &UnixDate($entries{$fields{'endreserve'}},"%s");
         }
         if (defined($slot{'endreserve'})
             && $slot{'endreserve'} > $slot{'starttime'}) {
@@ -2879,14 +2822,12 @@ sub csv_upload_assign {
             }
         }
 	if ($entries{$fields{'uniqueperiod'}}) {
-            my ($start,$end)= map { &UnixDate($_,"%s"); } split(',',$entries{$fields{'uniqueperiod'}});
-            if (($start ne '') && ($end ne '')) {
-                $slot{'uniqueperiod'}=[$start,$end];
-            } else {
-                push(@errors,"$name -- Slot's unique period ignored -- one or both of the comma separated values for start and end had an invalid format");
-            }
+	    my ($start,$end)=split(',',$entries{$fields{'uniqueperiod'}});
+	    my @times=(&UnixDate($start,"%s"),
+		       &UnixDate($end,"%s"));
+	    $slot{'uniqueperiod'}=\@times;
 	}
-	if (ref($slot{'uniqueperiod'}) eq 'ARRAY' 
+	if (defined($slot{'uniqueperiod'})
 	    && $slot{'uniqueperiod'}[0] > $slot{'uniqueperiod'}[1]) {
 	    push(@errors,"$name not created -- Slot's unique period start time is later than the unique period's end time.");
 	    next;
@@ -3049,7 +2990,7 @@ sub handler {
 	    }
 	    &csv_upload_map($r);
 	}
-    } elsif (($env{'form.command'} eq 'slotlog') && ($vgr eq 'F')) {
+    } elsif ($env{'form.command'} eq 'slotlog' && $mgr eq 'F') {
         &show_reservations_log($r);
     } else {
 	my $symb=&unescape($env{'form.symb'});