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.584 and 1.596.2.2

version 1.584, 2009/12/15 18:26:18	version 1.596.2.2, 2010/12/20 04:23:43
Line 160 sub response_type {	Line 160 sub response_type {
return;	return;
}	}
my $res = $navmap->getBySymb($symb);	my $res = $navmap->getBySymb($symb);
	unless (ref($res)) {
	$$response_error = 1;
	return;
	}
my $partlist = $res->parts();	my $partlist = $res->parts();
my %vPart =	my %vPart =
map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));	map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));
Line 267 sub reset_caches {	Line 271 sub reset_caches {
}	}

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

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

sub get_radiobutton_correct_foil {	sub get_radiobutton_correct_foil {
my ($partid,$respid,$symb,$uname,$udom)=@_;	my ($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed)=@_;
my $analyze = &get_analyze($symb,$uname,$udom);	my $analyze = &get_analyze($symb,$uname,$udom,undef,undef,$type,$trial,$rndseed);
my $foils = &get_order($partid,$respid,$symb,$uname,$udom);	my $foils = &get_order($partid,$respid,$symb,$uname,$udom,undef,$type,$trial,$rndseed);
if (ref($foils) eq 'ARRAY') {	if (ref($foils) eq 'ARRAY') {
foreach my $foil (@{$foils}) {	foreach my $foil (@{$foils}) {
if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {	if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {
Line 361 sub reset_caches {	Line 376 sub reset_caches {
# response types only.	# response types only.
sub cleanRecord {	sub cleanRecord {
my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,	my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,
$uname,$udom) = @_;	$uname,$udom,$type,$trial,$rndseed) = @_;
my $grayFont = '<span class="LC_internal_info">';	my $grayFont = '<span class="LC_internal_info">';
if ($response =~ /^(option\|rank)$/) {	if ($response =~ /^(option\|rank)$/) {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
Line 378 sub cleanRecord {	Line 393 sub cleanRecord {
return '<blockquote><table border="1">'.	return '<blockquote><table border="1">'.
'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.	'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.	'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';	$bottomrow.'</tr></table></blockquote>';
} elsif ($response eq 'match') {	} elsif ($response eq 'match') {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
Line 405 sub cleanRecord {	Line 420 sub cleanRecord {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
my ($toprow,$bottomrow);	my ($toprow,$bottomrow);
my $correct =	my $correct =
&get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom);	&get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed);
foreach my $foil (@$order) {	foreach my $foil (@$order) {
if (exists($answer{$foil})) {	if (exists($answer{$foil})) {
if ($foil eq $correct) {	if ($foil eq $correct) {
Line 944 LISTJAVASCRIPT	Line 959 LISTJAVASCRIPT
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;	my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
$env{'form.Status'} = $saveStatus;	$env{'form.Status'} = $saveStatus;
$submission_options.=	$submission_options.=
'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.&mt('last submission only').' </label>'."\n".	'<span class="LC_nobreak">'.
'<label><input type="radio" name="lastSub" value="last" /> '.&mt('last submission & parts info').' </label>'."\n".	'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.
'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n".	&mt('last submission only').' </label></span>'."\n".
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>';	'<span class="LC_nobreak">'.
	'<label><input type="radio" name="lastSub" value="last" /> '.
	&mt('last submission & parts info').' </label></span>'."\n".
	'<span class="LC_nobreak">'.
	'<label><input type="radio" name="lastSub" value="datesub" /> '.
	&mt('by dates and submissions').'</label></span>'."\n".
	'<span class="LC_nobreak">'.
	'<label><input type="radio" name="lastSub" value="all" /> '.
	&mt('all details').'</label></span>';
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))	$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))
.$submission_options	.$submission_options
.&Apache::lonhtmlcommon::row_closure();	.&Apache::lonhtmlcommon::row_closure();
Line 993 LISTJAVASCRIPT	Line 1016 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 1111 LISTJAVASCRIPT	Line 1134 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 1617 INNERJS	Line 1640 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 1691 INNERJS	Line 1714 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 1711 sub get_increment {	Line 1734 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 1730 sub gradeBox {	Line 1772 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 1738 sub gradeBox {	Line 1780 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 1749 sub gradeBox {	Line 1791 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 1768 sub gradeBox {	Line 1810 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.='</tr></table>'."\n";	$result.=&Apache::loncommon::end_data_table_row();
$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 1850 sub show_problem {	Line 1892 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 2047 sub submission {	Line 2086 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 2063 KEYWORDS	Line 2102 KEYWORDS
}	}

# This is where output for one specific student would start	# This is where output for one specific student would start
my $add_class = ($counter%2) ? 'LC_grade_show_user_odd_row' : '';	my $add_class = ($counter%2) ? ' LC_grade_show_user_odd_row' : '';
$request->print("\n\n".	$request->print(
'<div class="LC_grade_show_user '.$add_class.'">'.	"\n\n"
'<div class="LC_grade_user_name">'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'</div>'.	.'<div class="LC_grade_show_user'.$add_class.'">'
'<div class="LC_grade_show_user_body">'."\n");	.'<h2>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'</h2>'
	."\n"
	);

	# Show additional functions if allowed
	if ($perm{'vgr'}) {
	$request->print(
	&Apache::loncommon::track_student_link(
	&mt('View recent activity'),
	$uname,$udom,'check')
	.' '
	);
	}
	if ($perm{'opa'}) {
	$request->print(
	&Apache::loncommon::pprmlink(
	&mt('Set/Change parameters'),
	$uname,$udom,$symb,'check'));
	}

	# Show Problem
if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {	if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {
my $mode;	my $mode;
if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {	if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {
Line 2092 KEYWORDS	Line 2150 KEYWORDS

# 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 2116 KEYWORDS	Line 2171 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 2128 KEYWORDS	Line 2183 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>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n";

my %seenparts;	my %seenparts;
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
Line 2166 KEYWORDS	Line 2223 KEYWORDS
foreach my $submission (@$string) {	foreach my $submission (@$string) {
my ($partid,$respid) = ($submission =~ /^resource\.([^\.])\.([^\.])\.submission/);	my ($partid,$respid) = ($submission =~ /^resource\.([^\.])\.([^\.])\.submission/);
if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }	if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
my ($ressub,$subval) = split(/:/,$submission,2);	my ($ressub,$hide,$subval) = split(/:/,$submission,3);
# Similarity check	# Similarity check
my $similar='';	my $similar='';
	my ($type,$trial,$rndseed);
	if ($hide eq 'rand') {
	$type = 'randomizetry';
	$trial = $record{"resource.$partid.tries"};
	$rndseed = $record{"resource.$partid.rndseed"};
	}
if($env{'form.checkPlag'}){	if($env{'form.checkPlag'}){
my ($oname,$odom,$ocrsid,$oessay,$osim)=	my ($oname,$odom,$ocrsid,$oessay,$osim)=
&most_similar($uname,$udom,$subval,\%old_essays);	&most_similar($uname,$udom,$subval,\%old_essays);
Line 2178 KEYWORDS	Line 2241 KEYWORDS
&Apache::lonnet::coursedescription($ocrsid,	&Apache::lonnet::coursedescription($ocrsid,
{'one_time' => 1});	{'one_time' => 1});

$similar="<hr /><h3><span class=\"LC_warning\">".	if ($hide eq 'anon') {
&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',	$similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.
$osim,	&mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';
&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',	} else {
$old_course_desc{'description'},	$similar="<hr /><h3><span class=\"LC_warning\">".
$old_course_desc{'num'},	&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
$old_course_desc{'domain'}).	$osim,
'</span></h3><blockquote><i>'.	&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
&keywords_highlight($oessay).	$old_course_desc{'description'},
'</i></blockquote><hr />';	$old_course_desc{'num'},
	$old_course_desc{'domain'}).
	'</span></h3><blockquote><i>'.
	&keywords_highlight($oessay).
	'</i></blockquote><hr />';
	}
}	}
}	}
my $order=&get_order($partid,$respid,$symb,$uname,$udom);	my $order=&get_order($partid,$respid,$symb,$uname,$udom,
	undef,$type,$trial,$rndseed);
if ($env{'form.lastSub'} eq 'lastonly' \|\|	if ($env{'form.lastSub'} eq 'lastonly' \|\|
($env{'form.lastSub'} eq 'hdgrade' &&	($env{'form.lastSub'} eq 'hdgrade' &&
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {	$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
Line 2202 KEYWORDS	Line 2271 KEYWORDS
'</b></span>   ';	'</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 />';	if ($hide eq 'anon') {
my $file_counter = 0;	$lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));
foreach my $file (@$files) {	} else {
$file_counter++;	$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';
&Apache::lonnet::allowuploaded('/adm/grades',$file);	foreach my $file (@$files) {
$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" /> '.$file.'</a>';	&Apache::lonnet::allowuploaded('/adm/grades',$file);
}	$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" /> '.$file.'</a>';
	}
	}
$lastsubonly.='<br />';	$lastsubonly.='<br />';
}	}
$lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.	if ($hide eq 'anon') {
&cleanRecord($subval,$responsetype,$symb,$partid,	$lastsubonly.='<b>'.&mt('Anonymous Survey').'</b>';
$respid,\%record,$order,undef,$uname,$udom);	} else {
	$lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.
	&cleanRecord($subval,$responsetype,$symb,$partid,
	$respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed);
	}
if ($similar) {$lastsubonly.="<br /><br />$similar\n";}	if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
$lastsubonly.='</div>';	$lastsubonly.='</div>';
}	}
}	}
}	}
$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 2237 KEYWORDS	Line 2312 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 2281 KEYWORDS	Line 2356 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());
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 2297 KEYWORDS	Line 2372 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'}) {
$request->print(
&Apache::loncommon::track_student_link(&mt('View recent activity'),
$uname,$udom,'check'));
}
if ($perm{'opa'}) {
$request->print(
&Apache::loncommon::pprmlink(&mt('Set/Change parameters'),
$uname,$udom,$symb,'check'));
}
$request->print('</div>');	$request->print('</div>');

$result='<input type="hidden" name="partlist'.$counter.	$result='<input type="hidden" name="partlist'.$counter.
Line 2326 KEYWORDS	Line 2392 KEYWORDS

# Done with printing info for one student	# Done with printing info for one student

$request->print('</div>');#LC_grade_show_user_body
$request->print('</div>');#LC_grade_show_user	$request->print('</div>');#LC_grade_show_user


# print end of form	# print end of form
if ($counter == $total) {	if ($counter == $total) {
my $endform='<table border="0"><tr><td>'."\n";	my $endform='<br /><hr /><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 2344 KEYWORDS	Line 2409 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.='<span class="LC_warning">'.
	&mt('(Next and Previous (student) do not save the scores.)').
	'</span>'."\n" ;
$endform.="<input type='hidden' value='".&get_increment().	$endform.="<input type='hidden' value='".&get_increment().
"' name='increment' />";	"' name='increment' />";
$endform.='</td></tr></table></form>';	$endform.='</td></tr></table></form>';
Line 2416 sub check_collaborators {	Line 2483 sub check_collaborators {
#--- Retrieve the last submission for all the parts	#--- Retrieve the last submission for all the parts
sub get_last_submission {	sub get_last_submission {
my ($returnhash)=@_;	my ($returnhash)=@_;
my (@string,$timestamp);	my (@string,$timestamp,%lasthidden);
if ($$returnhash{'version'}) {	if ($$returnhash{'version'}) {
my %lasthash=();	my %lasthash=();
my ($version);	my ($version);
Line 2428 sub get_last_submission {	Line 2495 sub get_last_submission {
&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});	&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
}	}
}	}
	my (%typeparts,%randombytry);
	my $showsurv =
	&Apache::lonnet::allowed('vas',$env{'request.course.id'});
	foreach my $key (sort(keys(%lasthash))) {
	if ($key =~ /\.type$/) {
	if (($lasthash{$key} eq 'anonsurvey') \|\|
	($lasthash{$key} eq 'anonsurveycred') \|\|
	($lasthash{$key} eq 'randomizetry')) {
	my ($ign,@parts) = split(/\./,$key);
	pop(@parts);
	if ($lasthash{$key} eq 'randomizetry') {
	my $id = join(',',@parts);
	$randombytry{$ign.'.'.$id} = $lasthash{$key};
	} else {
	unless ($showsurv) {
	my $id = join(',',@parts);
	$typeparts{$ign.'.'.$id} = $lasthash{$key};
	}
	}
	delete($lasthash{$key});
	}
	}
	}
	my @hidden = keys(%typeparts);
	my @randomize = keys(%randombytry);
foreach my $key (keys(%lasthash)) {	foreach my $key (keys(%lasthash)) {
next if ($key !~ /\.submission$/);	next if ($key !~ /\.submission$/);
	my $hide;
	if (@hidden) {
	foreach my $id (@hidden) {
	if ($key =~ /^\Q$id\E/) {
	$hide = 'anon';
	last;
	}
	}
	}
	unless ($hide) {
	if (@randomize) {
	foreach my $id (@hidden) {
	if ($key =~ /^\Q$id\E/) {
	$hide = 'rand';
	last;
	}
	}
	}
	}
my ($partid,$foo) = split(/submission$/,$key);	my ($partid,$foo) = split(/submission$/,$key);
my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?	my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
'<span class="LC_warning">Draft Copy</span> ' : '';	'<span class="LC_warning">Draft Copy</span> ' : '';
push(@string, join(':', $key, $draft.$lasthash{$key}));	push(@string, join(':', $key, $hide, $draft.$lasthash{$key}));
}	}
}	}
if (!@string) {	if (!@string) {
Line 3335 sub viewgrades {	Line 3445 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 3360 sub viewgrades {	Line 3470 sub viewgrades {
$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 3424 sub viewgrades {	Line 3534 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 3476 sub viewstudentgrade {	Line 3586 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 3485 sub viewstudentgrade {	Line 3595 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 3523 sub editgrades {	Line 3633 sub editgrades {
'incorrect'=>'incorrect_by_override',	'incorrect'=>'incorrect_by_override',
'excused' =>'excused',	'excused' =>'excused',
'ungraded' =>'ungraded_attempted',	'ungraded' =>'ungraded_attempted',
	'credited' =>'credit_attempted',
'nothing' => '',	'nothing' => '',
);	);
my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0');	my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0');
Line 3845 $result	Line 3956 $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 3900 sub csvuploadmap_footer {	Line 4011 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 3945 sub upcsvScores_form {	Line 4056 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 4268 LISTJAVASCRIPT	Line 4379 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 4307 LISTJAVASCRIPT	Line 4418 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 4414 sub displayPage {	Line 4525 sub displayPage {
my $checkIcon = '<img alt="'.&mt('Check Mark').	my $checkIcon = '<img alt="'.&mt('Check Mark').
'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';	'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';

$studentTable.=' '.&mt('<b>Note:</b> Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon)."\n".	$studentTable.=' <span class="LC_info">'.
	&mt('Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon).
	'</span>'."\n".
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th align="center"> Prob. </th>'.	'<th align="center"> Prob. </th>'.
Line 4437 sub displayPage {	Line 4550 sub displayPage {
&Apache::loncommon::start_data_table_row().	&Apache::loncommon::start_data_table_row().
'<td align="center" valign="top" >'.$prob.	'<td align="center" valign="top" >'.$prob.
(scalar(@{$parts}) == 1 ? ''	(scalar(@{$parts}) == 1 ? ''
: '<br />('.&mt('[_1] parts)',	: '<br />('.&mt('[_1]parts)',
scalar(@{$parts}))	scalar(@{$parts}).' ')
).	).
'</td>';	'</td>';
$studentTable.='<td valign="top">';	$studentTable.='<td valign="top">';
Line 4485 sub displayPage {	Line 4598 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 4498 sub displayPage {	Line 4613 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 4530 sub displaySubByDates {	Line 4646 sub displaySubByDates {

my $interaction;	my $interaction;
my $no_increment = 1;	my $no_increment = 1;
	my %lastrndseed;
for ($version=1;$version<=$$record{'version'};$version++) {	for ($version=1;$version<=$$record{'version'};$version++) {
my $timestamp =	my $timestamp =
&Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});	&Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});
Line 4547 sub displaySubByDates {	Line 4664 sub displaySubByDates {
my @versionKeys = split(/\:/,$$record{$version.':keys'});	my @versionKeys = split(/\:/,$$record{$version.':keys'});
my @displaySub = ();	my @displaySub = ();
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
	my ($hidden,$type);
	$type = $$record{$version.':resource.'.$partid.'.type'};
	if (($type eq 'anonsurvey') \|\| ($type eq 'anonsurveycred')) {
	$hidden = 1;
	}
my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)	my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)
: sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));	: sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));


# next if ($$record{"$version:resource.$partid.solved"} eq '');	# next if ($$record{"$version:resource.$partid.solved"} eq '');
my $display_part=&get_display_part($partid,$symb);	my $display_part=&get_display_part($partid,$symb);
foreach my $matchKey (@matchKey) {	foreach my $matchKey (@matchKey) {
if (exists($$record{$version.':'.$matchKey}) &&	if (exists($$record{$version.':'.$matchKey}) &&
$$record{$version.':'.$matchKey} ne '') {	$$record{$version.':'.$matchKey} ne '') {

my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)	my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));	: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
$displaySub[0].='<span class="LC_nobreak"';	$displaySub[0].='<span class="LC_nobreak"';
Line 4565 sub displaySubByDates {	Line 4686 sub displaySubByDates {
.'('.&mt('Part ID: [_1]',$responseId).')'	.'('.&mt('Part ID: [_1]',$responseId).')'
.'</span>'	.'</span>'
.' <b>';	.' <b>';
if ($$record{"$where.$partid.tries"} eq '') {	if ($hidden) {
$displaySub[0].=&mt('Trial not counted');	$displaySub[0].= &mt('Anonymous Survey').'</b>';
} else {	} else {
$displaySub[0].=&mt('Trial: [_1]',	my ($trial,$rndseed,$newvariation);
	if ($type eq 'randomizetry') {
	$trial = $$record{"$where.$partid.tries"};
	$rndseed = $$record{"$where.$partid.rndseed"};
	}
	if ($$record{"$where.$partid.tries"} eq '') {
	$displaySub[0].=&mt('Trial not counted');
	} else {
	$displaySub[0].=&mt('Trial: [_1]',
$$record{"$where.$partid.tries"});	$$record{"$where.$partid.tries"});
}	if ($rndseed \|\| $lastrndseed{$partid}) {
my $responseType=($isTask ? 'Task'	if ($rndseed ne $lastrndseed{$partid}) {
	$newvariation = ' ('.&mt('New variation this try').')';
	}
	}
	}
	my $responseType=($isTask ? 'Task'
: $responseType->{$partid}->{$responseId});	: $responseType->{$partid}->{$responseId});
if (!exists($orders{$partid})) { $orders{$partid}={}; }	if (!exists($orders{$partid})) { $orders{$partid}={}; }
if (!exists($orders{$partid}->{$responseId})) {	if ((!exists($orders{$partid}->{$responseId})) \|\| ($trial)) {
$orders{$partid}->{$responseId}=	$orders{$partid}->{$responseId}=
&get_order($partid,$responseId,$symb,$uname,$udom,	&get_order($partid,$responseId,$symb,$uname,$udom,
$no_increment);	$no_increment,$type,$trial,$rndseed);
}	}
$displaySub[0].='</b></span>'; # /nobreak	$displaySub[0].='</b>'.$newvariation.'</span>'; # /nobreak
$displaySub[0].='  '.	$displaySub[0].='  '.
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';	&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'<br />';
	}
}	}
}	}
if (exists($$record{"$where.$partid.checkedin"})) {	if (exists($$record{"$where.$partid.checkedin"})) {
Line 4682 sub updateGradeByPage {	Line 4817 sub updateGradeByPage {
&Apache::loncommon::start_data_table_row().	&Apache::loncommon::start_data_table_row().
'<td align="center" valign="top" >'.$prob.	'<td align="center" valign="top" >'.$prob.
(scalar(@{$parts}) == 1 ? ''	(scalar(@{$parts}) == 1 ? ''
: '<br />('.&mt('[quant,_1, part]',scalar(@{$parts}))	: '<br />('.&mt('[quant,_1,part]',scalar(@{$parts}))
.')').'</td>';	.')').'</td>';
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';	$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';

Line 5247 sub scantron_selectphase {	Line 5382 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 7434 sub scantron_get_maxbubble {	Line 7569 sub scantron_get_maxbubble {
if (ref($nav_error)) {	if (ref($nav_error)) {
$$nav_error = 1;	$$nav_error = 1;
}	}
	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);
Line 7597 sub scantron_process_students {	Line 7733 sub scantron_process_students {
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 7610 sub scantron_process_students {	Line 7753 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 7680 SCANTRONFORM	Line 7827 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 7693 SCANTRONFORM	Line 7846 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 7916 sub scantron_upload_scantron_data {	Line 8075 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 Bubblesheet Data').'" />	<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
</form>	</form>
');	');
return '';	return '';
Line 8475 sub grading_menu {	Line 8634 sub grading_menu {
icon => 'addClickerInfoFile.png',	icon => 'addClickerInfoFile.png',
linktitle => 'Specify a file containing the clicker information for this resource.'	linktitle => 'Specify a file containing the clicker information for this resource.'
},	},
{ linktext => 'Grade/Manage/Review Bubblesheet Forms',	{ linktext => 'Grade/Manage/Review Bubblesheets',
url => $url4,	url => $url4,
permission => 'F',	permission => 'F',
icon => 'stat.png',	icon => 'stat.png',
Line 8502 sub grading_menu {	Line 8661 sub grading_menu {
$Str .= Apache::lonhtmlcommon::generate_menu(@menu);	$Str .= Apache::lonhtmlcommon::generate_menu(@menu);
#$menudata->{'jscript'}	#$menudata->{'jscript'}
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '.	$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '.
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.	' onclick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
' /> '.	' /> '.
&Apache::lonnet::recprefix($env{'request.course.id'}).	&Apache::lonnet::recprefix($env{'request.course.id'}).
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';	'-<input type="text" name="receipt" size="4" onchange="javascript:checkReceiptNo(this.form,\'OK\')" />';

$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.");
Line 8688 GRADINGMENUJS	Line 8847 GRADINGMENUJS
</label>	</label>
</div>	</div>
<div>	<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>

Line 8705 GRADINGMENUJS	Line 8864 GRADINGMENUJS
</label>	</label>
</div>	</div>
<div>	<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>
</form>';	</form>';
Line 8835 sub process_clicker {	Line 8994 sub process_clicker {
my $pcorrect=&mt("Percentage points for correct solution");	my $pcorrect=&mt("Percentage points for correct solution");
my $pincorrect=&mt("Percentage points for incorrect solution");	my $pincorrect=&mt("Percentage points for incorrect solution");
my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',	my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',
('iclicker' => 'i>clicker',	{'iclicker' => 'i>clicker',
'interwrite' => 'interwrite PRS'));	'interwrite' => 'interwrite PRS'});
$symb = &Apache::lonenc::check_encrypt($symb);	$symb = &Apache::lonenc::check_encrypt($symb);
$result.=<<ENDUPFORM;	$result.=<<ENDUPFORM;
<script type="text/javascript">	<script type="text/javascript">
Line 8885 function sanitycheck() {	Line 9044 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 9255 ENDHEADER	Line 9414 ENDHEADER
sub navmap_errormsg {	sub navmap_errormsg {
return '<div class="LC_error">'.	return '<div class="LC_error">'.
&mt('An error occurred retrieving information about resources in the course.').'<br />'.	&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>').	&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>';	'</div>';
}	}

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

Removed from v.1.584
changed lines
	Added in v.1.596.2.2