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.528.2.7 and 1.552

version 1.528.2.7, 2008/12/31 21:10:29	version 1.552, 2009/02/18 07:06:12
Line 26	Line 26
# http://www.lon-capa.org/	# http://www.lon-capa.org/
#	#



package Apache::grades;	package Apache::grades;
use strict;	use strict;
use Apache::style;	use Apache::style;
Line 58 my $ssi_error_resource;	Line 60 my $ssi_error_resource;
my $ssi_error_message;	my $ssi_error_message;


# Do an ssi with retries:
# While I'd love to factor out this with the vesrion in lonprintout,
# that would either require a data coupling between modules, which I refuse to perpetuate
# (there's quite enough of that already), or would require the invention of another infrastructure
# I'm not quite ready to invent (e.g. an ssi_with_retry object).
#
# At least the logic that drives this has been pulled out into loncommon.


#
# ssi_with_retries - Does the server side include of a resource.
# if the ssi call returns an error we'll retry it up to
# the number of times requested by the caller.
# If we still have a proble, no text is appended to the
# output and we set some global variables.
# to indicate to the caller an SSI error occurred.
# All of this is supposed to deal with the issues described
# in LonCAPA BZ 5631 see:
# http://bugs.lon-capa.org/show_bug.cgi?id=5631
# by informing the user that this happened.
#
# Parameters:
# resource - The resource to include. This is passed directly, without
# interpretation to lonnet::ssi.
# form - The form hash parameters that guide the interpretation of the resource
#
# retries - Number of retries allowed before giving up completely.
# Returns:
# On success, returns the rendered resource identified by the resource parameter.
# Side Effects:
# The following global variables can be set:
# ssi_error - If an unrecoverable error occurred this becomes true.
# It is up to the caller to initialize this to false
# if desired.
# ssi_error_resource - If an unrecoverable error occurred, this is the value
# of the resource that could not be rendered by the ssi
# call.
# ssi_error_message - The error string fetched from the ssi response
# in the event of an error.
#
sub ssi_with_retries {	sub ssi_with_retries {
my ($resource, $retries, %form) = @_;	my ($resource, $retries, %form) = @_;
my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form);	my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form);
Line 255 sub showResourceInfo {	Line 217 sub showResourceInfo {
$partsseen{$partID}=1;	$partsseen{$partID}=1;
}	}
my $display_part=&get_display_part($partID,$symb);	my $display_part=&get_display_part($partID,$symb);
$result.='<td>'.&mt('<b>Part: </b>[_1]',$display_part).' <span class="LC_internal_info">'.	$result.='<td><b>'.&mt('Part').': </b>'.$display_part.
$resID.'</span></td>'.	' <span class="LC_internal_info">'.$resID.'</span></td>'.
'<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>';	'<td><b>'.&mt('Type').': </b>'.$responsetype.'</td></tr>';
# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';	# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';
}	}
}	}
Line 821 sub listStudents {	Line 783 sub listStudents {
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?	$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};

my $result='<h3><span class="LC_info"> '.	my $result='<h3><span class="LC_info"> '
&mt($viewgrade.' Submissions for a Student or a Group of Students')	.&mt("$viewgrade Submissions for a Student or a Group of Students")
.'</span></h3>';	.'</span></h3>';

my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));	my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));

my %lt = ( 'multiple' =>	my %lt = ( 'multiple' =>
"Please select a student or group of students before clicking on the Next button.",	&mt("Please select a student or group of students before clicking on the Next button."),
'single' =>	'single' =>
"Please select the student before clicking on the Next button.",	&mt("Please select the student before clicking on the Next button."),
);	);
%lt = &Apache::lonlocal::texthash(%lt);	%lt = &Apache::lonlocal::texthash(%lt);
$request->print(<<LISTJAVASCRIPT);	$request->print(<<LISTJAVASCRIPT);
Line 875 LISTJAVASCRIPT	Line 837 LISTJAVASCRIPT
"\n".$table;	"\n".$table;

$gradeTable .=	$gradeTable .=
' '.	' <b>'.&mt('View Problem Text').': </b>'.
&mt('<b>View Problem Text: </b>[_1]',
'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".	'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n".	'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n".
'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label>').'<br />'."\n";	'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n";
$gradeTable .=	$gradeTable .=
' '.	' <b>'.&mt('View Answer').': </b>'.
&mt('<b>View Answer: </b>[_1]',
'<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n".	'<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n".
'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n".	'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n".
'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label>').'<br />'."\n";	'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n";

my $submission_options;	my $submission_options;
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {	if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
Line 901 LISTJAVASCRIPT	Line 861 LISTJAVASCRIPT
'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n".	'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n".
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>';	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>';
$gradeTable .=	$gradeTable .=
' '.	' <b>'.&mt('Submissions').': </b>'.$submission_options.'<br />'."\n";
&mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n";

$gradeTable .=	$gradeTable .=
' '.	' <b>'.&mt('Grading Increments').': </b>'.
&mt('<b>Grading Increments:</b> [_1]',
'<select name="increment">'.	'<select name="increment">'.
'<option value="1">'.&mt('Whole Points').'</option>'.	'<option value="1">'.&mt('Whole Points').'</option>'.
'<option value=".5">'.&mt('Half Points').'</option>'.	'<option value=".5">'.&mt('Half Points').'</option>'.
'<option value=".25">'.&mt('Quarter Points').'</option>'.	'<option value=".25">'.&mt('Quarter Points').'</option>'.
'<option value=".1">'.&mt('Tenths of a Point').'</option>'.	'<option value=".1">'.&mt('Tenths of a Point').'</option>'.
'</select>');	'</select>';

$gradeTable .=	$gradeTable .=
&build_section_inputs().	&build_section_inputs().
Line 931 LISTJAVASCRIPT	Line 889 LISTJAVASCRIPT
&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />';	&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />';
}	}

$gradeTable.=&mt('To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.	$gradeTable.=&mt('To '.lc($viewgrade)." a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.").'<br />'."\n".
'next to the student\'s name(s). Then click on the Next button.').'<br />'."\n".
'<input type="hidden" name="command" value="processGroup" />'."\n";	'<input type="hidden" name="command" value="processGroup" />'."\n";

# checkall buttons	# checkall buttons
$gradeTable.=&check_script('gradesub', 'stuinfo');	$gradeTable.=&check_script('gradesub', 'stuinfo');
$gradeTable.='<input type="button" '."\n".	$gradeTable.='<input type="button" '."\n".
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
'value="'.&mt('Next->').'" /> <br />'."\n";	'value="'.&mt('Next').' →" /> <br />'."\n";
$gradeTable.=&check_buttons();	$gradeTable.=&check_buttons();
$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />'.&mt('Check For Plagiarism').'</label>';	$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />'.&mt('Check For Plagiarism').'</label>';
my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);	my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);
Line 1059 LISTJAVASCRIPT	Line 1016 LISTJAVASCRIPT
$gradeTable.=&Apache::loncommon::end_data_table()."\n".	$gradeTable.=&Apache::loncommon::end_data_table()."\n".
'<input type="button" '.	'<input type="button" '.
'onClick="javascript:checkSelect(this.form.stuinfo);" '.	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
'value="'.&mt('Next->').'" /></form>'."\n";	'value="'.&mt('Next').' →" /></form>'."\n";
if ($ctr == 0) {	if ($ctr == 0) {
my $num_students=(scalar(keys(%$fullname)));	my $num_students=(scalar(keys(%$fullname)));
if ($num_students eq 0) {	if ($num_students eq 0) {
Line 1155 sub processGroup {	Line 1112 sub processGroup {
#--- Javascript to handle the submission page functionality ---	#--- Javascript to handle the submission page functionality ---
sub sub_page_js {	sub sub_page_js {
my $request = shift;	my $request = shift;
	my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
$request->print(<<SUBJAVASCRIPT);	$request->print(<<SUBJAVASCRIPT);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function updateRadio(formname,id,weight) {	function updateRadio(formname,id,weight) {
Line 1165 sub sub_page_js {	Line 1123 sub sub_page_js {
gradeBox.value = pts;	gradeBox.value = pts;
var resetbox = false;	var resetbox = false;
if (isNaN(pts) \|\| pts < 0) {	if (isNaN(pts) \|\| pts < 0) {
alert("A number equal or greater than 0 is expected. Entered value = "+pts);	alert("$alertmsg"+pts);
for (var i=0; i<radioButton.length; i++) {	for (var i=0; i<radioButton.length; i++) {
if (radioButton[i].checked) {	if (radioButton[i].checked) {
gradeBox.value = i;	gradeBox.value = i;
Line 1410 INNERJS	Line 1368 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.');
$request->print(<<SUBJAVASCRIPT);	$request->print(<<SUBJAVASCRIPT);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">

Line 1442 INNERJS	Line 1401 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("Please select a word or group of words from document and then click this link.");	alert("$alertmsg");
return;	return;
}	}
var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);	var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);
Line 1697 sub gradeBox {	Line 1656 sub gradeBox {
$wgt.')" /></td>'."\n";	$wgt.')" /></td>'."\n";
$line.='<td>/'.$wgt.' '.$wgtmsg.	$line.='<td>/'.$wgt.' '.$wgtmsg.
($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : '').	($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : '').
' </td><td>'."\n";	' </td><td><b>'.&mt('Grade Status').':</b>'."\n";
$line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.	$line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {	if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
Line 1710 sub gradeBox {	Line 1669 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 .=
&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);	'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.


$result.='</tr></table>'."\n";	$result.='</tr></table>'."\n";
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".	$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
Line 2094 KEYWORDS	Line 2053 KEYWORDS
$lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '.	$lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '.
$display_part.' <span class="LC_internal_info">( ID '.$respid.	$display_part.' <span class="LC_internal_info">( ID '.$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;
}	}
foreach my $submission (@$string) {	foreach my $submission (@$string) {
Line 2275 KEYWORDS	Line 2234 KEYWORDS
'<option>7</option><option>10</option></select>'."\n";	'<option>7</option><option>10</option></select>'."\n";
my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
$endform.=&mt('[_1]student(s)',$ntstu);	$endform.=&mt('[quant,_1,student]',$ntstu);
$endform.='  <input type="button" value="'.&mt('Previous').'" '.	$endform.='  <input type="button" value="'.&mt('Previous').'" '.
'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" />  '."\n".	'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" />  '."\n".
'<input type="button" value="'.&mt('Next').'" '.	'<input type="button" value="'.&mt('Next').'" '.
Line 2372 sub get_last_submission {	Line 2331 sub get_last_submission {
}	}
if (!@string) {	if (!@string) {
$string[0] =	$string[0] =
'<span class="LC_warning">Nothing submitted - no attempts.</span>';	'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span>';
}	}
return (\@string,\$timestamp);	return (\@string,\$timestamp);
}	}
Line 3018 sub file_name_version_ext {	Line 2977 sub file_name_version_ext {
sub viewgrades_js {	sub viewgrades_js {
my ($request) = shift;	my ($request) = shift;

	my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
$request->print(<<VIEWJAVASCRIPT);	$request->print(<<VIEWJAVASCRIPT);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function writePoint(partid,weight,point) {	function writePoint(partid,weight,point) {
Line 3026 sub viewgrades_js {	Line 2986 sub viewgrades_js {
if (point == "textval") {	if (point == "textval") {
point = document.classgrade["TEXTVAL_"+partid].value;	point = document.classgrade["TEXTVAL_"+partid].value;
if (isNaN(point) \|\| parseFloat(point) < 0) {	if (isNaN(point) \|\| parseFloat(point) < 0) {
alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));	alert("$alertmsg"+parseFloat(point));
var resetbox = false;	var resetbox = false;
for (var i=0; i<radioButton.length; i++) {	for (var i=0; i<radioButton.length; i++) {
if (radioButton[i].checked) {	if (radioButton[i].checked) {
Line 3124 sub viewgrades_js {	Line 3084 sub viewgrades_js {
var weight = document.classgrade["weight_"+partid].value;	var weight = document.classgrade["weight_"+partid].value;

if (isNaN(point) \|\| parseFloat(point) < 0) {	if (isNaN(point) \|\| parseFloat(point) < 0) {
alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));	alert("$alertmsg"+parseFloat(point));
textbox.value = "";	textbox.value = "";
return;	return;
}	}
Line 3216 sub viewgrades {	Line 3176 sub viewgrades {
my $sectionClass;	my $sectionClass;
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
if ($env{'form.section'} eq 'all') {	if ($env{'form.section'} eq 'all') {
$sectionClass='Class';	$sectionClass=&mt('Class');
} elsif ($env{'form.section'} eq 'none') {	} elsif ($env{'form.section'} eq 'none') {
$sectionClass='Students in no Section';	$sectionClass=&mt('Students in no Section');
} else {	} else {
$sectionClass='Students in Section(s) [_1]';	$sectionClass=&mt('Students in Section(s) [_1]');
}	}
$result.=	$result.=
'<h3>'.	'<h3>'.
&mt("Assign Common Grade To $sectionClass",$section_display).'</h3>';	&mt("Assign Common Grade to [_1]",$sectionClass,$section_display).'</h3>';
$result.= &Apache::loncommon::start_data_table();	$result.= &Apache::loncommon::start_data_table();
#radio buttons/text box for assigning points for a section or class.	#radio buttons/text box for assigning points for a section or class.
#handles different parts of a problem	#handles different parts of a problem
Line 3256 sub viewgrades {	Line 3216 sub viewgrades {
my $line = '<input type="text" name="TEXTVAL_'.	my $line = '<input type="text" name="TEXTVAL_'.
$partid.'" size="4" '.'onChange="javascript:writePoint(\''.	$partid.'" size="4" '.'onChange="javascript:writePoint(\''.
$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.	$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
$weight{$partid}.' (problem weight)</td>'."\n";	$weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n";
$line.= '<td><select name="SELVAL_'.$partid.'"'.	$line.= '<td><b>'.&mt('Grade Status').':</b><select name="SELVAL_'.$partid.'"'.
'onChange="javascript:writeRadText(\''.$partid.'\','.	'onChange="javascript:writeRadText(\''.$partid.'\','.
$weight{$partid}.')"> '.	$weight{$partid}.')"> '.
'<option selected="selected"> </option>'.	'<option selected="selected"> </option>'.
Line 3272 sub viewgrades {	Line 3232 sub viewgrades {

$result.=	$result.=
&Apache::loncommon::start_data_table_row()."\n".	&Apache::loncommon::start_data_table_row()."\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).	'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
&Apache::loncommon::end_data_table_row()."\n";	&Apache::loncommon::end_data_table_row()."\n";
$ctsparts++;	$ctsparts++;
}	}
Line 3283 sub viewgrades {	Line 3243 sub viewgrades {

#table listing all the students in a section/class	#table listing all the students in a section/class
#header of table	#header of table
$result.= '<h3>'.&mt('Assign Grade to Specific Students in '.$sectionClass,	$result.= '<h3>'.&mt('Assign Grade to Specific Students in ').$sectionClass,
$section_display).'</h3>';	$section_display.'</h3>';
$result.= &Apache::loncommon::start_data_table().	$result.= &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('No.').'</th>'.	'<th>'.&mt('No.').'</th>'.
Line 3294 sub viewgrades {	Line 3254 sub viewgrades {
my @partids = ();	my @partids = ();
foreach my $part (@parts) {	foreach my $part (@parts) {
my $display=&Apache::lonnet::metadata($url,$part.'.display');	my $display=&Apache::lonnet::metadata($url,$part.'.display');
$display =~ s\|^Number of Attempts\|Tries<br />\|; # makes the column narrower	my $narrowtext = &mt('Tries');
	$display =~ s\|^Number of Attempts\|$narrowtext <br />\|; # makes the column narrower
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }	if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
my ($partid) = &split_part_type($part);	my ($partid) = &split_part_type($part);
push(@partids,$partid);	push(@partids,$partid);
Line 3465 sub editgrades {	Line 3426 sub editgrades {
if ($part !~ m/^\Q$partid\E/) { next;}	if ($part !~ m/^\Q$partid\E/) { next;}
if ($type eq 'awarded' \|\| $type eq 'solved') { next; }	if ($type eq 'awarded' \|\| $type eq 'solved') { next; }
my $display=&Apache::lonnet::metadata($url,$stores.'.display');	my $display=&Apache::lonnet::metadata($url,$stores.'.display');
$display =~ s/\[Part: (\w)+\]//;	$display =~ s/\[Part: \Q$part\E\]//;
$display =~ s/Number of Attempts/Tries/;	my $narrowtext = &mt('Tries');
$header .= '<th align="center">'.&mt('Old '.$display).'</th>'.	$display =~ s/Number of Attempts/$narrowtext/;
'<th align="center">'.&mt('New '.$display).'</th>';	$header .= '<th align="center">'.&mt('Old').' '.$display.'</th>'.
	'<th align="center">'.&mt('New').' '.$display.'</th>';
$columns{$partid}+=2;	$columns{$partid}+=2;
}	}
}	}
Line 3810 ENDPICK	Line 3772 ENDPICK
}	}

sub checkforfile_js {	sub checkforfile_js {
	my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
my $result =<<CSVFORMJS;	my $result =<<CSVFORMJS;
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function checkUpload(formname) {	function checkUpload(formname) {
if (formname.upfile.value == "") {	if (formname.upfile.value == "") {
alert("Please use the browse button to select a file from your local directory.");	alert("$alertmsg");
return false;	return false;
}	}
formname.submit();	formname.submit();
Line 3834 sub upcsvScores_form {	Line 3797 sub upcsvScores_form {
$result.=$table;	$result.=$table;
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";	$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
$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();
Line 4088 sub csvuploadassign {	Line 4051 sub csvuploadassign {
sub pickStudentPage {	sub pickStudentPage {
my ($request) = shift;	my ($request) = shift;

	my $alertmsg = &mt('Please select the student you wish to grade.');
$request->print(<<LISTJAVASCRIPT);	$request->print(<<LISTJAVASCRIPT);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">

function checkPickOne(formname) {	function checkPickOne(formname) {
if (radioSelection(formname.student) == null) {	if (radioSelection(formname.student) == null) {
alert("Please select the student you wish to grade.");	alert("$alertmsg");
return;	return;
}	}
ptr = pullDownSelection(formname.selectpage);	ptr = pullDownSelection(formname.selectpage);
Line 4128 LISTJAVASCRIPT	Line 4092 LISTJAVASCRIPT
$ctr++;	$ctr++;
}	}
$select.= '</select>';	$select.= '</select>';
$result.=&mt(' <b>Problems from:</b> [_1]',$select)."<br />\n";	$result.=' <b>'.&mt('Problems from').':</b> '.$select."<br />\n";

$ctr=0;	$ctr=0;
foreach (@$titles) {	foreach (@$titles) {
Line 4143 LISTJAVASCRIPT	Line 4107 LISTJAVASCRIPT
my $options =	my $options =
'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".	'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n";	'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n";
$result.=' '.&mt('<b>View Problems Text: </b> [_1]',$options);	$result.=' <b>'.&mt('View Problem Text').': </b>'.$options;

$options =	$options =
'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n".	'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n".
'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n".	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n".
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n";	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n";
$result.=' '.&mt('<b>Submission Details: </b>[_1]',$options);	$result.=' <b>'.&mt('Submissions').': </b>'.$options;

$result.=&build_section_inputs();	$result.=&build_section_inputs();
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
Line 4158 LISTJAVASCRIPT	Line 4122 LISTJAVASCRIPT
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";

$result.=' '.&mt('<b>Use CODE: [_1] </b>',	$result.=' <b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n";
'<input type="text" name="CODE" value="" />').
'<br />'."\n";

$result.=' <input type="button" '.	$result.=' <input type="button" '.
'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next->').'" /><br />'."\n";	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' →" /><br />'."\n";

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

Line 4202 LISTJAVASCRIPT	Line 4164 LISTJAVASCRIPT
}	}
$studentTable.=&Apache::loncommon::end_data_table()."\n";	$studentTable.=&Apache::loncommon::end_data_table()."\n";
$studentTable.='<input type="button" '.	$studentTable.='<input type="button" '.
'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next->').'" /></form>'."\n";	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' →" /></form>'."\n";

$studentTable.=&show_grading_menu_form($symb);	$studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);	$request->print($studentTable);
Line 4339 sub displayPage {	Line 4301 sub displayPage {
# $request->print('match='.$1."<br />\n");	# $request->print('match='.$1."<br />\n");
# }	# }
# $companswer =~ s\|<table border=\"1\">\|<table border=\"0\">\|g;	# $companswer =~ s\|<table border=\"1\">\|<table border=\"0\">\|g;
$studentTable.=' <b>'.$title.'</b> <br /> '.&mt('<b>Correct answer:</b><br />[_1]',$companswer);	$studentTable.=' <b>'.$title.'</b> <br /> <b>'.&mt('Correct answer').':</b><br />'.$companswer;
}	}

my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);	my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
Line 4409 sub displaySubByDates {	Line 4371 sub displaySubByDates {
my %orders;	my %orders;
$mark{'correct_by_student'} = $checkIcon;	$mark{'correct_by_student'} = $checkIcon;
if (!exists($$record{'1:timestamp'})) {	if (!exists($$record{'1:timestamp'})) {
return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br />';	return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />';
}	}

my $interaction;	my $interaction;
Line 5525 sub scantron_parse_scanline {	Line 5487 sub scantron_parse_scanline {
my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_;	my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_;

my %record;	my %record;
my $questions=substr($line,$$scantron_config{'Qstart'}-1); # Answers	my $lastpos = $env{'form.scantron_maxbubble'}*$$scantron_config{'Qlength'};
	my $questions=substr($line,$$scantron_config{'Qstart'}-1,$lastpos); # Answers
my $data=substr($line,0,$$scantron_config{'Qstart'}-1); # earlier stuff	my $data=substr($line,0,$$scantron_config{'Qstart'}-1); # earlier stuff
if (!($$scantron_config{'CODElocation'} eq 0 \|\|	if (!($$scantron_config{'CODElocation'} eq 0 \|\|
$$scantron_config{'CODElocation'} eq 'none')) {	$$scantron_config{'CODElocation'} eq 'none')) {
Line 6215 sub scantron_validate_file {	Line 6178 sub scantron_validate_file {
}	}
if (!$stop) {	if (!$stop) {
my $warning=&scantron_warning_screen('Start Grading');	my $warning=&scantron_warning_screen('Start Grading');
$r->print(&mt('Validation process complete.').'<br />	$r->print(&mt('Validation process complete.').'<br />'.
'.$warning.'	$warning.
<input type="submit" name="submit" value="'.&mt('Start Grading').'" />	&mt('Perform verification for each student after storage of submissions?').
<input type="hidden" name="command" value="scantron_process" />	' <span class="LC_nobreak"><label>'.
');	'<input type="radio" name="verifyrecord" value="1" />'.&mt('Yes').'</label>'.
	(' 'x3).'<label>'.
	'<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No').
	'</label></span><br />'.
	&mt('Grading will take longer if you use verification.').'<br />'.
	&mt("Alternatively, the 'Review scantron data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'.
	'<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'.
	'<input type="hidden" name="command" value="scantron_process" />'."\n");
} else {	} else {
$r->print('<input type="hidden" name="command" value="scantron_validate" />');	$r->print('<input type="hidden" name="command" value="scantron_validate" />');
$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");	$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
}	}
if ($stop) {	if ($stop) {
if ($validate_phases[$currentphase] eq 'sequence') {	if ($validate_phases[$currentphase] eq 'sequence') {
$r->print('<input type="submit" name="submit" value="'.&mt('Ignore ->').' " />');	$r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' → " />');
$r->print(' '.&mt('this error').' <br />');	$r->print(' '.&mt('this error').' <br />');

$r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>");	$r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>");
} else {	} else {
if ($validate_phases[$currentphase] eq 'doublebubble' \|\| $validate_phases[$currentphase] eq 'missingbubbles') {	if ($validate_phases[$currentphase] eq 'doublebubble' \|\| $validate_phases[$currentphase] eq 'missingbubbles') {
$r->print('<input type="button" name="submitbutton" value="'.&mt('Continue ->').'" onclick="javascript:verify_bubble_radio(this.form)" />');	$r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' →" onclick="javascript:verify_bubble_radio(this.form)" />');
} else {	} else {
$r->print('<input type="submit" name="submit" value="'.&mt('Continue ->').'" />');	$r->print('<input type="submit" name="submit" value="'.&mt('Continue').' →" />');
}	}
$r->print(' '.&mt('using corrected info').' <br />');	$r->print(' '.&mt('using corrected info').' <br />');
$r->print("<input type='submit' value='".&mt("Skip")."' name='scantron_skip_record' />");	$r->print("<input type='submit' value='".&mt("Skip")."' name='scantron_skip_record' />");
Line 6613 sub scantron_validate_sequence {	Line 6582 sub scantron_validate_sequence {
return (0,$currentphase+1);	return (0,$currentphase+1);
}	}

=pod

=item scantron_validate_ID

Validates all scanlines in the selected file to not have any
invalid or underspecified student IDs

=cut

sub scantron_validate_ID {	sub scantron_validate_ID {
my ($r,$currentphase) = @_;	my ($r,$currentphase) = @_;
Line 6686 sub scantron_validate_ID {	Line 6648 sub scantron_validate_ID {
return (0,$currentphase+1);	return (0,$currentphase+1);
}	}

=pod

=item scantron_get_correction

Builds the interface screen to interact with the operator to fix a
specific error condition in a specific scanline

Arguments:
$r - Apache request object
$i - number of the current scanline
$scan_record - hash ref as returned from &scantron_parse_scanline()
$scan_config - hash ref as returned from &get_scantron_config()
$line - full contents of the current scanline
$error - error condition, valid values are
'incorrectCODE', 'duplicateCODE',
'doublebubble', 'missingbubble',
'duplicateID', 'incorrectID'
$arg - extra information needed
For errors:
- duplicateID - paper number that this studentID was seen before on
- duplicateCODE - array ref of the paper numbers this CODE was
seen on before
- incorrectCODE - current incorrect CODE
- doublebubble - array ref of the bubble lines that have double
bubble errors
- missingbubble - array ref of the bubble lines that have missing
bubble errors

=cut

sub scantron_get_correction {	sub scantron_get_correction {
my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;	my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
Line 7285 sub scantron_validate_doublebubble {	Line 7218 sub scantron_validate_doublebubble {
return (0,$currentphase+1);	return (0,$currentphase+1);
}	}

=pod

=item scantron_get_maxbubble

Returns the maximum number of bubble lines that are expected to
occur. Does this by walking the selected sequence rendering the
resource and then checking &Apache::lonxml::get_problem_counter()
for what the current value of the problem counter is.

Caches the results to $env{'form.scantron_maxbubble'},
$env{'form.scantron.bubble_lines.n'},
$env{'form.scantron.first_bubble_line.n'} and
$env{"form.scantron.sub_bubblelines.n"}
which are the total number of bubble, lines, the number of bubble
lines for response n and number of the first bubble line for response n,
and a comma separated list of numbers of bubble lines for sub-questions
(for optionresponse, matchresponse, and rankresponse items), for response n.

=cut

sub scantron_get_maxbubble {	sub scantron_get_maxbubble {
if (defined($env{'form.scantron_maxbubble'}) &&	if (defined($env{'form.scantron_maxbubble'}) &&
Line 7335 sub scantron_get_maxbubble {	Line 7249 sub scantron_get_maxbubble {
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);
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;

# TODO - make this a persistent hash not an array.	# TODO - make this a persistent hash not an array.
Line 7389 sub scantron_get_maxbubble {	Line 7302 sub scantron_get_maxbubble {
}	}
}	}
}	}
&Apache::lonnet::delenv('scantron\.');	&Apache::lonnet::delenv('scantron.');

&save_bubble_lines();	&save_bubble_lines();
$env{'form.scantron_maxbubble'} =	$env{'form.scantron_maxbubble'} =
Line 7399 sub scantron_get_maxbubble {	Line 7312 sub scantron_get_maxbubble {

sub scantron_partids_tograde {	sub scantron_partids_tograde {
my ($resource,$cid,$uname,$udom) = @_;	my ($resource,$cid,$uname,$udom) = @_;
my (%analysis,@parts);	my (%analysis,@parts);

if (ref($resource)) {	if (ref($resource)) {
my $symb = $resource->symb();	my $symb = $resource->symb();
Line 7424 sub scantron_partids_tograde {	Line 7337 sub scantron_partids_tograde {
return (\%analysis,\@parts);	return (\%analysis,\@parts);
}	}

=pod

=item scantron_validate_missingbubbles

Validates all scanlines in the selected file to not have any
answers that don't have bubbles that have not been verified
to be bubble free.

=cut

sub scantron_validate_missingbubbles {	sub scantron_validate_missingbubbles {
my ($r,$currentphase) = @_;	my ($r,$currentphase) = @_;
#get student info	#get student info
Line 7487 sub scantron_validate_missingbubbles {	Line 7390 sub scantron_validate_missingbubbles {
return (0,$currentphase+1);	return (0,$currentphase+1);
}	}

=pod

=item scantron_process_students

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

The parsed scanline hash is added to %env

Then foreach unskipped scanline it does an &Apache::lonnet::ssi()
foreach resource , with the form data of

'submitted' =>'scantron'
'grade_target' =>'grade',
'grade_username'=> username of student
'grade_domain' => domain of student
'grade_courseid'=> of course
'grade_symb' => symb of resource to grade

This triggers a grading pass. The problem grading code takes care
of converting the bubbled letter information (now in %env) into a
valid submission.

=cut

sub scantron_process_students {	sub scantron_process_students {
my ($r) = @_;	my ($r) = @_;
Line 7531 sub scantron_process_students {	Line 7411 sub scantron_process_students {

my ($uname,$udom,%partids_by_symb);	my ($uname,$udom,%partids_by_symb);
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my $ressymb = $resource->symb();	my $ressymb = $resource->symb();
my ($analysis,$parts) =	my ($analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom);	&scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom);
$partids_by_symb{$ressymb} = $parts;	$partids_by_symb{$ressymb} = $parts;
}	}
Line 7545 SCANTRONFORM	Line 7425 SCANTRONFORM
$r->print($result);	$r->print($result);

my @delayqueue;	my @delayqueue;
my (%completedstudents,,%scandata);	my (%completedstudents,%scandata);

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);
Line 7607 SCANTRONFORM	Line 7487 SCANTRONFORM
if (&scantron_clear_skip($scanlines,$scan_data,$i)) {	if (&scantron_clear_skip($scanlines,$scan_data,$i)) {
&scantron_putfile($scanlines,$scan_data);	&scantron_putfile($scanlines,$scan_data);
}	}

my $scancode;	my $scancode;
if ((exists($scan_record->{'scantron.CODE'})) &&	if ((exists($scan_record->{'scantron.CODE'})) &&
(&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {	(&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {
Line 7681 SCANTRONFORM	Line 7561 SCANTRONFORM
}	}
}	}
}	}
if (&Apache::loncommon::connection_aborted($r)) { last; }	if (&Apache::loncommon::connection_aborted($r)) { last; }
} continue {	} continue {
&Apache::lonxml::clear_problem_counter();	&Apache::lonxml::clear_problem_counter();
&Apache::lonnet::delenv('scantron\.');	&Apache::lonnet::delenv('scantron.');
}	}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
&Apache::lonnet::remove_lock($lock);	&Apache::lonnet::remove_lock($lock);
Line 7705 sub grade_student_bubbles {	Line 7585 sub grade_student_bubbles {
'grade_domain' => $udom,	'grade_domain' => $udom,
'grade_courseid'=> $env{'request.course.id'},	'grade_courseid'=> $env{'request.course.id'},
'grade_symb' => $resource->symb(),	'grade_symb' => $resource->symb(),
'code' => $scancode);	'CODE' => $scancode);
my $result=&ssi_with_retries($resource->src(),$ssi_retries,%form);	my $result=&ssi_with_retries($resource->src(),$ssi_retries,%form);
return 'ssi_error' if ($ssi_error);	return 'ssi_error' if ($ssi_error);
last if (&Apache::loncommon::connection_aborted($r));	last if (&Apache::loncommon::connection_aborted($r));
Line 7713 sub grade_student_bubbles {	Line 7593 sub grade_student_bubbles {
return;	return;
}	}

=pod

=item scantron_upload_scantron_data

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

=cut

sub scantron_upload_scantron_data {	sub scantron_upload_scantron_data {
my ($r)=@_;	my ($r)=@_;
$r->print(&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}));	$r->print(&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}));
Line 7734 sub scantron_upload_scantron_data {	Line 7606 sub scantron_upload_scantron_data {
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function checkUpload(formname) {	function checkUpload(formname) {
if (formname.upfile.value == "") {	if (formname.upfile.value == "") {
alert("Please use the browse button to select a file from your local directory.");	alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
return false;	return false;
}	}
formname.submit();	formname.submit();
Line 7761 sub scantron_upload_scantron_data {	Line 7633 sub scantron_upload_scantron_data {
return '';	return '';
}	}

=pod

=item scantron_upload_scantron_data_save

Adds a provided bubble information data file to the course if user
has the correct privileges to do so.

=cut

sub scantron_upload_scantron_data_save {	sub scantron_upload_scantron_data_save {
my($r)=@_;	my($r)=@_;
Line 7830 sub scantron_upload_scantron_data_save {	Line 7694 sub scantron_upload_scantron_data_save {
return '';	return '';
}	}

=pod

=item valid_file

Validates that the requested bubble data file exists in the course.

=cut

sub valid_file {	sub valid_file {
my ($requested_file)=@_;	my ($requested_file)=@_;
foreach my $filename (sort(&scantron_filenames())) {	foreach my $filename (sort(&scantron_filenames())) {
Line 7846 sub valid_file {	Line 7702 sub valid_file {
return 0;	return 0;
}	}

=pod

=item scantron_download_scantron_data

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

=cut

sub scantron_download_scantron_data {	sub scantron_download_scantron_data {
my ($r)=@_;	my ($r)=@_;
my $default_form_data=&defaultFormData(&get_symb($r,1));	my $default_form_data=&defaultFormData(&get_symb($r,1));
Line 7933 sub checkscantron_results {	Line 7779 sub checkscantron_results {
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron/Submissions Comparison Status',	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron/Submissions Comparison Status',
'Progress of Scantron Data/Submission Records Comparison',$count,	'Progress of Scantron Data/Submission Records Comparison',$count,
'inline',undef,'checkscantron');	'inline',undef,'checkscantron');
my ($username,$domain,$uname,$started);	my ($username,$domain,$started);

&Apache::grades::scantron_get_maxbubble(); # Need the bubble lines array to parse.	&Apache::grades::scantron_get_maxbubble(); # Need the bubble lines array to parse.

Line 8158 sub verify_scantron_grading {	Line 8004 sub verify_scantron_grading {
return ($counter,$record);	return ($counter,$record);
}	}

sub letter_to_digits {	sub letter_to_digits {
my %lettdig = (	my %lettdig = (
A => 1,	A => 1,
B => 2,	B => 2,
Line 8174 sub letter_to_digits {	Line 8020 sub letter_to_digits {
return %lettdig;	return %lettdig;
}	}

=pod

=back

=cut

#-------- end of section for handling grading scantron forms -------	#-------- end of section for handling grading scantron forms -------
#	#
Line 8225 sub grading_menu {	Line 8066 sub grading_menu {
'saveState'=>"",	'saveState'=>"",
'gradingMenu'=>1,	'gradingMenu'=>1,
'showgrading'=>"yes");	'showgrading'=>"yes");
my $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
my @menu = ({ url => $url,	my $url1 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
name => &mt('Manual Grading/View Submissions'),
short_description =>
&mt('Start the process of hand grading submissions.'),
});
$fields{'command'} = 'csvform';	$fields{'command'} = 'csvform';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push(@menu, { url => $url,
name => &mt('Upload Scores'),
short_description =>
&mt('Specify a file containing the class scores for current resource.')});
$fields{'command'} = 'processclicker';	$fields{'command'} = 'processclicker';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url3 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push(@menu, { url => $url,
name => &mt('Process Clicker'),
short_description =>
&mt('Specify a file containing the clicker information for this resource.')});
$fields{'command'} = 'scantron_selectphase';	$fields{'command'} = 'scantron_selectphase';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push(@menu, { url => $url,
name => &mt('Grade/Manage/Review Scantron Forms'),	my @menu = ({ categorytitle=>'Course Grading',
short_description =>	items =>[
&mt('Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.')});	{ linktext => 'Manual Grading/View Submissions',
$fields{'command'} = 'verify';	url => $url1,
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	permission => 'F',
push(@menu, { url => "",	icon => 'edit-find-replace.png',
name => &mt('Verify Receipt'),	linktitle => 'Start the process of hand grading submissions.'
short_description =>	},
&mt('')});	{ linktext => 'Upload Scores',
	url => $url2,
	permission => 'F',
	icon => 'uploadscores.png',
	linktitle => 'Specify a file containing the class scores for current resource.'
	},
	{ linktext => 'Process Clicker',
	url => $url3,
	permission => 'F',
	icon => 'addClickerInfoFile.png',
	linktitle => 'Specify a file containing the clicker information for this resource.'
	},
	{ linktext => 'Grade/Manage/Review Scantron Forms',
	url => $url4,
	permission => 'F',
	icon => 'stat.png',
	linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'
	}
	]
	});

	#$fields{'command'} = 'verify';
	#$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
#	#
# Create the menu	# Create the menu
my $Str;	my $Str;
Line 8268 sub grading_menu {	Line 8122 sub grading_menu {
'<input type="hidden" name="gradingMenu" value="1" />'."\n".	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";	'<input type="hidden" name="showgrading" value="yes" />'."\n";

foreach my $menudata (@menu) {	$Str .= Apache::lonhtmlcommon::generate_menu(@menu);
if ($menudata->{'name'} ne &mt('Verify Receipt')) {	#$menudata->{'jscript'}
$Str .=' <h3><a '.	$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '.
$menudata->{'jscript'}.	' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
' href="'.	' /> '.
$menudata->{'url'}.'" >'.	&Apache::lonnet::recprefix($env{'request.course.id'}).
$menudata->{'name'}."</a></h3>\n";	'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
} else {
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '.
$menudata->{'jscript'}.
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
' /> '.
&Apache::lonnet::recprefix($env{'request.course.id'}).
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
}
$Str .= ' '.(' 'x8).$menudata->{'short_description'}.
"\n";
}
$Str .="</form>\n";	$Str .="</form>\n";
	my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");
$request->print(<<GRADINGMENUJS);	$request->print(<<GRADINGMENUJS);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function checkChoice(formname,val,cmdx) {	function checkChoice(formname,val,cmdx) {
Line 8314 sub grading_menu {	Line 8159 sub grading_menu {
if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
if (nospace == "notOK" && (isNaN(receiptNo) \|\| receiptNo == "")) {checkOpt = true;}	if (nospace == "notOK" && (isNaN(receiptNo) \|\| receiptNo == "")) {checkOpt = true;}
if (checkOpt) {	if (checkOpt) {
alert("Please enter a receipt number given by a student in the receipt box.");	alert("$receiptalert");
formname.receipt.value = "";	formname.receipt.value = "";
formname.receipt.focus();	formname.receipt.focus();
return false;	return false;
Line 8335 sub submit_options {	Line 8180 sub submit_options {
if (!$symb) {return '';}	if (!$symb) {return '';}
my $probTitle = &Apache::lonnet::gettitle($symb);	my $probTitle = &Apache::lonnet::gettitle($symb);

	my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");
$request->print(<<GRADINGMENUJS);	$request->print(<<GRADINGMENUJS);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function checkChoice(formname,val,cmdx) {	function checkChoice(formname,val,cmdx) {
Line 8362 sub submit_options {	Line 8208 sub submit_options {
if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
if (nospace == "notOK" && (isNaN(receiptNo) \|\| receiptNo == "")) {checkOpt = true;}	if (nospace == "notOK" && (isNaN(receiptNo) \|\| receiptNo == "")) {checkOpt = true;}
if (checkOpt) {	if (checkOpt) {
alert("Please enter a receipt number given by a student in the receipt box.");	alert("$receiptalert");
formname.receipt.value = "";	formname.receipt.value = "";
formname.receipt.focus();	formname.receipt.focus();
return false;	return false;
Line 8381 GRADINGMENUJS	Line 8227 GRADINGMENUJS
my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});	my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});	my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});

	# Preselect sections
	my $selsec="";
	if (ref($sections)) {
	foreach my $section (sort(@$sections)) {
	$selsec.='<option value="'.$section.'" '.
	($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
	}
	}

$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".	$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".	'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
Line 8391 GRADINGMENUJS	Line 8246 GRADINGMENUJS
'<input type="hidden" name="showgrading" value="yes" />'."\n";	'<input type="hidden" name="showgrading" value="yes" />'."\n";

$result.='	$result.='
<div class="LC_grade_select_mode">	<h2>
<div class="LC_grade_select_mode_current">	'.&mt('Grade Current Resource').'
<h2>	</h2>
'.&mt('Grade Current Resource').'	<div>
</h2>	'.$table.'
<div class="LC_grade_select_mode_body">	</div>
<div class="LC_grades_resource_info">
'.$table.'	<div class="LC_columnSection">
</div>
<div class="LC_grade_select_mode_selector">	<fieldset>
<div class="LC_grade_select_mode_selector_header">	<legend>
'.&mt('Sections').'	'.&mt('Sections').'
</div>	</legend>
<div class="LC_grade_select_mode_selector_body">	<select name="section" multiple="multiple" size="5">'."\n";
<select name="section" multiple="multiple" size="5">'."\n";	$result.= $selsec;
if (ref($sections)) {
foreach my $section (sort(@$sections)) {
$result.='<option value="'.$section.'" '.
($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
}
}
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';	$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';
$result.='	$result.='
</div>	</fieldset>
</div>
<div class="LC_grade_select_mode_selector">	<fieldset>
<div class="LC_grade_select_mode_selector_header">	<legend>
'.&mt('Groups').'	'.&mt('Groups').'
</div>	</legend>
<div class="LC_grade_select_mode_selector_body">	'.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
'.&Apache::lonstatistics::GroupSelect('group','multiple',5).'	</fieldset>
</div>
</div>	<fieldset>
<div class="LC_grade_select_mode_selector">	<legend>
<div class="LC_grade_select_mode_selector_header">	'.&mt('Access Status').'
'.&mt('Access Status').'	</legend>
</div>	'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
<div class="LC_grade_select_mode_selector_body">	</fieldset>
'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
</div>	<fieldset>
</div>	<legend>
<div class="LC_grade_select_mode_selector">	'.&mt('Submission Status').'
<div class="LC_grade_select_mode_selector_header">	</legend>
'.&mt('Submission Status').'	<select name="submitonly" size="5">
</div>
<div class="LC_grade_select_mode_selector_body">
<select name="submitonly" size="5">
<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>	<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>	<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
<option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>	<option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
<option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>	<option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>
<option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>	<option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>
</select>	</select>
</div>	</fieldset>
</div>
<div class="LC_grade_select_mode_type_body">	</div>
<div class="LC_grade_select_mode_type">
	<br />
	<div>
	<div>
<label>	<label>
<input type="radio" name="radioChoice" value="submission" '.	<input type="radio" name="radioChoice" value="submission" '.
($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.	($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.
&mt('Select individual students to grade and view submissions.').'	&mt('Select individual students to grade and view submissions.').'
</label>	</label>
</div>	</div>
<div class="LC_grade_select_mode_type">	<div>
<label>	<label>
<input type="radio" name="radioChoice" value="viewgrades" '.	<input type="radio" name="radioChoice" value="viewgrades" '.
($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.	($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
&mt('Grade all selected students in a grading table.').'	&mt('Grade all selected students in a grading table.').'
</label>	</label>
</div>	</div>
<div class="LC_grade_select_mode_type">	<div>
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" />	<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" />
</div>	</div>
</div>	</div>
</div>
</div>
<div class="LC_grade_select_mode_page">
<h2>	<h2>
'.&mt('Grade Complete Folder for One Student').'	'.&mt('Grade Complete Folder for One Student').'
</h2>	</h2>
<div class="LC_grades_select_mode_body">	<div>
<div class="LC_grade_select_mode_type_body">	<div>
<div class="LC_grade_select_mode_type">
<label>	<label>
<input type="radio" name="radioChoice" value="pickStudentPage" '.	<input type="radio" name="radioChoice" value="pickStudentPage" '.
($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.	($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
&mt('The <b>complete</b> page/sequence/folder: For one student').'	&mt('The <b>complete</b> page/sequence/folder: For one student').'
</label>	</label>
</div>	</div>
<div class="LC_grade_select_mode_type">	<div>
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" />	<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" />
</div>	</div>
</div>
</div>	</div>
</div>
</div>
</form>';	</form>';
$result .= &show_grading_menu_form($symb);	$result .= &show_grading_menu_form($symb);
return $result;	return $result;
Line 8585 sub process_clicker {	Line 8429 sub process_clicker {
$result.=$table;	$result.=$table;
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";	$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
$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();
Line 9021 ENDHEADER	Line 8865 ENDHEADER
}	}
}	}
# We are done	# We are done
$result.='<br />'.&mt('Successfully stored grades for [_1] student(s).',$storecount).	$result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount).
'</td></tr></table>'."\n".	'</td></tr></table>'."\n".
'</td></tr></table><br /><br />'."\n";	'</td></tr></table><br /><br />'."\n";
return $result.&show_grading_menu_form($symb);	return $result.&show_grading_menu_form($symb);
Line 9047 sub handler {	Line 8891 sub handler {
}	}

$ssi_error = 0;	$ssi_error = 0;
$request->print(&Apache::loncommon::start_page('Grading'));	my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];
	$request->print(&Apache::loncommon::start_page('Grading',undef,
	{'bread_crumbs' => $brcrum}));
if ($symb eq '' && $command eq '') {	if ($symb eq '' && $command eq '') {
if ($env{'user.adv'}) {	if ($env{'user.adv'}) {
if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&	if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
Line 9159 sub handler {	Line 9005 sub handler {
1;	1;

__END__;	__END__;


	=head1 NAME

	Apache::grades

	=head1 SYNOPSIS

	Handles the viewing of grades.

	This is part of the LearningOnline Network with CAPA project
	described at http://www.lon-capa.org.

	=head1 OVERVIEW

	Do an ssi with retries:
	While I'd love to factor out this with the vesrion in lonprintout,
	that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure
	I'm not quite ready to invent (e.g. an ssi_with_retry object).

	At least the logic that drives this has been pulled out into loncommon.



	ssi_with_retries - Does the server side include of a resource.
	if the ssi call returns an error we'll retry it up to
	the number of times requested by the caller.
	If we still have a proble, no text is appended to the
	output and we set some global variables.
	to indicate to the caller an SSI error occurred.
	All of this is supposed to deal with the issues described
	in LonCAPA BZ 5631 see:
	http://bugs.lon-capa.org/show_bug.cgi?id=5631
	by informing the user that this happened.

	Parameters:
	resource - The resource to include. This is passed directly, without
	interpretation to lonnet::ssi.
	form - The form hash parameters that guide the interpretation of the resource

	retries - Number of retries allowed before giving up completely.
	Returns:
	On success, returns the rendered resource identified by the resource parameter.
	Side Effects:
	The following global variables can be set:
	ssi_error - If an unrecoverable error occurred this becomes true.
	It is up to the caller to initialize this to false
	if desired.
	ssi_error_resource - If an unrecoverable error occurred, this is the value
	of the resource that could not be rendered by the ssi
	call.
	ssi_error_message - The error string fetched from the ssi response
	in the event of an error.


	=head1 HANDLER SUBROUTINE

	ssi_with_retries()

	=head1 SUBROUTINES

	=over

	=item scantron_get_correction() :

	Builds the interface screen to interact with the operator to fix a
	specific error condition in a specific scanline

	Arguments:
	$r - Apache request object
	$i - number of the current scanline
	$scan_record - hash ref as returned from &scantron_parse_scanline()
	$scan_config - hash ref as returned from &get_scantron_config()
	$line - full contents of the current scanline
	$error - error condition, valid values are
	'incorrectCODE', 'duplicateCODE',
	'doublebubble', 'missingbubble',
	'duplicateID', 'incorrectID'
	$arg - extra information needed
	For errors:
	- duplicateID - paper number that this studentID was seen before on
	- duplicateCODE - array ref of the paper numbers this CODE was
	seen on before
	- incorrectCODE - current incorrect CODE
	- doublebubble - array ref of the bubble lines that have double
	bubble errors
	- missingbubble - array ref of the bubble lines that have missing
	bubble errors

	=item scantron_get_maxbubble() :

	Returns the maximum number of bubble lines that are expected to
	occur. Does this by walking the selected sequence rendering the
	resource and then checking &Apache::lonxml::get_problem_counter()
	for what the current value of the problem counter is.

	Caches the results to $env{'form.scantron_maxbubble'},
	$env{'form.scantron.bubble_lines.n'},
	$env{'form.scantron.first_bubble_line.n'} and
	$env{"form.scantron.sub_bubblelines.n"}
	which are the total number of bubble, lines, the number of bubble
	lines for response n and number of the first bubble line for response n,
	and a comma separated list of numbers of bubble lines for sub-questions
	(for optionresponse, matchresponse, and rankresponse items), for response n.


	=item scantron_validate_missingbubbles() :

	Validates all scanlines in the selected file to not have any
	answers that don't have bubbles that have not been verified
	to be bubble free.

	=item scantron_process_students() :

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

	The parsed scanline hash is added to %env

	Then foreach unskipped scanline it does an &Apache::lonnet::ssi()
	foreach resource , with the form data of

	'submitted' =>'scantron'
	'grade_target' =>'grade',
	'grade_username'=> username of student
	'grade_domain' => domain of student
	'grade_courseid'=> of course
	'grade_symb' => symb of resource to grade

	This triggers a grading pass. The problem grading code takes care
	of converting the bubbled letter information (now in %env) into a
	valid submission.

	=item scantron_upload_scantron_data() :

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

	=item scantron_upload_scantron_data_save() :

	Adds a provided bubble information data file to the course if user
	has the correct privileges to do so.

	=item valid_file() :

	Validates that the requested bubble data file exists in the course.

	=item scantron_download_scantron_data() :

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

	=item scantron_validate_ID() :

	Validates all scanlines in the selected file to not have any
	invalid or underspecified student IDs

	=back

	=cut

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

Removed from v.1.528.2.7
changed lines
	Added in v.1.552