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.574.2.2 and 1.590

version 1.574.2.2, 2009/06/06 19:36:37	version 1.590, 2010/01/18 17:54:26
Line 97 sub ssi_print_error {	Line 97 sub ssi_print_error {
#	#
# --- Retrieve the parts from the metadata file.---	# --- Retrieve the parts from the metadata file.---
sub getpartlist {	sub getpartlist {
my ($symb) = @_;	my ($symb,$errorref) = @_;

my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	if (ref($errorref)) {
	$$errorref = 'navmap';
	return;
	}
	}
my $res = $navmap->getBySymb($symb);	my $res = $navmap->getBySymb($symb);
my $partlist = $res->parts();	my $partlist = $res->parts();
my $url = $res->src();	my $url = $res->src();
Line 144 sub nameUserString {	Line 150 sub nameUserString {
#--- Get the partlist and the response type for a given problem. ---	#--- Get the partlist and the response type for a given problem. ---
#--- Indicate if a response type is coded handgraded or not. ---	#--- Indicate if a response type is coded handgraded or not. ---
sub response_type {	sub response_type {
my ($symb) = shift;	my ($symb,$response_error) = @_;

my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	if (ref($response_error)) {
	$$response_error = 1;
	}
	return;
	}
my $res = $navmap->getBySymb($symb);	my $res = $navmap->getBySymb($symb);
my $partlist = $res->parts();	my $partlist = $res->parts();
my %vPart =	my %vPart =
Line 183 sub get_display_part {	Line 195 sub get_display_part {
my ($partID,$symb)=@_;	my ($partID,$symb)=@_;
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);	my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
if (defined($display) and $display ne '') {	if (defined($display) and $display ne '') {
$display.= " (<span class=\"LC_internal_info\">id $partID</span>)";	$display.= ' (<span class="LC_internal_info">'
	.&mt('Part ID: [_1]',$partID).'</span>)';
} else {	} else {
$display=$partID;	$display=$partID;
}	}
Line 193 sub get_display_part {	Line 206 sub get_display_part {
#--- Show resource title	#--- Show resource title
#--- and parts and response type	#--- and parts and response type
sub showResourceInfo {	sub showResourceInfo {
my ($symb,$probTitle,$checkboxes) = @_;	my ($symb,$probTitle,$checkboxes,$res_error) = @_;
my $col=3;
if ($checkboxes) { $col=4; }
my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";	my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";
$result .='<table border="0">';	my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
my ($partlist,$handgrade,$responseType) = &response_type($symb);	if (ref($res_error)) {
	if ($$res_error) {
	return;
	}
	}
	$result.=&Apache::loncommon::start_data_table()
	.&Apache::loncommon::start_data_table_header_row();
	if ($checkboxes) {
	$result.='<th> </th>';
	}
	$result.='<th>'.&mt('Problem Part').'</th>'
	.'<th>'.&mt('Res. ID').'</th>'
	.'<th>'.&mt('Type').'</th>'
	.&Apache::loncommon::end_data_table_header_row();
my %resptype = ();	my %resptype = ();
my $hdgrade='no';	my $hdgrade='no';
my %partsseen;	my %partsseen;
foreach my $partID (sort(keys(%$responseType))) {	foreach my $partID (sort(keys(%$responseType))) {
foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {	foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {
my $handgrade=$$handgrade{$partID.'_'.$resID};	my $handgrade=$$handgrade{$partID.'_'.$resID};
my $responsetype = $responseType->{$partID}->{$resID};	my $responsetype = $responseType->{$partID}->{$resID};
$hdgrade = $handgrade if ($handgrade eq 'yes');	$hdgrade = $handgrade if ($handgrade eq 'yes');
$result.='<tr>';	$result.=&Apache::loncommon::start_data_table_row();
if ($checkboxes) {	if ($checkboxes) {
if (exists($partsseen{$partID})) {	if (exists($partsseen{$partID})) {
$result.="<td> </td>";	$result.="<td> </td>";
} else {	} else {
$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>";	$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>";
}	}
$partsseen{$partID}=1;	$partsseen{$partID}=1;
}	}
my $display_part=&get_display_part($partID,$symb);	my $display_part=&get_display_part($partID,$symb);
$result.='<td><b>'.&mt('Part').': </b>'.$display_part.	$result.='<td>'.$display_part.'</td>'
' <span class="LC_internal_info">'.$resID.'</span></td>'.	.'<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>'
'<td><b>'.&mt('Type').': </b>'.$responsetype.'</td></tr>';	.'<td>'.&mt($responsetype).'</td>'
# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';	# .'<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td>'
}	.&Apache::loncommon::end_data_table_row();
	}
}	}
$result.='</table>'."\n";	$result.=&Apache::loncommon::end_data_table();
return $result,$responseType,$hdgrade,$partlist,$handgrade;	return $result,$responseType,$hdgrade,$partlist,$handgrade;
}	}

Line 754 sub verifyreceipt {	Line 779 sub verifyreceipt {

my $title.=	my $title.=
'<h3><span class="LC_info">'.	'<h3><span class="LC_info">'.
&mt('Verifying Receipt No. [_1]',$receipt).	&mt('Verifying Receipt No. [_1]',$receipt).
'</span></h3>'."\n".	'</span></h3>'."\n".
'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).	'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
'</h4>'."\n";	'</h4>'."\n";
Line 766 sub verifyreceipt {	Line 791 sub verifyreceipt {
if ($env{"course.$courseid.receiptalg"} eq 'receipt2' \|\|	if ($env{"course.$courseid.receiptalg"} eq 'receipt2' \|\|
$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
my $parts=['0'];	my $parts=['0'];
if ($receiptparts) { ($parts)=&response_type($symb); }	if ($receiptparts) {
	my $res_error;
	($parts)=&response_type($symb,\$res_error);
	if ($res_error) {
	return &navmap_errormsg();
	}
	}

my $header =	my $header =
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
Line 808 sub verifyreceipt {	Line 839 sub verifyreceipt {
}	}
}	}
if ($matches == 0) {	if ($matches == 0) {
$string = $title.&mt('No match found for the above receipt.');	$string = $title
	.'<p class="LC_warning">'
	.&mt('No match found for the above receipt number.')
	.'</p>';
} else {	} else {
$string = &jscriptNform($symb).$title.	$string = &jscriptNform($symb).$title.
'<p>'.	'<p>'.
&mt('The above receipt matches the following [numerate,_1,student].',$matches).	&mt('The above receipt number matches the following [quant,_1,student].',$matches).
'</p>'.	'</p>'.
$header.	$header.
$contents.	$contents.
Line 959 LISTJAVASCRIPT	Line 993 LISTJAVASCRIPT
# 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();
my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);	my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);
$gradeTable.= &Apache::loncommon::start_data_table().	$gradeTable.= &Apache::loncommon::start_data_table().
Line 1077 LISTJAVASCRIPT	Line 1111 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 1583 INNERJS	Line 1617 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=\\"Save\\" onclick=\\"javascript:checkInput()\\">  ");
pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");	pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" 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 1657 INNERJS	Line 1691 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=\\"Save\\" onclick=\\"javascript:updateChoice(1)\\">  ");
hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");	hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" 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 1677 sub get_increment {	Line 1711 sub get_increment {
return $increment;	return $increment;
}	}

	sub gradeBox_start {
	return (
	&Apache::loncommon::start_data_table()
	.&Apache::loncommon::start_data_table_header_row()
	.'<th>'.&mt('Part').'</th>'
	.'<th>'.&mt('Points').'</th>'
	.'<th> </th>'
	.'<th>'.&mt('Assign Grade').'</th>'
	.'<th>'.&mt('Weight').'</th>'
	.'<th>'.&mt('Grade Status').'</th>'
	.&Apache::loncommon::end_data_table_header_row()
	);
	}

	sub gradeBox_end {
	return (
	&Apache::loncommon::end_data_table()
	);
	}
#--- displays the grading box, used in essay type problem and grading by page/sequence	#--- displays the grading box, used in essay type problem and grading by page/sequence
sub gradeBox {	sub gradeBox {
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;	my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
Line 1696 sub gradeBox {	Line 1749 sub gradeBox {
if ($last_resets{$partid}) {	if ($last_resets{$partid}) {
$aggtries = &get_num_tries($record,$last_resets{$partid},$partid);	$aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
}	}
$result.='<table border="0"><tr>';	$result.=&Apache::loncommon::start_data_table_row();
my $ctr = 0;	my $ctr = 0;
my $thisweight = 0;	my $thisweight = 0;
my $increment = &get_increment();	my $increment = &get_increment();
Line 1704 sub gradeBox {	Line 1757 sub gradeBox {
my $radio.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across	my $radio.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across
while ($thisweight<=$wgt) {	while ($thisweight<=$wgt) {
$radio.= '<td><span class="LC_nobreak"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.	$radio.= '<td><span class="LC_nobreak"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.	'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
$thisweight.')" value="'.$thisweight.'" '.	$thisweight.')" value="'.$thisweight.'" '.
($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";	($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";
$radio.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');	$radio.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
Line 1715 sub gradeBox {	Line 1768 sub gradeBox {

my $line.='<input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.	my $line.='<input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
($score ne ''? ' value = "'.$score.'"':'').' size="4" '.	($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
'onChange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','.	'onchange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','.
$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><b>'.&mt('Grade Status').':</b>'."\n";	' </td>'."\n";
$line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.	$line.='<td><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.='<option></option>'.	$line.='<option></option>'.
'<option value="excused" selected="selected">'.&mt('excused').'</option>';	'<option value="excused" selected="selected">'.&mt('excused').'</option>';
Line 1734 sub gradeBox {	Line 1787 sub gradeBox {

#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);	#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
$result .=	$result .=
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.	'<td>'.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';
	$result.=&Apache::loncommon::end_data_table_row();
$result.='</tr></table>'."\n";
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".	$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.	'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
Line 1745 sub gradeBox {	Line 1797 sub gradeBox {
$$record{'resource.'.$partid.'.tries'}.'" />'."\n".	$$record{'resource.'.$partid.'.tries'}.'" />'."\n".
'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.	'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
$aggtries.'" />'."\n";	$aggtries.'" />'."\n";
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);	my $res_error;
	$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error);
	if ($res_error) {
	return &navmap_errormsg();
	}
return $result;	return $result;
}	}

sub handback_box {	sub handback_box {
my ($symb,$uname,$udom,$counter,$partid,$record) = @_;	my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_;
my ($partlist,$handgrade,$responseType) = &response_type($symb);	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) {
Line 1813 sub show_problem {	Line 1869 sub show_problem {
$companswer=~s\|name="submit"\|name="would_have_been_submit"\|g;	$companswer=~s\|name="submit"\|name="would_have_been_submit"\|g;
}	}
$rendered=	$rendered=
'<div class="LC_grade_show_problem_header">'.	'<div class="LC_Box">'
&mt('View of the problem').	.'<h3 class="LC_hcell">'.&mt('View of the problem').'</h3>'
'</div><div class="LC_grade_show_problem_problem">'.	.$rendered
$rendered.	.'</div>';
'</div>';
$companswer=	$companswer=
'<div class="LC_grade_show_problem_header">'.	'<div class="LC_Box">'
&mt('Correct answer').	.'<h3 class="LC_hcell">'.&mt('Correct answer').'</h3>'
'</div><div class="LC_grade_show_problem_problem">'.	.$companswer
$companswer.	.'</div>';
'</div>';
my $result;	my $result;
if ($mode eq 'both') {	if ($mode eq 'both') {
$result=$rendered.$companswer;	$result=$rendered.$companswer;
} elsif ($mode eq 'text') {	} elsif ($mode eq 'text') {
$result=$rendered;	$result=$rendered;
} elsif ($mode eq 'answer') {	} elsif ($mode eq 'answer') {
$result=$companswer;	$result=$companswer;
}	}
$result='<div class="LC_grade_show_problem">'.$result.'</div>';
return $result;	return $result;
}	}

Line 2010 sub submission {	Line 2063 sub submission {
$request->print(<<KEYWORDS);	$request->print(<<KEYWORDS);
<b>Keyword Options:</b>	<b>Keyword Options:</b>
<a href="javascript:keywords(document.SCORE);" target="_self">List</a>	<a href="javascript:keywords(document.SCORE);" target="_self">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">Paste Selection to List</a>
<a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br />	<a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br />
KEYWORDS	KEYWORDS
Line 2046 KEYWORDS	Line 2099 KEYWORDS
}	}

my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
my ($partlist,$handgrade,$responseType) = &response_type($symb);	my $res_error;
	my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
	if ($res_error) {
	$request->print(&navmap_errormsg());
	return;
	}

# Display student info	# Display student info
$request->print(($counter == 0 ? '' : '<br />'));	$request->print(($counter == 0 ? '' : '<br />'));
my $result='<div class="LC_grade_submissions">';
	my $result='<div class="LC_Box">'
$result.='<div class="LC_grade_submissions_header">';	.'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>';
$result.= &mt('Submissions');
$result.='<input type="hidden" name="name'.$counter.	$result.='<input type="hidden" name="name'.$counter.
'" value="'.$env{'form.fullname'}.'" />'."\n";	'" value="'.$env{'form.fullname'}.'" />'."\n";
if ($env{'form.handgrade'} eq 'no') {	if ($env{'form.handgrade'} eq 'no') {
$result.='<span class="LC_grade_check_note">'.	$result.='<p class="LC_info">'
&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)."</span>\n";	.&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)
	."</p>\n";
}	}



# If any part of the problem is an essay-response (handgraded), then check for collaborators	# If any part of the problem is an essay-response (handgraded), then check for collaborators
my $fullname;	my $fullname;
my $col_fullnames = [];	my $col_fullnames = [];
Line 2074 KEYWORDS	Line 2129 KEYWORDS
$result.=$sub_result;	$result.=$sub_result;
}	}
$request->print($result."\n");	$request->print($result."\n");
$request->print('</div>'."\n");
# print student answer/submission	# print student answer/submission
# Options are (1) Handgaded submission only	# Options are (1) Handgraded submission only
# (2) Last submission, includes submission that is not handgraded	# (2) Last submission, includes submission that is not handgraded
# (for multi-response type part)	# (for multi-response type part)
# (3) Last submission plus the parts info	# (3) Last submission plus the parts info
Line 2086 KEYWORDS	Line 2141 KEYWORDS

my $lastsubonly;	my $lastsubonly;

if ($$timestamp eq '') {	if ($$timestamp eq '') {
$lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>';	$lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>';
} else {	} else {
$lastsubonly = '<div class="LC_grade_submissions_body"> <b>Date Submitted:</b> '.$$timestamp."\n";	$lastsubonly = '<div class="LC_grade_submissions_body"> <b>Date Submitted:</b> '.$$timestamp."\n";

my %seenparts;	my %seenparts;
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
Line 2113 KEYWORDS	Line 2168 KEYWORDS
}	}
my $responsetype = $responseType->{$partid}->{$respid};	my $responsetype = $responseType->{$partid}->{$respid};
if (!exists($record{"resource.$partid.$respid.submission"})) {	if (!exists($record{"resource.$partid.$respid.submission"})) {
$lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '.	$lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
$display_part.' <span class="LC_internal_info">( ID '.$respid.	'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' )</span>   '.	' <span class="LC_internal_info">'.
	'('.&mt('Part ID: [_1]',$respid).')</b>'.
	'</span>   '.
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';	'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
next;	next;
}	}
Line 2151 KEYWORDS	Line 2208 KEYWORDS
($env{'form.lastSub'} eq 'hdgrade' &&	($env{'form.lastSub'} eq 'hdgrade' &&
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {	$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
my $display_part=&get_display_part($partid,$symb);	my $display_part=&get_display_part($partid,$symb);
$lastsubonly.='<div class="LC_grade_submission_part"><b>Part:</b> '.	$lastsubonly.='<div class="LC_grade_submission_part">'.
$display_part.' <span class="LC_internal_info">( ID '.$respid.	'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' )</span>   ';	' <span class="LC_internal_info">'.
	'('.&mt('Part ID: [_1]',$respid).')'.
	'</b></span>   ';
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);	my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
if (@$files) {	if (@$files) {
$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';	$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';
Line 2173 KEYWORDS	Line 2232 KEYWORDS
}	}
}	}
}	}
$lastsubonly.='</div>'."\n";	$lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body
}	}
$request->print($lastsubonly);	$request->print($lastsubonly);
} elsif ($env{'form.lastSub'} eq 'datesub') {	} elsif ($env{'form.lastSub'} eq 'datesub') {
Line 2191 KEYWORDS	Line 2250 KEYWORDS
# return if view submission with no grading option	# return if view submission with no grading option
if ($env{'form.showgrading'} eq '' \|\| (!&canmodify($usec))) {	if ($env{'form.showgrading'} eq '' \|\| (!&canmodify($usec))) {
my $toGrade.='<input type="button" value="Grade Student" '.	my $toGrade.='<input type="button" value="Grade Student" '.
'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''	'onclick="javascript:checksubmit(this.form,\'Grade Student\',\''
.$counter.'\');" target="_self" />  '."\n" if (&canmodify($usec));	.$counter.'\');" target="_self" />  '."\n" if (&canmodify($usec));
$toGrade.='</div>'."\n";	$toGrade.='</div>'."\n";
if (($env{'form.command'} eq 'submission') \|\|	if (($env{'form.command'} eq 'submission') \|\|
Line 2235 KEYWORDS	Line 2294 KEYWORDS
my @partlist;	my @partlist;
my @gradePartRespid;	my @gradePartRespid;
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
$request->print('<div class="LC_grade_assign">'.	$request->print(
	'<div class="LC_Box">'
'<div class="LC_grade_assign_header">'.	.'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>'
&mt('Assign Grades').'</div>'.	);
'<div class="LC_grade_assign_body">');	$request->print(&gradeBox_start()); # <div class="LC_grade_assign_body">
foreach my $part_response_id (@part_response_id) {	foreach my $part_response_id (@part_response_id) {
my ($partid,$respid) = @{ $part_response_id };	my ($partid,$respid) = @{ $part_response_id };
my $part_resp = join('_',@{ $part_response_id });	my $part_resp = join('_',@{ $part_response_id });
Line 2251 KEYWORDS	Line 2310 KEYWORDS
push(@gradePartRespid,$partid.'.'.$respid);	push(@gradePartRespid,$partid.'.'.$respid);
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
}	}
$request->print('</div></div>');	$request->print(&gradeBox_end()); # </div>
	$request->print('</div>');

$request->print('<div class="LC_grade_info_links">');	$request->print('<div class="LC_grade_info_links">');
if ($perm{'vgr'}) {	if ($perm{'vgr'}) {
Line 2288 KEYWORDS	Line 2348 KEYWORDS
if ($counter == $total) {	if ($counter == $total) {
my $endform='<table border="0"><tr><td>'."\n";	my $endform='<table border="0"><tr><td>'."\n";
$endform.='<input type="button" value="'.&mt('Save & Next').'" '.	$endform.='<input type="button" value="'.&mt('Save & Next').'" '.
'onClick="javascript:checksubmit(this.form,\'Save & Next\','.	'onclick="javascript:checksubmit(this.form,\'Save & Next\','.
$total.','.scalar(@partlist).');" target="_self" />  '."\n";	$total.','.scalar(@partlist).');" target="_self" />  '."\n";
my $ntstu ='<select name="NTSTU">'.	my $ntstu ='<select name="NTSTU">'.
'<option>1</option><option>2</option>'.	'<option>1</option><option>2</option>'.
Line 2298 KEYWORDS	Line 2358 KEYWORDS
$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
$endform.=&mt('[_1]student(s)',$ntstu);	$endform.=&mt('[_1]student(s)',$ntstu);
$endform.='  <input type="button" value="'.&mt('Previous').'" '.	$endform.='  <input type="button" value="'.&mt('Previous').'" '.
'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" />  '."\n".	'onclick="javascript:checksubmit(this.form,\'Previous\');" target="_self" />  '."\n".
'<input type="button" value="'.&mt('Next').'" '.	'<input type="button" value="'.&mt('Next').'" '.
'onClick="javascript:checksubmit(this.form,\'Next\');" target="_self" />  ';	'onclick="javascript:checksubmit(this.form,\'Next\');" target="_self" />  ';
$endform.=&mt('(Next and Previous (student) do not save the scores.)')."\n" ;	$endform.=&mt('(Next and Previous (student) do not save the scores.)')."\n" ;
$endform.="<input type='hidden' value='".&get_increment().	$endform.="<input type='hidden' value='".&get_increment().
"' name='increment' />";	"' name='increment' />";
Line 2593 sub processHandGrade {	Line 2653 sub processHandGrade {
}	}
$ctr = 0;	$ctr = 0;
@parsedlist = reverse @parsedlist if ($button eq 'Previous');	@parsedlist = reverse @parsedlist if ($button eq 'Previous');
my ($partlist) = &response_type($symb);	my $res_error;
	my ($partlist) = &response_type($symb,\$res_error);
	if ($res_error) {
	$request->print(&navmap_errormsg());
	return;
	}
foreach my $student (@parsedlist) {	foreach my $student (@parsedlist) {
my $submitonly=$env{'form.submitonly'};	my $submitonly=$env{'form.submitonly'};
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);
Line 2791 sub check_and_remove_from_queue {	Line 2856 sub check_and_remove_from_queue {
sub handback_files {	sub handback_files {
my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;	my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;
my $portfolio_root = '/userfiles/portfolio';	my $portfolio_root = '/userfiles/portfolio';
my ($partlist,$handgrade,$responseType) = &response_type($symb);	my $res_error;
	my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
	if ($res_error) {
	$request->print('<br />'.&navmap_errormsg().'<br />');
	return;
	}
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 };
Line 3250 sub viewgrades {	Line 3319 sub viewgrades {
$result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table();	$result.= '<h3>'.$common_header.'</h3>'.&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
my ($partlist,$handgrade,$responseType) = &response_type($symb);	my $res_error;
	my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
	if ($res_error) {
	return &navmap_errormsg();
	}
my %weight = ();	my %weight = ();
my $ctsparts = 0;	my $ctsparts = 0;
my %seen = ();	my %seen = ();
Line 3276 sub viewgrades {	Line 3349 sub viewgrades {
}	}
$radio.='</tr></table>';	$radio.='</tr></table>';
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}.' '.&mt('(problem weight)').'</td>'."\n";	$weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n";
$line.= '<td><b>'.&mt('Grade Status').':</b><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>'.
'<option value="excused">'.&mt('excused').'</option>'.	'<option value="excused">'.&mt('excused').'</option>'.
Line 3294 sub viewgrades {	Line 3367 sub viewgrades {

$result.=	$result.=
&Apache::loncommon::start_data_table_row()."\n".	&Apache::loncommon::start_data_table_row()."\n".
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.	'<td><b>'.&mt('Part:').'</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points:').'</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
&Apache::loncommon::end_data_table_row()."\n";	&Apache::loncommon::end_data_table_row()."\n";
$ctsparts++;	$ctsparts++;
}	}
$result.=&Apache::loncommon::end_data_table()."\n".	$result.=&Apache::loncommon::end_data_table()."\n".
'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
$result.='<input type="button" value="'.&mt('Revert to Default').'" '.	$result.='<input type="button" value="'.&mt('Revert to Default').'" '.
'onClick="javascript:resetEntry('.$ctsparts.');" />';	'onclick="javascript:resetEntry('.$ctsparts.');" />';

#table listing all the students in a section/class	#table listing all the students in a section/class
#header of table	#header of table
Line 3310 sub viewgrades {	Line 3383 sub viewgrades {
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('No.').'</th>'.	'<th>'.&mt('No.').'</th>'.
'<th>'.&nameUserString('header')."</th>\n";	'<th>'.&nameUserString('header')."</th>\n";
my (@parts) = sort(&getpartlist($symb));	my $partserror;
	my (@parts) = sort(&getpartlist($symb,\$partserror));
	if ($partserror) {
	return &navmap_errormsg();
	}
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);	my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
my @partids = ();	my @partids = ();
foreach my $part (@parts) {	foreach my $part (@parts) {
Line 3361 sub viewgrades {	Line 3438 sub viewgrades {
$result.=&Apache::loncommon::end_data_table();	$result.=&Apache::loncommon::end_data_table();
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";	$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
$result.='<input type="button" value="'.&mt('Save').'" '.	$result.='<input type="button" value="'.&mt('Save').'" '.
'onClick="javascript:submit();" target="_self" /></form>'."\n";	'onclick="javascript:submit();" target="_self" /></form>'."\n";
if (scalar(%$fullname) eq 0) {	if (scalar(%$fullname) eq 0) {
my $colspan=3+scalar(@parts);	my $colspan=3+scalar(@parts);
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
Line 3413 sub viewstudentgrade {	Line 3490 sub viewstudentgrade {
'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";	'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
$result.='<input type="text" name="'.	$result.='<input type="text" name="'.
'GD_'.$student.'_'.$part.'_awarded" '.	'GD_'.$student.'_'.$part.'_awarded" '.
'onChange="javascript:changeSelect(\''.$part.'\',\''.$student.	'onchange="javascript:changeSelect(\''.$part.'\',\''.$student.
'\')" value="'.$pts.'" size="4" /></td>'."\n";	'\')" value="'.$pts.'" size="4" /></td>'."\n";
} elsif ($type eq 'solved') {	} elsif ($type eq 'solved') {
my ($status,$foo)=split(/_/,$score,2);	my ($status,$foo)=split(/_/,$score,2);
Line 3422 sub viewstudentgrade {	Line 3499 sub viewstudentgrade {
$part.'_solved_s" value="'.$status.'" />'."\n";	$part.'_solved_s" value="'.$status.'" />'."\n";
$result.=' <select name="'.	$result.=' <select name="'.
'GD_'.$student.'_'.$part.'_solved" '.	'GD_'.$student.'_'.$part.'_solved" '.
'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";	'onchange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
$result.= (($status eq 'excused') ? '<option> </option><option selected="selected" value="excused">'.&mt('excused').'</option>'	$result.= (($status eq 'excused') ? '<option> </option><option selected="selected" value="excused">'.&mt('excused').'</option>'
: '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n";	: '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n";
$result.='<option value="reset status">'.&mt('reset status').'</option>';	$result.='<option value="reset status">'.&mt('reset status').'</option>';
Line 3469 sub editgrades {	Line 3546 sub editgrades {
my %columns = ();	my %columns = ();
my ($i,$ctr,$count,$rec_update) = (0,0,0,0);	my ($i,$ctr,$count,$rec_update) = (0,0,0,0);

my (@parts) = sort(&getpartlist($symb));	my $partserror;
	my (@parts) = sort(&getpartlist($symb,\$partserror));
	if ($partserror) {
	return &navmap_errormsg();
	}
my $header;	my $header;
while ($ctr < $env{'form.totalparts'}) {	while ($ctr < $env{'form.totalparts'}) {
my $partid = $env{'form.partid_'.$ctr};	my $partid = $env{'form.partid_'.$ctr};
Line 3778 $result	Line 3859 $result
Total number of records found in file: $distotal <hr />	Total number of records found in file: $distotal <hr />
Enter as many fields as you can. The system will inform you and bring you back	Enter as many fields as you can. The system will inform you and bring you back
to this page if the data selected is insufficient to run your class.<hr />	to this page if the data selected is insufficient to run your class.<hr />
<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />	<input type="button" value="Reverse Association" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>	<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
<input type="hidden" name="associate" value="" />	<input type="hidden" name="associate" value="" />
<input type="hidden" name="phase" value="three" />	<input type="hidden" name="phase" value="three" />
Line 3801 ENDPICK	Line 3882 ENDPICK
}	}

sub csvupload_fields {	sub csvupload_fields {
my ($symb) = @_;	my ($symb,$errorref) = @_;
my (@parts) = &getpartlist($symb);	my (@parts) = &getpartlist($symb,$errorref);
	if (ref($errorref)) {
	if ($$errorref) {
	return;
	}
	}

my @fields=(['ID','Student/Employee ID'],	my @fields=(['ID','Student/Employee ID'],
['username','Student Username'],	['username','Student Username'],
['domain','Student Domain']);	['domain','Student Domain']);
Line 3827 sub csvuploadmap_footer {	Line 3914 sub csvuploadmap_footer {
</table>	</table>
<input type="hidden" name="nfields" value="$i" />	<input type="hidden" name="nfields" value="$i" />
<input type="hidden" name="keyfields" value="$keyfields" />	<input type="hidden" name="keyfields" value="$keyfields" />
<input type="button" onClick="javascript:verify(this.form)" value="Assign Grades" /><br />	<input type="button" onclick="javascript:verify(this.form)" value="Assign Grades" /><br />
</form>	</form>
ENDPICK	ENDPICK
}	}
Line 3872 sub upcsvScores_form {	Line 3959 sub upcsvScores_form {
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />	<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
$upfile_select	$upfile_select
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />	<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
<label><input type="checkbox" name="noFirstLine" />$ignore</label>	<label><input type="checkbox" name="noFirstLine" />$ignore</label>
</form>	</form>
ENDUPFORM	ENDUPFORM
Line 3902 sub csvuploadmap {	Line 3989 sub csvuploadmap {
&csvuploadmap_header($request,$symb,$datatoken,$#records+1);	&csvuploadmap_header($request,$symb,$datatoken,$#records+1);
my ($i,$keyfields);	my ($i,$keyfields);
if (@records) {	if (@records) {
my @fields=&csvupload_fields($symb);	my $fieldserror;
	my @fields=&csvupload_fields($symb,\$fieldserror);
	if ($fieldserror) {
	$request->print(&navmap_errormsg());
	return;
	}
if ($env{'form.upfile_associate'} eq 'reverse') {	if ($env{'form.upfile_associate'} eq 'reverse') {
&Apache::loncommon::csv_print_samples($request,\@records);	&Apache::loncommon::csv_print_samples($request,\@records);
$i=&Apache::loncommon::csv_print_select_table($request,\@records,	$i=&Apache::loncommon::csv_print_select_table($request,\@records,
Line 4139 LISTJAVASCRIPT	Line 4230 LISTJAVASCRIPT
&mt('Manual Grading by Page or Sequence').'</span></h3>';	&mt('Manual Grading by Page or Sequence').'</span></h3>';

$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";	$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
my ($titles,$symbx) = &getSymbMap();	my $map_error;
	my ($titles,$symbx) = &getSymbMap($map_error);
	if ($map_error) {
	$request->print(&navmap_errormsg());
	return;
	}
my ($curpage) =&Apache::lonnet::decode_symb($symb);	my ($curpage) =&Apache::lonnet::decode_symb($symb);
# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);	# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);
# my $type=($curpage =~ /\.(page\|sequence)/);	# my $type=($curpage =~ /\.(page\|sequence)/);
Line 4186 LISTJAVASCRIPT	Line 4282 LISTJAVASCRIPT
$result.=' <b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n";	$result.=' <b>'.&mt('Use CODE').': </b> <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 4225 LISTJAVASCRIPT	Line 4321 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 4234 LISTJAVASCRIPT	Line 4330 LISTJAVASCRIPT
}	}

sub getSymbMap {	sub getSymbMap {
	my ($map_error) = @_;
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	if (ref($map_error)) {
	$$map_error = 'navmap';
	}
	return;
	}
my %symbx = ();	my %symbx = ();
my @titles = ();	my @titles = ();
my $minder = 0;	my $minder = 0;
Line 4294 sub displayPage {	Line 4396 sub displayPage {
$request->print($result);	$request->print($result);

my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	$request->print(&navmap_errormsg());
	$request->print(&show_grading_menu_form($symb));
	return;
	}
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});	my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {	if (!$map) {
Line 4392 sub displayPage {	Line 4499 sub displayPage {

}	}
if (&canmodify($usec)) {	if (&canmodify($usec)) {
	$studentTable.=&gradeBox_start();
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
$studentTable.=&gradeBox($request,$symbx,$uname,$udom,$question,$partid,\%record);	$studentTable.=&gradeBox($request,$symbx,$uname,$udom,$question,$partid,\%record);
$studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n";	$studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n";
$question++;	$question++;
}	}
	$studentTable.=&gradeBox_end();
$prob++;	$prob++;
}	}
$studentTable.='</td></tr>';	$studentTable.='</td></tr>';
Line 4405 sub displayPage {	Line 4514 sub displayPage {
$curRes = $iterator->next();	$curRes = $iterator->next();
}	}

$studentTable.='</table>'."\n".	$studentTable.=
'<input type="button" value="'.&mt('Save').'" '.	'</table>'."\n".
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'.	'<input type="button" value="'.&mt('Save').'" '.
'</form>'."\n";	'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
	'</form>'."\n";
$studentTable.=&show_grading_menu_form($symb);	$studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);	$request->print($studentTable);

Line 4466 sub displaySubByDates {	Line 4576 sub displaySubByDates {

my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)	my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));	: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
$displaySub[0].='<b>'.&mt('Part:').'</b> '.$display_part.' ';	$displaySub[0].='<span class="LC_nobreak"';
$displaySub[0].='<span class="LC_internal_info">('.&mt('ID').' '.	$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
$responseId.')</span> <b>';	.' <span class="LC_internal_info">'
	.'('.&mt('Part ID: [_1]',$responseId).')'
	.'</span>'
	.' <b>';
if ($$record{"$where.$partid.tries"} eq '') {	if ($$record{"$where.$partid.tries"} eq '') {
$displaySub[0].=&mt('Trial not counted');	$displaySub[0].=&mt('Trial not counted');
} else {	} else {
$displaySub[0].=&mt('Trial [_1]',	$displaySub[0].=&mt('Trial: [_1]',
$$record{"$where.$partid.tries"});	$$record{"$where.$partid.tries"});
}	}
my $responseType=($isTask ? 'Task'	my $responseType=($isTask ? 'Task'
Line 4483 sub displaySubByDates {	Line 4596 sub displaySubByDates {
&get_order($partid,$responseId,$symb,$uname,$udom,	&get_order($partid,$responseId,$symb,$uname,$udom,
$no_increment);	$no_increment);
}	}
$displaySub[0].='</b>  '.	$displaySub[0].='</b></span>'; # /nobreak
	$displaySub[0].='  '.
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';	&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
}	}
}	}
Line 4544 sub updateGradeByPage {	Line 4658 sub updateGradeByPage {

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


my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	$request->print(&navmap_errormsg());
	return;
	}
my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});	my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {	if (!$map) {
Line 4689 sub updateGradeByPage {	Line 4808 sub updateGradeByPage {
#	#
#-------------------------------------------------------------------	#-------------------------------------------------------------------

#--------------------Scantron Grading-----------------------------------	#-------------------- Bubblesheet (Scantron) Grading -------------------
#	#
#------ start of section for handling grading by page/sequence ---------	#------ start of section for handling grading by page/sequence ---------

Line 4767 sub defaultFormData {	Line 4886 sub defaultFormData {
Return html dropdown of possible sequences to grade	Return html dropdown of possible sequences to grade

Arguments:	Arguments:
$symb - $symb of the current resource	$symb - $symb of the current resource
	$map_error - ref to scalar which will container error if
	$navmap object is unavailable in &getSymbMap().

=cut	=cut

sub getSequenceDropDown {	sub getSequenceDropDown {
my ($symb)=@_;	my ($symb,$map_error)=@_;
my $result='<select name="selectpage">'."\n";	my $result='<select name="selectpage">'."\n";
my ($titles,$symbx) = &getSymbMap();	my ($titles,$symbx) = &getSymbMap($map_error);
	if (ref($map_error)) {
	return if ($$map_error);
	}
my ($curpage)=&Apache::lonnet::decode_symb($symb);	my ($curpage)=&Apache::lonnet::decode_symb($symb);
my $ctr=0;	my $ctr=0;
foreach (@$titles) {	foreach (@$titles) {
Line 5040 sub scantron_selectphase {	Line 5164 sub scantron_selectphase {
my ($r,$file2grade) = @_;	my ($r,$file2grade) = @_;
my ($symb)=&get_symb($r);	my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $sequence_selector=&getSequenceDropDown($symb);	my $map_error;
	my $sequence_selector=&getSequenceDropDown($symb,\$map_error);
	if ($map_error) {
	$r->print('<br />'.&navmap_errormsg().'<br />');
	return;
	}
my $default_form_data=&defaultFormData($symb);	my $default_form_data=&defaultFormData($symb);
my $grading_menu_button=&show_grading_menu_form($symb);	my $grading_menu_button=&show_grading_menu_form($symb);
my $file_selector=&scantron_uploads($file2grade);	my $file_selector=&scantron_uploads($file2grade);
Line 5135 sub scantron_selectphase {	Line 5264 sub scantron_selectphase {
<input name="command" value="scantronupload_save" type="hidden" />	<input name="command" value="scantronupload_save" type="hidden" />
'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'	'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
<br />	<br />
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />	<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
</form>	</form>
');	');

Line 5199 sub scantron_selectphase {	Line 5328 sub scantron_selectphase {
&Apache::loncommon::start_data_table_row()."\n".	&Apache::loncommon::start_data_table_row()."\n".
'<td colspan="2">'."\n".	'<td colspan="2">'."\n".
'<input type="hidden" name="command" value="checksubmissions" />'."\n".	'<input type="hidden" name="command" value="checksubmissions" />'."\n".
'<input type="submit" value="'.&mt('Review Scantron Data and Submission Records').'" />'."\n".	'<input type="submit" value="'.&mt('Review Bubblesheet Data and Submission Records').'" />'."\n".
'</td>'."\n".	'</td>'."\n".
&Apache::loncommon::end_data_table_row()."\n".	&Apache::loncommon::end_data_table_row()."\n".
&Apache::loncommon::end_data_table()."\n".	&Apache::loncommon::end_data_table()."\n".
Line 6214 sub scantron_validate_file {	Line 6343 sub scantron_validate_file {
$r->print('<p>'.&mt('Gathering necessary information.').'</p>');$r->rflush();	$r->print('<p>'.&mt('Gathering necessary information.').'</p>');$r->rflush();
#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 $max_bubble=&scantron_get_maxbubble();	my $nav_error;
	my $max_bubble=&scantron_get_maxbubble(\$nav_error);
	if ($nav_error) {
	$r->print(&navmap_errormsg());
	return '';
	}
my $result=&scantron_form_start($max_bubble).$default_form_data;	my $result=&scantron_form_start($max_bubble).$default_form_data;
$r->print($result);	$r->print($result);

Line 6626 sub scantron_validate_sequence {	Line 6760 sub scantron_validate_sequence {
my ($r,$currentphase) = @_;	my ($r,$currentphase) = @_;

my $navmap=Apache::lonnavmaps::navmap->new();	my $navmap=Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	$r->print(&navmap_errormsg());
	return (1,$currentphase);
	}
my (undef,undef,$sequence)=	my (undef,undef,$sequence)=
&Apache::lonnet::decode_symb($env{'form.selectpage'});	&Apache::lonnet::decode_symb($env{'form.selectpage'});

Line 6657 sub scantron_validate_ID {	Line 6795 sub scantron_validate_ID {
#get scantron line setup	#get scantron line setup
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();

&scantron_get_maxbubble(); # parse needs the bubble_lines.. array.	my $nav_error;
	&scantron_get_maxbubble(\$nav_error); # parse needs the bubble_lines.. array.
	if ($nav_error) {
	$r->print(&navmap_errormsg());
	return(1,$currentphase);
	}

my %found=('ids'=>{},'usernames'=>{});	my %found=('ids'=>{},'usernames'=>{});
for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
Line 7211 sub scantron_validate_CODE {	Line 7354 sub scantron_validate_CODE {

my %allcodes=&get_codes();	my %allcodes=&get_codes();

&scantron_get_maxbubble(); # parse needs the lines per response array.	my $nav_error;
	&scantron_get_maxbubble(\$nav_error); # parse needs the lines per response array.
	if ($nav_error) {
	$r->print(&navmap_errormsg());
	return(1,$currentphase);
	}

my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
Line 7265 sub scantron_validate_doublebubble {	Line 7413 sub scantron_validate_doublebubble {
#get scantron line setup	#get scantron line setup
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();
&scantron_get_maxbubble(); # parse needs the bubble line array.	my $nav_error;
	&scantron_get_maxbubble(\$nav_error); # parse needs the bubble line array.
	if ($nav_error) {
	$r->print(&navmap_errormsg());
	return(1,$currentphase);
	}

for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$scan_data,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
Line 7283 sub scantron_validate_doublebubble {	Line 7436 sub scantron_validate_doublebubble {


sub scantron_get_maxbubble {	sub scantron_get_maxbubble {
	my ($nav_error) = @_;
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 7293 sub scantron_get_maxbubble {	Line 7447 sub scantron_get_maxbubble {
&Apache::lonnet::decode_symb($env{'form.selectpage'});	&Apache::lonnet::decode_symb($env{'form.selectpage'});

my $navmap=Apache::lonnavmaps::navmap->new();	my $navmap=Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	if (ref($nav_error)) {
	$$nav_error = 1;
	}
	}
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);

Line 7382 sub scantron_validate_missingbubbles {	Line 7541 sub scantron_validate_missingbubbles {
#get scantron line setup	#get scantron line setup
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 $max_bubble=&scantron_get_maxbubble();	my $nav_error;
	my $max_bubble=&scantron_get_maxbubble(\$nav_error);
	if ($nav_error) {
	return(1,$currentphase);
	}
if (!$max_bubble) { $max_bubble=2**31; }	if (!$max_bubble) { $max_bubble=2**31; }
for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$scan_data,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
Line 7442 sub scantron_process_students {	Line 7605 sub scantron_process_students {
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&username_to_idmap($classlist);	my %idmap=&username_to_idmap($classlist);
my $navmap=Apache::lonnavmaps::navmap->new();	my $navmap=Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	$r->print(&navmap_errormsg());
	return '';
	}
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 (%grader_partids_by_symb,%grader_randomlists_by_symb);	my (%grader_partids_by_symb,%grader_randomlists_by_symb);
&graders_resources_pass(\@resources,\%grader_partids_by_symb,	&graders_resources_pass(\@resources,\%grader_partids_by_symb,
\%grader_randomlists_by_symb);	\%grader_randomlists_by_symb);
	my $resource_error;
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my $ressymb = $resource->symb();	my $ressymb;
	if (ref($resource)) {
	$ressymb = $resource->symb();
	} else {
	$resource_error = 1;
	last;
	}
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);
Line 7460 sub scantron_process_students {	Line 7634 sub scantron_process_students {
}	}
}	}
}	}
	if ($resource_error) {
	$r->print(&navmap_errormsg());
	return '';
	}

my ($uname,$udom);	my ($uname,$udom);
my $result= <<SCANTRONFORM;	my $result= <<SCANTRONFORM;
Line 7474 SCANTRONFORM	Line 7652 SCANTRONFORM

my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));	my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
my $count=&get_todo_count($scanlines,$scan_data);	my $count=&get_todo_count($scanlines,$scan_data);
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status',	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status',
'Scantron Progress',$count,	'Bubblesheet Progress',$count,
'inline',undef,'scantronupload');	'inline',undef,'scantronupload');
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,	&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
'Processing first student');	'Processing first student');
Line 7484 SCANTRONFORM	Line 7662 SCANTRONFORM
my $i=-1;	my $i=-1;
my $started;	my $started;

&scantron_get_maxbubble(); # Need the bubble lines array to parse.	my $nav_error;
	&scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.
	if ($nav_error) {
	$r->print(&navmap_errormsg());
	return '';
	}

# If an ssi failed in scantron_get_maxbubble, put an error message out to	# If an ssi failed in scantron_get_maxbubble, put an error message out to
# the user and return.	# the user and return.
Line 7525 SCANTRONFORM	Line 7708 SCANTRONFORM
}	}
($uname,$udom)=split(/:/,$uname);	($uname,$udom)=split(/:/,$uname);

my %partids_by_symb;	my (%partids_by_symb,$res_error);
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my $ressymb = $resource->symb();	my $ressymb;
	if (ref($resource)) {
	$ressymb = $resource->symb();
	} else {
	$res_error = 1;
	last;
	}
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) =
Line 7538 SCANTRONFORM	Line 7727 SCANTRONFORM
}	}
}	}

	if ($res_error) {
	&scantron_add_delay(\@delayqueue,$line,
	'An error occurred while grading student '.$uname,2);
	next;
	}

&Apache::lonxml::clear_problem_counter();	&Apache::lonxml::clear_problem_counter();
&Apache::lonnet::appenv($scan_record);	&Apache::lonnet::appenv($scan_record);

Line 7709 sub scantron_upload_scantron_data {	Line 7904 sub scantron_upload_scantron_data {
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 $default_form_data=&defaultFormData(&get_symb($r,1));
	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.");
$r->print('	$r->print('
<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("'.&mt('Please use the browse button to select a file from your local directory.').'");	alert("'.$nofile_alert.'");
return false;	return false;
}	}
if (formname.courseid.value == "") {	if (formname.courseid.value == "") {
alert("'.&mt('Please use the \"Select Course\" link to open a separate window where you can search for a course to which a file can be uploaded.').'");	alert("'.$nocourseid_alert.'");
return false;	return false;
}	}
formname.submit();	formname.submit();
Line 7759 sub scantron_upload_scantron_data {	Line 7956 sub scantron_upload_scantron_data {
&Apache::lonhtmlcommon::end_pick_box().'<br />	&Apache::lonhtmlcommon::end_pick_box().'<br />

<input name="command" value="scantronupload_save" type="hidden" />	<input name="command" value="scantronupload_save" type="hidden" />
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />	<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
</form>	</form>
');	');
return '';	return '';
Line 7777 sub scantron_upload_scantron_data_save {	Line 7974 sub scantron_upload_scantron_data_save {
if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&	if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&
!&Apache::lonnet::allowed('usc',	!&Apache::lonnet::allowed('usc',
$env{'form.domainid'}.'_'.$env{'form.courseid'})) {	$env{'form.domainid'}.'_'.$env{'form.courseid'})) {
$r->print(&mt("You are not allowed to upload Scantron data to the requested course.")."<br />");	$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />");
if ($symb) {	if ($symb) {
$r->print(&show_grading_menu_form($symb));	$r->print(&show_grading_menu_form($symb));
} else {	} else {
Line 7966 sub checkscantron_results {	Line 8163 sub checkscantron_results {
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&Apache::grades::username_to_idmap($classlist);	my %idmap=&Apache::grades::username_to_idmap($classlist);
my $navmap=Apache::lonnavmaps::navmap->new();	my $navmap=Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	$r->print(&navmap_errormsg());
	return '';
	}
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 (%grader_partids_by_symb,%grader_randomlists_by_symb);	my (%grader_partids_by_symb,%grader_randomlists_by_symb);
Line 7980 sub checkscantron_results {	Line 8181 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,'Scantron/Submissions Comparison Status',	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status',
'Progress of Scantron Data/Submission Records Comparison',$count,	'Progress of Bubblesheet Data/Submission Records Comparison',$count,
'inline',undef,'checkscantron');	'inline',undef,'checkscantron');
my ($username,$domain,$started);	my ($username,$domain,$started);
	my $nav_error;
&scantron_get_maxbubble(); # Need the bubble lines array to parse.	&scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.
	if ($nav_error) {
	$r->print(&navmap_errormsg());
	return '';
	}

&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,	&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
'Processing first student');	'Processing first student');
Line 8058 sub checkscantron_results {	Line 8263 sub checkscantron_results {
if ($scandata{$pid} eq $record{$pid}) {	if ($scandata{$pid} eq $record{$pid}) {
my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row';	my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row';
$okstudents .= '<tr class="'.$css_class.'">'.	$okstudents .= '<tr class="'.$css_class.'">'.
'<td>'.&mt('Scantron').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".	'<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
'</tr>'."\n".	'</tr>'."\n".
'<tr class="'.$css_class.'">'."\n".	'<tr class="'.$css_class.'">'."\n".
'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n";	'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n";
$passed ++;	$passed ++;
} else {	} else {
my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row';	my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row';
$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Scantron').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".	$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
'</tr>'."\n".	'</tr>'."\n".
'<tr class="'.$css_class.'">'."\n".	'<tr class="'.$css_class.'">'."\n".
'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".	'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".
Line 8278 sub grading_menu {	Line 8483 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 Bubblesheets',
	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;
# $Str .= '<h2>'.&mt('Please select a grading task').'</h2>';	# $Str .= '<h2>'.&mt('Please select a grading task').'</h2>';
Line 8319 sub grading_menu {	Line 8538 sub grading_menu {
'<input type="hidden" name="saveState" value="" />'."\n".	'<input type="hidden" name="saveState" value="" />'."\n".
'<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) {
if ($menudata->{'name'} ne &mt('Verify Receipt')) {	$Str .= Apache::lonhtmlcommon::generate_menu(@menu);
$Str .=' <h3><a '.	#$menudata->{'jscript'}
$menudata->{'jscript'}.	$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '.
' href="'.	' onclick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
$menudata->{'url'}.'" >'.	' /> '.
$menudata->{'name'}."</a></h3>\n";	&Apache::lonnet::recprefix($env{'request.course.id'}).
} else {	'-<input type="text" name="receipt" size="4" onchange="javascript:checkReceiptNo(this.form,\'OK\')" />';
$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.");	my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");
$request->print(<<GRADINGMENUJS);	$request->print(<<GRADINGMENUJS);
Line 8453 GRADINGMENUJS	Line 8663 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>	<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
<div class="LC_grade_select_mode_selector_body">	<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
<select name="submitonly" size="5">	<option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>	<option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</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="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 8726 function sanitycheck() {	Line 8925 function sanitycheck() {
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
<input type="file" name="upfile" size="50" />	<input type="file" name="upfile" size="50" />
<br /><label>$type: $selectform</label>	<br /><label>$type: $selectform</label>
<br /><label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onClick="sanitycheck()" />$attendance </label>	<br /><label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onclick="sanitycheck()" />$attendance </label>
<br /><label><input type="radio" name="gradingmechanism" value="personnel"$checked{'personnel'} onClick="sanitycheck()" />$personnel</label>	<br /><label><input type="radio" name="gradingmechanism" value="personnel"$checked{'personnel'} onclick="sanitycheck()" />$personnel</label>
<br /><label><input type="radio" name="gradingmechanism" value="specific"$checked{'specific'} onClick="sanitycheck()" />$specific </label>	<br /><label><input type="radio" name="gradingmechanism" value="specific"$checked{'specific'} onclick="sanitycheck()" />$specific </label>
<input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />	<input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />
<br /><label><input type="radio" name="gradingmechanism" value="given"$checked{'given'} onClick="sanitycheck()" />$given </label>	<br /><label><input type="radio" name="gradingmechanism" value="given"$checked{'given'} onclick="sanitycheck()" />$given </label>
<br />	<br />
<input type="text" name="givenanswer" size="50" />	<input type="text" name="givenanswer" size="50" />
<input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />	<input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onChange="sanitycheck()" /></label>	<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onchange="sanitycheck()" /></label>
<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onChange="sanitycheck()" /></label>	<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onchange="sanitycheck()" /></label>
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />	<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
</form>	</form>
ENDUPFORM	ENDUPFORM
$result.='</td></tr></table>'."\n".	$result.='</td></tr></table>'."\n".
Line 8985 sub assign_clicker_grades {	Line 9184 sub assign_clicker_grades {
my ($symb)=&get_symb($r);	my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
# See which part we are saving to	# See which part we are saving to
my ($partlist,$handgrade,$responseType) = &response_type($symb);	my $res_error;
	my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
	if ($res_error) {
	return &navmap_errormsg();
	}
# FIXME: This should probably look for the first handgradeable part	# FIXME: This should probably look for the first handgradeable part
my $part=$$partlist[0];	my $part=$$partlist[0];
# Start screen output	# Start screen output
Line 9049 ENDHEADER	Line 9252 ENDHEADER
my $sum=0;	my $sum=0;
my $realnumber=$number;	my $realnumber=$number;
for (my $i=0;$i<$number;$i++) {	for (my $i=0;$i<$number;$i++) {
if ($answer[$i]) {	if ($correct[$i] eq '-') {
	$realnumber--;
	} elsif ($answer[$i]) {
if ($gradingmechanism eq 'attendance') {	if ($gradingmechanism eq 'attendance') {
$sum+=$pcorrect;	$sum+=$pcorrect;
} elsif ($answer[$i] eq '*') {	} elsif ($correct[$i] eq '*') {
$sum+=$pcorrect;	$sum+=$pcorrect;
} elsif ($answer[$i] eq '-') {
$realnumber--;
} else {	} else {
if ($answer[$i] eq $correct[$i]) {	if ($answer[$i] eq $correct[$i]) {
$sum+=$pcorrect;	$sum+=$pcorrect;
Line 9089 ENDHEADER	Line 9292 ENDHEADER
return $result.&show_grading_menu_form($symb);	return $result.&show_grading_menu_form($symb);
}	}

	sub navmap_errormsg {
	return '<div class="LC_error">'.
	&mt('An error occurred retrieving information about resources in the course.').'<br />'.
	&mt('It is recommended that you [_1]re-initialize the course[_2] and then return to this grading page..','<a href="/adm/roles?selectrole=1&newrole='.$env{'request.role'}.'">','</a>').
	'</div>';
	}

sub handler {	sub handler {
my $request=$_[0];	my $request=$_[0];
&reset_caches();	&reset_caches();
Line 9314 ssi_with_retries()	Line 9524 ssi_with_retries()

=item scantron_get_maxbubble() :	=item scantron_get_maxbubble() :

	Arguments:
	$nav_error - Reference to scalar which is a flag to indicate a
	failure to retrieve a navmap object.
	if $nav_error is set to 1 by scantron_get_maxbubble(), the
	calling routine should trap the error condition and display the warning
	found in &navmap_errormsg().

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 9379 ssi_with_retries()	Line 9596 ssi_with_retries()
Validates all scanlines in the selected file to not have any	Validates all scanlines in the selected file to not have any
invalid or underspecified student/employee IDs	invalid or underspecified student/employee IDs

	=item navmap_errormsg() :

	Returns HTML mark-up inside a <div></div> with a link to re-initialize the course.
	Should be called whenever the request to instantiate a navmap object fails.

=back	=back

=cut	=cut

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

Removed from v.1.574.2.2
changed lines
	Added in v.1.590