loncom/interface/slotrequest.pm - diff

Return to slotrequest.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/slotrequest.pm between versions 1.45 and 1.46

version 1.45, 2006/02/06 22:42:11	version 1.46, 2006/02/09 17:59:57
Line 694 sub show_table {	Line 694 sub show_table {
'order' => 'scalar',	'order' => 'scalar',
'deleted' => 'scalar',	'deleted' => 'scalar',
);	);
&Apache::loncommon::store_course_settings('slotrequest',\%Saveable_Parameters);	&Apache::loncommon::store_course_settings('slotrequest',
&Apache::loncommon::restore_course_settings('slotrequest',\%Saveable_Parameters);	\%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(	my %show_fields=&Apache::lonlocal::texthash(
'name' => 'Slot Name',	'name' => 'Slot Name',
Line 731 sub show_table {	Line 736 sub show_table {
my $when = (exists($env{'form.when'})) ? $env{'form.when'}	my $when = (exists($env{'form.when'})) ? $env{'form.when'}
: 'now';	: '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 =	my $hide_radio =
&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide');	&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide');
my $show_radio =	my $show_radio =
Line 741 sub show_table {	Line 756 sub show_table {
$r->print('<div>');	$r->print('<div>');
$r->print('<table class="inline">	$r->print('<table class="inline">
<tr><th>'.&mt('Show').'</th>	<tr><th>'.&mt('Show').'</th>
	<th>'.&mt('Student Display').'</th>
<th>'.&mt('Open').'</th>	<th>'.&mt('Open').'</th>
<th>'.&mt('Options').'</th>	<th>'.&mt('Options').'</th>
</tr>	</tr>
<tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order).	<tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order).
'</td>	'</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>'.&Apache::loncommon::select_form($when,'when',%when_fields).
'</td>	'</td>
<td>	<td>
Line 817 sub show_table {	Line 838 sub show_table {
foreach my $entry (sort(keys(%consumed))) {	foreach my $entry (sort(keys(%consumed))) {
my (undef,$id)=split("\0",$entry);	my (undef,$id)=split("\0",$entry);
my ($uname,$udom) = split('@',$consumed{$entry}{'name'});	my ($uname,$udom) = split('@',$consumed{$entry}{'name'});
my $name = &Apache::loncommon::plainname($uname,$udom);	$ids.= '<nobr>';
$ids.= '<nobr>'.$name.&remove_link($slot,$entry,$uname,$udom,	foreach my $item (@stu_display_order) {
$consumed{$entry}{'symb'})	if ($stu_display{$item}) {
.'</nobr><br />';	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 />';
}	}
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.45
changed lines
	Added in v.1.46