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.561 and 1.578

version 1.561, 2009/04/15 17:02:35	version 1.578, 2009/06/06 19:23:30
Line 183 sub get_display_part {	Line 183 sub get_display_part {
my ($partID,$symb)=@_;	my ($partID,$symb)=@_;
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);	my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
if (defined($display) and $display ne '') {	if (defined($display) and $display ne '') {
$display.= " (<span class=\"LC_internal_info\">id $partID</span>)";	$display.= ' (<span class="LC_internal_info">'
	.&mt('Part ID: [_1]',$partID).'</span>)';
} else {	} else {
$display=$partID;	$display=$partID;
}	}
Line 217 sub showResourceInfo {	Line 218 sub showResourceInfo {
$partsseen{$partID}=1;	$partsseen{$partID}=1;
}	}
my $display_part=&get_display_part($partID,$symb);	my $display_part=&get_display_part($partID,$symb);
$result.='<td><b>'.&mt('Part').': </b>'.$display_part.	$result.='<td><b>'.&mt('Part: [_1]',$display_part).'</b>'.
' <span class="LC_internal_info">'.$resID.'</span></td>'.	' <span class="LC_internal_info">'.$resID.'</span></td>'.
'<td><b>'.&mt('Type').': </b>'.$responsetype.'</td></tr>';	'<td><b>'.&mt('Type: [_1]',$responsetype).'</b></td></tr>';
# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';	# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';
}	}
}	}
Line 1044 LISTJAVASCRIPT	Line 1045 LISTJAVASCRIPT
$gradeTable.= &Apache::loncommon::start_data_table_row();	$gradeTable.= &Apache::loncommon::start_data_table_row();
}	}
$gradeTable.='<td align="right">'.$ctr.' </td>'.	$gradeTable.='<td align="right">'.$ctr.' </td>'.
'<td align="center"><label><input type=checkbox name="stuinfo" value="'.	'<td align="center"><label><input type="checkbox" name="stuinfo" value="'.
$student.':'.$$fullname{$student}.':::SECTION'.$section.	$student.':'.$$fullname{$student}.':::SECTION'.$section.
') " />  </label></td>'."\n".'<td>'.	') " />  </label></td>'."\n".'<td>'.
&nameUserString(undef,$$fullname{$student},$uname,$udom).	&nameUserString(undef,$$fullname{$student},$uname,$udom).
Line 1551 INNERJS	Line 1552 INNERJS
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");	pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
pDoc.write("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />");	pDoc.write("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />");

pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");	pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');
pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");	pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');
pDoc.write("<td><b>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>");	pDoc.write("<td><b>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>");
}	}
function displaySubject(msg,shwsel) {	function displaySubject(msg,shwsel) {
Line 1636 INNERJS	Line 1637 INNERJS
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");	hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
hDoc.write("<h3><span class=\\"LC_info\\"> Keyword Highlight Options<\\/span><\\/h3><br /><br />");	hDoc.write("<h3><span class=\\"LC_info\\"> Keyword Highlight Options<\\/span><\\/h3><br /><br />");

hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");	hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');
hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");	hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');
hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>");	hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>");
}	}

Line 1734 sub gradeBox {	Line 1735 sub gradeBox {

#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);	#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
$result .=	$result .=
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.	'<td><b>'.&mt('Part:').'</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points:').'</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.

$result.='</tr></table>'."\n";	$result.='</tr></table>'."\n";
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".	$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
Line 2113 KEYWORDS	Line 2114 KEYWORDS
}	}
my $responsetype = $responseType->{$partid}->{$respid};	my $responsetype = $responseType->{$partid}->{$respid};
if (!exists($record{"resource.$partid.$respid.submission"})) {	if (!exists($record{"resource.$partid.$respid.submission"})) {
$lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '.	$lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
$display_part.' <span class="LC_internal_info">( ID '.$respid.	'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' )</span>   '.	' <span class="LC_internal_info">'.
	'('.&mt('Part ID: [_1]',$respid).')</b>'.
	'</span>   '.
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';	'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
next;	next;
}	}
Line 2135 KEYWORDS	Line 2138 KEYWORDS
{'one_time' => 1});	{'one_time' => 1});

$similar="<hr /><h3><span class=\"LC_warning\">".	$similar="<hr /><h3><span class=\"LC_warning\">".
&mt('Essay is [_1]% similar to an essay by [_2] ([_3]:[_4]) in course [_5] (course id [_6]:[_7])',	&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
$osim,	$osim,
&Apache::loncommon::plainname($oname,$odom),	&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
$oname,$odom,
$old_course_desc{'description'},	$old_course_desc{'description'},
$old_course_desc{'num'},	$old_course_desc{'num'},
$old_course_desc{'domain'}).	$old_course_desc{'domain'}).
Line 2152 KEYWORDS	Line 2154 KEYWORDS
($env{'form.lastSub'} eq 'hdgrade' &&	($env{'form.lastSub'} eq 'hdgrade' &&
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {	$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
my $display_part=&get_display_part($partid,$symb);	my $display_part=&get_display_part($partid,$symb);
$lastsubonly.='<div class="LC_grade_submission_part"><b>Part:</b> '.	$lastsubonly.='<div class="LC_grade_submission_part">'.
$display_part.' <span class="LC_internal_info">( ID '.$respid.	'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' )</span>   ';	' <span class="LC_internal_info">'.
	'('.&mt('Part ID: [_1]',$respid).')'.
	'</b></span>   ';
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);	my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
if (@$files) {	if (@$files) {
$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';	$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';
Line 2162 KEYWORDS	Line 2166 KEYWORDS
foreach my $file (@$files) {	foreach my $file (@$files) {
$file_counter++;	$file_counter++;
&Apache::lonnet::allowuploaded('/adm/grades',$file);	&Apache::lonnet::allowuploaded('/adm/grades',$file);
$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';	$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" /> '.$file.'</a>';
}	}
$lastsubonly.='<br />';	$lastsubonly.='<br />';
}	}
Line 2297 KEYWORDS	Line 2301 KEYWORDS
'<option>7</option><option>10</option></select>'."\n";	'<option>7</option><option>10</option></select>'."\n";
my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
$endform.=&mt('[quant,_1,student]',$ntstu);	$endform.=&mt('[_1]student(s)',$ntstu);
$endform.='  <input type="button" value="'.&mt('Previous').'" '.	$endform.='  <input type="button" value="'.&mt('Previous').'" '.
'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" />  '."\n".	'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" />  '."\n".
'<input type="button" value="'.&mt('Next').'" '.	'<input type="button" value="'.&mt('Next').'" '.
Line 2463 sub processHandGrade {	Line 2467 sub processHandGrade {
undef,$feedurl,undef,	undef,$feedurl,undef,
undef,undef,$showsymb,	undef,undef,$showsymb,
$restitle);	$restitle);
$request->print('<br />'.&mt('Sending message to [_1]:[_2]',$uname,$udom).': '.	$request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '.
$msgstatus);	$msgstatus);
}	}
if ($env{'form.collaborator'.$ctr}) {	if ($env{'form.collaborator'.$ctr}) {
Line 3295 sub viewgrades {	Line 3299 sub viewgrades {

$result.=	$result.=
&Apache::loncommon::start_data_table_row()."\n".	&Apache::loncommon::start_data_table_row()."\n".
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.	'<td><b>'.&mt('Part:').'</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points:').'</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
&Apache::loncommon::end_data_table_row()."\n";	&Apache::loncommon::end_data_table_row()."\n";
$ctsparts++;	$ctsparts++;
}	}
Line 3681 sub split_part_type {	Line 3685 sub split_part_type {
#	#
#--- Javascript to handle csv upload	#--- Javascript to handle csv upload
sub csvupload_javascript_reverse_associate {	sub csvupload_javascript_reverse_associate {
my $error1=&mt('You need to specify the username or ID');	my $error1=&mt('You need to specify the username or the student/employee ID');
my $error2=&mt('You need to specify at least one grading field');	my $error2=&mt('You need to specify at least one grading field');
return(<<ENDPICK);	return(<<ENDPICK);
function verify(vf) {	function verify(vf) {
Line 3721 ENDPICK	Line 3725 ENDPICK
}	}

sub csvupload_javascript_forward_associate {	sub csvupload_javascript_forward_associate {
my $error1=&mt('You need to specify the username or ID');	my $error1=&mt('You need to specify the username or the student/employee ID');
my $error2=&mt('You need to specify at least one grading field');	my $error2=&mt('You need to specify at least one grading field');
return(<<ENDPICK);	return(<<ENDPICK);
function verify(vf) {	function verify(vf) {
Line 4090 sub csvuploadassign {	Line 4094 sub csvuploadassign {
$countdone++;	$countdone++;
}	}
}	}
$request->print('<br /><span class="LC_info">'.&mt("Saved [_1] students",$countdone)."</span>\n");	$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0));
if (@skipped) {	if (@skipped) {
$request->print('<p><span class="LC_warning">'.&mt('Skipped Students').'</span></p>');	$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />');
foreach my $student (@skipped) { $request->print("$student<br />\n"); }	$request->print(join(', ',@skipped));
}	}
if (@notallowed) {	if (@notallowed) {
$request->print('<p><span class="LC_error">'.&mt('Students Not Allowed to Modify').'</span></p>');	$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('Modification of scores not allowed for the following username(s):'),1).'<br />');
foreach my $student (@notallowed) { $request->print("$student<br />\n"); }	$request->print(join(', ',@notallowed));
}	}
$request->print("<br />\n");	$request->print("<br />\n");
$request->print(&show_grading_menu_form($symb));	$request->print(&show_grading_menu_form($symb));
Line 4467 sub displaySubByDates {	Line 4471 sub displaySubByDates {

my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)	my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));	: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
$displaySub[0].='<b>'.&mt('Part:').'</b> '.$display_part.' ';	$displaySub[0].='<span class="LC_nobreak"';
$displaySub[0].='<span class="LC_internal_info">('.&mt('ID').' '.	$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
$responseId.')</span> <b>';	.' <span class="LC_internal_info">'
	.'('.&mt('Part ID: [_1]',$responseId).')'
	.'</span>'
	.' <b>';
if ($$record{"$where.$partid.tries"} eq '') {	if ($$record{"$where.$partid.tries"} eq '') {
$displaySub[0].=&mt('Trial not counted');	$displaySub[0].=&mt('Trial not counted');
} else {	} else {
$displaySub[0].=&mt('Trial [_1]',	$displaySub[0].=&mt('Trial: [_1]',
$$record{"$where.$partid.tries"});	$$record{"$where.$partid.tries"});
}	}
my $responseType=($isTask ? 'Task'	my $responseType=($isTask ? 'Task'
Line 4484 sub displaySubByDates {	Line 4491 sub displaySubByDates {
&get_order($partid,$responseId,$symb,$uname,$udom,	&get_order($partid,$responseId,$symb,$uname,$udom,
$no_increment);	$no_increment);
}	}
$displaySub[0].='</b>  '.	$displaySub[0].='</b></span>'; # /nobreak
	$displaySub[0].='  '.
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';	&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
}	}
}	}
Line 5069 sub scantron_selectphase {	Line 5077 sub scantron_selectphase {
<td> '.&mt('Sequence to grade:').' </td><td> '.$sequence_selector.' </td>	<td> '.&mt('Sequence to grade:').' </td><td> '.$sequence_selector.' </td>
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td> '.&mt('Filename of scoring office file:').' </td><td> '.$file_selector.' </td>	<td> '.&mt('Filename of bubblesheet data file:').' </td><td> '.$file_selector.' </td>
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td> '.&mt('Format of data file:').' </td><td> '.$format_selector.' </td>	<td> '.&mt('Format of bubblesheet data file:').' </td><td> '.$format_selector.' </td>
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td> '.&mt('Saved CODEs to validate against:').' </td><td> '.$CODE_selector.' </td>	<td> '.&mt('Saved CODEs to validate against:').' </td><td> '.$CODE_selector.' </td>
Line 5090 sub scantron_selectphase {	Line 5098 sub scantron_selectphase {
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td colspan="2">	<td colspan="2">
<input type="submit" value="'.&mt('Grading: Validate Scantron Records').'" />	<input type="submit" value="'.&mt('Grading: Validate Bubblesheet Records').'" />
</td>	</td>
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::end_data_table().'	'.&Apache::loncommon::end_data_table().'
Line 5109 sub scantron_selectphase {	Line 5117 sub scantron_selectphase {
'.&Apache::loncommon::start_data_table('LC_scantron_action').'	'.&Apache::loncommon::start_data_table('LC_scantron_action').'
'.&Apache::loncommon::start_data_table_header_row().'	'.&Apache::loncommon::start_data_table_header_row().'
<th>	<th>
'.&mt('Specify a Scantron data file to upload.').'	'.&mt('Specify a bubblesheet data file to upload.').'
</th>	</th>
'.&Apache::loncommon::end_data_table_header_row().'	'.&Apache::loncommon::end_data_table_header_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
Line 5136 sub scantron_selectphase {	Line 5144 sub scantron_selectphase {
<input name="command" value="scantronupload_save" type="hidden" />	<input name="command" value="scantronupload_save" type="hidden" />
'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'	'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
<br />	<br />
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />	<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
</form>	</form>
');	');

Line 5178 sub scantron_selectphase {	Line 5186 sub scantron_selectphase {
&Apache::loncommon::start_data_table('LC_scantron_action')."\n".	&Apache::loncommon::start_data_table('LC_scantron_action')."\n".
&Apache::loncommon::start_data_table_header_row()."\n".	&Apache::loncommon::start_data_table_header_row()."\n".
'<th colspan="2">	'<th colspan="2">
'.&mt('Review scantron data and submissions for a previously graded folder/sequence')."\n".	'.&mt('Review bubblesheet data and submissions for a previously graded folder/sequence')."\n".
'</th>'."\n".	'</th>'."\n".
&Apache::loncommon::end_data_table_header_row()."\n".	&Apache::loncommon::end_data_table_header_row()."\n".
&Apache::loncommon::start_data_table_row()."\n".	&Apache::loncommon::start_data_table_row()."\n".
Line 5200 sub scantron_selectphase {	Line 5208 sub scantron_selectphase {
&Apache::loncommon::start_data_table_row()."\n".	&Apache::loncommon::start_data_table_row()."\n".
'<td colspan="2">'."\n".	'<td colspan="2">'."\n".
'<input type="hidden" name="command" value="checksubmissions" />'."\n".	'<input type="hidden" name="command" value="checksubmissions" />'."\n".
'<input type="submit" value="'.&mt('Review Scantron Data and Submission Records').'" />'."\n".	'<input type="submit" value="'.&mt('Review Bubblesheet Data and Submission Records').'" />'."\n".
'</td>'."\n".	'</td>'."\n".
&Apache::loncommon::end_data_table_row()."\n".	&Apache::loncommon::end_data_table_row()."\n".
&Apache::loncommon::end_data_table()."\n".	&Apache::loncommon::end_data_table()."\n".
Line 5241 sub scantron_selectphase {	Line 5249 sub scantron_selectphase {
CODEstart - (only matter if a CODE exists) column in the line where	CODEstart - (only matter if a CODE exists) column in the line where
the CODE starts	the CODE starts
CODElength - length of the CODE	CODElength - length of the CODE
IDstart - column where the student/employee ID number starts	IDstart - column where the student/employee ID starts
IDlength - length of the student/employee ID info	IDlength - length of the student/employee ID info
Qstart - column where the information from the bubbled	Qstart - column where the information from the bubbled
'questions' start	'questions' start
Line 5341 sub username_to_idmap {	Line 5349 sub username_to_idmap {
$whichline - line number of the passed in scanline	$whichline - line number of the passed in scanline
$field - type of change to process	$field - type of change to process
(either	(either
'ID' -> correct the student/employee ID number	'ID' -> correct the student/employee ID
'CODE' -> correct the CODE	'CODE' -> correct the CODE
'answer' -> fixup the submitted answers)	'answer' -> fixup the submitted answers)

Line 6251 sub scantron_validate_file {	Line 6259 sub scantron_validate_file {
'<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No').	'<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No').
'</label></span><br />'.	'</label></span><br />'.
&mt('Grading will take longer if you use verification.').'<br />'.	&mt('Grading will take longer if you use verification.').'<br />'.
&mt("Alternatively, the 'Review scantron data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'.	&mt("Alternatively, the 'Review bubblesheet data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'.
'<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'.	'<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'.
'<input type="hidden" name="command" value="scantron_process" />'."\n");	'<input type="hidden" name="command" value="scantron_process" />'."\n");
} else {	} else {
Line 6777 sub scantron_get_correction {	Line 6785 sub scantron_get_correction {
if ($closest > 0) {	if ($closest > 0) {
foreach my $testcode (@{$closest}) {	foreach my $testcode (@{$closest}) {
my $checked='';	my $checked='';
if (!$i) { $checked=' checked="checked" '; }	if (!$i) { $checked=' checked="checked"'; }
$r->print("	$r->print("
<label>	<label>
<input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked />	<input type='radio' name='scantron_CODE_resolution' value='use_closest_$i'$checked />
".&mt("Use the similar CODE [_1] instead.",	".&mt("Use the similar CODE [_1] instead.",
"<b><tt>".$testcode."</tt></b>")."	"<b><tt>".$testcode."</tt></b>")."
</label>	</label>
Line 6791 sub scantron_get_correction {	Line 6799 sub scantron_get_correction {
}	}
}	}
if ($$scan_record{'scantron.CODE'}=~/\S/ ) {	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
my $checked; if (!$i) { $checked=' checked="checked" '; }	my $checked; if (!$i) { $checked=' checked="checked"'; }
$r->print("	$r->print("
<label>	<label>
<input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked />	<input type='radio' name='scantron_CODE_resolution' value='use_unfound'$checked />
".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.",	".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.",
"<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")."	"<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")."
</label>");	</label>");
Line 7018 sub prompt_for_corrections {	Line 7026 sub prompt_for_corrections {
($responsetype_per_response{$question-1} eq 'imageresponse') \|\|	($responsetype_per_response{$question-1} eq 'imageresponse') \|\|
($responsetype_per_response{$question-1} eq 'reactionresponse') \|\|	($responsetype_per_response{$question-1} eq 'reactionresponse') \|\|
($responsetype_per_response{$question-1} eq 'organicresponse')) {	($responsetype_per_response{$question-1} eq 'organicresponse')) {
$r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the exam directed students to leave [quant,_1,line] blank on their scantron sheets.",$lines).'<br /><br />'.&mt('A non-zero score can be assigned to the student during scantron grading by selecting a bubble in at least one line.').'<br />'.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.').'<br />'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'<br /><br />');	$r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines).'<br /><br />'.&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.').'<br />'.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.').'<br />'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'<br /><br />');
} else {	} else {
$r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />");	$r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />");
}	}
Line 7475 SCANTRONFORM	Line 7483 SCANTRONFORM

my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));	my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
my $count=&get_todo_count($scanlines,$scan_data);	my $count=&get_todo_count($scanlines,$scan_data);
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status',	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status',
'Scantron Progress',$count,	'Bubblesheet Progress',$count,
'inline',undef,'scantronupload');	'inline',undef,'scantronupload');
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,	&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
'Processing first student');	'Processing first student');
Line 7701 sub grade_student_bubbles {	Line 7709 sub grade_student_bubbles {

sub scantron_upload_scantron_data {	sub scantron_upload_scantron_data {
my ($r)=@_;	my ($r)=@_;
$r->print(&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}));	my $dom = $env{'request.role.domain'};
	my $domdesc = &Apache::lonnet::domain($dom,'description');
	$r->print(&Apache::loncommon::coursebrowser_javascript($dom));
my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',	my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
'domainid',	'domainid',
'coursename');	'coursename',$dom);
my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},	my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.
'domainid');	('&nbsp'x2).&mt('(shows course personnel)');
my $default_form_data=&defaultFormData(&get_symb($r,1));	my $default_form_data=&defaultFormData(&get_symb($r,1));
$r->print('	$r->print('
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
Line 7715 sub scantron_upload_scantron_data {	Line 7725 sub scantron_upload_scantron_data {
alert("'.&mt('Please use the browse button to select a file from your local directory.').'");	alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
return false;	return false;
}	}
	if (formname.courseid.value == "") {
	alert("'.&mt('Please use the \"Select Course\" link to open a separate window where you can search for a course to which a file can be uploaded.').'");
	return false;
	}
formname.submit();	formname.submit();
}	}

	function ToSyllabus() {
	var cdom = '."'$dom'".';
	var cnum = document.rules.courseid.value;
	if (cdom == "" \|\| cdom == null) {
	return;
	}
	if (cnum == "" \|\| cnum == null) {
	return;
	}
	syllwin=window.open("/public/"+cdom+"/"+cnum+"/syllabus","LONCAPASyllabus",
	"height=350,width=350,scrollbars=yes,menubar=no");
	return;
	}

</script>	</script>

	<h3>'.&mt('Send scanned bubblesheet data to a course').'</h3>

<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">	<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
'.$default_form_data.'	'.$default_form_data.
<table>	&Apache::lonhtmlcommon::start_pick_box().
<tr><td>'.$select_link.' </td></tr>	&Apache::lonhtmlcommon::row_title(&mt('Course ID')).
<tr><td>'.&mt('Course ID:').' </td>	'<input name="courseid" type="text" size="30" />'.$select_link.
<td><input name="courseid" type="text" /> </td></tr>	&Apache::lonhtmlcommon::row_closure().
<tr><td>'.&mt('Course Name:').' </td>	&Apache::lonhtmlcommon::row_title(&mt('Course Name')).
<td><input name="coursename" type="text" /> </td></tr>	'<input name="coursename" type="text" size="30" />'.$syllabuslink.
<tr><td>'.&mt('Domain:').' </td>	&Apache::lonhtmlcommon::row_closure().
<td>'.$domsel.' </td></tr>	&Apache::lonhtmlcommon::row_title(&mt('Domain')).
<tr><td>'.&mt('File to upload:').'</td>	'<input name="domainid" type="hidden" />'.$domdesc.
<td><input type="file" name="upfile" size="50" /></td></tr>	&Apache::lonhtmlcommon::row_closure().
</table>	&Apache::lonhtmlcommon::row_title(&mt('File to upload')).
	'<input type="file" name="upfile" size="50" />'.
	&Apache::lonhtmlcommon::row_closure(1).
	&Apache::lonhtmlcommon::end_pick_box().'<br />

<input name="command" value="scantronupload_save" type="hidden" />	<input name="command" value="scantronupload_save" type="hidden" />
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />	<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
</form>	</form>
');	');
return '';	return '';
Line 7751 sub scantron_upload_scantron_data_save {	Line 7786 sub scantron_upload_scantron_data_save {
if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&	if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&
!&Apache::lonnet::allowed('usc',	!&Apache::lonnet::allowed('usc',
$env{'form.domainid'}.'_'.$env{'form.courseid'})) {	$env{'form.domainid'}.'_'.$env{'form.courseid'})) {
$r->print(&mt("You are not allowed to upload Scantron data to the requested course.")."<br />");	$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />");
if ($symb) {	if ($symb) {
$r->print(&show_grading_menu_form($symb));	$r->print(&show_grading_menu_form($symb));
} else {	} else {
Line 7760 sub scantron_upload_scantron_data_save {	Line 7795 sub scantron_upload_scantron_data_save {
return '';	return '';
}	}
my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});	my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
$r->print(&mt("Doing upload to [_1]",$coursedata{'description'})." <br />");	my $uploadedfile;
my $fname=$env{'form.upfile.filename'};	$r->print('<h3>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</h3>');
#FIXME
#copied from lonnet::userfileupload()
#make that function able to target a specified course
# Replace Windows backslashes by forward slashes
$fname=~s/\\/\//g;
# Get rid of everything but the actual filename
$fname=~s/^.*\/([^\/]+)$/$1/;
# Replace spaces by underscores
$fname=~s/\s+/\_/g;
# Replace all other weird characters by nothing
$fname=~s/[^\w\.\-]//g;
# See if there is anything left
unless ($fname) { return 'error: no uploaded file'; }
my $uploadedfile=$fname;
$fname='scantron_orig_'.$fname;
if (length($env{'form.upfile'}) < 2) {	if (length($env{'form.upfile'}) < 2) {
$r->print(&mt("<span class=\"LC_error\">Error:</span> The file you attempted to upload, [_1] contained no information. Please check that you entered the correct filename.",'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));	$r->print(&mt('[_1]Error:[_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.','<span class="LC_error">','</span>','<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'));
} else {	} else {
my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);	my $result =
if ($result =~ m\|^/uploaded/\|) {	&Apache::lonnet::userfileupload('upfile','','scantron','','','',
$r->print(&mt("<span class=\"LC_success\">Success:</span> Successfully uploaded [_1] bytes of data into location [_2]",	$env{'form.courseid'},$env{'form.domainid'});
(length($env{'form.upfile'})-1),	if ($result =~ m{^/uploaded/}) {
'<span class="LC_filename">'.$result."</span>"));	$r->print(&mt('[_1]Success:[_2] Successfully uploaded [_3] bytes of data into location: [_4]',
	'<span class="LC_success">','</span>',(length($env{'form.upfile'})-1),
	'<span class="LC_filename">'.$result.'</span>'));
	($uploadedfile) = ($result =~ m{/([^/]+)$});
	$r->print(&validate_uploaded_scantron_file($env{'form.domainid'},
	$env{'form.courseid'},$uploadedfile));
} else {	} else {
$r->print(&mt("<span class=\"LC_error\">Error:</span> An error ([_1]) occurred when attempting to upload the file, [_2]",	$r->print(&mt('[_1]Error:[_2] An error ([_3]) occurred when attempting to upload the file, [_4]',
$result,	'<span class="LC_error">','</span>',$result,
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));	'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'));

}	}
}	}
if ($symb) {	if ($symb) {
Line 7800 sub scantron_upload_scantron_data_save {	Line 7824 sub scantron_upload_scantron_data_save {
return '';	return '';
}	}

	sub validate_uploaded_scantron_file {
	my ($cdom,$cname,$fname) = @_;
	my $scanlines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.$fname);
	my @lines;
	if ($scanlines ne '-1') {
	@lines=split("\n",$scanlines,-1);
	}
	my $output;
	if (@lines) {
	my (%counts,$max_match_format);
	my ($max_match_count,$max_match_pct) = (0,0);
	my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cname);
	my %idmap = &username_to_idmap($classlist);
	foreach my $key (keys(%idmap)) {
	my $lckey = lc($key);
	$idmap{$lckey} = $idmap{$key};
	}
	my %unique_formats;
	my @formatlines = &get_scantronformat_file();
	foreach my $line (@formatlines) {
	chomp($line);
	my @config = split(/:/,$line);
	my $idstart = $config[5];
	my $idlength = $config[6];
	if (($idstart ne '') && ($idlength > 0)) {
	if (ref($unique_formats{$idstart.':'.$idlength}) eq 'ARRAY') {
	push(@{$unique_formats{$idstart.':'.$idlength}},$config[0].':'.$config[1]);
	} else {
	$unique_formats{$idstart.':'.$idlength} = [$config[0].':'.$config[1]];
	}
	}
	}
	foreach my $key (keys(%unique_formats)) {
	my ($idstart,$idlength) = split(':',$key);
	%{$counts{$key}} = (
	'found' => 0,
	'total' => 0,
	);
	foreach my $line (@lines) {
	next if ($line =~ /^#/);
	next if ($line =~ /^[\s\cz]*$/);
	my $id = substr($line,$idstart-1,$idlength);
	$id = lc($id);
	if (exists($idmap{$id})) {
	$counts{$key}{'found'} ++;
	}
	$counts{$key}{'total'} ++;
	}
	if ($counts{$key}{'total'}) {
	my $percent_match = (100*$counts{$key}{'found'})/($counts{$key}{'total'});
	if (($max_match_format eq '') \|\| ($percent_match > $max_match_pct)) {
	$max_match_pct = $percent_match;
	$max_match_format = $key;
	$max_match_count = $counts{$key}{'total'};
	}
	}
	}
	if (ref($unique_formats{$max_match_format}) eq 'ARRAY') {
	my $format_descs;
	my $numwithformat = @{$unique_formats{$max_match_format}};
	for (my $i=0; $i<$numwithformat; $i++) {
	my ($name,$desc) = split(':',$unique_formats{$max_match_format}[$i]);
	if ($i<$numwithformat-2) {
	$format_descs .= '"<i>'.$desc.'</i>", ';
	} elsif ($i==$numwithformat-2) {
	$format_descs .= '"<i>'.$desc.'</i>" '.&mt('and').' ';
	} elsif ($i==$numwithformat-1) {
	$format_descs .= '"<i>'.$desc.'</i>"';
	}
	}
	my $showpct = sprintf("%.0f",$max_match_pct).'%';
	$output .= '<br />'.&mt('Comparison of student IDs in the uploaded file with the course roster found matches for [_1] of the [_2] entries in the file (for the format defined for [_3]).','<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs).
	'<br />'.&mt('A low percentage of matches results from one of the following:').'<ul>'.
	'<li>'.&mt('The file was uploaded to the wrong course').'</li>'.
	'<li>'.&mt('The data are not in the format expected for the domain: [_1]',
	'<i>'.$cdom.'</i>').'</li>'.
	'<li>'.&mt('Students did not bubble their IDs, or mis-bubbled them').'</li>'.
	'<li>'.&mt('The course roster is not up to date').'</li>'.
	'</ul>';
	}
	} else {
	$output = '<span class="LC_warning">'.&mt('Uploaded file contained no data').'</span>';
	}
	return $output;
	}

sub valid_file {	sub valid_file {
my ($requested_file)=@_;	my ($requested_file)=@_;
foreach my $filename (sort(&scantron_filenames())) {	foreach my $filename (sort(&scantron_filenames())) {
Line 7975 sub checkscantron_results {	Line 8085 sub checkscantron_results {
}	}
}	}
}	}
$r->print('<p>'.&mt('Comparison of scantron data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b> ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>');	$r->print('<p>'.&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b> ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>');
$r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>');	$r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>');
if ($passed) {	if ($passed) {
$r->print(&mt('Students with exact correspondence between scantron data and submissions are as follows:').'<br /><br />');	$r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'<br /><br />');
$r->print(&Apache::loncommon::start_data_table()."\n".	$r->print(&Apache::loncommon::start_data_table()."\n".
&Apache::loncommon::start_data_table_header_row()."\n".	&Apache::loncommon::start_data_table_header_row()."\n".
'<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'.	'<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'.
Line 7987 sub checkscantron_results {	Line 8097 sub checkscantron_results {
&Apache::loncommon::end_data_table().'<br />');	&Apache::loncommon::end_data_table().'<br />');
}	}
if ($failed) {	if ($failed) {
$r->print(&mt('Students with differences between scantron data and submissions are as follows:').'<br /><br />');	$r->print(&mt('Students with differences between bubblesheet data and submissions are as follows:').'<br /><br />');
$r->print(&Apache::loncommon::start_data_table()."\n".	$r->print(&Apache::loncommon::start_data_table()."\n".
&Apache::loncommon::start_data_table_header_row()."\n".	&Apache::loncommon::start_data_table_header_row()."\n".
'<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'.	'<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'.
&Apache::loncommon::end_data_table_header_row()."\n".	&Apache::loncommon::end_data_table_header_row()."\n".
$badstudents."\n".	$badstudents."\n".
&Apache::loncommon::end_data_table()).'<br />'.	&Apache::loncommon::end_data_table()).'<br />'.
&mt('Differences can occur if submissions were modified using manual grading after a scantron grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original scantron sheets.');	&mt('Differences can occur if submissions were modified using manual grading after a bubblesheet grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original bubblesheets.');
}	}
$r->print('</form><br />'.$grading_menu_button);	$r->print('</form><br />'.$grading_menu_button);
return;	return;
Line 8555 sub process_clicker {	Line 8665 sub process_clicker {
my %checked;	my %checked;
foreach my $gradingmechanism ('attendance','personnel','specific','given') {	foreach my $gradingmechanism ('attendance','personnel','specific','given') {
if ($env{'form.gradingmechanism'} eq $gradingmechanism) {	if ($env{'form.gradingmechanism'} eq $gradingmechanism) {
$checked{$gradingmechanism}="checked='checked'";	$checked{$gradingmechanism}=' checked="checked"';
}	}
}	}

Line 8619 function sanitycheck() {	Line 8729 function sanitycheck() {
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
<input type="file" name="upfile" size="50" />	<input type="file" name="upfile" size="50" />
<br /><label>$type: $selectform</label>	<br /><label>$type: $selectform</label>
<br /><label><input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" />$attendance </label>	<br /><label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onClick="sanitycheck()" />$attendance </label>
<br /><label><input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" />$personnel</label>	<br /><label><input type="radio" name="gradingmechanism" value="personnel"$checked{'personnel'} onClick="sanitycheck()" />$personnel</label>
<br /><label><input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" />$specific </label>	<br /><label><input type="radio" name="gradingmechanism" value="specific"$checked{'specific'} onClick="sanitycheck()" />$specific </label>
<input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />	<input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />
<br /><label><input type="radio" name="gradingmechanism" value="given" $checked{'given'} onClick="sanitycheck()" />$given </label>	<br /><label><input type="radio" name="gradingmechanism" value="given"$checked{'given'} onClick="sanitycheck()" />$given </label>
<br />	<br />
<input type="text" name="givenanswer" size="50" />	<input type="text" name="givenanswer" size="50" />
<input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />	<input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
Line 8942 ENDHEADER	Line 9052 ENDHEADER
my $sum=0;	my $sum=0;
my $realnumber=$number;	my $realnumber=$number;
for (my $i=0;$i<$number;$i++) {	for (my $i=0;$i<$number;$i++) {
if ($answer[$i]) {	if ($correct[$i] eq '-') {
	$realnumber--;
	} elsif ($answer[$i]) {
if ($gradingmechanism eq 'attendance') {	if ($gradingmechanism eq 'attendance') {
$sum+=$pcorrect;	$sum+=$pcorrect;
} elsif ($answer[$i] eq '*') {	} elsif ($correct[$i] eq '*') {
$sum+=$pcorrect;	$sum+=$pcorrect;
} elsif ($answer[$i] eq '-') {
$realnumber--;
} else {	} else {
if ($answer[$i] eq $correct[$i]) {	if ($answer[$i] eq $correct[$i]) {
$sum+=$pcorrect;	$sum+=$pcorrect;
Line 9102 sub handler {	Line 9212 sub handler {
} elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {	} elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {
$request->print(&checkscantron_results($request));	$request->print(&checkscantron_results($request));
} elsif ($command) {	} elsif ($command) {
$request->print("Access Denied ($command)");	$request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>');
}	}
}	}
if ($ssi_error) {	if ($ssi_error) {

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

Removed from v.1.561
changed lines
	Added in v.1.578