--- loncom/interface/slotrequest.pm	2006/02/03 23:42:54	1.43
+++ loncom/interface/slotrequest.pm	2006/02/09 17:59:57	1.46
@@ -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.43 2006/02/03 23:42:54 albertel Exp $
+# $Id: slotrequest.pm,v 1.46 2006/02/09 17:59:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -362,7 +362,6 @@ sub release_slot {
 						      '0_availablestudent',
 						      1, $new_param, 'string',
 						      $uname,$udom);
-    my $description=&get_description($env{'form.slotname'},\%slot);
     $r->print("<p>Released Reservation: $description</p>");
     if ($mgr eq 'F') {
 	$r->print('<p><a href="/adm/slotrequest?command=showslots">'.
@@ -452,7 +451,7 @@ STUFF
 	}
 	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);
@@ -498,7 +497,7 @@ STUFF
 }
 
 sub allowed_slot {
-    my ($slot_name,$slot,$symb)=@_;
+    my ($slot_name,$slot,$symb,$slots)=@_;
     #already started
     if ($slot->{'starttime'} < time) {
 	# all open slot to be schedulable
@@ -521,6 +520,12 @@ sub allowed_slot {
 	&& $slot->{'symb'} ne $symb) {
 	return 0;
     }
+    my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots);
+    if ($conflict) {
+	if ($slots->{$conflict}{'starttime'} < time) {
+	    return 0;
+	}
+    }
     &Apache::lonxml::debug("$slot_name symb good");
     return 1;
 }
@@ -550,7 +555,7 @@ sub show_choices {
 		      (keys(%slots)))  {
 
 	&Apache::lonxml::debug("Checking Slot $slot");
-	next if (!&allowed_slot($slot,$slots{$slot}));
+	next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots));
 
 	$available++;
 
@@ -689,8 +694,13 @@ sub show_table {
 			       'order'   => 'scalar',
 			       'deleted' => '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();
 
     my %show_fields=&Apache::lonlocal::texthash(
 	     'name'         => 'Slot Name',
@@ -726,6 +736,16 @@ sub show_table {
     my $when = 	(exists($env{'form.when'})) ? $env{'form.when'}
                                             : 'now';
 
+    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);
+
     my $hide_radio = 
 	&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide');
     my $show_radio = 
@@ -736,11 +756,17 @@ 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('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>
@@ -812,10 +838,18 @@ sub show_table {
 	    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 />';
+		$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 />';
 	    }
 	}