--- loncom/interface/slotrequest.pm	2005/11/21 19:50:36	1.34
+++ loncom/interface/slotrequest.pm	2006/03/30 05:13:38	1.48.2.3
@@ -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.34 2005/11/21 19:50:36 albertel Exp $
+# $Id: slotrequest.pm,v 1.48.2.3 2006/03/30 05:13:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,7 @@ use Apache::Constants qw(:common :http :
 use Apache::loncommon();
 use Apache::lonlocal;
 use Apache::lonnet;
+use Apache::lonnavmaps();
 use Date::Manip;
 
 sub fail {
@@ -47,8 +48,7 @@ sub fail {
 	$r->print('<p>'.&mt('Failed.').'</p>');
     }
     
-    $r->print('<p><a href="/adm/flip?postdata=return:">'.
-	      &mt('Return to last resource').'</a></p>');
+    &return_link($r);
     &end_page($r);
 }
 
@@ -89,7 +89,9 @@ sub get_reservation_ids {
 
     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
 				       "^$slot_name\0");
-    
+    if (&network_error(%consumed)) { 
+	return 'error: Unable to determine current status';
+    }
     my ($tmp)=%consumed;
     if ($tmp=~/^error: 2 / ) {
 	return 0;
@@ -111,7 +113,7 @@ sub space_available {
 }
 
 sub check_for_reservation {
-    my ($symb)=@_;
+    my ($symb,$mode)=@_;
     my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb,
 				       $env{'user.domain'}, $env{'user.name'});
 
@@ -124,7 +126,19 @@ sub check_for_reservation {
     my ($cnum,$cdom)=&get_course();
     my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum);
 
-    foreach my $slot_name (@slots) {
+    if (&network_error($student) || &network_error($course)  ||
+	&network_error(%slots)) {
+	return 'error: Unable to determine current status';
+    }    
+    my @got;
+    foreach my $slot_name (sort {
+	if (ref($slots{$a}) && ref($slots{$b})) {
+	    return $slots{$a}{'starttime'} <=> $slots{$b}{'starttime'}
+	}
+	if (ref($slots{$a})) { return -1;}
+	if (ref($slots{$b})) { return 1;}
+	return 0;
+    } @slots) {
 	next if (!defined($slots{$slot_name}) ||
 		 !ref($slots{$slot_name}));
 	&Apache::lonxml::debug(time." $slot_name ".
@@ -133,29 +147,81 @@ sub check_for_reservation {
 	if ($slots{$slot_name}->{'endtime'} > time &&
 	    $slots{$slot_name}->{'startreserve'} < time) {
 	    # between start of reservation times and end of slot
-	    return($slot_name, $slots{$slot_name});
+	    if ($mode eq 'allslots') {
+		push(@got,$slot_name);
+	    } else {
+		return($slot_name, $slots{$slot_name});
+	    }
 	}
     }
+    if ($mode eq 'allslots' && @got) {
+	return @got;
+    }
     return (undef,undef);
 }
 
+sub get_consumed_uniqueperiods {
+    my ($slots) = @_;
+    my $navmap=Apache::lonnavmaps::navmap->new;
+    my @problems = $navmap->retrieveResources(undef,
+					      sub { $_[0]->is_problem() },1,0);
+    my %used_slots;
+    foreach my $problem (@problems) {
+	my $symb = $problem->symb();
+	my $student = &Apache::lonnet::EXT("resource.0.availablestudent",
+					   $symb, $env{'user.domain'},
+					   $env{'user.name'});
+	my $course =  &Apache::lonnet::EXT("resource.0.available",
+					   $symb, $env{'user.domain'},
+					   $env{'user.name'});
+	if (&network_error($student) || &network_error($course)) {
+	    return 'error: Unable to determine current status';
+	}
+	foreach my $slot (split(/:/,$student), split(/:/, $course)) {
+	    $used_slots{$slot}=1;
+	}
+    }
+
+    if (!ref($slots)) {
+	my ($cnum,$cdom)=&get_course();
+	my %slots=&Apache::lonnet::get('slots', [keys(%used_slots)], $cdom, $cnum);
+	if (&network_error(%slots)) {
+	    return 'error: Unable to determine current status';
+	}
+	$slots = \%slots;
+    }
+
+    my %consumed_uniqueperiods;
+    foreach my $slot_name (keys(%used_slots)) {
+	next if (!defined($slots->{$slot_name}) ||
+		 !ref($slots->{$slot_name}));
+	
+        next if (!defined($slots->{$slot_name}{'uniqueperiod'}) ||
+		 !ref($slots->{$slot_name}{'uniqueperiod'}));
+	$consumed_uniqueperiods{$slot_name} = 
+	    $slots->{$slot_name}{'uniqueperiod'};
+    }
+    return \%consumed_uniqueperiods;
+}
+
 sub check_for_conflict {
-    my ($symb,$new_slot_name)=@_;
-    my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb,
-				       $env{'user.domain'}, $env{'user.name'});
-    my $course = &Apache::lonnet::EXT("resource.0.available", $symb,
-				      $env{'user.domain'}, $env{'user.name'});
-    my @slots = (split(/:/,$student), split(/:/, $course));
-    my ($cnum,$cdom)=&get_course();
-    my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum);
-    foreach my $slot_name (@slots) {
-	next if (!defined($slots{$slot_name}) ||
-		 !ref($slots{$slot_name}));
+    my ($symb,$new_slot_name,$new_slot,$slots,$consumed_uniqueperiods)=@_;
 
-        next if (!defined($slots{$slot_name}->{'uniqueperiod'}) ||
-		 !ref($slots{$slot_name}->{'uniqueperiod'}));
-	my ($start,$end)=@{$slots{$slot_name}->{'uniqueperiod'}};
-	if ($start<time && time < $end) {
+    if (!defined($new_slot->{'uniqueperiod'})) { return undef; }
+
+    if (!ref($consumed_uniqueperiods)) {
+	$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots);
+	if (&network_error(%$consumed_uniqueperiods)) {
+	    return 'error: Unable to determine current status';
+	}
+    }
+    
+    my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}};
+    foreach my $slot_name (keys(%$consumed_uniqueperiods)) {
+	my ($start,$end)=@{$consumed_uniqueperiods->{$slot_name}};
+	if (!
+	    ($start < $new_uniq_start &&  $end < $new_uniq_start) ||
+	    ($start > $new_uniq_end   &&  $end > $new_uniq_end  )) {
 	    return $slot_name;
 	}
     }
@@ -163,6 +229,14 @@ sub check_for_conflict {
 
 }
 
+sub network_error {
+    my ($result) = @_;
+    if ($result =~ /^(con_lost|no_such_host|error: [^2])/) {
+	return 1;
+    }
+    return 0;
+}
+
 sub make_reservation {
     my ($slot_name,$slot,$symb)=@_;
 
@@ -171,11 +245,17 @@ sub make_reservation {
     my $value=&Apache::lonnet::EXT("resource.0.availablestudent",$symb,
 				   $env{'user.domain'},$env{'user.name'});
     &Apache::lonxml::debug("value is  $value<br />");
+    if (&network_error($value)) { 
+	return 'error: Unable to determine current status';
+    }
+
     foreach my $other_slot (split(/:/, $value)) {
 	if ($other_slot eq $slot_name) {
 	    my %consumed=&Apache::lonnet::dump('slot_reservations', $cdom,
 					       $cnum, "^$slot_name\0");   
-
+	    if (&network_error($value)) { 
+		return 'error: Unable to determine current status';
+	    }
 	    my $me=$env{'user.name'}.'@'.$env{'user.domain'};
 	    foreach my $key (keys(%consumed)) {
 		if ($consumed{$key}->{'name'} eq $me) {
@@ -190,7 +270,9 @@ sub make_reservation {
     if (!defined($max)) { $max=99999; }
 
     my (@ids)=&get_reservation_ids($slot_name);
-
+    if (&network_error(@ids)) { 
+	return 'error: Unable to determine current status';
+    }
     my $last=0;
     foreach my $id (@ids) {
 	my $num=(split('\0',$id))[1];
@@ -233,37 +315,106 @@ sub make_reservation {
 
 sub remove_registration {
     my ($r) = @_;
+    if ($env{'form.entry'} ne 'remove all') {
+	return &remove_registration_user($r);
+    }
+    my $slot_name = $env{'form.slotname'};
+    my %slot=&Apache::lonnet::get_slot($slot_name);
+
+    my ($cnum,$cdom)=&get_course();
+    my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+				       "^$slot_name\0");
+    if (&network_error(%consumed)) {
+	$r->print("<p>".&mt('A network error has occured.').'</p>');
+	return;
+    }
+    if (!%consumed) {
+	$r->print("<p>".&mt('Slot <tt>[_1]</tt> has no reservations.',
+			    $slot_name)."</p>");
+	return;
+    }
+
+    my @names = map { $consumed{$_}{'name'} } (sort(keys(%consumed)));
+    my $names = join(' ',@names);
+
+    my $msg = &mt('Remove all of [_1] from slot [_2]?',$names,$slot_name);
+    &remove_registration_confirmation($r,$msg,['entry','slotname']);
+}
+
+sub remove_registration_user {
+    my ($r) = @_;
+    
+    my $slot_name = $env{'form.slotname'};
+
     my $name = &Apache::loncommon::plainname($env{'form.uname'},
 					     $env{'form.udom'});
 
     my $title = &Apache::lonnet::gettitle($env{'form.symb'});
 
+    my $msg = &mt('Remove [_1] from slot [_2] for [_3]',
+		  $name,$slot_name,$title);
+    
+    &remove_registration_confirmation($r,$msg,['uname','udom','slotname',
+					       'entry','symb']);
+}
+
+sub remove_registration_confirmation {
+    my ($r,$msg,$inputs) =@_;
+
     my $hidden_input;
-    foreach my $parm ('uname','udom','slotname','entry','symb') {
+    foreach my $parm (@{$inputs}) {
 	$hidden_input .=
 	    '<input type="hidden" name="'.$parm.'" value="'
 	    .&HTML::Entities::encode($env{'form.'.$parm},'"<>&\'').'" />'."\n";
     }
+    my %lt = &Apache::lonlocal::texthash('yes' => 'Yes',
+					 'no'  => 'No',);
     $r->print(<<"END_CONFIRM");
-<p> Remove $name from slot $env{'form.slotname'} for $title</p>
+<p> $msg </p>
 <form action="/adm/slotrequest" method="POST">
     <input type="hidden" name="command" value="release" />
+    <input type="hidden" name="button" value="yes" />
     $hidden_input
-    <input type="submit" name="Yes" value="yes" />
+    <input type="submit" value="$lt{'yes'}" />
 </form>
 <form action="/adm/slotrequest" method="POST">
     <input type="hidden" name="command" value="showslots" />
-    <input type="submit" name="No" value="no" />
+    <input type="submit" value="$lt{'no'}" />
 </form>
 END_CONFIRM
 
 }
 
+sub release_all_slot {
+    my ($r,$mgr)=@_;
+    
+    my $slot_name = $env{'form.slotname'};
+
+    my ($cnum,$cdom)=&get_course();
+
+    my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+				       "^$slot_name\0");
+    
+    $r->print('<p>'.&mt('Releasing reservations').'</p>');
+
+    foreach my $entry (sort { $consumed{$a}{'name'} cmp 
+				  $consumed{$b}{'name'} } (keys(%consumed))) {
+	my ($uname,$udom) = split('@',$consumed{$entry}{'name'});
+	my ($result,$msg) =
+	    &release_reservation($slot_name,$uname,$udom,
+				 $consumed{$entry}{'symb'},$mgr);
+	$r->print("<p>$msg</p>");
+	$r->rflush();
+    }
+    $r->print('<p><a href="/adm/slotrequest?command=showslots">'.
+	      &mt('Return to slot list').'</a></p>');
+    &return_link($r);
+}
+
 sub release_slot {
     my ($r,$symb,$slot_name,$inhibit_return_link,$mgr)=@_;
 
     if ($slot_name eq '') { $slot_name=$env{'form.slotname'}; }
-    my ($cnum,$cdom)=&get_course();
 
     my ($uname,$udom) = ($env{'user.name'}, $env{'user.domain'});
     if ($mgr eq 'F' 
@@ -276,6 +427,29 @@ sub release_slot {
 	$symb = $env{'form.symb'};
     }
 
+    my ($result,$msg) =
+	&release_reservation($slot_name,$uname,$udom,$symb,$mgr);
+    $r->print("<p>$msg</p>");
+    
+    if ($mgr eq 'F') {
+	$r->print('<p><a href="/adm/slotrequest?command=showslots">'.
+		  &mt('Return to slot list').'</a></p>');
+    }
+
+    if (!$inhibit_return_link) { &return_link($r);  }
+    return $result;
+}
+
+sub release_reservation {
+    my ($slot_name,$uname,$udom,$symb,$mgr) = @_;
+    my %slot=&Apache::lonnet::get_slot($slot_name);
+    my $description=&get_description($slot_name,\%slot);
+
+    if ($mgr ne 'F') {
+	if ($slot{'starttime'} < time) {
+	    return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description));
+	}
+    }
     # get parameter string, check for existance, rebuild string with the slot
     my @slots = split(/:/,&Apache::lonnet::EXT("resource.0.availablestudent",
 					       $symb,$udom,$uname));
@@ -287,6 +461,8 @@ sub release_slot {
     }
     my $new_param = join(':',@new_slots);
 
+    my ($cnum,$cdom)=&get_course();
+
     # get slot reservations, check if user has one, if so remove reservation
     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
 				       "^$slot_name\0");
@@ -302,18 +478,14 @@ sub release_slot {
 						      '0_availablestudent',
 						      1, $new_param, 'string',
 						      $uname,$udom);
-    my %slot=&Apache::lonnet::get_slot($slot_name);
-    my $description=&get_description($env{'form.slotname'},\%slot);
-    $r->print("<p>Released Reservation: $description</p>");
+
+    my $msg;
     if ($mgr eq 'F') {
-	$r->print('<p><a href="/adm/slotrequest?command=showslots">'.
-		  &mt('Return to slot list').'</a></p>');
-    }
-    if (!$inhibit_return_link) {
-	$r->print('<p><a href="/adm/flip?postdata=return:">'.
-		  &mt('Return to last resource').'</a></p>');
+	$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom");
+    } else {
+	$msg = &mt('Released Reservation: [_1]',$description);
     }
-    return 1;
+    return (1,$msg);
 }
 
 sub delete_slot {
@@ -325,6 +497,8 @@ sub delete_slot {
     my ($cnum,$cdom)=&get_course();
     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
 				       "^$slot_name\0");
+    my ($tmp) = %consumed;
+    if ($tmp =~ /error: 2/) { undef(%consumed); }
 
     if (%slot && !%consumed) {
 	$slot{'type'} = 'deleted';
@@ -344,6 +518,11 @@ sub delete_slot {
     }
     $r->print('<p><a href="/adm/slotrequest?command=showslots">'.
 	      &mt('Return to slot list').'</a></p>');
+    &return_link($r);
+}
+
+sub return_link {
+    my ($r) = @_;
     $r->print('<p><a href="/adm/flip?postdata=return:">'.
 	      &mt('Return to last resource').'</a></p>');
 }
@@ -351,7 +530,14 @@ sub delete_slot {
 sub get_slot {
     my ($r,$symb)=@_;
 
-    my $slot_name=&check_for_conflict($symb,$env{'form.slotname'});
+    my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
+    my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot);
+
+    if ($slot_name =~ /^error: (.*)/) {
+	$r->print("<p>An error occured while attempting to make a reservation. ($1)</p>");
+	&return_link($r);
+	return;
+    }
     if ($slot_name) {
 	my %slot=&Apache::lonnet::get_slot($slot_name);
 	my $description1=&get_description($slot_name,\%slot);
@@ -372,33 +558,30 @@ STUFF
 STUFF
 	    $r->print(' your reservation from <b>'.$description1.'</b> to <b>'.
 		      $description2.
-		      '</b> <br />or <a href="/adm/flip?postdata=return:">'.
-		      &mt('Return to last resource').'</a></p>');
+		      '</b> <br />or </p>');
+	    &return_link($r);
 	    $r->print(<<STUFF);
 </form>
 STUFF
         } else {
-	    $r->print('<p><a href="/adm/flip?postdata=return:">'.
-		      &mt('Return to last resource').'</a></p>');
+	    &return_link($r);
 	}
 	return;
     }
-    my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
+
     my $reserved=&make_reservation($env{'form.slotname'},
 				   \%slot,$symb);
     my $description=&get_description($env{'form.slotname'},\%slot);
     if (defined($reserved)) {
-	if ($reserved > -1) {
+	if ($slot_name =~ /^error: (.*)/) {
+	    $r->print("<p>An error occured while attempting to make a reservation. ($1)</p>");
+	} elsif ($reserved > -1) {
 	    $r->print("<p>Success: $description</p>");
-	    $r->print('<p><a href="/adm/flip?postdata=return:">'.
-		      &mt('Return to last resource').'</a></p>');
-	    return;
 	} elsif ($reserved < 0) {
 	    $r->print("<p>Already reserved: $description</p>");
-	    $r->print('<p><a href="/adm/flip?postdata=return:">'.
-		      &mt('Return to last resource').'</a></p>');
-	    return;
 	}
+	&return_link($r);
+	return;
     }
 
     my %lt=('request'=>"Availibility list",
@@ -425,13 +608,13 @@ or
 </p>
 or
 STUFF
-    $r->print('<p><a href="/adm/flip?postdata=return:">'.
-	      &mt('Return to last resource').'</a></p>');
+
+    &return_link($r);
     return;
 }
 
 sub allowed_slot {
-    my ($slot_name,$slot,$symb)=@_;
+    my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_;
     #already started
     if ($slot->{'starttime'} < time) {
 	# all open slot to be schedulable
@@ -454,6 +637,19 @@ sub allowed_slot {
 	&& $slot->{'symb'} ne $symb) {
 	return 0;
     }
+    # reserve time not yet started
+    if ($slot->{'startreserve'} > time) {
+	return 0;
+    }
+    &Apache::lonxml::debug("$slot_name reserve good");
+
+    my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots,
+				       $consumed_uniqueperiods);
+    if ($conflict) {
+	if ($slots->{$conflict}{'starttime'} < time) {
+	    return 0;
+	}
+    }
     &Apache::lonxml::debug("$slot_name symb good");
     return 1;
 }
@@ -474,29 +670,39 @@ sub show_choices {
 
     my ($cnum,$cdom)=&get_course();
     my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
+    my $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots);
     my $available;
     $r->print('<table border="1">');
     &Apache::lonxml::debug("Checking Slots");
-    my ($got_slot)=&check_for_reservation($symb);
+    my @got_slots=&check_for_reservation($symb,'allslots');
     foreach my $slot (sort 
 		      { return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
 		      (keys(%slots)))  {
 
 	&Apache::lonxml::debug("Checking Slot $slot");
-	next if (!&allowed_slot($slot,$slots{$slot}));
+	next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots,
+				$consumed_uniqueperiods));
 
 	$available++;
 
 	my $description=&get_description($slot,$slots{$slot});
 
 	my $form=&mt('Unavailable');
-	if (($slot eq $got_slot) ||
+	if ((grep(/^\Q$slot\E$/,@got_slots)) ||
 	    &space_available($slot,$slots{$slot},$symb)) {
 	    my $text=&mt('Select');
 	    my $command='get';
-	    if ($slot eq $got_slot) {
+	    if (grep(/^\Q$slot\E$/,@got_slots)) {
 		$text=&mt('Free Reservation');
 		$command='release';
+	    } else {
+		my $conflict = &check_for_conflict($symb,$slot,$slots{$slot},
+						   \%slots,
+						   $consumed_uniqueperiods);
+		if ($conflict) {
+		    $text=&mt('Change Reservation');
+		    $command='get';
+		}
 	    }
 	    my $escsymb=&Apache::lonnet::escape($symb);
 	    $form=<<STUFF;
@@ -524,10 +730,30 @@ STUFF
 }
 
 sub to_show {
-    my ($when,$slot) = @_;
+    my ($slotname,$slot,$when,$deleted,$name) = @_;
     my $time=time;
     my $week=60*60*24*7;
-    if ($when eq 'now') {
+
+    if ($deleted eq 'hide' && $slot->{'type'} eq 'deleted') {
+	return 0;
+    }
+
+    if ($name && $name->{'value'} =~ /\w/) {
+	if ($name->{'type'} eq 'substring') {
+	    if ($slotname !~ /\Q$name->{'value'}\E/) {
+		return 0;
+	    }
+	}
+	if ($name->{'type'} eq 'exact') {
+	    if ($slotname eq $name->{'value'}) {
+		return 0;
+	    }
+	}
+    }
+
+    if ($when eq 'any') {
+	return 1;
+    } elsif ($when eq 'now') {
 	if ($time > $slot->{'starttime'} &&
 	    $time < $slot->{'endtime'}) {
 	    return 1;
@@ -569,14 +795,20 @@ sub to_show {
 sub remove_link {
     my ($slotname,$entry,$uname,$udom,$symb) = @_;
 
+    my $remove = &mt('Remove');
+
+    if ($entry eq 'remove all') {
+	$remove = &mt('Remove All');
+	undef($uname);
+	undef($udom);
+    }
+
     $slotname  = &Apache::lonnet::escape($slotname);
     $entry     = &Apache::lonnet::escape($entry);
     $uname     = &Apache::lonnet::escape($uname);
     $udom      = &Apache::lonnet::escape($udom);
     $symb      = &Apache::lonnet::escape($symb);
 
-    my $remove= &mt('Remove');
-
     return <<"END_LINK";
  <a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb"
    >($remove)</a>
@@ -605,13 +837,22 @@ sub show_table {
 	$r->print('</div>');
     }
     
-    my %Saveable_Parameters = ('show'  => 'array',
-			       'when'  => 'scalar',
-			       'order' => 'scalar');
-
-    &Apache::loncommon::store_course_settings('slotrequest',\%Saveable_Parameters);
-    &Apache::loncommon::restore_course_settings('slotrequest',\%Saveable_Parameters);
+    my %Saveable_Parameters = ('show'              => 'array',
+			       'when'              => 'scalar',
+			       'order'             => 'scalar',
+			       'deleted'           => 'scalar',
+			       'name_filter_type'  => 'scalar',
+			       'name_filter_value' => 'scalar',
+			       );
+    &Apache::loncommon::store_course_settings('slotrequest',
+					      \%Saveable_Parameters);
+    &Apache::loncommon::restore_course_settings('slotrequest',
+						\%Saveable_Parameters);
+    &Apache::grades::init_perm();
+    my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all');
+    &Apache::grades::reset_perm();
 
+    # what to display filtering
     my %show_fields=&Apache::lonlocal::texthash(
 	     'name'         => 'Slot Name',
 	     'description'  => 'Description',
@@ -620,36 +861,106 @@ sub show_table {
 	     'endtime'      => 'End Time',
              'startreserve' => 'Time students can start reserving',
 	     'secret'       => 'Secret Word',
-	     'maxspace'     => 'Maxium # of students',
+	     'maxspace'     => 'Maximum # of students',
 	     'ip'           => 'IP or DNS restrictions',
 	     'symb'         => 'Resource slot is restricted to.',
 	     'uniqueperiod' => 'Period of time slot is unique',
+	     'scheduled'    => 'Scheduled Students',
 	     'proctor'      => 'List of proctors');
     my @show_order=('name','description','type','starttime','endtime',
 	       'startreserve','secret','maxspace','ip','symb',
-	       'uniqueperiod','proctor');
+	       'uniqueperiod','scheduled','proctor');
     my @show = 
 	(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show')
 	                            : keys(%show_fields);
     my %show =  map { $_ => 1 } (@show);
 
+    #when filtering setup
     my %when_fields=&Apache::lonlocal::texthash(
-	     'now' => 'Open now',
+	     'now'      => 'Open now',
 	     'nextweek' => 'Open within the next week',
 	     'lastweek' => 'Were open last week',
 	     'willopen' => 'Will open later',
-	     'wereopen' => 'Were open');
-    my @when_order=('now','nextweek','lastweek','willopen','wereopen');
+	     'wereopen' => 'Were open',
+	     'any'      => 'Anytime',
+						);
+    my @when_order=('any','now','nextweek','lastweek','willopen','wereopen');
     $when_fields{'select_form_order'} = \@when_order;
     my $when = 	(exists($env{'form.when'})) ? $env{'form.when'}
                                             : 'now';
 
+    #display of students setup
+    my %stu_display_fields=
+	&Apache::lonlocal::texthash('username' => 'User name',
+				    'fullname' => 'Full name',
+				    );
+    my @stu_display_order=('fullname','username');
+    my @stu_display = 
+	(exists($env{'form.studisplay'})) ? &Apache::loncommon::get_env_multiple('form.studisplay')
+	                                  : keys(%stu_display_fields);
+    my %stu_display =  map { $_ => 1 } (@stu_display);
+
+    #name filtering setup
+    my %name_filter_type_fields=
+	&Apache::lonlocal::texthash('substring' => 'Substring',
+				    'exact'     => 'Exact',
+				    #'reg'       => 'Regular Expression',
+				    );
+    my @name_filter_type_order=('substring','exact');
+
+    $name_filter_type_fields{'select_form_order'} = \@name_filter_type_order;
+    my $name_filter_type = 
+	(exists($env{'form.name_filter_type'})) ? $env{'form.name_filter_type'}
+                                                : 'substring';
+    my $name_filter = {'type'  => $name_filter_type,
+		       'value' => $env{'form.name_filter_value'},};
+
+    #deleted slot filtering
+    my $hide_radio = 
+	&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide');
+    my $show_radio = 
+	&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'show');
+	
     $r->print('<form method="POST" action="/adm/slotrequest">
 <input type="hidden" name="command" value="showslots" />');
     $r->print('<div>');
-    $r->print('<table class="inline"><tr><th>'.&mt('Show').'</th><th>'.&mt('Open').'</th></tr><tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order).
-	      '</td><td>'.&Apache::loncommon::select_form($when,'when',%when_fields).
-	      '</td></tr></table>');
+    $r->print('<table class="inline">
+      <tr><th>'.&mt('Show').'</th>
+          <th>'.&mt('Student Display').'</th>
+          <th>'.&mt('Open').'</th>
+          <th>'.&mt('Slot Name Filter').'</th>
+          <th>'.&mt('Options').'</th>
+      </tr>
+      <tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order).
+	      '</td>
+           <td>
+         '.&Apache::loncommon::multiple_select_form('studisplay',\@stu_display,
+						    6,\%stu_display_fields,
+						    \@stu_display_order).'
+           </td>
+           <td>'.&Apache::loncommon::select_form($when,'when',%when_fields).
+          '</td>
+           <td>'.&Apache::loncommon::select_form($name_filter_type,
+						 'name_filter_type',
+						 %name_filter_type_fields).
+	      '<br />'.
+	      &Apache::lonhtmlcommon::textbox('name_filter_value',
+					      $env{'form.name_filter_value'},
+					      15).
+          '</td>
+           <td>
+            <table>
+              <tr>
+                <td rowspan="2">Deleted slots:</td>
+                <td><label>'.$show_radio.'Show</label></td>
+              </tr>
+              <tr>
+                <td><label>'.$hide_radio.'Hide</label></td>
+              </tr>
+            </table>
+	  </td>
+       </tr>
+    </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=';
@@ -661,7 +972,6 @@ sub show_table {
 	    $r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>');
 	}
     }
-    $r->print('<th>Scheduled Students</th></tr>');
 
     my %name_cache;
     my $slotsort = sub {
@@ -691,22 +1001,38 @@ sub show_table {
 	return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'};
     };
     foreach my $slot (sort $slotsort (keys(%slots)))  {
-	if (!&to_show($when,$slots{$slot})) { next; }
+	if (!&to_show($slot,$slots{$slot},$when,
+		      $env{'form.deleted'},$name_filter)) { next; }
 	if (defined($slots{$slot}->{'type'})
 	    && $slots{$slot}->{'type'} ne 'schedulable_student') {
 	    #next;
 	}
 	my $description=&get_description($slot,$slots{$slot});
-	my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
-					   "^$slot\0");
 	my $ids;
-	foreach my $entry (sort(keys(%consumed))) {
-	    my (undef,$id)=split("\0",$entry);
-	    my ($uname,$udom) = split('@',$consumed{$entry}{'name'});
-	    my $name = &Apache::loncommon::plainname($uname,$udom);
-	    $ids.= '<nobr>'.$name.&remove_link($slot,$entry,$uname,$udom,
-					       $consumed{$entry}{'symb'})
-		.'</nobr><br />';
+	if (exists($show{'scheduled'})) {
+	    my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+					       "^$slot\0");
+	    my ($tmp)=%consumed;
+	    if ($tmp !~ /^error: /) {
+		foreach my $entry (sort { $consumed{$a}{name} cmp 
+					      $consumed{$b}{name} }
+				   (keys(%consumed))) {
+		    my (undef,$id)=split("\0",$entry);
+		    my ($uname,$udom) = split('@',$consumed{$entry}{'name'});
+		    $ids.= '<nobr>';
+		    foreach my $item (@stu_display_order) {
+			if ($stu_display{$item}) {
+			    if ($item eq 'fullname') {
+				$ids.=$fullname->{"$uname:$udom"}.' ';
+			    } elsif ($item eq 'username') {
+				$ids.="<tt>$uname\@$udom</tt> ";
+			    }
+			}
+		    }
+		    $ids.=&remove_link($slot,$entry,$uname,$udom,
+				       $consumed{$entry}{'symb'}).'</nobr><br />';
+		}
+	    }
 	}
 
 	my $start=($slots{$slot}->{'starttime'}?
@@ -757,7 +1083,14 @@ EDITLINK
 	my $delete=(<<"DELETELINK");
 <a href="/adm/slotrequest?command=delete&slotname=$slot">Delete</a>
 DELETELINK
+
+        my $remove_all=&remove_link($slot,'remove all').'<br />';
+
         if ($ids ne '') { undef($delete); }
+	if ($slots{$slot}{'type'} ne 'schedulable_student' 
+	    || $ids eq '') { 
+	    undef($remove_all);
+	}
 
         $r->print("<tr>\n<td rowspan=\"$rowspan\">$edit $delete</td>\n");
 	if (exists($show{'name'})) {
@@ -793,7 +1126,9 @@ DELETELINK
 	if (exists($show{'uniqueperiod'})) {
 	    $colspan++;$r->print("<td>$unique</td>\n");
 	}
-	$colspan++;$r->print("<td>$ids</td>\n</tr>\n");
+	if (exists($show{'scheduled'})) {
+	    $colspan++;$r->print("<td>$remove_all $ids</td>\n</tr>\n");
+	}
 	if (exists($show{'proctor'})) {
 	    $r->print(<<STUFF);
 <tr>
@@ -1076,7 +1411,11 @@ sub handler {
     } elsif ($env{'form.command'} eq 'remove_registration' && $mgr eq 'F') {
 	&remove_registration($r);
     } elsif ($env{'form.command'} eq 'release' && $mgr eq 'F') {
-	&release_slot($r,undef,undef,undef,$mgr);
+	if ($env{'form.entry'} eq 'remove all') {
+	    &release_all_slot($r,$mgr);
+	} else {
+	    &release_slot($r,undef,undef,undef,$mgr);
+	}
     } elsif ($env{'form.command'} eq 'delete' && $mgr eq 'F') {
 	&delete_slot($r);
     } elsif ($env{'form.command'} eq 'uploadstart' && $mgr eq 'F') {
@@ -1097,12 +1436,15 @@ sub handler {
     } else {
 	my $symb=&Apache::lonnet::unescape($env{'form.symb'});
 	my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);
-	if ($res !~ /\.task$/) {
+	my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
+	if ($useslots ne 'resource') {
 	    &fail($r,'not_valid');
 	    return OK;
 	}
 	$env{'request.symb'}=$symb;
-	my ($status) = &Apache::lonhomework::check_task_access('0');
+	my $type = ($res =~ /\.task$/) ? 'Task'
+	                               : 'problem';
+	my ($status) = &Apache::lonhomework::check_slot_access('0',$type);
 	if ($status eq 'CAN_ANSWER' ||
 	    $status eq 'NEEDS_CHECKIN' ||
 	    $status eq 'WAITING_FOR_GRADE') {
@@ -1116,8 +1458,9 @@ sub handler {
 	} elsif ($env{'form.command'} eq 'get') {
 	    &get_slot($r,$symb);
 	} elsif ($env{'form.command'} eq 'change') {
-	    &release_slot($r,$symb,$env{'form.releaseslot'},1);
-	    &get_slot($r,$symb);
+	    if (&release_slot($r,$symb,$env{'form.releaseslot'},1)) {
+		&get_slot($r,$symb);
+	    }
 	} else {
 	    $r->print("<p>Unknown command: ".$env{'form.command'}."</p>");
 	}