--- loncom/interface/slotrequest.pm	2006/02/06 22:42:11	1.45
+++ 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.45 2006/02/06 22:42:11 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 {
@@ -159,35 +160,65 @@ sub check_for_reservation {
     return (undef,undef);
 }
 
-sub check_for_conflict {
-    my ($symb,$new_slot_name,$new_slot,$slots)=@_;
-
-    if (!defined($new_slot->{'uniqueperiod'})) { return 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;
+	}
+    }
 
-    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();
     if (!ref($slots)) {
-	my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum);
+	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;
     }
 
-    if (&network_error($student) || &network_error($course)  ||
-	&network_error(%$slots)) {
-	return 'error: Unable to determine current status';
-    }    
-
-    my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}};
-    foreach my $slot_name (@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'}));
-	my ($start,$end)=@{$slots->{$slot_name}{'uniqueperiod'}};
+	$consumed_uniqueperiods{$slot_name} = 
+	    $slots->{$slot_name}{'uniqueperiod'};
+    }
+    return \%consumed_uniqueperiods;
+}
+
+sub check_for_conflict {
+    my ($symb,$new_slot_name,$new_slot,$slots,$consumed_uniqueperiods)=@_;
+
+    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  )) {
@@ -284,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' 
@@ -326,14 +426,28 @@ sub release_slot {
 	&& defined($env{'form.symb'})) {
 	$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($env{'form.slotname'},\%slot);
+    my $description=&get_description($slot_name,\%slot);
 
     if ($mgr ne 'F') {
 	if ($slot{'starttime'} < time) {
-	    $r->print("<p>Not allowed to release Reservation: $description, as it has already ended.  </p>");
-	    &return_link($r);
-	    return 0;
+	    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
@@ -347,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");
@@ -362,13 +478,14 @@ sub release_slot {
 						      '0_availablestudent',
 						      1, $new_param, 'string',
 						      $uname,$udom);
-    $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>');
+	$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom");
+    } else {
+	$msg = &mt('Released Reservation: [_1]',$description);
     }
-    if (!$inhibit_return_link) { &return_link($r);  }
-    return 1;
+    return (1,$msg);
 }
 
 sub delete_slot {
@@ -497,7 +614,7 @@ STUFF
 }
 
 sub allowed_slot {
-    my ($slot_name,$slot,$symb,$slots)=@_;
+    my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_;
     #already started
     if ($slot->{'starttime'} < time) {
 	# all open slot to be schedulable
@@ -520,7 +637,14 @@ sub allowed_slot {
 	&& $slot->{'symb'} ne $symb) {
 	return 0;
     }
-    my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots);
+    # 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;
@@ -546,6 +670,7 @@ 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");
@@ -555,7 +680,8 @@ sub show_choices {
 		      (keys(%slots)))  {
 
 	&Apache::lonxml::debug("Checking Slot $slot");
-	next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots));
+	next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots,
+				$consumed_uniqueperiods));
 
 	$available++;
 
@@ -571,7 +697,8 @@ sub show_choices {
 		$command='release';
 	    } else {
 		my $conflict = &check_for_conflict($symb,$slot,$slots{$slot},
-						   \%slots);
+						   \%slots,
+						   $consumed_uniqueperiods);
 		if ($conflict) {
 		    $text=&mt('Change Reservation');
 		    $command='get';
@@ -603,12 +730,27 @@ STUFF
 }
 
 sub to_show {
-    my ($slot,$when,$deleted) = @_;
+    my ($slotname,$slot,$when,$deleted,$name) = @_;
     my $time=time;
     my $week=60*60*24*7;
+
     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') {
@@ -653,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>
@@ -689,14 +837,22 @@ sub show_table {
 	$r->print('</div>');
     }
     
-    my %Saveable_Parameters = ('show'    => 'array',
-			       'when'    => 'scalar',
-			       'order'   => 'scalar',
-			       'deleted' => 'scalar',
+    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::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',
@@ -709,15 +865,17 @@ sub show_table {
 	     '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',
 	     'nextweek' => 'Open within the next week',
@@ -731,6 +889,33 @@ sub show_table {
     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 = 
@@ -741,13 +926,28 @@ sub show_table {
     $r->print('<div>');
     $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>
@@ -772,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 {
@@ -802,25 +1001,37 @@ sub show_table {
 	return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'};
     };
     foreach my $slot (sort $slotsort (keys(%slots)))  {
-	if (!&to_show($slots{$slot},$when,$env{'form.deleted'})) { 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;
-
-	my ($tmp)=%consumed;
-	if ($tmp !~ /^error: /) {
-	    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 />';
+		}
 	    }
 	}
 
@@ -872,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'})) {
@@ -908,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>
@@ -1191,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') {