[LON-CAPA-cvs] cvs: loncom /interface slotrequest.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 09 Feb 2006 17:59:58 -0000
albertel Thu Feb 9 12:59:58 2006 EDT
Modified files:
/loncom/interface slotrequest.pm
Log:
- add the username to scedule student display
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.45 loncom/interface/slotrequest.pm:1.46
--- loncom/interface/slotrequest.pm:1.45 Mon Feb 6 17:42:11 2006
+++ loncom/interface/slotrequest.pm Thu Feb 9 12:59:57 2006
@@ -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.46 2006/02/09 17:59:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -694,8 +694,13 @@
'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',
@@ -731,6 +736,16 @@
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 =
@@ -741,11 +756,17 @@
$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>
@@ -817,10 +838,18 @@
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 />';
}
}