loncom/homework/grades.pm - diff

Return to grades.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.485 and 1.488

version 1.485, 2007/11/08 01:48:18	version 1.488, 2007/11/13 01:14:32
Line 733 sub verifyreceipt {	Line 733 sub verifyreceipt {
$receipt =~ s/[^\-\d]//g;	$receipt =~ s/[^\-\d]//g;
my ($symb) = &get_symb($request);	my ($symb) = &get_symb($request);

my $title.='<h3><span class="LC_info">Verifying Submission Receipt '.	my $title.=
$receipt.'</h3></span>'."\n".	'<h3><span class="LC_info">'.
'<h4><b>Resource: </b>'.$env{'form.probTitle'}.'</h4><br /><br />'."\n";	&mt('Verifying Submission Receipt [_1]',$receipt).
	'</span></h3>'."\n".
	'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
	'</h4>'."\n";

my ($string,$contents,$matches) = ('','',0);	my ($string,$contents,$matches) = ('','',0);
my (undef,undef,$fullname) = &getclasslist('all','0');	my (undef,undef,$fullname) = &getclasslist('all','0');
Line 745 sub verifyreceipt {	Line 748 sub verifyreceipt {
$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
my $parts=['0'];	my $parts=['0'];
if ($receiptparts) { ($parts)=&response_type($symb); }	if ($receiptparts) { ($parts)=&response_type($symb); }

	my $header =
	&Apache::loncommon::start_data_table().
	&Apache::loncommon::start_data_table_header_row().
	'<th> '.&mt('Fullname').' </th>'."\n".
	'<th> '.&mt('Username').' </th>'."\n".
	'<th> '.&mt('Domain').' </th>';
	if ($receiptparts) {
	$header.='<th> '.&mt('Problem Part').' </th>';
	}
	$header.=
	&Apache::loncommon::end_data_table_header_row();

foreach (sort	foreach (sort
{	{
if (lc($$fullname{$a}) ne lc($$fullname{$b})) {	if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
Line 755 sub verifyreceipt {	Line 771 sub verifyreceipt {
my ($uname,$udom)=split(/\:/);	my ($uname,$udom)=split(/\:/);
foreach my $part (@$parts) {	foreach my $part (@$parts) {
if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {	if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {
$contents.='<tr bgcolor="#ffffe6"><td> '."\n".	$contents.=
	&Apache::loncommon::start_data_table_row().
	'<td> '."\n".
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
'\');" target="_self">'.$$fullname{$_}.'</a> </td>'."\n".	'\');" target="_self">'.$$fullname{$_}.'</a> </td>'."\n".
'<td> '.$uname.' </td>'.	'<td> '.$uname.' </td>'.
Line 763 sub verifyreceipt {	Line 781 sub verifyreceipt {
if ($receiptparts) {	if ($receiptparts) {
$contents.='<td> '.$part.' </td>';	$contents.='<td> '.$part.' </td>';
}	}
$contents.='</tr>'."\n";	$contents.=
	&Apache::loncommon::end_data_table_row()."\n";

$matches++;	$matches++;
}	}
}	}
}	}
if ($matches == 0) {	if ($matches == 0) {
$string = $title.'No match found for the above receipt.';	$string = $title.&mt('No match found for the above receipt.');
} else {	} else {
$string = &jscriptNform($symb).$title.	$string = &jscriptNform($symb).$title.
'The above receipt matches the following student'.	'<p>'.
($matches <= 1 ? '.' : 's.')."\n".	&mt('The above receipt matches the following [numerate,_1,student].',$matches).
'<table border="0"><tr><td bgcolor="#777777">'."\n".	'</p>'.
'<table border="0"><tr bgcolor="#e6ffff">'."\n".	$header.
'<td><b> Fullname </b></td>'."\n".	$contents.
'<td><b> Username </b></td>'."\n".	&Apache::loncommon::end_data_table()."\n";
'<td><b> Domain </b></td>';
if ($receiptparts) {
$string.='<td> Problem Part </td>';
}
$string.='</tr>'."\n".$contents.
'</table></td></tr></table>'."\n";
}	}
return $string.&show_grading_menu_form($symb);	return $string.&show_grading_menu_form($symb);
}	}
Line 4891 sub scantron_selectphase {	Line 4904 sub scantron_selectphase {
$result.= <<SCANTRONFORM;	$result.= <<SCANTRONFORM;
<table width="100%" border="0">	<table width="100%" border="0">
<tr>	<tr>
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
<td bgcolor="#777777">	<td bgcolor="#777777">
	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
<input type="hidden" name="command" value="scantron_warning" />	<input type="hidden" name="command" value="scantron_warning" />
$default_form_data	$default_form_data
<table width="100%" border="0">	<table width="100%" border="0">
Line 4930 sub scantron_selectphase {	Line 4943 sub scantron_selectphase {
</td>	</td>
</tr>	</tr>
</table>	</table>
</td>	</form>
</form>	</td>
</tr>	</tr>
SCANTRONFORM	SCANTRONFORM

Line 4993 SCANTRONFORM	Line 5006 SCANTRONFORM

$r->print(<<SCANTRONFORM);	$r->print(<<SCANTRONFORM);
<tr>	<tr>
<form action='/adm/grades' name='scantron_download'>	<td bgcolor="#777777">
<td bgcolor="#777777">	<form action='/adm/grades' name='scantron_download'>
$default_form_data	$default_form_data
<input type="hidden" name="command" value="scantron_download" />	<input type="hidden" name="command" value="scantron_download" />
<table width="100%" border="0">	<table width="100%" border="0">
<tr bgcolor="#e6ffff">	<tr bgcolor="#e6ffff">
<td colspan="2">	<td>
<b>Download a scoring office file</b>	<b>Download a scoring office file</b>
</td>	</td>
</tr>	</tr>
<tr bgcolor="#ffffe6">	<tr bgcolor="#ffffe6">
<td> Filename of scoring office file: </td><td> $file_selector </td>	<td> Filename of scoring office file: $file_selector </td>
</tr>	</tr>
<tr bgcolor="#ffffe6">	<tr bgcolor="#ffffe6">
<td colspan="2">	<td>
<input type="submit" value="Download: Show List of Associated Files" />	<input type="submit" value="Download: Show List of Associated Files" />
</td>	</td>
</tr>	</tr>
</table>	</table>
</td>	</form>
</form>	</td>
</tr>	</tr>
SCANTRONFORM	SCANTRONFORM

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

Removed from v.1.485
changed lines
	Added in v.1.488