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.596.2.2 and 1.596.2.12.2.7

version 1.596.2.2, 2010/12/20 04:23:43	version 1.596.2.12.2.7, 2012/05/02 17:57:25
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::bridgetask();
use String::Similarity;	use String::Similarity;
use LONCAPA;	use LONCAPA;

Line 123 sub getpartlist {	Line 124 sub getpartlist {
# --- Get the symbolic name of a problem and the url	# --- Get the symbolic name of a problem and the url
sub get_symb {	sub get_symb {
my ($request,$silent) = @_;	my ($request,$silent) = @_;
(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;	my $symb=$env{'form.symb'};
my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));	unless ($symb) {
if ($symb eq '') {	(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;
if (!$silent) {	$symb = &Apache::lonnet::symbread($url);
$request->print("Unable to handle ambiguous references:$url:.");	if ($symb eq '') {
return ();	if (!$silent) {
}	$request->print(&mt("Unable to handle ambiguous references: [_1].",$url));
	return ();
	}
	}
}	}
&Apache::lonenc::check_decrypt(\$symb);	&Apache::lonenc::check_decrypt(\$symb);
return ($symb);	return ($symb);
Line 271 sub reset_caches {	Line 275 sub reset_caches {
}	}

sub get_analyze {	sub get_analyze {
my ($symb,$uname,$udom,$no_increment,$add_to_hash,$type,$trial,$rndseed)=@_;	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 ($type eq 'randomizetry') {
if ($trial ne '') {	if ($trial ne '') {
Line 305 sub reset_caches {	Line 309 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') {	if ($type eq 'randomizetry') {
$form{'grade_questiontype'} = $type;	$form{'grade_questiontype'} = $type;
if ($rndseed ne '') {	if ($rndseed ne '') {
Line 345 sub reset_caches {	Line 352 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 353 sub reset_caches {	Line 360 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 415 sub cleanRecord {	Line 424 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);
Line 436 sub cleanRecord {	Line 445 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 '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 745 sub most_similar {	Line 754 sub most_similar {

# ignore empty submissions (occuring when only files are sent)	# ignore empty submissions (occuring when only files are sent)

unless ($uessay=~/\w+/) { return ''; }	unless ($uessay=~/\w+/s) { return ''; }

# these will be returned. Do not care if not at least 50 percent similar	# these will be returned. Do not care if not at least 50 percent similar
my $limit=0.6;	my $limit=0.6;
Line 1488 INNERJS	Line 1497 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(<<SUBJAVASCRIPT);	$request->print(<<SUBJAVASCRIPT);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">

//===================== 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 1521 INNERJS	Line 1546 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 1588 INNERJS	Line 1613 INNERJS

function savedMsgHeader(Nmsg,usrctr,fullname) {	function savedMsgHeader(Nmsg,usrctr,fullname) {
var height = 70*Nmsg+250;	var height = 70*Nmsg+250;
var scrollbar = "no";
if (height > 600) {	if (height > 600) {
height = 600;	height = 600;
scrollbar = "yes";
}	}
var xpos = (screen.width-600)/2;	var xpos = (screen.width-600)/2;
xpos = (xpos < 0) ? '0' : xpos;	xpos = (xpos < 0) ? '0' : xpos;
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=yes,screenx='+xpos+',screeny='+ypos+',width=700,height='+height);
pWin.focus();	pWin.focus();
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.$docopen;	pDoc.$docopen;
Line 1606 INNERJS	Line 1629 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 1631 INNERJS	Line 1654 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 1640 INNERJS	Line 1663 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 1691 INNERJS	Line 1714 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 1714 INNERJS	Line 1737 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 1808 sub gradeBox {	Line 1831 sub gradeBox {
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";	$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";


#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
$result .=	$result .=
'<td>'.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';	'<td>'.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';
$result.=&Apache::loncommon::end_data_table_row();	$result.=&Apache::loncommon::end_data_table_row();
Line 1832 sub handback_box {	Line 1854 sub handback_box {
my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_;	my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_;
my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);	my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
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 1844 sub handback_box {	Line 1866 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 1854 sub handback_box {	Line 1877 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 1891 sub show_problem {	Line 1917 sub show_problem {
$companswer=~s\|</form>\|\|g;	$companswer=~s\|</form>\|\|g;
$companswer=~s\|name="submit"\|name="would_have_been_submit"\|g;	$companswer=~s\|name="submit"\|name="would_have_been_submit"\|g;
}	}
	my $renderheading = &mt('View of the problem');
	my $answerheading = &mt('Correct answer');
	if (($uname ne $env{'user.name'}) \|\| ($udom ne $env{'user.domain'})) {
	my $stu_fullname = $env{'form.fullname'};
	if ($stu_fullname eq '') {
	$stu_fullname = &Apache::loncommon::plainname($uname,$udom,'lastname');
	}
	my $forwhom = &nameUserString(undef,$stu_fullname,$uname,$udom);
	if ($forwhom ne '') {
	$renderheading = &mt('View of the problem for[_1]',$forwhom);
	$answerheading = &mt('Correct answer for[_1]',$forwhom);
	}
	}
$rendered=	$rendered=
'<div class="LC_Box">'	'<div class="LC_Box">'
.'<h3 class="LC_hcell">'.&mt('View of the problem').'</h3>'	.'<h3 class="LC_hcell">'.$renderheading.'</h3>'
.$rendered	.$rendered
.'</div>';	.'</div>';
$companswer=	$companswer=
'<div class="LC_Box">'	'<div class="LC_Box">'
.'<h3 class="LC_hcell">'.&mt('Correct answer').'</h3>'	.'<h3 class="LC_hcell">'.$answerheading.'</h3>'
.$companswer	.$companswer
.'</div>';	.'</div>';
my $result;	my $result;
Line 1969 sub submission {	Line 2008 sub submission {
$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?	$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});	my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';	$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
my $symb = &get_symb($request);	my ($symb) = &get_symb($request);
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }	if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }

if (!&canview($usec)) {	if (!&canview($usec)) {
Line 2080 sub submission {	Line 2119 sub submission {
$request->print($prnmsg);	$request->print($prnmsg);

if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') {	if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') {

	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>	<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 2215 KEYWORDS	Line 2261 KEYWORDS
$lastsubonly.="\n".'<div class="LC_grade_submission_part">'.	$lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
'<b>'.&mt('Part: [_1]',$display_part).'</b>'.	'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' <span class="LC_internal_info">'.	' <span class="LC_internal_info">'.
'('.&mt('Part ID: [_1]',$respid).')</b>'.	'('.&mt('Response ID: [_1]',$respid).')'.
'</span>   '.	'</span>   '.
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';	'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
next;	next;
Line 2267 KEYWORDS	Line 2313 KEYWORDS
$lastsubonly.='<div class="LC_grade_submission_part">'.	$lastsubonly.='<div class="LC_grade_submission_part">'.
'<b>'.&mt('Part: [_1]',$display_part).'</b>'.	'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' <span class="LC_internal_info">'.	' <span class="LC_internal_info">'.
'('.&mt('Part ID: [_1]',$respid).')'.	'('.&mt('Response ID: [_1]',$respid).')'.
'</b></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 eq 'anon') {	if ($hide eq 'anon') {
Line 2437 sub check_collaborators {	Line 2483 sub check_collaborators {
next if ($record->{'resource.'.$part.'.collaborators'} eq '');	next if ($record->{'resource.'.$part.'.collaborators'} eq '');
my (@good_collaborators, @bad_collaborators);	my (@good_collaborators, @bad_collaborators);
foreach my $possible_collaborator	foreach my $possible_collaborator
(split(/,?\s+/,$record->{'resource.'.$part.'.collaborators'})) {	(split(/[,;\s]+/,$record->{'resource.'.$part.'.collaborators'})) {
$possible_collaborator =~ s/[\$\^]//g;	$possible_collaborator =~ s/[\$\^]//g;
next if ($possible_collaborator eq '');	next if ($possible_collaborator eq '');
my ($co_name,$co_dom) = split(/\@\|:/,$possible_collaborator);	my ($co_name,$co_dom) = split(/:/,$possible_collaborator);
$co_dom = $udom if (! defined($co_dom) \|\| $co_dom =~ /^domain$/i);	$co_dom = $udom if (! defined($co_dom) \|\| $co_dom =~ /^domain$/i);
next if ($co_name eq $uname && $co_dom eq $udom);	next if ($co_name eq $uname && $co_dom eq $udom);
# Doing this grep allows 'fuzzy' specification	# Doing this grep allows 'fuzzy' specification
Line 2453 sub check_collaborators {	Line 2499 sub check_collaborators {
}	}
}	}
if (scalar(@good_collaborators) != 0) {	if (scalar(@good_collaborators) != 0) {
$result.='<br />'.&mt('Collaborators: ');	$result.='<br />'.&mt('Collaborators:').'<ol>';
foreach my $name (@good_collaborators) {	foreach my $name (@good_collaborators) {
my ($lastname,$givenn) = split(/,/,$$fullname{$name});	my ($lastname,$givenn) = split(/,/,$$fullname{$name});
push(@col_fullnames, $givenn.' '.$lastname);	push(@col_fullnames, $givenn.' '.$lastname);
$result.=$fullname->{$name}.'     ';	$result.='<li>'.$fullname->{$name}.'</li>';
}	}
$result.='<br />'."\n";	$result.='</ol><br />'."\n";
my ($part)=split(/\./,$part);	my ($part)=split(/\./,$part);
$result.='<input type="hidden" name="collaborator'.$counter.	$result.='<input type="hidden" name="collaborator'.$counter.
'" value="'.$part.':'.(join ':',@good_collaborators).'" />'.	'" value="'.$part.':'.(join ':',@good_collaborators).'" />'.
Line 2505 sub get_last_submission {	Line 2551 sub get_last_submission {
($lasthash{$key} eq 'randomizetry')) {	($lasthash{$key} eq 'randomizetry')) {
my ($ign,@parts) = split(/\./,$key);	my ($ign,@parts) = split(/\./,$key);
pop(@parts);	pop(@parts);
	my $id = join('.',@parts);
if ($lasthash{$key} eq 'randomizetry') {	if ($lasthash{$key} eq 'randomizetry') {
my $id = join(',',@parts);
$randombytry{$ign.'.'.$id} = $lasthash{$key};	$randombytry{$ign.'.'.$id} = $lasthash{$key};
} else {	} else {
unless ($showsurv) {	unless ($showsurv) {
my $id = join(',',@parts);
$typeparts{$ign.'.'.$id} = $lasthash{$key};	$typeparts{$ign.'.'.$id} = $lasthash{$key};
}	}
}	}
Line 2567 sub keywords_highlight {	Line 2612 sub keywords_highlight {
return $string;	return $string;
}	}

	# For Tasks provide a mechanism to display previous version for one specific student

	sub show_previous_task_version {
	my ($request,$symb) = @_;
	if ($symb eq '') {
	$request->print("Unable to handle ambiguous references.");

	return '';
	}
	my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
	my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
	if (!&canview($usec)) {
	$request->print('<span class="LC_warning">Unable to view previous version for requested student.('.
	$uname.':'.$udom.' in section '.$usec.' in course id '.
	$env{'request.course.id'}.')</span>');
	return;
	}
	my $mode = 'both';
	my $isTask = ($symb =~/\.task$/);
	if ($isTask) {
	if ($env{'form.previousversion'} =~ /^\d+$/) {
	if ($env{'form.fullname'} eq '') {
	$env{'form.fullname'} =
	&Apache::loncommon::plainname($uname,$udom,'lastname');
	}
	my $probtitle=&Apache::lonnet::gettitle($symb);
	$request->print("\n\n".
	'<div class="LC_grade_show_user">'.
	'<h2>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
	'</h2>'."\n");
	&Apache::lonxml::clear_problem_counter();
	$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode,
	{'previousversion' => $env{'form.previousversion'} }));
	$request->print("\n</div>");
	}
	}
	return;
	}

	sub choose_task_version_form {
	my ($symb,$uname,$udom,$nomenu) = @_;
	my $isTask = ($symb =~/\.task$/);
	my ($current,$version,$result,$js,$displayed,$rowtitle);
	if ($isTask) {
	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
	$udom,$uname);
	if (($record{'resource.0.version'} eq '') \|\|
	($record{'resource.0.version'} < 2)) {
	return ($record{'resource.0.version'},
	$record{'resource.0.version'},$result,$js);
	} else {
	$current = $record{'resource.0.version'};
	}
	if ($env{'form.previousversion'}) {
	$displayed = $env{'form.previousversion'};
	$rowtitle = &mt('Choose another version:')
	} else {
	$displayed = $current;
	$rowtitle = &mt('Show earlier version:');
	}
	$result = '<div class="LC_left_float">';
	my $list;
	my $numversions = 0;
	for (my $i=1; $i<=$record{'resource.0.version'}; $i++) {
	if ($i == $current) {
	if (!$env{'form.previousversion'} \|\| $nomenu) {
	next;
	} else {
	$list .= '<option value="'.$i.'">'.&mt('Current').'</option>'."\n";
	$numversions ++;
	}
	} elsif (defined($record{'resource.'.$i.'.0.status'})) {
	unless ($i == $env{'form.previousversion'}) {
	$numversions ++;
	}
	$list .= '<option value="'.$i.'">'.$i.'</option>'."\n";
	}
	}
	if ($numversions) {
	$symb = &HTML::Entities::encode($symb,'<>"&');
	$result .=
	'<form name="getprev" method="post" action=""'.
	' onsubmit="return previousVersion('."'$uname','$udom','$symb','$displayed'".');">'.
	&Apache::loncommon::start_data_table().
	&Apache::loncommon::start_data_table_row().
	'<th align="left">'.$rowtitle.'</th>'.
	'<td><select name="version">'.
	'<option>'.&mt('Select').'</option>'.
	$list.
	'</select></td>'.
	&Apache::loncommon::end_data_table_row();
	unless ($nomenu) {
	$result .= &Apache::loncommon::start_data_table_row().
	'<th align="left">'.&mt('Open in new window').'</th>'.
	'<td><span class="LC_nobreak">'.
	'<label><input type="radio" name="prevwin" value="1" />'.
	&mt('Yes').'</label>'.
	'<label><input type="radio" name="prevwin" value="0" checked="checked" />'.&mt('No').'</label>'.
	'</span></td>'.
	&Apache::loncommon::end_data_table_row();
	}
	$result .=
	&Apache::loncommon::start_data_table_row().
	'<th align="left"> </th>'.
	'<td>'.
	'<input type="submit" name="prevsub" value="'.&mt('Display').'" />'.
	'</td>'.
	&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::end_data_table().
	'</form>';
	$js = &previous_display_javascript($nomenu,$current);
	} elsif ($displayed && $nomenu) {
	$result .= '<a href="javascript:window.close()">'.&mt('Close window').'</a>';
	} else {
	$result .= &mt('No previous versions to show for this student');
	}
	$result .= '</div>';
	}
	return ($current,$displayed,$result,$js);
	}

	sub previous_display_javascript {
	my ($nomenu,$current) = @_;
	my $js = <<"JSONE";
	<script type="text/javascript">
	// <![CDATA[
	function previousVersion(uname,udom,symb) {
	var current = '$current';
	var version = document.getprev.version.options[document.getprev.version.selectedIndex].value;
	var prevstr = new RegExp("^\\\\d+\$");
	if (!prevstr.test(version)) {
	return false;
	}
	var url = '';
	if (version == current) {
	url = '/adm/grades?student='+uname+'&userdom='+udom+'&symb='+symb+'&command=submission';
	} else {
	url = '/adm/grades?student='+uname+'&userdom='+udom+'&symb='+symb+'&command=versionsub&previousversion='+version;
	}
	JSONE
	if ($nomenu) {
	$js .= <<"JSTWO";
	document.location.href = url;
	JSTWO
	} else {
	$js .= <<"JSTHREE";
	var newwin = 0;
	for (var i=0; i<document.getprev.prevwin.length; i++) {
	if (document.getprev.prevwin[i].checked == true) {
	newwin = document.getprev.prevwin[i].value;
	}
	}
	if (newwin == 1) {
	var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no';
	url = url+'&inhibitmenu=yes';
	if (typeof(previousWin) == 'undefined' \|\| previousWin.closed) {
	previousWin = window.open(url,'',options,1);
	} else {
	previousWin.location.href = url;
	}
	previousWin.focus();
	return false;
	} else {
	document.location.href = url;
	return false;
	}
	JSTHREE
	}
	$js .= <<"ENDJS";
	return false;
	}
	// ]]>
	</script>
	ENDJS

	}

#--- Called from submission routine	#--- Called from submission routine
sub processHandGrade {	sub processHandGrade {
my ($request) = shift;	my ($request) = shift;
my $symb = &get_symb($request);	my ($symb) = &get_symb($request);
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);	my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
my $button = $env{'form.gradeOpt'};	my $button = $env{'form.gradeOpt'};
my $ngrade = $env{'form.NCT'};	my $ngrade = $env{'form.NCT'};
Line 2619 sub processHandGrade {	Line 2841 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 2805 sub processHandGrade {	Line 3027 sub processHandGrade {
}	}
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 = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n";
$the_end.=&mt('<b>Message: </b> No more students for this section or class.').'<br /><br />'."\n";	$the_end.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\n";
$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n";	$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n";
$the_end.=&show_grading_menu_form($symb);	$the_end.=&show_grading_menu_form($symb);
$request->print($the_end);	$request->print($the_end);
Line 2958 sub handback_files {	Line 3180 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)) {
	for (my $counter=1; $counter<=$env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'}; $counter++) {
# if multiple files are uploaded names will be 'returndoc2','returndoc3'	# if multiple files are uploaded names will be 'returndoc2','returndoc3'
my $file_counter = 1;	if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) {
my $file_msg;	my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter.'.filename'};
while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) {
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(.*)/);
my $getpropath = 1;	my $getpropath = 1;
my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$portfolio_path,$domain,$stuname,$getpropath);	my ($dir_list,$listerror) =
my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);	&Apache::lonnet::dirlist($portfolio_root.$portfolio_path,
	$domain,$stuname,$getpropath);
	my $version = &get_next_version($answer_name,$answer_ext,$dir_list);
# 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');
	} 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 3123 sub version_portfiles {	Line 3360 sub version_portfiles {
my ($directory,$answer_file) =($file =~ /^(.?)([^\/])$/);	my ($directory,$answer_file) =($file =~ /^(.?)([^\/])$/);
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 $getpropath = 1;	my $getpropath = 1;
my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,$stu_name,$getpropath);	my ($dir_list,$listerror) =
my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);	&Apache::lonnet::dirlist($portfolio_root.$directory,$domain,
	$stu_name,$getpropath);
	my $version = &get_next_version($answer_name,$answer_ext,$dir_list);
my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);	my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
if ($new_answer ne 'problem getting file') {	if ($new_answer ne 'problem getting file') {
push(@versioned_portfiles, $directory.$new_answer);	push(@versioned_portfiles, $directory.$new_answer);
Line 3144 sub version_portfiles {	Line 3383 sub version_portfiles {
sub get_next_version {	sub get_next_version {
my ($answer_name, $answer_ext, $dir_list) = @_;	my ($answer_name, $answer_ext, $dir_list) = @_;
my $version;	my $version;
foreach my $row (@$dir_list) {	if (ref($dir_list) eq 'ARRAY') {
my ($file) = split(/\&/,$row,2);	foreach my $row (@{$dir_list}) {
my ($file_name,$file_version,$file_ext) =	my ($file) = split(/\&/,$row,2);
&file_name_version_ext($file);	my ($file_name,$file_version,$file_ext) =
if (($file_name eq $answer_name) &&	&file_name_version_ext($file);
($file_ext eq $answer_ext)) {	if (($file_name eq $answer_name) &&
# gets here if filename and extension match, regardless of version	($file_ext eq $answer_ext)) {
	# gets here if filename and extension match,
	# regardless of version
if ($file_version ne '') {	if ($file_version ne '') {
# a versioned file is found so save it for later	# a versioned file is found so save it for later
if ($file_version > $version) {	if ($file_version > $version) {
$version = $file_version;	$version = $file_version;
	}
}	}
}	}
}	}
}	}
$version ++;	$version ++;
return($version);	return($version);
}	}
Line 3618 sub viewstudentgrade {	Line 3860 sub viewstudentgrade {
sub editgrades {	sub editgrades {
my ($request) = @_;	my ($request) = @_;

my $symb=&get_symb($request);	my ($symb)=&get_symb($request);
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
my $title='<h2>'.&mt('Current Grade Status').'</h2>';	my $title='<h2>'.&mt('Current Grade Status').'</h2>';
$title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";	$title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";
Line 4044 sub upcsvScores_form {	Line 4286 sub upcsvScores_form {
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";	$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
$result.=' <b>'.&mt('Specify a file containing the class scores for current resource.').	$result.=' <b>'.&mt('Specify a file containing the class scores for current resource.').
'</b></td></tr>'."\n";	'</b></td></tr>'."\n";
$result.='<tr bgcolor=#ffffe6><td>'."\n";	$result.='<tr bgcolor="#ffffe6"><td>'."\n";
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 4192 sub csvuploadassign {	Line 4434 sub csvuploadassign {
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 4240 sub csvuploadassign {	Line 4483 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 4268 sub csvuploadassign {	Line 4514 sub csvuploadassign {
$domain,$username);	$domain,$username);
if ($result eq 'ok') {	if ($result eq 'ok') {
$request->print('.');	$request->print('.');
	# Remove from grading queue
	&Apache::bridgetask::remove_from_queue('gradingqueue',$symb,
	$env{'course.'.$env{'request.course.id'}.'.domain'},
	$env{'course.'.$env{'request.course.id'}.'.num'},
	$domain,$username);
} else {	} else {
$request->print("<p><span class=\"LC_error\">".	$request->print("<p><span class=\"LC_error\">".
&mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",	&mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",
Line 4278 sub csvuploadassign {	Line 4529 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 4633 sub displaySubByDates {	Line 4888 sub displaySubByDates {
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('Date/Time').'</th>'.	'<th>'.&mt('Date/Time').'</th>'.
($isCODE?'<th>'.&mt('CODE').'</th>':'').	($isCODE?'<th>'.&mt('CODE').'</th>':'').
	($isTask?'<th>'.&mt('Version').'</th>':'').
'<th>'.&mt('Submission').'</th>'.	'<th>'.&mt('Submission').'</th>'.
'<th>'.&mt('Status').'</th>'.	'<th>'.&mt('Status').'</th>'.
&Apache::loncommon::end_data_table_header_row();	&Apache::loncommon::end_data_table_header_row();
Line 4653 sub displaySubByDates {	Line 4909 sub displaySubByDates {
if (exists($$record{$version.':resource.0.version'})) {	if (exists($$record{$version.':resource.0.version'})) {
$interaction = $$record{$version.':resource.0.version'};	$interaction = $$record{$version.':resource.0.version'};
}	}
	if ($isTask && $env{'form.previousversion'}) {
	next unless ($interaction == $env{'form.previousversion'});
	}
my $where = ($isTask ? "$version:resource.$interaction"	my $where = ($isTask ? "$version:resource.$interaction"
: "$version:resource");	: "$version:resource");
$studentTable.=&Apache::loncommon::start_data_table_row().	$studentTable.=&Apache::loncommon::start_data_table_row().
Line 4661 sub displaySubByDates {	Line 4919 sub displaySubByDates {
if ($isCODE) {	if ($isCODE) {
$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';	$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
}	}
	if ($isTask) {
	$studentTable.='<td>'.$interaction.'</td>';
	}
my @versionKeys = split(/\:/,$$record{$version.':keys'});	my @versionKeys = split(/\:/,$$record{$version.':keys'});
my @displaySub = ();	my @displaySub = ();
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
Line 4680 sub displaySubByDates {	Line 4941 sub displaySubByDates {

my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)	my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));	: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
$displaySub[0].='<span class="LC_nobreak"';	$displaySub[0].='<span class="LC_nobreak">';
$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'	$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
.' <span class="LC_internal_info">'	.' <span class="LC_internal_info">'
.'('.&mt('Part ID: [_1]',$responseId).')'	.'('.&mt('Response ID: [_1]',$responseId).')'
.'</span>'	.'</span>'
.' <b>';	.' <b>';
if ($hidden) {	if ($hidden) {
Line 4940 sub updateGradeByPage {	Line 5201 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 4961 username:domain.	Line 5222 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 5104 sub scantron_filenames {	Line 5365 sub scantron_filenames {
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};	my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
my $getpropath = 1;	my $getpropath = 1;
my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,	my ($dirlist,$listerror) = &Apache::lonnet::dirlist('userfiles',$cdom,
$getpropath);	$cname,$getpropath);
my @possiblenames;	my @possiblenames;
foreach my $filename (sort(@files)) {	if (ref($dirlist) eq 'ARRAY') {
($filename)=split(/&/,$filename);	foreach my $filename (sort(@{$dirlist})) {
if ($filename!~/^scantron_orig_/) { next ; }	($filename)=split(/&/,$filename);
$filename=~s/^scantron_orig_//;	if ($filename!~/^scantron_orig_/) { next ; }
push(@possiblenames,$filename);	$filename=~s/^scantron_orig_//;
	push(@possiblenames,$filename);
	}
}	}
return @possiblenames;	return @possiblenames;
}	}
Line 5265 sub scantron_CODEunique {	Line 5528 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 5298 sub scantron_selectphase {	Line 5561 sub scantron_selectphase {

$ssi_error = 0;	$ssi_error = 0;

	if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) \|\|
	&Apache::lonnet::allowed('usc',$env{'request.course.id'})) {

	# Chunk of form to prompt for a scantron file upload.

	$r->print('
	<br />
	'.&Apache::loncommon::start_data_table('LC_scantron_action').'
	'.&Apache::loncommon::start_data_table_header_row().'
	<th>
	'.&mt('Specify a bubblesheet data file to upload.').'
	</th>
	'.&Apache::loncommon::end_data_table_header_row().'
	'.&Apache::loncommon::start_data_table_row().'
	<td>
	');
	my $default_form_data=&defaultFormData(&get_symb($r,1));
	my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
	my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
	$r->print('
	<script type="text/javascript" language="javascript">
	function checkUpload(formname) {
	if (formname.upfile.value == "") {
	alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
	return false;
	}
	formname.submit();
	}
	</script>

	<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
	'.$default_form_data.'
	<input name="courseid" type="hidden" value="'.$cnum.'" />
	<input name="domainid" type="hidden" value="'.$cdom.'" />
	<input name="command" value="scantronupload_save" type="hidden" />
	'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
	<br />
	<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
	</form>
	');

	$r->print('
	</td>
	'.&Apache::loncommon::end_data_table_row().'
	'.&Apache::loncommon::end_data_table().'
	');
	}

# Chunk of form to prompt for a file to grade and how:	# Chunk of form to prompt for a file to grade and how:

$result.= '	$result.= '
Line 5345 sub scantron_selectphase {	Line 5656 sub scantron_selectphase {

$r->print($result);	$r->print($result);

if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) \|\|
&Apache::lonnet::allowed('usc',$env{'request.course.id'})) {

# Chunk of form to prompt for a scantron file upload.

$r->print('
<br />
'.&Apache::loncommon::start_data_table('LC_scantron_action').'
'.&Apache::loncommon::start_data_table_header_row().'
<th>
'.&mt('Specify a bubblesheet data file to upload.').'
</th>
'.&Apache::loncommon::end_data_table_header_row().'
'.&Apache::loncommon::start_data_table_row().'
<td>
');
my $default_form_data=&defaultFormData(&get_symb($r,1));
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
$r->print('
<script type="text/javascript" language="javascript">
function checkUpload(formname) {
if (formname.upfile.value == "") {
alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
return false;
}
formname.submit();
}
</script>

<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
'.$default_form_data.'
<input name="courseid" type="hidden" value="'.$cnum.'" />
<input name="domainid" type="hidden" value="'.$cdom.'" />
<input name="command" value="scantronupload_save" type="hidden" />
'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
<br />
<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
</form>
');

$r->print('
</td>
'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::end_data_table().'
');
}

# Chunk of the form that prompts to view a scoring office file,	# Chunk of the form that prompts to view a scoring office file,
# corrected file, skipped records in a file.	# corrected file, skipped records in a file.

Line 5509 sub scantron_selectphase {	Line 5772 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

Line 5539 sub get_scantron_config {	Line 5804 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 6288 sub remember_current_skipped {	Line 6554 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 6323 sub scantron_warning_screen {	Line 6589 sub scantron_warning_screen {
'<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'.	'<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'.
$env{'form.scantron_CODElist'}.'</tt></td></tr>';	$env{'form.scantron_CODElist'}.'</tt></td></tr>';
}	}
	my $lastbubblepoints;
	if ($env{'form.scantron_lastbubblepoints'} ne '') {
	$lastbubblepoints =
	'<tr><td><b>'.&mt('Hand-graded items: points from last bubble in row').'</b></td><td><tt>'.
	$env{'form.scantron_lastbubblepoints'}.'</tt></td></tr>';
	}
return ('	return ('
<p>	<p>
<span class="LC_warning">	<span class="LC_warning">
Line 6331 sub scantron_warning_screen {	Line 6603 sub scantron_warning_screen {
<table>	<table>
<tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr>	<tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr>
<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.$lastbubblepoints.'
</table>	</table>
<br />	<br />
<p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p>	<p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p>
Line 6359 sub scantron_do_warning {	Line 6631 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');
	my $bubbledbyhand=&hand_bubble_option();
$r->print('	$r->print('
'.$warning.'	'.$warning.$bubbledbyhand.'
<input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" />	<input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" />
<input type="hidden" name="command" value="scantron_validate" />	<input type="hidden" name="command" value="scantron_validate" />
');	');
Line 6424 SCANTRONFORM	Line 6697 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 6462 sub scantron_validate_file {	Line 6735 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 '';
}	}
my $result=&scantron_form_start($max_bubble).$default_form_data;	my $result=&scantron_form_start($max_bubble).$default_form_data;
	if ($env{'form.scantron_lastbubblepoints'} ne '') {
	$result .= '<input type="hidden" name="scantron_lastbubblepoints" value="'.$env{'form.scantron_lastbubblepoints'}.'" />';
	}
$r->print($result);	$r->print($result);

my @validate_phases=( 'sequence',	my @validate_phases=( 'sequence',
Line 6535 sub scantron_validate_file {	Line 6812 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 6560 sub scantron_remove_file {	Line 6837 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 6597 sub scantron_remove_scan_data {	Line 6874 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 6697 sub lonnet_putfile {	Line 6974 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 6791 sub get_todo_count {	Line 7068 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 6915 sub scantron_validate_ID {	Line 7192 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 6980 sub scantron_get_correction {	Line 7257 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]',
} else {	"<b>$error</b>",
$r->print("<p>".&mt("<b>An error was detected ($error)</b>".	'<tt>'.$$scan_record{'scantron.PaperID'}.'</tt>')
" in scanline [_1] <pre>[_2]</pre>",	."</p> \n");
$i,$line)."</p> \n");	} else {
}	$r->print(
my $message="<p>".&mt("The ID on the form is <tt>[_1]</tt><br />".	'<p class="LC_warning">'
"The name on the paper is [_2],[_3]",	.&mt('An error was detected ([_1]) in scanline [_2] [_3]',
$$scan_record{'scantron.ID'},	"<b>$error</b>", $i, "<pre>$line</pre>")
$$scan_record{'scantron.LastName'},	."</p> \n");
$$scan_record{'scantron.FirstName'})."</p>";	}
	my $message =
	'<p>'
	.&mt('The ID on the form is [_1]',
	"<tt>$$scan_record{'scantron.ID'}</tt>")
	.'<br />'
	.&mt('The name on the paper is [_1], [_2]',
	$$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 7002 sub scantron_get_correction {	Line 7288 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 7021 sub scantron_get_correction {	Line 7307 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 7055 sub scantron_get_correction {	Line 7342 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 7095 ENDSCRIPT	Line 7382 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 7113 ENDSCRIPT	Line 7400 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 7318 sub scantron_bubble_selector {	Line 7605 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 7473 sub scantron_validate_CODE {	Line 7772 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 7532 sub scantron_validate_doublebubble {	Line 7831 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 7554 sub scantron_validate_doublebubble {	Line 7853 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 7573 sub scantron_get_maxbubble {	Line 7872 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 7588 sub scantron_get_maxbubble {	Line 7888 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,$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 7617 sub scantron_get_maxbubble {	Line 7918 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 7630 sub scantron_get_maxbubble {	Line 7932 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 7651 sub scantron_get_maxbubble {	Line 7953 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 7661 sub scantron_validate_missingbubbles {	Line 7975 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 7708 sub scantron_validate_missingbubbles {	Line 8022 sub scantron_validate_missingbubbles {
return (0,$currentphase+1);	return (0,$currentphase+1);
}	}

	sub hand_bubble_option {
	my (undef, undef, $sequence) =
	&Apache::lonnet::decode_symb($env{'form.selectpage'});
	return if ($sequence eq '');
	my $navmap = Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	return;
	}
	my $needs_hand_bubbles;
	my $map=$navmap->getResourceByUrl($sequence);
	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
	foreach my $res (@resources) {
	if (ref($res)) {
	if ($res->is_problem()) {
	my $partlist = $res->parts();
	foreach my $part (@{ $partlist }) {
	my @types = $res->responseType($part);
	if (grep(/^(chem\|essay\|image\|formula\|math\|string\|functionplot)$/,@types)) {
	$needs_hand_bubbles = 1;
	last;
	}
	}
	}
	}
	}
	if ($needs_hand_bubbles) {
	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
	my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
	return &mt('The sequence to be graded contains response types which are handgraded.').'<p>'.
	&mt('If you have already graded these by bubbling sheets to indicate points awarded, [_1]what point value is assigned to a filled last bubble in each row?','<br />').
	'<label><input type="radio" name="scantron_lastbubblepoints" value="'.$bubbles_per_row.'" checked="checked" />'.&mt('[quant,_1,point]',$bubbles_per_row).'</label> '.&mt('or').' '.
	'<label><input type="radio" name="scantron_lastbubblepoints" value="0"/>0 points</label></p>';
	}
	return;
	}

sub scantron_process_students {	sub scantron_process_students {
my ($r) = @_;	my ($r) = @_;
Line 7744 sub scantron_process_students {	Line 8093 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 7771 SCANTRONFORM	Line 8121 SCANTRONFORM

my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));	my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
my $count=&get_todo_count($scanlines,$scan_data);	my $count=&get_todo_count($scanlines,$scan_data);
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status',	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);
'Bubblesheet Progress',$count,
'inline',undef,'scantronupload');
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,	&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
'Processing first student');	'Processing first student');
$r->print('<br />');	$r->print('<br />');
Line 7782 SCANTRONFORM	Line 8130 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 7839 SCANTRONFORM	Line 8187 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 7868 SCANTRONFORM	Line 8217 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 7896 SCANTRONFORM	Line 8246 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 7916 SCANTRONFORM	Line 8267 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 7929 SCANTRONFORM	Line 8280 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">'.$studentdata.'</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">'.$studentrecord.'</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>');
Line 7968 sub graders_resources_pass {	Line 8319 sub graders_resources_pass {
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 7982 sub graders_resources_pass {	Line 8334 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) = @_;
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 7995 sub grade_student_bubbles {	Line 8347 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 ($env{'form.scantron_lastbubblepoints'} ne '') {
	$form{'scantron_lastbubblepoints'} = $env{'form.scantron_lastbubblepoints'};
	}
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 8021 sub scantron_upload_scantron_data {	Line 8379 sub scantron_upload_scantron_data {
'domainid',	'domainid',
'coursename',$dom);	'coursename',$dom);
my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.	my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.
('&nbsp'x2).&mt('(shows course personnel)');	('&nbsp'x2).&mt('(shows course personnel)');
my $default_form_data=&defaultFormData(&get_symb($r,1));	my ($symb) = &get_symb($r,1);
	my $default_form_data=&defaultFormData($symb);
my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');	my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');
my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");	my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");
$r->print('	$r->print('
Line 8055 sub scantron_upload_scantron_data {	Line 8414 sub scantron_upload_scantron_data {

</script>	</script>

<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 8227 sub valid_file {	Line 8586 sub valid_file {

sub scantron_download_scantron_data {	sub scantron_download_scantron_data {
my ($r)=@_;	my ($r)=@_;
my $default_form_data=&defaultFormData(&get_symb($r,1));	my ($symb) = &get_symb($r,1);
	my $default_form_data=&defaultFormData($symb);
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};	my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $file=$env{'form.scantron_selectfile'};	my $file=$env{'form.scantron_selectfile'};
Line 8237 sub scantron_download_scantron_data {	Line 8597 sub scantron_download_scantron_data {
'.&mt('The requested file name was invalid.').'	'.&mt('The requested file name was invalid.').'
</p>	</p>
');	');
$r->print(&show_grading_menu_form(&get_symb($r,1)));	$r->print(&show_grading_menu_form($symb));
return;	return;
}	}
my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;	my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
Line 8260 sub scantron_download_scantron_data {	Line 8620 sub scantron_download_scantron_data {
'<a href="'.$skipped.'">','</a>').'	'<a href="'.$skipped.'">','</a>').'
</p>	</p>
');	');
$r->print(&show_grading_menu_form(&get_symb($r,1)));	$r->print(&show_grading_menu_form($symb));
return '';	return '';
}	}

Line 8300 sub checkscantron_results {	Line 8660 sub checkscantron_results {
my %completedstudents;	my %completedstudents;

my $count=&Apache::grades::get_todo_count($scanlines,$scan_data);	my $count=&Apache::grades::get_todo_count($scanlines,$scan_data);
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status',	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);
'Progress of Bubblesheet Data/Submission Records Comparison',$count,
'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 8355 sub checkscantron_results {	Line 8713 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 8400 sub checkscantron_results {	Line 8760 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 8587 sub savedState {	Line 8954 sub savedState {
return \%savedState;	return \%savedState;
}	}

	#--- Href with symb and command ---

	sub href_symb_cmd {
	my ($symb,$cmd)=@_;
	return '/adm/grades?symb='.&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'<>&"').'&command='.$cmd;
	}

sub grading_menu {	sub grading_menu {
my ($request) = @_;	my ($request) = @_;
my ($symb)=&get_symb($request);	my ($symb)=&get_symb($request);
Line 8638 sub grading_menu {	Line 9012 sub grading_menu {
url => $url4,	url => $url4,
permission => 'F',	permission => 'F',
icon => 'stat.png',	icon => 'stat.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.'
}	}
]	]
});	});
Line 8967 sub process_clicker {	Line 9341 sub process_clicker {
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";	$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource.').	$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource.').
'</b></td></tr>'."\n";	'</b></td></tr>'."\n";
$result.='<tr bgcolor=#ffffe6><td>'."\n";	$result.='<tr bgcolor="#ffffe6"><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 8995 sub process_clicker {	Line 9369 sub process_clicker {
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',
	'turning' => 'Turning Technologies'});
$symb = &Apache::lonenc::check_encrypt($symb);	$symb = &Apache::lonenc::check_encrypt($symb);
$result.=<<ENDUPFORM;	$result.=<<ENDUPFORM;
<script type="text/javascript">	<script type="text/javascript">
Line 9085 sub process_clicker_file {	Line 9460 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 9145 sub process_clicker_file {	Line 9520 sub process_clicker_file {
$result.=(<<ENDHEADER);	$result.=(<<ENDHEADER);
<br /><table width="100%" border="0"><tr><td bgcolor="#777777">	<br /><table width="100%" border="0"><tr><td bgcolor="#777777">
<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>	<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>
<b>$heading</b></td></tr><tr bgcolor=#ffffe6><td>	<b>$heading</b></td></tr><tr bgcolor="#ffffe6"><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 9168 ENDHEADER	Line 9543 ENDHEADER
if ($env{'form.upfiletype'} eq 'interwrite') {	if ($env{'form.upfiletype'} eq 'interwrite') {
($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);	($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);
}	}
	if ($env{'form.upfiletype'} eq 'turning') {
	($errormsg,$number)=&turning_eval(\@questiontitles,\%responses);
	}
$result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.	$result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.
'<input type="hidden" name="number" value="'.$number.'" />'.	'<input type="hidden" name="number" value="'.$number.'" />'.
&mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',	&mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',
Line 9214 ENDHEADER	Line 9592 ENDHEADER
"\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 9259 sub iclicker_eval {	Line 9637 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 9298 sub interwrite_eval {	Line 9677 sub interwrite_eval {
return ($errormsg,$number);	return ($errormsg,$number);
}	}

	sub turning_eval {
	my ($questiontitles,$responses)=@_;
	my $number=0;
	my $errormsg='';
	foreach my $line (split(/[\n\r]/,$env{'form.upfile'})) {
	my %components=&Apache::loncommon::record_sep($line);
	my @entries=map {$components{$_}} (sort(keys(%components)));
	if ($#entries>$number) { $number=$#entries; }
	my $id=$entries[0];
	my @idresponses;
	$id=~s/^[\#0]+//;
	unless ($id) { next; }
	for (my $idx=1;$idx<=$#entries;$idx++) {
	$entries[$idx]=~s/\,/\;/g;
	$entries[$idx]=~s/[^a-zA-Z0-9\.\*\-\+\;]+//g;
	push(@idresponses,$entries[$idx]);
	}
	$$responses{$id}=join(',',@idresponses);
	}
	for (my $i=1; $i<=$number; $i++) {
	$$questiontitles[$i]=&mt('Question [_1]',$i);
	}
	return ($errormsg,$number);
	}

sub assign_clicker_grades {	sub assign_clicker_grades {
my ($r)=@_;	my ($r)=@_;
my ($symb)=&get_symb($r);	my ($symb)=&get_symb($r);
Line 9313 sub assign_clicker_grades {	Line 9717 sub assign_clicker_grades {
# Start screen output	# Start screen output
my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});	my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});

my $heading=&mt('Assigning grades based on clicker file');	$result .= '<br />'.
$result.=(<<ENDHEADER);	&Apache::loncommon::start_data_table().
<br /><table width="100%" border="0"><tr><td bgcolor="#777777">	&Apache::loncommon::start_data_table_header_row().
<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>	'<th>'.&mt('Assigning grades based on clicker file').'</th>'.
<b>$heading</b></td></tr><tr bgcolor=#ffffe6><td>	&Apache::loncommon::end_data_table_header_row().
ENDHEADER	&Apache::loncommon::start_data_table_row().'<td>';

# Get correct result	# Get correct result
# FIXME: Possibly need delimiter other than ":"	# FIXME: Possibly need delimiter other than ":"
my @correct=();	my @correct=();
Line 9334 ENDHEADER	Line 9739 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 9366 ENDHEADER	Line 9772 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;
Line 9379 ENDHEADER	Line 9791 ENDHEADER
} 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 9406 ENDHEADER	Line 9830 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()."<br /><br />\n";
return $result.&show_grading_menu_form($symb);	return $result.&show_grading_menu_form($symb);
}	}

Line 9418 sub navmap_errormsg {	Line 9843 sub navmap_errormsg {
'</div>';	'</div>';
}	}

	sub startpage {
	my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js) = @_;
	if ($nomenu) {
	$r->print(&Apache::loncommon::start_page("Student's Version",$js,{'only_body' => '1'}));
	} else {
	$r->print(&Apache::loncommon::start_page('Grading',$js,
	{'bread_crumbs' => $crumbs}));
	}
	unless ($nodisplayflag) {
	$r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp));
	}
	}

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'});

my $symb=&get_symb($request,1);	my $symb=&get_symb($request,1);
my @commands=&Apache::loncommon::get_env_multiple('form.command');	my @commands=&Apache::loncommon::get_env_multiple('form.command');
my $command=$commands[0];	my $command=$commands[0];
Line 9439 sub handler {	Line 9876 sub handler {

$ssi_error = 0;	$ssi_error = 0;
my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];	my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];
$request->print(&Apache::loncommon::start_page('Grading',undef,	my $start_page = &Apache::loncommon::start_page('Grading',undef,
{'bread_crumbs' => $brcrum}));	{'bread_crumbs' => $brcrum});
if ($symb eq '' && $command eq '') {	if ($symb eq '' && $command eq '') {
if ($env{'user.adv'}) {	if ($env{'user.adv'}) {
	&Apache::loncommon::content_type($request,'text/html');
	$request->send_http_header;
	$request->print($start_page);
if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&	if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
($env{'form.codethree'})) {	($env{'form.codethree'})) {
my $token=$env{'form.codeone'}.''.$env{'form.codetwo'}.''.	my $token=$env{'form.codeone'}.''.$env{'form.codetwo'}.''.
Line 9466 sub handler {	Line 9906 sub handler {
} else {	} else {
$request->print(&Apache::lonxml::tokeninputfield());	$request->print(&Apache::lonxml::tokeninputfield());
}	}
}	} elsif ($env{'request.course.id'}) {
	&init_perm();
	if (!%perm) {
	$request->internal_redirect('/adm/quickgrades');
	} else {
	&Apache::loncommon::content_type($request,'text/html');
	$request->send_http_header;
	$request->print($start_page);
	}
	}
} else {	} else {
&init_perm();	&init_perm();
	if (!$env{'request.course.id'}) {
	unless ((&Apache::lonnet::allowed('usc',$env{'request.role.domain'})) &&
	($command =~ /^scantronupload/)) {
	# 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;
	unless ((($command eq 'submission' \|\| $command eq 'versionsub')) && ($perm{'vgr'})) {
	$request->print($start_page);
	}
if ($command eq 'submission' && $perm{'vgr'}) {	if ($command eq 'submission' && $perm{'vgr'}) {
	my ($stuvcurrent,$stuvdisp,$versionform,$js);
	if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) {
	($stuvcurrent,$stuvdisp,$versionform,$js) =
	&choose_task_version_form($symb,$env{'form.student'},
	$env{'form.userdom'});
	}
	&startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,$stuvcurrent,$stuvdisp,undef,$js);
	if ($versionform) {
	$request->print($versionform);
	}
	$request->print('<br clear="all" />');
($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));	($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
	} elsif ($command eq 'versionsub' && $perm{'vgr'}) {
	my ($stuvcurrent,$stuvdisp,$versionform,$js) =
	&choose_task_version_form($symb,$env{'form.student'},
	$env{'form.userdom'},
	$env{'form.inhibitmenu'});
	&startpage($request,$symb,[{href=>"", text=>"Previous Student Version"}],undef,undef,$stuvcurrent,$stuvdisp,$env{'form.inhibitmenu'},$js);
	if ($versionform) {
	$request->print($versionform);
	}
	$request->print('<br clear="all" />');
	$request->print(&show_previous_task_version($request,$symb));
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
&pickStudentPage($request);	&pickStudentPage($request);
} elsif ($command eq 'displayPage' && $perm{'vgr'}) {	} elsif ($command eq 'displayPage' && $perm{'vgr'}) {
Line 9546 sub handler {	Line 10032 sub handler {
}	}
$request->print(&Apache::loncommon::end_page());	$request->print(&Apache::loncommon::end_page());
&reset_caches();	&reset_caches();
return '';	return OK;
}	}

1;	1;
Line 9650 ssi_with_retries()	Line 10136 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 9673 ssi_with_retries()	Line 10161 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 9693 ssi_with_retries()	Line 10181 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 9707 ssi_with_retries()	Line 10195 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.596.2.2
changed lines
	Added in v.1.596.2.12.2.7