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.631 and 1.661

version 1.631, 2010/04/25 13:18:32	version 1.661, 2011/10/11 18:04:40
Line 40 use Apache::lonhomework;	Line 40 use Apache::lonhomework;
use Apache::lonpickcode;	use Apache::lonpickcode;
use Apache::loncoursedata;	use Apache::loncoursedata;
use Apache::lonmsg();	use Apache::lonmsg();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common :http);
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::lonenc;	use Apache::lonenc;
use Apache::lonstathelpers;	use Apache::lonstathelpers;
	use Apache::lonquickgrades;
	use Apache::bridgetask();
use String::Similarity;	use String::Similarity;
use LONCAPA;	use LONCAPA;

Line 212 sub reset_caches {	Line 214 sub reset_caches {
}	}

sub get_analyze {	sub get_analyze {
my ($symb,$uname,$udom,$no_increment,$add_to_hash)=@_;	my ($symb,$uname,$udom,$no_increment,$add_to_hash,$type,$trial,$rndseed,$bubbles_per_row)=@_;
my $key = "$symb\0$uname\0$udom";	my $key = "$symb\0$uname\0$udom";
	if ($type eq 'randomizetry') {
	if ($trial ne '') {
	$key .= "\0".$trial;
	}
	}
if (exists($analyze_cache{$key})) {	if (exists($analyze_cache{$key})) {
my $getupdate = 0;	my $getupdate = 0;
if (ref($add_to_hash) eq 'HASH') {	if (ref($add_to_hash) eq 'HASH') {
Line 241 sub reset_caches {	Line 248 sub reset_caches {
'grade_courseid' => $env{'request.course.id'},	'grade_courseid' => $env{'request.course.id'},
'grade_username' => $uname,	'grade_username' => $uname,
'grade_noincrement' => $no_increment);	'grade_noincrement' => $no_increment);
	if ($bubbles_per_row ne '') {
	$form{'bubbles_per_row'} = $bubbles_per_row;
	}
	if ($type eq 'randomizetry') {
	$form{'grade_questiontype'} = $type;
	if ($rndseed ne '') {
	$form{'grade_rndseed'} = $rndseed;
	}
	}
if (ref($add_to_hash)) {	if (ref($add_to_hash)) {
%form = (%form,%{$add_to_hash});	%form = (%form,%{$add_to_hash});
}	}
my $subresult=&ssi_with_retries($url, $ssi_retries,%form);	my $subresult=&ssi_with_retries($url, $ssi_retries,%form);
(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);	(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
my %analyze=&Apache::lonnet::str2hash($subresult);	my %analyze=&Apache::lonnet::str2hash($subresult);
Line 256 sub reset_caches {	Line 272 sub reset_caches {
}	}

sub get_order {	sub get_order {
my ($partid,$respid,$symb,$uname,$udom,$no_increment)=@_;	my ($partid,$respid,$symb,$uname,$udom,$no_increment,$type,$trial,$rndseed)=@_;
my $analyze = &get_analyze($symb,$uname,$udom,$no_increment);	my $analyze = &get_analyze($symb,$uname,$udom,$no_increment,undef,$type,$trial,$rndseed);
return $analyze->{"$partid.$respid.shown"};	return $analyze->{"$partid.$respid.shown"};
}	}

sub get_radiobutton_correct_foil {	sub get_radiobutton_correct_foil {
my ($partid,$respid,$symb,$uname,$udom)=@_;	my ($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed)=@_;
my $analyze = &get_analyze($symb,$uname,$udom);	my $analyze = &get_analyze($symb,$uname,$udom,undef,undef,$type,$trial,$rndseed);
my $foils = &get_order($partid,$respid,$symb,$uname,$udom);	my $foils = &get_order($partid,$respid,$symb,$uname,$udom,undef,$type,$trial,$rndseed);
if (ref($foils) eq 'ARRAY') {	if (ref($foils) eq 'ARRAY') {
foreach my $foil (@{$foils}) {	foreach my $foil (@{$foils}) {
if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {	if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {
Line 275 sub reset_caches {	Line 291 sub reset_caches {
}	}

sub scantron_partids_tograde {	sub scantron_partids_tograde {
my ($resource,$cid,$uname,$udom,$check_for_randomlist) = @_;	my ($resource,$cid,$uname,$udom,$check_for_randomlist,$bubbles_per_row) = @_;
my (%analysis,@parts);	my (%analysis,@parts);
if (ref($resource)) {	if (ref($resource)) {
my $symb = $resource->symb();	my $symb = $resource->symb();
Line 283 sub reset_caches {	Line 299 sub reset_caches {
if ($check_for_randomlist) {	if ($check_for_randomlist) {
$add_to_form = { 'check_parts_withrandomlist' => 1,};	$add_to_form = { 'check_parts_withrandomlist' => 1,};
}	}
my $analyze = &get_analyze($symb,$uname,$udom,undef,$add_to_form);	my $analyze =
	&get_analyze($symb,$uname,$udom,undef,$add_to_form,
	undef,undef,undef,$bubbles_per_row);
if (ref($analyze) eq 'HASH') {	if (ref($analyze) eq 'HASH') {
%analysis = %{$analyze};	%analysis = %{$analyze};
}	}
Line 306 sub reset_caches {	Line 324 sub reset_caches {
# response types only.	# response types only.
sub cleanRecord {	sub cleanRecord {
my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,	my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,
$uname,$udom) = @_;	$uname,$udom,$type,$trial,$rndseed) = @_;
my $grayFont = '<span class="LC_internal_info">';	my $grayFont = '<span class="LC_internal_info">';
if ($response =~ /^(option\|rank)$/) {	if ($response =~ /^(option\|rank)$/) {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
Line 323 sub cleanRecord {	Line 341 sub cleanRecord {
return '<blockquote><table border="1">'.	return '<blockquote><table border="1">'.
'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.	'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.	'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';	$bottomrow.'</tr></table></blockquote>';
} elsif ($response eq 'match') {	} elsif ($response eq 'match') {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
Line 345 sub cleanRecord {	Line 363 sub cleanRecord {
'<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'.	'<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'.
$middlerow.'</tr>'.	$middlerow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.	'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$bottomrow.'</tr>'.'</table></blockquote>';	$bottomrow.'</tr></table></blockquote>';
} elsif ($response eq 'radiobutton') {	} elsif ($response eq 'radiobutton') {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
my ($toprow,$bottomrow);	my ($toprow,$bottomrow);
my $correct =	my $correct =
&get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom);	&get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed);
foreach my $foil (@$order) {	foreach my $foil (@$order) {
if (exists($answer{$foil})) {	if (exists($answer{$foil})) {
if ($foil eq $correct) {	if ($foil eq $correct) {
Line 366 sub cleanRecord {	Line 384 sub cleanRecord {
return '<blockquote><table border="1">'.	return '<blockquote><table border="1">'.
'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.	'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.	'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$bottomrow.'</tr>'.'</table></blockquote>';	$bottomrow.'</tr></table></blockquote>';
} elsif ($response eq 'essay') {	} elsif ($response eq 'essay') {
if (! exists ($env{'form.'.$symb})) {	if (! exists ($env{'form.'.$symb})) {
my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',	my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
Line 820 sub listStudents {	Line 838 sub listStudents {
$submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};	$submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
}	}

my $result='<h3><span class="LC_info"> '	my $result='';
.&mt("View/Grade/Regrade Submissions for a Student or a Group of Students")
.'</span></h3>';
my $res_error;	my $res_error;
my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);	my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);

Line 1269 sub sub_page_js {	Line 1285 sub sub_page_js {
}	}

}	}
if (val == "Grade Student") {
if (formname.Status.value == "") {
formname.Status.value = "Active";
}
formname.studentNo.value = total;
}
formname.submit();	formname.submit();
}	}

Line 1399 INNERJS	Line 1409 INNERJS

my $docopen=&Apache::lonhtmlcommon::javascript_docopen();	my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
$docopen=~s/^document\.//;	$docopen=~s/^document\.//;
my $alertmsg = &mt('Please select a word or group of words from document and then click this link.');	my %lt = &Apache::lonlocal::texthash(
	keyw => 'Keywords list, separated by a space. Add/delete to list if desired.',
	plse => 'Please select a word or group of words from document and then click this link.',
	adds => 'Add selection to keyword list? Edit if desired.',
	comp => 'Compose Message for: ',
	incl => 'Include',
	type => 'Type',
	subj => 'Subject',
	mesa => 'Message',
	new => 'New',
	save => 'Save',
	canc => 'Cancel',
	kehi => 'Keyword Highlight Options',
	txtc => 'Text Color',
	font => 'Font Size',
	fnst => 'Font Style',
	);
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));	$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));

//===================== Show list of keywords ====================	//===================== Show list of keywords ====================
function keywords(formname) {	function keywords(formname) {
var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",formname.keywords.value);	var nret = prompt("$lt{'keyw'}",formname.keywords.value);
if (nret==null) return;	if (nret==null) return;
formname.keywords.value = nret;	formname.keywords.value = nret;

Line 1431 INNERJS	Line 1457 INNERJS
else return;	else return;
var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");	var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
if (cleantxt=="") {	if (cleantxt=="") {
alert("$alertmsg");	alert("$lt{'plse'}");
return;	return;
}	}
var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);	var nret = prompt("$lt{'adds'}",cleantxt);
if (nret==null) return;	if (nret==null) return;
document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;	document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
if (document.SCORE.keywords.value != "") {	if (document.SCORE.keywords.value != "") {
Line 1508 INNERJS	Line 1534 INNERJS
var ypos = (screen.height-height)/2-30;	var ypos = (screen.height-height)/2-30;
ypos = (ypos < 0) ? '0' : ypos;	ypos = (ypos < 0) ? '0' : ypos;

pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);	pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=700,height='+height);
pWin.focus();	pWin.focus();
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.$docopen;	pDoc.$docopen;
Line 1516 INNERJS	Line 1542 INNERJS

pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");	pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
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\\"> $lt{'comp'}\"+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>$lt{'type'}<\\/b><\\/td><td><b>$lt{'incl'}<\\/b><\\/td><td><b>$lt{'mesa'}<\\/td><\\/tr>");
}	}
function displaySubject(msg,shwsel) {	function displaySubject(msg,shwsel) {
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.write("<tr bgcolor=\\"#ffffdd\\">");	pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
pDoc.write("<td>Subject<\\/td>");	pDoc.write("<td>$lt{'subj'}<\\/td>");
pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");	pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>");	pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>");
}	}
Line 1541 INNERJS	Line 1567 INNERJS
function newMsg(newmsg,shwsel) {	function newMsg(newmsg,shwsel) {
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.write("<tr bgcolor=\\"#ffffdd\\">");	pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
pDoc.write("<td align=\\"center\\">New<\\/td>");	pDoc.write("<td align=\\"center\\">$lt{'new'}<\\/td>");
pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");	pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>");	pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>");
}	}
Line 1550 INNERJS	Line 1576 INNERJS
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.write("<\\/table>");	pDoc.write("<\\/table>");
pDoc.write("<\\/td><\\/tr><\\/table> ");	pDoc.write("<\\/td><\\/tr><\\/table> ");
pDoc.write("<input type=\\"button\\" value=\\"Save\\" onclick=\\"javascript:checkInput()\\">  ");	pDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:checkInput()\\">  ");
pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onclick=\\"self.close()\\"><br /><br />");	pDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />");
pDoc.write("<\\/form>");	pDoc.write("<\\/form>");
pDoc.write('$end_page_msg_central');	pDoc.write('$end_page_msg_central');
pDoc.close();	pDoc.close();
Line 1601 INNERJS	Line 1627 INNERJS
hDoc.$docopen;	hDoc.$docopen;
hDoc.write('$start_page_highlight_central');	hDoc.write('$start_page_highlight_central');
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\\"> $lt{'kehi'}<\\/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>$lt{'txtc'}<\\/b><\\/td><td><b>$lt{'font'}<\\/b><\\/td><td><b>$lt{'fnst'}<\\/td><\\/tr>");
}	}

function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) {	function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) {
Line 1624 INNERJS	Line 1650 INNERJS
var hDoc = hwdWin.document;	var hDoc = hwdWin.document;
hDoc.write("<\\/table>");	hDoc.write("<\\/table>");
hDoc.write("<\\/td><\\/tr><\\/table> ");	hDoc.write("<\\/td><\\/tr><\\/table> ");
hDoc.write("<input type=\\"button\\" value=\\"Save\\" onclick=\\"javascript:updateChoice(1)\\">  ");	hDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\">  ");
hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onclick=\\"self.close()\\"><br /><br />");	hDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />");
hDoc.write("<\\/form>");	hDoc.write("<\\/form>");
hDoc.write('$end_page_highlight_central');	hDoc.write('$end_page_highlight_central');
hDoc.close();	hDoc.close();
Line 1740 sub handback_box {	Line 1766 sub handback_box {
my ($symb,$uname,$udom,$counter,$partid,$record,$res_error_pointer) = @_;	my ($symb,$uname,$udom,$counter,$partid,$record,$res_error_pointer) = @_;
my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error_pointer);	my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error_pointer);
my (@respids);	my (@respids);
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
foreach my $part_response_id (@part_response_id) {	foreach my $part_response_id (@part_response_id) {
my ($part,$resp) = @{ $part_response_id };	my ($part,$resp) = @{ $part_response_id };
if ($part eq $partid) {	if ($part eq $partid) {
Line 1752 sub handback_box {	Line 1778 sub handback_box {
my $prefix = $counter.'_'.$partid.'_'.$respid.'_';	my $prefix = $counter.'_'.$partid.'_'.$respid.'_';
my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record);	my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record);
next if (!@$files);	next if (!@$files);
my $file_counter = 1;	my $file_counter = 0;
foreach my $file (@$files) {	foreach my $file (@$files) {
if ($file =~ /\/portfolio\//) {	if ($file =~ /\/portfolio\//) {
	$file_counter++;
my ($file_path, $file_disp) = ($file =~ m\|(.+/)(.+)$\|);	my ($file_path, $file_disp) = ($file =~ m\|(.+/)(.+)$\|);
my ($name,$version,$ext) = &file_name_version_ext($file_disp);	my ($name,$version,$ext) = &file_name_version_ext($file_disp);
$file_disp = "$name.$ext";	$file_disp = "$name.$ext";
Line 1762 sub handback_box {	Line 1789 sub handback_box {
$result.=&mt('Return commented version of [_1] to student.',	$result.=&mt('Return commented version of [_1] to student.',
'<span class="LC_filename">'.$file_disp.'</span>');	'<span class="LC_filename">'.$file_disp.'</span>');
$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";	$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
$result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';	$result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />'."\n";
$result.='('.&mt('File will be uploaded when you click on Save & Next below.').')<br />';
$file_counter++;
}	}
}	}
	if ($file_counter) {
	$result .= '<input type="hidden" name="'.$prefix.'countreturndoc" value="'.$file_counter.'" />'."\n".
	'<span class="LC_info">'.
	'('.&mt('File(s) will be uploaded when you click on Save & Next below.',$file_counter).')</span><br /><br />';
	}
}	}
return $result;	return $result;
}	}
Line 1913 sub submission {	Line 1943 sub submission {
if ($counter == 0) {	if ($counter == 0) {
&sub_page_js($request);	&sub_page_js($request);
&sub_page_kw_js($request);	&sub_page_kw_js($request);
$request->print('<h3> <span class="LC_info">'.&mt('Submission Record').'</span></h3>');

# option to display problem, only once else it cause problems	# option to display problem, only once else it cause problems
# with the form later since the problem has a form.	# with the form later since the problem has a form.
Line 1993 sub submission {	Line 2022 sub submission {

# if ($env{'form.handgrade'} eq 'yes') {	# if ($env{'form.handgrade'} eq 'yes') {
if (1) {	if (1) {

	my %lt = &Apache::lonlocal::texthash(
	keyw => 'Keyword Options',
	list => 'List',
	past => 'Paste Selection to List',
	high => 'Highlight Attribute',
	);
#	#
# Print out the keyword options line	# Print out the keyword options line
#	#
$request->print(<<KEYWORDS);	$request->print(<<KEYWORDS);
<b>Keyword Options:</b>	<br /><b>$lt{'keyw'}:</b>
<a href="javascript:keywords(document.SCORE);" target="_self">List</a>	<a href="javascript:keywords(document.SCORE);" target="_self">$lt{'list'}</a>
<a href="#" onmousedown="javascript:getSel(); return false"	<a href="#" onmousedown="javascript:getSel(); return false"
CLASS="page">Paste Selection to List</a>	CLASS="page">$lt{'past'}</a>
<a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br />	<a href="javascript:kwhighlight();" target="_self">$lt{'high'}</a><br /><br />
KEYWORDS	KEYWORDS
#	#
# Load the other essays for similarity check	# Load the other essays for similarity check
Line 2141 KEYWORDS	Line 2177 KEYWORDS
my ($ressub,$hide,$subval) = split(/:/,$submission,3);	my ($ressub,$hide,$subval) = split(/:/,$submission,3);
# Similarity check	# Similarity check
my $similar='';	my $similar='';
	my ($type,$trial,$rndseed);
	if ($hide eq 'rand') {
	$type = 'randomizetry';
	$trial = $record{"resource.$partid.tries"};
	$rndseed = $record{"resource.$partid.rndseed"};
	}
if($env{'form.checkPlag'}){	if($env{'form.checkPlag'}){
my ($oname,$odom,$ocrsid,$oessay,$osim)=	my ($oname,$odom,$ocrsid,$oessay,$osim)=
&most_similar($uname,$udom,$subval,\%old_essays);	&most_similar($uname,$udom,$subval,\%old_essays);
Line 2150 KEYWORDS	Line 2192 KEYWORDS
&Apache::lonnet::coursedescription($ocrsid,	&Apache::lonnet::coursedescription($ocrsid,
{'one_time' => 1});	{'one_time' => 1});

if ($hide) {	if ($hide eq 'anon') {
$similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.	$similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.
&mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';	&mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';
} else {	} else {
Line 2167 KEYWORDS	Line 2209 KEYWORDS
}	}
}	}
}	}
my $order=&get_order($partid,$respid,$symb,$uname,$udom);	my $order=&get_order($partid,$respid,$symb,$uname,$udom,
	undef,$type,$trial,$rndseed);
if ($env{'form.lastSub'} eq 'lastonly' \|\|	if ($env{'form.lastSub'} eq 'lastonly' \|\|
($env{'form.lastSub'} eq 'hdgrade' &&	($env{'form.lastSub'} eq 'hdgrade' &&
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {	$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
Line 2179 KEYWORDS	Line 2222 KEYWORDS
'</span>   ';	'</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) {
if ($hide) {	if ($hide eq 'anon') {
$lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));	$lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));
} else {	} else {
$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 2190 KEYWORDS	Line 2233 KEYWORDS
}	}
$lastsubonly.='<br />';	$lastsubonly.='<br />';
}	}
if ($hide) {	if ($hide eq 'anon') {
$lastsubonly.='<b>'.&mt('Anonymous Survey').'</b>';	$lastsubonly.='<b>'.&mt('Anonymous Survey').'</b>';
} else {	} else {
$lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.	$lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.
&cleanRecord($subval,$responsetype,$symb,$partid,	&cleanRecord($subval,$responsetype,$symb,$partid,
$respid,\%record,$order,undef,$uname,$udom);	$respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed);
}	}
if ($similar) {$lastsubonly.="<br /><br />$similar\n";}	if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
$lastsubonly.='</div>';	$lastsubonly.='</div>';
Line 2217 KEYWORDS	Line 2260 KEYWORDS
$request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'	$request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
.$udom.'" />'."\n");	.$udom.'" />'."\n");
# return if view submission with no grading option	# return if view submission with no grading option
# FIXME: the logic seems off here. Why show the grade button if you cannot grade?
if (!&canmodify($usec)) {	if (!&canmodify($usec)) {
my $toGrade.='<input type="button" value="Grade Student" '.	$request->print('<p><span class="LC_warning">'.&mt('No grading privileges').'</span></p></div>');
'onclick="javascript:checksubmit(this.form,\'Grade Student\',\''
.$counter.'\');" target="_self" />  '."\n" if (&canmodify($usec));
$toGrade.='</div>'."\n";
$request->print($toGrade);
return;	return;
} else {	} else {
$request->print('</div>'."\n");	$request->print('</div>'."\n");
Line 2399 sub get_last_submission {	Line 2437 sub get_last_submission {
&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});	&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
}	}
}	}
my %typeparts;	my (%typeparts,%randombytry);
my $showsurv =	my $showsurv =
&Apache::lonnet::allowed('vas',$env{'request.course.id'});	&Apache::lonnet::allowed('vas',$env{'request.course.id'});
foreach my $key (sort(keys(%lasthash))) {	foreach my $key (sort(keys(%lasthash))) {
if ($key =~ /\.type$/) {	if ($key =~ /\.type$/) {
if (($lasthash{$key} eq 'anonsurvey') \|\|	if (($lasthash{$key} eq 'anonsurvey') \|\|
($lasthash{$key} eq 'anonsurveycred')) {	($lasthash{$key} eq 'anonsurveycred') \|\|
	($lasthash{$key} eq 'randomizetry')) {
my ($ign,@parts) = split(/\./,$key);	my ($ign,@parts) = split(/\./,$key);
pop(@parts);	pop(@parts);
unless ($showsurv) {	my $id = join('.',@parts);
my $id = join(',',@parts);	if ($lasthash{$key} eq 'randomizetry') {
$typeparts{$ign.'.'.$id} = $lasthash{$key};	$randombytry{$ign.'.'.$id} = $lasthash{$key};
	} else {
	unless ($showsurv) {
	$typeparts{$ign.'.'.$id} = $lasthash{$key};
	}
}	}
delete($lasthash{$key});	delete($lasthash{$key});
}	}
}	}
}	}
my @hidden = keys(%typeparts);	my @hidden = keys(%typeparts);
	my @randomize = keys(%randombytry);
foreach my $key (keys(%lasthash)) {	foreach my $key (keys(%lasthash)) {
next if ($key !~ /\.submission$/);	next if ($key !~ /\.submission$/);
my $hide;	my $hide;
if (@hidden) {	if (@hidden) {
foreach my $id (@hidden) {	foreach my $id (@hidden) {
if ($key =~ /^\Q$id\E/) {	if ($key =~ /^\Q$id\E/) {
$hide = 1;	$hide = 'anon';
last;	last;
}	}
}	}
}	}
	unless ($hide) {
	if (@randomize) {
	foreach my $id (@hidden) {
	if ($key =~ /^\Q$id\E/) {
	$hide = 'rand';
	last;
	}
	}
	}
	}
my ($partid,$foo) = split(/submission$/,$key);	my ($partid,$foo) = split(/submission$/,$key);
my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?	my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
'<span class="LC_warning">Draft Copy</span> ' : '';	'<span class="LC_warning">Draft Copy</span> ' : '';
Line 2505 sub processHandGrade {	Line 2559 sub processHandGrade {
undef,undef,$showsymb,	undef,undef,$showsymb,
$restitle);	$restitle);
$request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '.	$request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '.
$msgstatus);	$msgstatus.'<br />');
}	}
if ($env{'form.collaborator'.$ctr}) {	if ($env{'form.collaborator'.$ctr}) {
my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");	my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");
Line 2596 sub processHandGrade {	Line 2650 sub processHandGrade {
return '';	return '';
}	}

# Go directly to grade student - from submission or link from chart page
# FIXME: looks like reading off the button label!
if ($button eq 'Grade Student') {
my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};
($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
$env{'form.fullname'} = $$fullname{$processUser};
&submission($request,0,0,$symb);
return '';
}

# Get the next/previous one or group of students	# Get the next/previous one or group of students
my $firststu = $env{'form.unamedom0'};	my $firststu = $env{'form.unamedom0'};
my $laststu = $env{'form.unamedom'.($ngrade-1)};	my $laststu = $env{'form.unamedom'.($ngrade-1)};
Line 2693 sub processHandGrade {	Line 2737 sub processHandGrade {
$ctr++;	$ctr++;
}	}
if ($total < 0) {	if ($total < 0) {
my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n";	my $the_end.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\n";
$the_end.=&mt('<b>Message: </b> No more students for this section or class.').'<br /><br />'."\n";
$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n";
$request->print($the_end);	$request->print($the_end);
}	}
return '';	return '';
Line 2846 sub handback_files {	Line 2888 sub handback_files {
$request->print('<br />'.&navmap_errormsg().'<br />');	$request->print('<br />'.&navmap_errormsg().'<br />');
return;	return;
}	}
	my @handedback;
	my $file_msg;
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
foreach my $part_response_id (@part_response_id) {	foreach my $part_response_id (@part_response_id) {
my ($part_id,$resp_id) = @{ $part_response_id };	my ($part_id,$resp_id) = @{ $part_response_id };
my $part_resp = join('_',@{ $part_response_id });	my $part_resp = join('_',@{ $part_response_id });
if (($env{'form.'.$newflg.'_'.$part_resp.'_returndoc1'}) && ($new_part == $part_id)) {	if (($env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'} =~ /^\d+$/) & ($new_part eq $part_id)) {
# if multiple files are uploaded names will be 'returndoc2','returndoc3'	for (my $counter=1; $counter<=$env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'}; $counter++) {
my $file_counter = 1;	# if multiple files are uploaded names will be 'returndoc2','returndoc3'
my $file_msg;	if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) {
while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) {	my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter.'.filename'};
my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'};
my ($directory,$answer_file) =	my ($directory,$answer_file) =
($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter} =~ /^(.?)([^\/])$/);	($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter} =~ /^(.?)([^\/])$/);
my ($answer_name,$answer_ver,$answer_ext) =	my ($answer_name,$answer_ver,$answer_ext) =
&file_name_version_ext($answer_file);	&file_name_version_ext($answer_file);
my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);	my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
Line 2867 sub handback_files {	Line 2910 sub handback_files {
# fix file name	# fix file name
my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);	my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,	my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,
$newflg.'_'.$part_resp.'_returndoc'.$file_counter,	$newflg.'_'.$part_resp.'_returndoc'.$counter,
$save_file_name);	$save_file_name);
if ($result !~ m\|^/uploaded/\|) {	if ($result !~ m\|^/uploaded/\|) {
$request->print('<br /><span class="LC_error">'.	$request->print('<br /><span class="LC_error">'.
&mt('An error occurred ([_1]) while trying to upload [_2].',	&mt('An error occurred ([_1]) while trying to upload [_2].',
$result,$newflg.'_'.$part_resp.'_returndoc'.$file_counter).	$result,$newflg.'_'.$part_resp.'_returndoc'.$counter).
'</span>');	'</span>');
} else {	} else {
# mark the file as read only	# mark the file as read only
my @files = ($save_file_name);	push(@handedback,$save_file_name);
my @what = ($symb,$env{'request.course.id'},'handback');
&Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what);
if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) {	if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) {
$$newrecord{"resource.$new_part.$resp_id.handback"}.=',';	$$newrecord{"resource.$new_part.$resp_id.handback"}.=',';
}	}
$$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name;	$$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name;
$file_msg.= "\n".'<br /><span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span><br />";	$file_msg.= '<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />";

}	}
$request->print("<br />".$fname." will be the uploaded file name");	$request->print('<br />'.&mt('[_1] will be the uploaded file name [_2]','<span class="LC_info">'.$fname.'</span>','<span class="LC_filename">'.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'</span>'));
$request->print(" ".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
$file_counter++;
}	}
my $subject = "File Handed Back by Instructor ";
my $message = "A file has been returned that was originally submitted in reponse to: <br />";
$message .= "<strong>".&Apache::lonnet::gettitle($symb)."</strong><br />";
$message .= ' The returned file(s) are named: '. $file_msg;
$message .= " and can be found in your portfolio space.";
my ($feedurl,$showsymb) =
&get_feedurl_and_symb($symb,$domain,$stuname);
my $restitle = &Apache::lonnet::gettitle($symb);
my $msgstatus =
&Apache::lonmsg::user_normal_msg($stuname,$domain,$subject.
' (File Returned) ['.$restitle.']',$message,undef,
$feedurl,undef,undef,undef,$showsymb,$restitle);
}	}
}	}
	}
	if (@handedback > 0) {
	$request->print('<br />');
	my @what = ($symb,$env{'request.course.id'},'handback');
	&Apache::lonnet::mark_as_readonly($domain,$stuname,\@handedback,\@what);
	my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'});
	my ($subject,$message);
	if (scalar(@handedback) == 1) {
	$subject = &mt_user($user_lh,'File Handed Back by Instructor');
	$message = &mt_user($user_lh,'A file has been returned that was originally submitted in response to: ');
	} else {
	$subject = &mt_user($user_lh,'Files Handed Back by Instructor');
	$message = &mt_user($user_lh,'Files have been returned that were originally submitted in response to: ');
	}
	$message .= "<p><strong>".&Apache::lonnet::gettitle($symb)." </strong></p>";
	$message .= &mt_user($user_lh,'The returned file(s) are named: [_1]',"<br />$file_msg <br />").
	&mt_user($user_lh,'The file(s) can be found in your [_1]portfolio[_2].','<a href="/adm/portfolio">','</a>');
	my ($feedurl,$showsymb) =
	&get_feedurl_and_symb($symb,$domain,$stuname);
	my $restitle = &Apache::lonnet::gettitle($symb);
	$subject .= ' '.&mt_user($user_lh,'(File Returned)').' ['.$restitle.']';
	my $msgstatus =
	&Apache::lonmsg::user_normal_msg($stuname,$domain,$subject,
	$message,undef,$feedurl,undef,undef,undef,$showsymb,
	$restitle);
	if ($msgstatus) {
	$request->print(&mt('Notification message status: [_1]','<span class="LC_info">'.$msgstatus.'</span>').'<br />');
	}
	}
return;	return;
}	}

Line 3824 sub csvuploadmap_header {	Line 3879 sub csvuploadmap_header {
$javascript=&csvupload_javascript_forward_associate();	$javascript=&csvupload_javascript_forward_associate();
}	}

my $result='';
$symb = &Apache::lonenc::check_encrypt($symb);	$symb = &Apache::lonenc::check_encrypt($symb);
	$request->print('<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">'.
	&mt('Total number of records found in file: [_1]',$distotal).'<hr />'.
	&mt('Associate entries from the uploaded file with as many fields as you can.'));
	my $reverse=&mt("Reverse Association");
$request->print(<<ENDPICK);	$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<br />
<h3><span class="LC_info">Uploading Class Grades</span></h3>	<input type="button" value="$reverse" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
$result
<hr />
<h3>Identify fields</h3>
Total number of records found in file: $distotal <hr />
Enter as many fields as you can. The system will inform you and bring you back
to this page if the data selected is insufficient to run your class.<hr />
<input type="button" value="Reverse Association" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
<input type="hidden" name="associate" value="" />	<input type="hidden" name="associate" value="" />
<input type="hidden" name="phase" value="three" />	<input type="hidden" name="phase" value="three" />
<input type="hidden" name="datatoken" value="$datatoken" />	<input type="hidden" name="datatoken" value="$datatoken" />
Line 3908 sub upcsvScores_form {	Line 3959 sub upcsvScores_form {
my ($request,$symb) = @_;	my ($request,$symb) = @_;
if (!$symb) {return '';}	if (!$symb) {return '';}
my $result=&checkforfile_js();	my $result=&checkforfile_js();
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";	$result.=&Apache::loncommon::start_data_table().
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";	&Apache::loncommon::start_data_table_header_row().
$result.=' <b>'.&mt('Specify a file containing the class scores for current resource.').	'<th>'.&mt('Specify a file containing the class scores for current resource.').'</th>'.
'</b></td></tr>'."\n";	&Apache::loncommon::end_data_table_header_row().
$result.='<tr bgcolor=#ffffe6><td>'."\n";	&Apache::loncommon::start_data_table_row().'<td>';
my $upload=&mt("Upload Scores");	my $upload=&mt("Upload Scores");
my $upfile_select=&Apache::loncommon::upfile_select_html();	my $upfile_select=&Apache::loncommon::upfile_select_html();
my $ignore=&mt('Ignore First Line');	my $ignore=&mt('Ignore First Line');
Line 3926 $upfile_select	Line 3977 $upfile_select
</form>	</form>
ENDUPFORM	ENDUPFORM
$result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",	$result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
&mt("How do I create a CSV file from a spreadsheet"))	&mt("How do I create a CSV file from a spreadsheet")).
.'</td></tr></table>'."\n";	'</td>'.
$result.='</td></tr></table><br /><br />'."\n";	&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::end_data_table();
return $result;	return $result;
}	}

Line 3980 sub csvuploadmap {	Line 4032 sub csvuploadmap {

sub csvuploadoptions {	sub csvuploadoptions {
my ($request,$symb)= @_;	my ($request,$symb)= @_;
	my $overwrite=&mt('Overwrite any existing score');
$request->print(<<ENDPICK);	$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<h3><span class="LC_info">Uploading Class Grade Options</span></h3>
<input type="hidden" name="command" value="csvuploadassign" />	<input type="hidden" name="command" value="csvuploadassign" />
<!--
<p>
<label>
<input type="checkbox" name="show_full_results" />
Show a table of all changes
</label>
</p>
-->
<p>	<p>
<label>	<label>
<input type="checkbox" name="overwite_scores" checked="checked" />	<input type="checkbox" name="overwite_scores" checked="checked" />
Overwrite any existing score	$overwrite
</label>	</label>
</p>	</p>
ENDPICK	ENDPICK
my %fields=&get_fields();	my %fields=&get_fields();
if (!defined($fields{'domain'})) {	if (!defined($fields{'domain'})) {
my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain');	my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain');
$request->print("\n<p> Users are in domain: ".$domform."</p>\n");	$request->print("\n<p>".&mt('Users are in domain: [_1]',$domform)."</p>\n");
}	}
foreach my $key (sort(keys(%env))) {	foreach my $key (sort(keys(%env))) {
if ($key !~ /^form\.(.*)$/) { next; }	if ($key !~ /^form\.(.*)$/) { next; }
Line 4042 sub csvuploadassign {	Line 4086 sub csvuploadassign {
&Apache::loncommon::load_tmp_file($request);	&Apache::loncommon::load_tmp_file($request);
my @gradedata = &Apache::loncommon::upfile_record_sep();	my @gradedata = &Apache::loncommon::upfile_record_sep();
my %fields=&get_fields();	my %fields=&get_fields();
$request->print('<h3>Assigning Grades</h3>');
my $courseid=$env{'request.course.id'};	my $courseid=$env{'request.course.id'};
my ($classlist) = &getclasslist('all',0);	my ($classlist) = &getclasslist('all',0);
my @notallowed;	my @notallowed;
my @skipped;	my @skipped;
	my @warnings;
my $countdone=0;	my $countdone=0;
foreach my $grade (@gradedata) {	foreach my $grade (@gradedata) {
my %entries=&Apache::loncommon::record_sep($grade);	my %entries=&Apache::loncommon::record_sep($grade);
Line 4095 sub csvuploadassign {	Line 4139 sub csvuploadassign {
my $pcr=$entries{$fields{$dest}} / $wgt;	my $pcr=$entries{$fields{$dest}} / $wgt;
my $award=($pcr == 0) ? 'incorrect_by_override'	my $award=($pcr == 0) ? 'incorrect_by_override'
: 'correct_by_override';	: 'correct_by_override';
	if ($pcr>1) {
	push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain"));
	}
$grades{"resource.$part.awarded"}=$pcr;	$grades{"resource.$part.awarded"}=$pcr;
$grades{"resource.$part.solved"}=$award;	$grades{"resource.$part.solved"}=$award;
$points{$part}=1;	$points{$part}=1;
Line 4139 sub csvuploadassign {	Line 4186 sub csvuploadassign {
}	}
}	}
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0));	$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0));
	if (@warnings) {
	$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('Warnings generated for the following saved scores:'),1).'<br />');
	$request->print(join(', ',@warnings));
	}
if (@skipped) {	if (@skipped) {
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />');	$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />');
$request->print(join(', ',@skipped));	$request->print(join(', ',@skipped));
Line 4400 sub displayPage {	Line 4451 sub displayPage {
&Apache::loncommon::start_data_table_row().	&Apache::loncommon::start_data_table_row().
'<td align="center" valign="top" >'.$prob.	'<td align="center" valign="top" >'.$prob.
(scalar(@{$parts}) == 1 ? ''	(scalar(@{$parts}) == 1 ? ''
: '<br />('.&mt('[_1] parts)',	: '<br />('.&mt('[_1]parts)',
scalar(@{$parts}))	scalar(@{$parts}).' ')
).	).
'</td>';	'</td>';
$studentTable.='<td valign="top">';	$studentTable.='<td valign="top">';
Line 4495 sub displaySubByDates {	Line 4546 sub displaySubByDates {

my $interaction;	my $interaction;
my $no_increment = 1;	my $no_increment = 1;
	my %lastrndseed;
for ($version=1;$version<=$$record{'version'};$version++) {	for ($version=1;$version<=$$record{'version'};$version++) {
my $timestamp =	my $timestamp =
&Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});	&Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});
Line 4512 sub displaySubByDates {	Line 4564 sub displaySubByDates {
my @versionKeys = split(/\:/,$$record{$version.':keys'});	my @versionKeys = split(/\:/,$$record{$version.':keys'});
my @displaySub = ();	my @displaySub = ();
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
my $hidden;	my ($hidden,$type);
if (($$record{$version.':resource.'.$partid.'.type'} eq 'anonsurvey') \|\|	$type = $$record{$version.':resource.'.$partid.'.type'};
($$record{$version.':resource.'.$partid.'.type'} eq 'anonsurveycred')) {	if (($type eq 'anonsurvey') \|\| ($type eq 'anonsurveycred')) {
$hidden = 1;	$hidden = 1;
}	}
my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)	my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)
Line 4537 sub displaySubByDates {	Line 4589 sub displaySubByDates {
if ($hidden) {	if ($hidden) {
$displaySub[0].= &mt('Anonymous Survey').'</b>';	$displaySub[0].= &mt('Anonymous Survey').'</b>';
} else {	} else {
	my ($trial,$rndseed,$newvariation);
	if ($type eq 'randomizetry') {
	$trial = $$record{"$where.$partid.tries"};
	$rndseed = $$record{"$where.$partid.rndseed"};
	}
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"});
	if ($rndseed \|\| $lastrndseed{$partid}) {
	if ($rndseed ne $lastrndseed{$partid}) {
	$newvariation = ' ('.&mt('New variation this try').')';
	}
	}
	$lastrndseed{$partid} = $rndseed;
}	}
my $responseType=($isTask ? 'Task'	my $responseType=($isTask ? 'Task'
: $responseType->{$partid}->{$responseId});	: $responseType->{$partid}->{$responseId});
if (!exists($orders{$partid})) { $orders{$partid}={}; }	if (!exists($orders{$partid})) { $orders{$partid}={}; }
if (!exists($orders{$partid}->{$responseId})) {	if ((!exists($orders{$partid}->{$responseId})) \|\| ($trial)) {
$orders{$partid}->{$responseId}=	$orders{$partid}->{$responseId}=
&get_order($partid,$responseId,$symb,$uname,$udom,	&get_order($partid,$responseId,$symb,$uname,$udom,
$no_increment);	$no_increment,$type,$trial,$rndseed);
}	}
$displaySub[0].='</b></span>'; # /nobreak	$displaySub[0].='</b>'.$newvariation.'</span>'; # /nobreak
$displaySub[0].='  '.	$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,$type,$trial,$rndseed).'<br />';
}	}
}	}
}	}
Line 4652 sub updateGradeByPage {	Line 4715 sub updateGradeByPage {
&Apache::loncommon::start_data_table_row().	&Apache::loncommon::start_data_table_row().
'<td align="center" valign="top" >'.$prob.	'<td align="center" valign="top" >'.$prob.
(scalar(@{$parts}) == 1 ? ''	(scalar(@{$parts}) == 1 ? ''
: '<br />('.&mt('[quant,_1, part]',scalar(@{$parts}))	: '<br />('.&mt('[quant,_1,part]',scalar(@{$parts}))
.')').'</td>';	.')').'</td>';
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';	$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';

Line 4774 sub updateGradeByPage {	Line 4837 sub updateGradeByPage {
from the file that we are parsing that represents one entire sheet	from the file that we are parsing that represents one entire sheet

'bubble line' refers to the data	'bubble line' refers to the data
representing the line of bubbles that are on the physical bubble sheet	representing the line of bubbles that are on the physical bubblesheet


The overall process is that a scanned in bubble sheet data is uploaded	The overall process is that a scanned in bubblesheet data is uploaded
into a course. When a user wants to grade, they select a	into a course. When a user wants to grade, they select a
sequence/folder of resources, a file of bubble sheet info, and pick	sequence/folder of resources, a file of bubblesheet info, and pick
one of the predefined configurations for what each scanline looks	one of the predefined configurations for what each scanline looks
like.	like.

Line 4795 username:domain.	Line 4858 username:domain.

During the validation phase the instructor can choose to skip scanlines.	During the validation phase the instructor can choose to skip scanlines.

After the validation phase, there are now 3 bubble sheet files	After the validation phase, there are now 3 bubblesheet files

scantron_original_filename (unmodified original file)	scantron_original_filename (unmodified original file)
scantron_corrected_filename (file where the corrected information has replaced the original information)	scantron_corrected_filename (file where the corrected information has replaced the original information)
scantron_skipped_filename (contains the exact text of scanlines that where skipped)	scantron_skipped_filename (contains the exact text of scanlines that where skipped)

Also there is a separate hash nohist_scantrondata that contains extra	Also there is a separate hash nohist_scantrondata that contains extra
correction information that isn't representable in the bubble sheet	correction information that isn't representable in the bubblesheet
file (see &scantron_getfile() for more information)	file (see &scantron_getfile() for more information)

After all scanlines are either valid, marked as valid or skipped, then	After all scanlines are either valid, marked as valid or skipped, then
Line 5097 sub scantron_CODEunique {	Line 5160 sub scantron_CODEunique {

=item scantron_selectphase	=item scantron_selectphase

Generates the initial screen to start the bubble sheet process.	Generates the initial screen to start the bubblesheet process.
Allows for - starting a grading run.	Allows for - starting a grading run.
- downloading existing scan data (original, corrected	- downloading existing scan data (original, corrected
or skipped info)	or skipped info)
Line 5338 sub scantron_selectphase {	Line 5401 sub scantron_selectphase {

LastName - column that the last name starts in	LastName - column that the last name starts in
LastNameLength - number of columns that the last name spans	LastNameLength - number of columns that the last name spans
	BubblesPerRow - number of bubbles available in each row used to
	bubble an answer. (If not specified, 10 assumed).
=cut	=cut

sub get_scantron_config {	sub get_scantron_config {
Line 5368 sub get_scantron_config {	Line 5432 sub get_scantron_config {
$config{'FirstNamelength'}=$config[14];	$config{'FirstNamelength'}=$config[14];
$config{'LastName'}=$config[15];	$config{'LastName'}=$config[15];
$config{'LastNamelength'}=$config[16];	$config{'LastNamelength'}=$config[16];
	$config{'BubblesPerRow'}=$config[17];
last;	last;
}	}
return %config;	return %config;
Line 6117 sub remember_current_skipped {	Line 6182 sub remember_current_skipped {
=item check_for_error	=item check_for_error

Checks if there was an error when attempting to remove a specific	Checks if there was an error when attempting to remove a specific
scantron_.. bubble sheet data file. Prints out an error if	scantron_.. bubblesheet data file. Prints out an error if
something went wrong.	something went wrong.

=cut	=cut
Line 6139 sub check_for_error {	Line 6204 sub check_for_error {
=cut	=cut

sub scantron_warning_screen {	sub scantron_warning_screen {
my ($button_text)=@_;	my ($button_text,$symb)=@_;
my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});	my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my $CODElist;	my $CODElist;
Line 6162 sub scantron_warning_screen {	Line 6227 sub scantron_warning_screen {
<tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr>	<tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr>
'.$CODElist.'	'.$CODElist.'
</table>	</table>
<br />	<p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'<br />
<p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p>	'.&mt('If something is incorrect, please return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p>
<p> '.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').'</p>

<br />	<br />
');	');
Line 6187 sub scantron_do_warning {	Line 6251 sub scantron_do_warning {
if ( $env{'form.selectpage'} eq '' \|\|	if ( $env{'form.selectpage'} eq '' \|\|
$env{'form.scantron_selectfile'} eq '' \|\|	$env{'form.scantron_selectfile'} eq '' \|\|
$env{'form.scantron_format'} eq '' ) {	$env{'form.scantron_format'} eq '' ) {
$r->print("<p>".&mt('You have forgetten to specify some information. Please go Back and try again.')."</p>");	$r->print("<p>".&mt('You have forgotten to specify some information. Please go Back and try again.')."</p>");
if ( $env{'form.selectpage'} eq '') {	if ( $env{'form.selectpage'} eq '') {
$r->print('<p><span class="LC_error">'.&mt('You have not selected a Sequence to grade').'</span></p>');	$r->print('<p><span class="LC_error">'.&mt('You have not selected a Sequence to grade').'</span></p>');
}	}
if ( $env{'form.scantron_selectfile'} eq '') {	if ( $env{'form.scantron_selectfile'} eq '') {
$r->print('<p><span class="LC_error">'.&mt('You have not selected a file that contains the student\'s response data.').'</span></p>');	$r->print('<p><span class="LC_error">'.&mt("You have not selected a file that contains the student's response data.").'</span></p>');
}	}
if ( $env{'form.scantron_format'} eq '') {	if ( $env{'form.scantron_format'} eq '') {
$r->print('<p><span class="LC_error">'.&mt('You have not selected a the format of the student\'s response data.').'</span></p>');	$r->print('<p><span class="LC_error">'.&mt("You have not selected the format of the student's response data.").'</span></p>');
}	}
} else {	} else {
my $warning=&scantron_warning_screen('Grading: Validate Records');	my $warning=&scantron_warning_screen('Grading: Validate Records',$symb);
$r->print('	$r->print('
'.$warning.'	'.$warning.'
<input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" />	<input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" />
Line 6252 SCANTRONFORM	Line 6316 SCANTRONFORM

=item scantron_validate_file	=item scantron_validate_file

Dispatch routine for doing validation of a bubble sheet data file.	Dispatch routine for doing validation of a bubblesheet data file.

Also processes any necessary information resets that need to	Also processes any necessary information resets that need to
occur before validation begins (ignore previous corrections,	occur before validation begins (ignore previous corrections,
Line 6289 sub scantron_validate_file {	Line 6353 sub scantron_validate_file {
#get the student pick code ready	#get the student pick code ready
$r->print(&Apache::loncommon::studentbrowser_javascript());	$r->print(&Apache::loncommon::studentbrowser_javascript());
my $nav_error;	my $nav_error;
my $max_bubble=&scantron_get_maxbubble(\$nav_error);	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
	my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config);
if ($nav_error) {	if ($nav_error) {
$r->print(&navmap_errormsg());	$r->print(&navmap_errormsg());
return '';	return '';
Line 6319 sub scantron_validate_file {	Line 6384 sub scantron_validate_file {
}	}
}	}
if (!$stop) {	if (!$stop) {
my $warning=&scantron_warning_screen('Start Grading');	my $warning=&scantron_warning_screen('Start Grading',$symb);
$r->print(&mt('Validation process complete.').'<br />'.	$r->print(&mt('Validation process complete.').'<br />'.
$warning.	$warning.
&mt('Perform verification for each student after storage of submissions?').	&mt('Perform verification for each student after storage of submissions?').
Line 6329 sub scantron_validate_file {	Line 6394 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 bubblesheet data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'.	&mt('Otherwise, Grade/Manage/Review Bubblesheets [_1] Review bubblesheet data can be used once 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 6341 sub scantron_validate_file {	Line 6406 sub scantron_validate_file {
$r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' → " />');	$r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' → " />');
$r->print(' '.&mt('this error').' <br />');	$r->print(' '.&mt('this error').' <br />');

$r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>");	$r->print('<p>'.&mt('Or return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p>');
} else {	} else {
if ($validate_phases[$currentphase] eq 'doublebubble' \|\| $validate_phases[$currentphase] eq 'missingbubbles') {	if ($validate_phases[$currentphase] eq 'doublebubble' \|\| $validate_phases[$currentphase] eq 'missingbubbles') {
$r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' →" onclick="javascript:verify_bubble_radio(this.form)" />');	$r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' →" onclick="javascript:verify_bubble_radio(this.form)" />');
Line 6362 sub scantron_validate_file {	Line 6427 sub scantron_validate_file {

=item scantron_remove_file	=item scantron_remove_file

Removes the requested bubble sheet data file, makes sure that	Removes the requested bubblesheet data file, makes sure that
scantron_original_<filename> is never removed	scantron_original_<filename> is never removed


Line 6387 sub scantron_remove_file {	Line 6452 sub scantron_remove_file {

=item scantron_remove_scan_data	=item scantron_remove_scan_data

Removes all scan_data correction for the requested bubble sheet	Removes all scan_data correction for the requested bubblesheet
data file. (In the case that both the are doing skipped records we need	data file. (In the case that both the are doing skipped records we need
to remember the old skipped lines for the time being so that element	to remember the old skipped lines for the time being so that element
persists for a while.)	persists for a while.)
Line 6424 sub scantron_remove_scan_data {	Line 6489 sub scantron_remove_scan_data {

=item scantron_getfile	=item scantron_getfile

Fetches the requested bubble sheet data file (all 3 versions), and	Fetches the requested bubblesheet data file (all 3 versions), and
the scan_data hash	the scan_data hash

Arguments:	Arguments:
Line 6524 sub lonnet_putfile {	Line 6589 sub lonnet_putfile {

=item scantron_putfile	=item scantron_putfile

Stores the current version of the bubble sheet data files, and the	Stores the current version of the bubblesheet data files, and the
scan_data hash. (Does not modify the original version only the	scan_data hash. (Does not modify the original version only the
corrected and skipped versions.	corrected and skipped versions.

Line 6618 sub get_todo_count {	Line 6683 sub get_todo_count {

=item scantron_put_line	=item scantron_put_line

Updates the 'corrected' or 'skipped' versions of the bubble sheet	Updates the 'corrected' or 'skipped' versions of the bubblesheet
data file.	data file.

Arguments:	Arguments:
Line 6742 sub scantron_validate_ID {	Line 6807 sub scantron_validate_ID {
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();

my $nav_error;	my $nav_error;
&scantron_get_maxbubble(\$nav_error); # parse needs the bubble_lines.. array.	&scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the bubble_lines.. array.
if ($nav_error) {	if ($nav_error) {
$r->print(&navmap_errormsg());	$r->print(&navmap_errormsg());
return(1,$currentphase);	return(1,$currentphase);
Line 6807 sub scantron_get_correction {	Line 6872 sub scantron_get_correction {
#the previous one or the current one	#the previous one or the current one

if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {	if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {
$r->print("<p>".&mt("<b>An error was detected ($error)</b>".	$r->print(
" for PaperID <tt>[_1]</tt>",	'<p class="LC_warning">'
$$scan_record{'scantron.PaperID'})."</p> \n");	.&mt('An error was detected ([_1]) for PaperID [_2]',
	"<b>$error</b>",
	'<tt>'.$$scan_record{'scantron.PaperID'}.'</tt>')
	."</p> \n");
} else {	} else {
$r->print("<p>".&mt("<b>An error was detected ($error)</b>".	$r->print(
" in scanline [_1] <pre>[_2]</pre>",	'<p class="LC_warning">'
$i,$line)."</p> \n");	.&mt('An error was detected ([_1]) in scanline [_2] [_3]',
}	"<b>$error</b>", $i, "<pre>$line</pre>")
my $message="<p>".&mt("The ID on the form is <tt>[_1]</tt><br />".	."</p> \n");
"The name on the paper is [_2],[_3]",	}
$$scan_record{'scantron.ID'},	my $message =
$$scan_record{'scantron.LastName'},	'<p>'
$$scan_record{'scantron.FirstName'})."</p>";	.&mt('The ID on the form is [_1]',
	"<tt>$$scan_record{'scantron.ID'}</tt>")
	.'<br />'
	.&mt('The name on the paper is [_2], [_3]',
	$$scan_record{'scantron.LastName'},
	$$scan_record{'scantron.FirstName'})
	.'</p>';

$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");	$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");	$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");
Line 6829 sub scantron_get_correction {	Line 6903 sub scantron_get_correction {

if ($error =~ /ID$/) {	if ($error =~ /ID$/) {
if ($error eq 'incorrectID') {	if ($error eq 'incorrectID') {
$r->print("<p>".&mt("The encoded ID is not in the classlist").	$r->print('<p class="LC_warning">'.&mt("The encoded ID is not in the classlist").
"</p>\n");	"</p>\n");
} elsif ($error eq 'duplicateID') {	} elsif ($error eq 'duplicateID') {
$r->print("<p>".&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");	$r->print('<p class="LC_warning">'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");
}	}
$r->print($message);	$r->print($message);
$r->print("<p>".&mt("How should I handle this?")." <br /> \n");	$r->print("<p>".&mt("How should I handle this?")." <br /> \n");
Line 6848 sub scantron_get_correction {	Line 6922 sub scantron_get_correction {
$r->print('</li>');	$r->print('</li>');
} elsif ($error =~ /CODE$/) {	} elsif ($error =~ /CODE$/) {
if ($error eq 'incorrectCODE') {	if ($error eq 'incorrectCODE') {
$r->print("<p>".&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n");	$r->print('<p class="LC_warning">'.&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n");
} elsif ($error eq 'duplicateCODE') {	} elsif ($error eq 'duplicateCODE') {
$r->print("<p>".&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n");	$r->print('<p class="LC_warning">'.&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n");
}	}
$r->print("<p>".&mt("The CODE on the form is <tt>'[_1]'</tt>",	$r->print("<p>".&mt('The CODE on the form is [_1]',
$$scan_record{'scantron.CODE'})."<br />\n");	"<tt>'$$scan_record{'scantron.CODE'}'</tt>")
	."</p>\n");
$r->print($message);	$r->print($message);
$r->print("<p>".&mt("How should I handle this?")." <br /> \n");	$r->print("<p>".&mt("How should I handle this?")."</p>\n");
$r->print("\n<br /> ");	$r->print("\n<br /> ");
my $i=0;	my $i=0;
if ($error eq 'incorrectCODE'	if ($error eq 'incorrectCODE'
Line 6882 sub scantron_get_correction {	Line 6957 sub scantron_get_correction {
$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 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>");
$r->print("\n<br />");	$r->print("\n<br />");
Line 6920 ENDSCRIPT	Line 6995 ENDSCRIPT
"</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />"));	"</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />"));
$r->print("\n<br /><br />");	$r->print("\n<br /><br />");
} elsif ($error eq 'doublebubble') {	} elsif ($error eq 'doublebubble') {
$r->print("<p>".&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n");	$r->print('<p class="LC_warning">'.&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n");

# The form field scantron_questions is acutally a list of line numbers.	# The form field scantron_questions is acutally a list of line numbers.
# represented by this form so:	# represented by this form so:
Line 6938 ENDSCRIPT	Line 7013 ENDSCRIPT
}	}
$r->print(&verify_bubbles_checked(@lines_to_correct));	$r->print(&verify_bubbles_checked(@lines_to_correct));
} elsif ($error eq 'missingbubble') {	} elsif ($error eq 'missingbubble') {
$r->print("<p>".&mt("There have been <b>no</b> bubbles scanned for some question(s)")."</p>\n");	$r->print('<p class="LC_warning">'.&mt("There have been [_1]no[_2] bubbles scanned for some question(s)",'<b>','</b>')."</p>\n");
$r->print($message);	$r->print($message);
$r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");	$r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");
$r->print(&mt("Some questions have no scanned bubbles.")."\n");	$r->print(&mt("Some questions have no scanned bubbles.")."\n");
Line 7141 sub scantron_bubble_selector {	Line 7216 sub scantron_bubble_selector {
my $max=$$scan_config{'Qlength'};	my $max=$$scan_config{'Qlength'};

my $scmode=$$scan_config{'Qon'};	my $scmode=$$scan_config{'Qon'};
if ($scmode eq 'number' \|\| $scmode eq 'letter') { $max=10; }	if ($scmode eq 'number' \|\| $scmode eq 'letter') {
	if (($$scan_config{'BubblesPerRow'} =~ /^\d+$/) &&
	($$scan_config{'BubblesPerRow'} > 0)) {
	$max=$$scan_config{'BubblesPerRow'};
	if (($scmode eq 'number') && ($max > 10)) {
	$max = 10;
	} elsif (($scmode eq 'letter') && $max > 26) {
	$max = 26;
	}
	} else {
	$max = 10;
	}
	}

my @alphabet=('A'..'Z');	my @alphabet=('A'..'Z');
$r->print(&Apache::loncommon::start_data_table().	$r->print(&Apache::loncommon::start_data_table().
Line 7296 sub scantron_validate_CODE {	Line 7383 sub scantron_validate_CODE {
my %allcodes=&get_codes();	my %allcodes=&get_codes();

my $nav_error;	my $nav_error;
&scantron_get_maxbubble(\$nav_error); # parse needs the lines per response array.	&scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the lines per response array.
if ($nav_error) {	if ($nav_error) {
$r->print(&navmap_errormsg());	$r->print(&navmap_errormsg());
return(1,$currentphase);	return(1,$currentphase);
Line 7355 sub scantron_validate_doublebubble {	Line 7442 sub scantron_validate_doublebubble {
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
my $nav_error;	my $nav_error;
&scantron_get_maxbubble(\$nav_error); # parse needs the bubble line array.	&scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the bubble line array.
if ($nav_error) {	if ($nav_error) {
$r->print(&navmap_errormsg());	$r->print(&navmap_errormsg());
return(1,$currentphase);	return(1,$currentphase);
Line 7377 sub scantron_validate_doublebubble {	Line 7464 sub scantron_validate_doublebubble {


sub scantron_get_maxbubble {	sub scantron_get_maxbubble {
my ($nav_error) = @_;	my ($nav_error,$scantron_config) = @_;
if (defined($env{'form.scantron_maxbubble'}) &&	if (defined($env{'form.scantron_maxbubble'}) &&
$env{'form.scantron_maxbubble'}) {	$env{'form.scantron_maxbubble'}) {
&restore_bubble_lines();	&restore_bubble_lines();
Line 7396 sub scantron_get_maxbubble {	Line 7483 sub scantron_get_maxbubble {
}	}
my $map=$navmap->getResourceByUrl($sequence);	my $map=$navmap->getResourceByUrl($sequence);
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
	my $bubbles_per_row = &bubblesheet_bubbles_per_row($scantron_config);

&Apache::lonxml::clear_problem_counter();	&Apache::lonxml::clear_problem_counter();

Line 7411 sub scantron_get_maxbubble {	Line 7499 sub scantron_get_maxbubble {
my $response_number = 0;	my $response_number = 0;
my $bubble_line = 0;	my $bubble_line = 0;
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom);	my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom,undef,$bubbles_per_row);
if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {	if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
foreach my $part_id (@{$parts}) {	foreach my $part_id (@{$parts}) {
my $lines;	my $lines;
Line 7440 sub scantron_get_maxbubble {	Line 7528 sub scantron_get_maxbubble {
if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') {	if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') {
$numshown = scalar(@{$analysis->{$part_id.'.shown'}});	$numshown = scalar(@{$analysis->{$part_id.'.shown'}});
}	}
my $bubbles_per_line = 10;	my $bubbles_per_row =
my $inner_bubble_lines = int($numbub/$bubbles_per_line);	&bubblesheet_bubbles_per_row($scantron_config);
if (($numbub % $bubbles_per_line) != 0) {	my $inner_bubble_lines = int($numbub/$bubbles_per_row);
	if (($numbub % $bubbles_per_row) != 0) {
$inner_bubble_lines++;	$inner_bubble_lines++;
}	}
for (my $i=0; $i<$numshown; $i++) {	for (my $i=0; $i<$numshown; $i++) {
Line 7453 sub scantron_get_maxbubble {	Line 7542 sub scantron_get_maxbubble {
$lines = $numshown * $inner_bubble_lines;	$lines = $numshown * $inner_bubble_lines;
} else {	} else {
$lines = $analysis->{"$part_id.bubble_lines"};	$lines = $analysis->{"$part_id.bubble_lines"};
}	}

$first_bubble_line{$response_number} = $bubble_line;	$first_bubble_line{$response_number} = $bubble_line;
$bubble_lines_per_response{$response_number} = $lines;	$bubble_lines_per_response{$response_number} = $lines;
Line 7474 sub scantron_get_maxbubble {	Line 7563 sub scantron_get_maxbubble {
return $env{'form.scantron_maxbubble'};	return $env{'form.scantron_maxbubble'};
}	}

	sub bubblesheet_bubbles_per_row {
	my ($scantron_config) = @_;
	my $bubbles_per_row;
	if (ref($scantron_config) eq 'HASH') {
	$bubbles_per_row = $scantron_config->{'BubblesPerRow'};
	}
	if ((!$bubbles_per_row) \|\| ($bubbles_per_row < 1)) {
	$bubbles_per_row = 10;
	}
	return $bubbles_per_row;
	}

sub scantron_validate_missingbubbles {	sub scantron_validate_missingbubbles {
my ($r,$currentphase) = @_;	my ($r,$currentphase) = @_;
#get student info	#get student info
Line 7484 sub scantron_validate_missingbubbles {	Line 7585 sub scantron_validate_missingbubbles {
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
my $nav_error;	my $nav_error;
my $max_bubble=&scantron_get_maxbubble(\$nav_error);	my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config);
if ($nav_error) {	if ($nav_error) {
return(1,$currentphase);	return(1,$currentphase);
}	}
Line 7542 sub scantron_process_students {	Line 7643 sub scantron_process_students {
my $default_form_data=&defaultFormData($symb);	my $default_form_data=&defaultFormData($symb);

my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
	my $bubbles_per_row =
	&bubblesheet_bubbles_per_row(\%scantron_config);
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&username_to_idmap($classlist);	my %idmap=&username_to_idmap($classlist);
Line 7554 sub scantron_process_students {	Line 7657 sub scantron_process_students {
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
my (%grader_partids_by_symb,%grader_randomlists_by_symb);	my (%grader_partids_by_symb,%grader_randomlists_by_symb);
&graders_resources_pass(\@resources,\%grader_partids_by_symb,	&graders_resources_pass(\@resources,\%grader_partids_by_symb,
\%grader_randomlists_by_symb);	\%grader_randomlists_by_symb,$bubbles_per_row);
my $resource_error;	my $resource_error;
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my $ressymb;	my $ressymb;
Line 7566 sub scantron_process_students {	Line 7669 sub scantron_process_students {
}	}
my ($analysis,$parts) =	my ($analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},	&scantron_partids_tograde($resource,$env{'request.course.id'},
$env{'user.name'},$env{'user.domain'},1);	$env{'user.name'},$env{'user.domain'},1,$bubbles_per_row);
$grader_partids_by_symb{$ressymb} = $parts;	$grader_partids_by_symb{$ressymb} = $parts;
if (ref($analysis) eq 'HASH') {	if (ref($analysis) eq 'HASH') {
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {	if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {
Line 7604 SCANTRONFORM	Line 7707 SCANTRONFORM
my $started;	my $started;

my $nav_error;	my $nav_error;
&scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.	&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse.
if ($nav_error) {	if ($nav_error) {
$r->print(&navmap_errormsg());	$r->print(&navmap_errormsg());
return '';	return '';
Line 7660 SCANTRONFORM	Line 7763 SCANTRONFORM
if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|	if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {	(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
my ($analysis,$parts) =	my ($analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom);	&scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom,undef,$bubbles_per_row);
$partids_by_symb{$ressymb} = $parts;	$partids_by_symb{$ressymb} = $parts;
} else {	} else {
$partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb};	$partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb};
Line 7689 SCANTRONFORM	Line 7792 SCANTRONFORM
}	}

if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,	if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
\@resources,\%partids_by_symb) eq 'ssi_error') {	\@resources,\%partids_by_symb,
	$bubbles_per_row) eq 'ssi_error') {
$ssi_error = 0; # So end of handler error message does not trigger.	$ssi_error = 0; # So end of handler error message does not trigger.
$r->print("</form>");	$r->print("</form>");
&ssi_print_error($r);	&ssi_print_error($r);
Line 7716 SCANTRONFORM	Line 7820 SCANTRONFORM
if ($studentrecord ne $studentdata) {	if ($studentrecord ne $studentdata) {
&Apache::lonxml::clear_problem_counter();	&Apache::lonxml::clear_problem_counter();
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,	if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
\@resources,\%partids_by_symb) eq 'ssi_error') {	\@resources,\%partids_by_symb,
	$bubbles_per_row) eq 'ssi_error') {
$ssi_error = 0; # So end of handler error message does not trigger.	$ssi_error = 0; # So end of handler error message does not trigger.
$r->print("</form>");	$r->print("</form>");
&ssi_print_error($r);	&ssi_print_error($r);
Line 7735 SCANTRONFORM	Line 7840 SCANTRONFORM
$studentrecord .= $recording;	$studentrecord .= $recording;
}	}
if ($studentrecord ne $studentdata) {	if ($studentrecord ne $studentdata) {
$r->print('<p><span class="LC_error">');	$r->print('<p><span class="LC_warning">');
if ($scancode eq '') {	if ($scancode eq '') {
$r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2].',	$r->print(&mt('Mismatch grading bubblesheet for user: [_1] with ID: [_2].',
$uname.':'.$udom,$scan_record->{'scantron.ID'}));	$uname.':'.$udom,$scan_record->{'scantron.ID'}));
} else {	} else {
$r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2] and CODE: [_3].',	$r->print(&mt('Mismatch grading bubblesheet for user: [_1] with ID: [_2] and CODE: [_3].',
$uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode));	$uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode));
}	}
$r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n".	$r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n".
Line 7748 SCANTRONFORM	Line 7853 SCANTRONFORM
'<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'.	'<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'.
&Apache::loncommon::end_data_table_header_row()."\n".	&Apache::loncommon::end_data_table_header_row()."\n".
&Apache::loncommon::start_data_table_row().	&Apache::loncommon::start_data_table_row().
'<td>'.&mt('Bubble Sheet').'</td>'.	'<td>'.&mt('Bubblesheet').'</td>'.
'<td><span class="LC_nobreak">'.$studentdata.'</span></td>'.	'<td><span class="LC_nobreak"><tt>'.$studentdata.'</tt></span></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>Stored submissions</td>'.	'<td>'.&mt('Stored submissions').'</td>'.
'<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n".	'<td><span class="LC_nobreak"><tt>'.$studentrecord.'</tt></span></td>'."\n".
&Apache::loncommon::end_data_table_row().	&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table().'</p>');	&Apache::loncommon::end_data_table().'</p>');
} else {	} else {
Line 7779 SCANTRONFORM	Line 7884 SCANTRONFORM
}	}

sub graders_resources_pass {	sub graders_resources_pass {
my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb) = @_;	my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb,
	$bubbles_per_row) = @_;
if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) &&	if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) &&
(ref($grader_randomlists_by_symb) eq 'HASH')) {	(ref($grader_randomlists_by_symb) eq 'HASH')) {
foreach my $resource (@{$resources}) {	foreach my $resource (@{$resources}) {
my $ressymb = $resource->symb();	my $ressymb = $resource->symb();
my ($analysis,$parts) =	my ($analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},	&scantron_partids_tograde($resource,$env{'request.course.id'},
$env{'user.name'},$env{'user.domain'},1);	$env{'user.name'},$env{'user.domain'},1,$bubbles_per_row);
$grader_partids_by_symb->{$ressymb} = $parts;	$grader_partids_by_symb->{$ressymb} = $parts;
if (ref($analysis) eq 'HASH') {	if (ref($analysis) eq 'HASH') {
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {	if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {
Line 7800 sub graders_resources_pass {	Line 7906 sub graders_resources_pass {
}	}

sub grade_student_bubbles {	sub grade_student_bubbles {
my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts) = @_;	my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts,$bubbles_per_row) = @_;
	# Walk folder as student here to get resources in order student sees.
if (ref($resources) eq 'ARRAY') {	if (ref($resources) eq 'ARRAY') {
my $count = 0;	my $count = 0;
foreach my $resource (@{$resources}) {	foreach my $resource (@{$resources}) {
Line 7813 sub grade_student_bubbles {	Line 7920 sub grade_student_bubbles {
'grade_symb' => $ressymb,	'grade_symb' => $ressymb,
'CODE' => $scancode	'CODE' => $scancode
);	);
	if ($bubbles_per_row ne '') {
	$form{'bubbles_per_row'} = $bubbles_per_row;
	}
if (ref($parts) eq 'HASH') {	if (ref($parts) eq 'HASH') {
if (ref($parts->{$ressymb}) eq 'ARRAY') {	if (ref($parts->{$ressymb}) eq 'ARRAY') {
foreach my $part (@{$parts->{$ressymb}}) {	foreach my $part (@{$parts->{$ressymb}}) {
Line 7872 sub scantron_upload_scantron_data {	Line 7982 sub scantron_upload_scantron_data {

'));	'));
$r->print('	$r->print('
<h3>'.&mt('Send scanned bubblesheet data to a course').'</h3>	<h3>'.&mt('Send 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.
Line 8088 sub checkscantron_results {	Line 8198 sub checkscantron_results {
my %record;	my %record;
my %scantron_config =	my %scantron_config =
&Apache::grades::get_scantron_config($env{'form.scantron_format'});	&Apache::grades::get_scantron_config($env{'form.scantron_format'});
	my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();	my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&Apache::grades::username_to_idmap($classlist);	my %idmap=&Apache::grades::username_to_idmap($classlist);
Line 8115 sub checkscantron_results {	Line 8226 sub checkscantron_results {
'inline',undef,'checkscantron');	'inline',undef,'checkscantron');
my ($username,$domain,$started);	my ($username,$domain,$started);
my $nav_error;	my $nav_error;
&scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.	&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse.
if ($nav_error) {	if ($nav_error) {
$r->print(&navmap_errormsg());	$r->print(&navmap_errormsg());
return '';	return '';
Line 8165 sub checkscantron_results {	Line 8276 sub checkscantron_results {
if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|	if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {	(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
(my $analysis,$parts) =	(my $analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain);	&scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain,undef,$bubbles_per_row);
} else {	} else {
$parts = $grader_partids_by_symb{$ressymb};	$parts = $grader_partids_by_symb{$ressymb};
}	}
Line 8210 sub checkscantron_results {	Line 8321 sub checkscantron_results {
}	}
}	}
}	}
$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('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).',
	'<b>',
	$numstudents,
	'</b>',
	$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 bubblesheet 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 />');
Line 8418 sub grading_menu {	Line 8537 sub grading_menu {
{ linktext => 'Select individual students to grade',	{ linktext => 'Select individual students to grade',
url => $url1a,	url => $url1a,
permission => 'F',	permission => 'F',
icon => 'edit-find-replace.png',	icon => 'grade_students.png',
linktitle => 'Grade current resource for a selection of students.'	linktitle => 'Grade current resource for a selection of students.'
},	},
{ linktext => 'Grade ungraded submissions.',	{ linktext => 'Grade ungraded submissions.',
url => $url1b,	url => $url1b,
permission => 'F',	permission => 'F',
icon => 'edit-find-replace.png',	icon => 'ungrade_sub.png',
linktitle => 'Grade all submissions that have not been graded yet.'	linktitle => 'Grade all submissions that have not been graded yet.'
},	},

{ linktext => 'Grading table',	{ linktext => 'Grading table',
url => $url1c,	url => $url1c,
permission => 'F',	permission => 'F',
icon => 'edit-find-replace.png',	icon => 'grading_table.png',
linktitle => 'Grade current resource for all students.'	linktitle => 'Grade current resource for all students.'
},	},
{ linktext => 'Grade page/folder for one student',	{ linktext => 'Grade page/folder for one student',
url => $url1d,	url => $url1d,
permission => 'F',	permission => 'F',
icon => 'edit-find-replace.png',	icon => 'grade_PageFolder.png',
linktitle => 'Grade all resources in current page/sequence/folder for one student.'	linktitle => 'Grade all resources in current page/sequence/folder for one student.'
},	},
{ linktext => 'Download submissions',	{ linktext => 'Download submissions',
url => $url1e,	url => $url1e,
permission => 'F',	permission => 'F',
icon => 'edit-find-replace.png',	icon => 'download_sub.png',
linktitle => 'Download all students submissions.'	linktitle => 'Download all students submissions.'
}]},	}]},
{ categorytitle=>'Automated Grading',	{ categorytitle=>'Automated Grading',
Line 8464 sub grading_menu {	Line 8583 sub grading_menu {
{ linktext => 'Grade/Manage/Review Bubblesheets',	{ linktext => 'Grade/Manage/Review Bubblesheets',
url => $url4,	url => $url4,
permission => 'F',	permission => 'F',
icon => 'stat.png',	icon => 'bubblesheet.png',
linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'	linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.'
},	},
{ linktext => 'Verify Receipt Number',	{ linktext => 'Verify Receipt Number',
url => $url5,	url => $url5,
permission => 'F',	permission => 'F',
icon => 'edit-find-replace.png',	icon => 'receipt_number.png',
linktitle => 'Verify a system-generated receipt number for correct problem solution.'	linktitle => 'Verify a system-generated receipt number for correct problem solution.'
}	}

Line 8501 sub submit_options_sequence {	Line 8620 sub submit_options_sequence {

$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".	$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
$result.='	$result.=&selectfield(0).
<h2>
'.&mt('Grade page/folder for one student').'
</h2>'.
&selectfield(0).
'<input type="hidden" name="command" value="pickStudentPage" />	'<input type="hidden" name="command" value="pickStudentPage" />
<div>	<div>
<input type="submit" value="'.&mt('Next').' →" />	<input type="submit" value="'.&mt('Next').' →" />
Line 8524 sub submit_options_table {	Line 8639 sub submit_options_table {
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".	$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";

$result.='	$result.=&selectfield(0).
<h2>
'.&mt('Grading table').'
</h2>'.
&selectfield(0).
'<input type="hidden" name="command" value="viewgrades" />	'<input type="hidden" name="command" value="viewgrades" />
<div>	<div>
<input type="submit" value="'.&mt('Next').' →" />	<input type="submit" value="'.&mt('Next').' →" />
Line 8570 sub submit_options {	Line 8681 sub submit_options {

$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".	$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
$result.='	$result.=&selectfield(1).'
<h2>
'.&mt('Select individual students to grade').'
</h2>'.&selectfield(1).'
<input type="hidden" name="command" value="submission" />	<input type="hidden" name="command" value="submission" />
<input type="submit" value="'.&mt('Next').' →" />	<input type="submit" value="'.&mt('Next').' →" />
</div>	</div>
Line 8586 sub submit_options {	Line 8694 sub submit_options {

sub selectfield {	sub selectfield {
my ($full)=@_;	my ($full)=@_;
	my %options =
	(&Apache::lonlocal::texthash(
	'yes' => 'with submissions',
	'queued' => 'in grading queue',
	'graded' => 'with ungraded submissions',
	'incorrect' => 'with incorrect submissions',
	'all' => 'with any status'),
	'select_form_order' => ['yes','queued','graded','incorrect','all']);
my $result='<div class="LC_columnSection">	my $result='<div class="LC_columnSection">

<fieldset>	<fieldset>
Line 8614 sub selectfield {	Line 8730 sub selectfield {
<legend>	<legend>
'.&mt('Submission Status').'	'.&mt('Submission Status').'
</legend>'.	</legend>'.
&Apache::loncommon::select_form('all','submitonly',	&Apache::loncommon::select_form('all','submitonly',\%options).
(&Apache::lonlocal::texthash(
'yes' => 'with submissions',
'queued' => 'in grading queue',
'graded' => 'with ungraded submissions',
'incorrect' => 'with incorrect submissions',
'all' => 'with any status'),
'select_form_order' => ['yes','queued','graded','incorrect','all'])).
'</fieldset>';	'</fieldset>';
}	}
$result.='</div><br />';	$result.='</div><br />';
Line 8715 sub process_clicker {	Line 8824 sub process_clicker {
my ($r,$symb)=@_;	my ($r,$symb)=@_;
if (!$symb) {return '';}	if (!$symb) {return '';}
my $result=&checkforfile_js();	my $result=&checkforfile_js();
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";	$result.=&Apache::loncommon::start_data_table().
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";	&Apache::loncommon::start_data_table_header_row().
$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource.').	'<th>'.&mt('Specify a file containing clicker information and set grading options.').'</th>'.
'</b></td></tr>'."\n";	&Apache::loncommon::end_data_table_header_row().
$result.='<tr bgcolor="#ffffe6"><td>'."\n";	&Apache::loncommon::start_data_table_row()."<td>\n";
# Attempt to restore parameters from last session, set defaults if not present	# Attempt to restore parameters from last session, set defaults if not present
my %Saveable_Parameters=&clicker_grading_parameters();	my %Saveable_Parameters=&clicker_grading_parameters();
&Apache::loncommon::restore_course_settings('grades_clicker',	&Apache::loncommon::restore_course_settings('grades_clicker',
Line 8736 sub process_clicker {	Line 8845 sub process_clicker {
}	}
}	}

my $upload=&mt("Upload File");	my $upload=&mt("Evaluate File");
my $type=&mt("Type");	my $type=&mt("Type");
my $attendance=&mt("Award points just for participation");	my $attendance=&mt("Award points just for participation");
my $personnel=&mt("Correctness determined from response by course personnel");	my $personnel=&mt("Correctness determined from response by course personnel");
Line 8746 sub process_clicker {	Line 8855 sub process_clicker {
my $pcorrect=&mt("Percentage points for correct solution");	my $pcorrect=&mt("Percentage points for correct solution");
my $pincorrect=&mt("Percentage points for incorrect solution");	my $pincorrect=&mt("Percentage points for incorrect solution");
my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',	my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',
('iclicker' => 'i>clicker',	{'iclicker' => 'i>clicker',
'interwrite' => 'interwrite PRS'));	'interwrite' => 'interwrite PRS'});
$symb = &Apache::lonenc::check_encrypt($symb);	$symb = &Apache::lonenc::check_encrypt($symb);
$result.= &Apache::lonhtmlcommon::scripttag(<<ENDUPFORM);	$result.= &Apache::lonhtmlcommon::scripttag(<<ENDUPFORM);
function sanitycheck() {	function sanitycheck() {
Line 8794 ENDUPFORM	Line 8903 ENDUPFORM
<input type="hidden" name="command" value="processclickerfile" />	<input type="hidden" name="command" value="processclickerfile" />
<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>	ENDUPFORM
	$result.='</td>'.&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::start_data_table_row().'<td>'.(<<ENDGRADINGFORM);
	<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" />
Line 8802 ENDUPFORM	Line 8914 ENDUPFORM
<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'}" />
<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onchange="sanitycheck()" /></label>	ENDGRADINGFORM
	$result.='</td>'.&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::start_data_table_row().'<td>'.(<<ENDPERCFORM);
	<label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onchange="sanitycheck()" /></label>
<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onchange="sanitycheck()" /></label>	<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onchange="sanitycheck()" /></label>
<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />	<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
</form>'	</form>'
ENDUPFORM	ENDPERCFORM
$result.='</td></tr></table>'."\n".	$result.='</td>'.
'</td></tr></table><br /><br />'."\n";	&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::end_data_table();
return $result;	return $result;
}	}

Line 8832 sub process_clicker_file {	Line 8948 sub process_clicker_file {
if ($env{'form.gradingmechanism'} eq 'given') {	if ($env{'form.gradingmechanism'} eq 'given') {
$env{'form.givenanswer'}=~s/^\s*//gs;	$env{'form.givenanswer'}=~s/^\s*//gs;
$env{'form.givenanswer'}=~s/\s*$//gs;	$env{'form.givenanswer'}=~s/\s*$//gs;
$env{'form.givenanswer'}=~s/[^a-zA-Z0-9\.\*\-]+/\,/g;	$env{'form.givenanswer'}=~s/[^a-zA-Z0-9\.\*\-\+]+/\,/g;
$env{'form.givenanswer'}=uc($env{'form.givenanswer'});	$env{'form.givenanswer'}=uc($env{'form.givenanswer'});
my @answers=split(/\,/,$env{'form.givenanswer'});	my @answers=split(/\,/,$env{'form.givenanswer'});
$foundgiven=$#answers+1;	$foundgiven=$#answers+1;
Line 8888 sub process_clicker_file {	Line 9004 sub process_clicker_file {

$result.=&Apache::loncommon::studentbrowser_javascript();	$result.=&Apache::loncommon::studentbrowser_javascript();
$symb = &Apache::lonenc::check_encrypt($symb);	$symb = &Apache::lonenc::check_encrypt($symb);
my $heading=&mt('Scanning clicker file');	$result.=&Apache::loncommon::start_data_table().
$result.=(<<ENDHEADER);	&Apache::loncommon::start_data_table_header_row().
<br /><table width="100%" border="0"><tr><td bgcolor="#777777">	'<th>'.&mt('Evaluate clicker file').'</th>'.
<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>	&Apache::loncommon::end_data_table_header_row().
<b>$heading</b></td></tr><tr bgcolor=#ffffe6><td>	&Apache::loncommon::start_data_table_row().(<<ENDHEADER);
	<td>
<form method="post" action="/adm/grades" name="clickeranalysis">	<form method="post" action="/adm/grades" name="clickeranalysis">
<input type="hidden" name="symb" value="$symb" />	<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="command" value="assignclickergrades" />	<input type="hidden" name="command" value="assignclickergrades" />
Line 8940 ENDHEADER	Line 9057 ENDHEADER
} elsif ($clicker_ids{$id}) {	} elsif ($clicker_ids{$id}) {
if ($clicker_ids{$id}=~/\,/) {	if ($clicker_ids{$id}=~/\,/) {
# More than one user with the same clicker!	# More than one user with the same clicker!
$result.="\n<hr />".&mt('Clicker registered more than once').": <tt>".$id."</tt><br />";	$result.="</td>".&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::start_data_table_row()."<td>".
	&mt('Clicker registered more than once').": <tt>".$id."</tt><br />";
$result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.	$result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.
"<select name='multi".$id."'>";	"<select name='multi".$id."'>";
foreach my $reguser (sort(split(/\,/,$clicker_ids{$id}))) {	foreach my $reguser (sort(split(/\,/,$clicker_ids{$id}))) {
Line 8954 ENDHEADER	Line 9073 ENDHEADER
$student_count++;	$student_count++;
}	}
} else {	} else {
$result.="\n<hr />".&mt('Unregistered Clicker')." <tt>".$id."</tt><br />";	$result.="</td>".&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::start_data_table_row()."<td>".
	&mt('Unregistered Clicker')." <tt>".$id."</tt><br />";
$result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.	$result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.
"\n".&mt("Username").": <input type='text' name='uname".$id."' /> ".	"\n".&mt("Username").": <input type='text' name='uname".$id."' /> ".
"\n".&mt("Domain").": ".	"\n".&mt("Domain").": ".
&Apache::loncommon::select_dom_form($env{'course.'.$env{'request.course.id'}.'.domain'},'udom'.$id).' '.	&Apache::loncommon::select_dom_form($env{'course.'.$env{'request.course.id'}.'.domain'},'udom'.$id).' '.
&Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id);	&Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id,0,$id);
$unknown_count++;	$unknown_count++;
}	}
}	}
Line 8980 ENDHEADER	Line 9101 ENDHEADER
} else {	} else {
$result.='<br /><input type="submit" name="finalize" value="'.&mt('Finalize Grading').'" />';	$result.='<br /><input type="submit" name="finalize" value="'.&mt('Finalize Grading').'" />';
}	}
$result.='</form></td></tr></table>'."\n".	$result.='</form></td>'.
'</td></tr></table><br /><br />'."\n";	&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::end_data_table();
return $result;	return $result;
}	}

Line 9004 sub iclicker_eval {	Line 9126 sub iclicker_eval {
$id=~s/^[\#0]+//;	$id=~s/^[\#0]+//;
for (my $i=0;$i<$number;$i++) {	for (my $i=0;$i<$number;$i++) {
my $idx=3+$i*6;	my $idx=3+$i*6;
	$entries[$idx]=~s/[^a-zA-Z0-9\.\*\-\+]+//g;
push(@idresponses,$entries[$idx]);	push(@idresponses,$entries[$idx]);
}	}
$$responses{$id}=join(',',@idresponses);	$$responses{$id}=join(',',@idresponses);
Line 9055 sub assign_clicker_grades {	Line 9178 sub assign_clicker_grades {
# FIXME: This should probably look for the first handgradeable part	# FIXME: This should probably look for the first handgradeable part
my $part=$$partlist[0];	my $part=$$partlist[0];
# Start screen output	# Start screen output
my $result='';	my $result=&Apache::loncommon::start_data_table().
	&Apache::loncommon::start_data_table_header_row().
my $heading=&mt('Assigning grades based on clicker file');	'<th>'.&mt('Assigning grades based on clicker file').'</th>'.
$result.=(<<ENDHEADER);	&Apache::loncommon::end_data_table_header_row().
<br /><table width="100%" border="0"><tr><td bgcolor="#777777">	&Apache::loncommon::start_data_table_row().'<td>';
<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>
<b>$heading</b></td></tr><tr bgcolor=#ffffe6><td>
ENDHEADER
# Get correct result	# Get correct result
# FIXME: Possibly need delimiter other than ":"	# FIXME: Possibly need delimiter other than ":"
my @correct=();	my @correct=();
Line 9078 ENDHEADER	Line 9198 ENDHEADER
$result.='<br /><span class="LC_warning">'.	$result.='<br /><span class="LC_warning">'.
&mt('More than one correct result given for question "[_1]": [_2] versus [_3].',	&mt('More than one correct result given for question "[_1]": [_2] versus [_3].',
$env{'form.question:'.$i},$correct[$i],$input[$i]).'</span>';	$env{'form.question:'.$i},$correct[$i],$input[$i]).'</span>';
} elsif ($input[$i]) {	} elsif (($input[$i]) \|\| ($input[$i] eq '0')) {
$correct[$i]=$input[$i];	$correct[$i]=$input[$i];
}	}
}	}
}	}
}	}
for (my $i=0;$i<$number;$i++) {	for (my $i=0;$i<$number;$i++) {
if (!$correct[$i]) {	if ((!$correct[$i]) && ($correct[$i] ne '0')) {
$result.='<br /><span class="LC_error">'.	$result.='<br /><span class="LC_error">'.
&mt('No correct result given for question "[_1]"!',	&mt('No correct result given for question "[_1]"!',
$env{'form.question:'.$i}).'</span>';	$env{'form.question:'.$i}).'</span>';
}	}
}	}
$result.='<br />'.&mt("Correct answer: [_1]",join(', ',map { ($_?$_:'-') } @correct));	$result.='<br />'.&mt("Correct answer: [_1]",join(', ',map { ((($_) \|\| ($_ eq '0'))?$_:'-') } @correct));
}	}
# Start grading	# Start grading
my $pcorrect=$env{'form.pcorrect'};	my $pcorrect=$env{'form.pcorrect'};
my $pincorrect=$env{'form.pincorrect'};	my $pincorrect=$env{'form.pincorrect'};
my $storecount=0;	my $storecount=0;
	my %users=();
foreach my $key (keys(%env)) {	foreach my $key (keys(%env)) {
my $user='';	my $user='';
if ($key=~/^form\.student\:(.*)$/) {	if ($key=~/^form\.student\:(.*)$/) {
Line 9110 ENDHEADER	Line 9231 ENDHEADER
$user=$env{'form.multi'.$id};	$user=$env{'form.multi'.$id};
}	}
}	}
if ($user) {	if ($user) {
	if ($users{$user}) {
	$result.='<br /><span class="LC_warning">'.
	&mt("More than one entry found for <tt>[_1]</tt>!",$user).
	'</span><br />';
	}
	$users{$user}=1;
my @answer=split(/\,/,$env{$key});	my @answer=split(/\,/,$env{$key});
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 ($correct[$i] eq '-') {	if ($correct[$i] eq '-') {
$realnumber--;	$realnumber--;
} elsif ($answer[$i]) {	} elsif (($answer[$i]) \|\| ($answer[$i]=~/^[0\.]+$/)) {
if ($gradingmechanism eq 'attendance') {	if ($gradingmechanism eq 'attendance') {
$sum+=$pcorrect;	$sum+=$pcorrect;
} elsif ($correct[$i] eq '*') {	} elsif ($correct[$i] eq '*') {
$sum+=$pcorrect;	$sum+=$pcorrect;
} else {	} else {
if ($answer[$i] eq $correct[$i]) {	# We actually grade if correct or not
$sum+=$pcorrect;	my $increment=$pincorrect;
} else {	# Special case: numerical answer "0"
$sum+=$pincorrect;	if ($correct[$i] eq '0') {
	if ($answer[$i]=~/^[0\.]+$/) {
	$increment=$pcorrect;
	}
	# General numerical answer, both evaluate to something non-zero
	} elsif ((1.0$correct[$i]!=0) && (1.0$answer[$i]!=0)) {
	if (1.0$correct[$i]==1.0$answer[$i]) {
	$increment=$pcorrect;
	}
	# Must be just alphanumeric
	} elsif ($answer[$i] eq $correct[$i]) {
	$increment=$pcorrect;
}	}
	$sum+=$increment;
}	}
}	}
}	}
Line 9150 ENDHEADER	Line 9289 ENDHEADER
}	}
# We are done	# We are done
$result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount).	$result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount).
'</td></tr></table>'."\n".	'</td>'.
'</td></tr></table><br /><br />'."\n";	&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::end_data_table();
return $result;	return $result;
}	}

Line 9167 sub startpage {	Line 9307 sub startpage {
unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});	unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});
$r->print(&Apache::loncommon::start_page('Grading',undef,	$r->print(&Apache::loncommon::start_page('Grading',undef,
{'bread_crumbs' => $crumbs}));	{'bread_crumbs' => $crumbs}));
	&Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading'));
unless ($nodisplayflag) {	unless ($nodisplayflag) {
$r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag));	$r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag));
}	}
Line 9174 sub startpage {	Line 9315 sub startpage {

sub select_problem {	sub select_problem {
my ($r)=@_;	my ($r)=@_;
$r->print('<h2>'.&mt('Select the problem or one of the problems you want to grade').'</h2><form action="/adm/grades">');	$r->print('<h3>'.&mt('Select the problem or one of the problems you want to grade').'</h3><form action="/adm/grades">');
$r->print(&Apache::lonstathelpers::problem_selector('.',undef,1));	$r->print(&Apache::lonstathelpers::problem_selector('.',undef,1));
$r->print('<input type="hidden" name="command" value="gradingmenu" />');	$r->print('<input type="hidden" name="command" value="gradingmenu" />');
$r->print('<input type="submit" value="'.&mt('Next').' →" /></form>');	$r->print('<input type="submit" value="'.&mt('Next').' →" /></form>');
Line 9183 sub select_problem {	Line 9324 sub select_problem {
sub handler {	sub handler {
my $request=$_[0];	my $request=$_[0];
&reset_caches();	&reset_caches();
if ($env{'browser.mathml'}) {	if ($request->header_only) {
&Apache::loncommon::content_type($request,'text/xml');	&Apache::loncommon::content_type($request,'text/html');
} else {	$request->send_http_header;
&Apache::loncommon::content_type($request,'text/html');	return OK;
}	}
$request->send_http_header;
return '' if $request->header_only;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});

	&init_perm();
	if (!$env{'request.course.id'}) {
	# Not in a course.
	$env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";
	return HTTP_NOT_ACCEPTABLE;
	} elsif (!%perm) {
	$request->internal_redirect('/adm/quickgrades');
	}
	&Apache::loncommon::content_type($request,'text/html');
	$request->send_http_header;


# see what command we need to execute	# see what command we need to execute

my @commands=&Apache::loncommon::get_env_multiple('form.command');	my @commands=&Apache::loncommon::get_env_multiple('form.command');
Line 9208 sub handler {	Line 9359 sub handler {
(my $url=$env{'form.url'}) =~ s-^https*://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;	(my $url=$env{'form.url'}) =~ s-^https*://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;
$symb=&Apache::lonnet::symbread($url);	$symb=&Apache::lonnet::symbread($url);
}	}
&Apache::lonenc::check_decrypt(\$symb);	&Apache::lonenc::check_decrypt(\$symb);

$ssi_error = 0;	$ssi_error = 0;
if ($symb eq '' \|\| $command eq '') {	if (($symb eq '' \|\| $command eq '') && ($env{'request.course.id'})) {
#	#
# Not called from a resource	# Not called from a resource, but inside a course
#	#
&startpage($request,undef,[],1,1);	&startpage($request,undef,[],1,1);
&select_problem($request);	&select_problem($request);
} else {	} else {
&init_perm();
if ($command eq 'submission' && $perm{'vgr'}) {	if ($command eq 'submission' && $perm{'vgr'}) {
&startpage($request,$symb,[{href=>"", text=>"Student Submissions"}]);	&startpage($request,$symb,[{href=>"", text=>"Student Submissions"}]);
($env{'form.student'} eq '' ? &listStudents($request,$symb) : &submission($request,0,0,$symb));	($env{'form.student'} eq '' ? &listStudents($request,$symb) : &submission($request,0,0,$symb));
Line 9359 sub handler {	Line 9509 sub handler {
if ($ssi_error) {	if ($ssi_error) {
&ssi_print_error($request);	&ssi_print_error($request);
}	}
	&Apache::lonquickgrades::endGradeScreen($request);
$request->print(&Apache::loncommon::end_page());	$request->print(&Apache::loncommon::end_page());
&reset_caches();	&reset_caches();
return '';	return OK;
}	}

1;	1;
Line 9465 ssi_with_retries()	Line 9616 ssi_with_retries()
calling routine should trap the error condition and display the warning	calling routine should trap the error condition and display the warning
found in &navmap_errormsg().	found in &navmap_errormsg().

	$scantron_config - Reference to bubblesheet format configuration hash.

Returns the maximum number of bubble lines that are expected to	Returns the maximum number of bubble lines that are expected to
occur. Does this by walking the selected sequence rendering the	occur. Does this by walking the selected sequence rendering the
resource and then checking &Apache::lonxml::get_problem_counter()	resource and then checking &Apache::lonxml::get_problem_counter()
Line 9488 ssi_with_retries()	Line 9641 ssi_with_retries()

=item scantron_process_students() :	=item scantron_process_students() :

Routine that does the actual grading of the bubble sheet information.	Routine that does the actual grading of the bubblesheet information.

The parsed scanline hash is added to %env	The parsed scanline hash is added to %env

Line 9508 ssi_with_retries()	Line 9661 ssi_with_retries()

=item scantron_upload_scantron_data() :	=item scantron_upload_scantron_data() :

Creates the screen for adding a new bubble sheet data file to a course.	Creates the screen for adding a new bubblesheet data file to a course.

=item scantron_upload_scantron_data_save() :	=item scantron_upload_scantron_data_save() :

Line 9522 ssi_with_retries()	Line 9675 ssi_with_retries()
=item scantron_download_scantron_data() :	=item scantron_download_scantron_data() :

Shows a list of the three internal files (original, corrected,	Shows a list of the three internal files (original, corrected,
skipped) for a specific bubble sheet data file that exists in the	skipped) for a specific bubblesheet data file that exists in the
course.	course.

=item scantron_validate_ID() :	=item scantron_validate_ID() :

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

Removed from v.1.631
changed lines
	Added in v.1.661