loncom/homework/grades.pm - diff - 1.596.2.12.2.60.2.4

Return to grades.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.596.2.12.2.55 and 1.596.2.12.2.60.2.4

version 1.596.2.12.2.55, 2020/11/12 01:37:12	version 1.596.2.12.2.60.2.4, 2023/07/05 23:49:18
Line 46 use Apache::lonenc;	Line 46 use Apache::lonenc;
use Apache::lonstathelpers;	use Apache::lonstathelpers;
use Apache::bridgetask();	use Apache::bridgetask();
use Apache::lontexconvert();	use Apache::lontexconvert();
	use String::Similarity;
use HTML::Parser();	use HTML::Parser();
use File::MMagic;	use File::MMagic;
use String::Similarity;
use LONCAPA;	use LONCAPA;

use POSIX qw(floor);	use POSIX qw(floor);
Line 118 sub getpartlist {	Line 118 sub getpartlist {
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();
my @metakeys = split(/,/,&Apache::lonnet::metadata($url,'keys'));	my $toolsymb;
	if ($url =~ /ext\.tool$/) {
	$toolsymb = $symb;
	}
	my @metakeys = split(/,/,&Apache::lonnet::metadata($url,'keys',$toolsymb));

my @stores;	my @stores;
foreach my $part (@{ $partlist }) {	foreach my $part (@{ $partlist }) {
Line 299 sub showResourceInfo {	Line 303 sub showResourceInfo {
} else {	} else {
return '<br clear="all" />';	return '<br clear="all" />';
}	}
}	}
return $result;	return $result;
}	}

Line 586 sub cleanRecord {	Line 590 sub cleanRecord {
return $result;	return $result;
}	}
} elsif ( $response =~ m/(?:numerical\|formula\|custom)/) {	} elsif ( $response =~ m/(?:numerical\|formula\|custom)/) {
# Respect multiple input fields, see Bug #5409	# Respect multiple input fields, see Bug #5409
$answer =	$answer =
&Apache::loncommon::format_previous_attempt_value('submission',	&Apache::loncommon::format_previous_attempt_value('submission',
$answer);	$answer);
Line 1037 sub verifyreceipt {	Line 1041 sub verifyreceipt {
sub listStudents {	sub listStudents {
my ($request,$symb,$submitonly,$divforres) = @_;	my ($request,$symb,$submitonly,$divforres) = @_;

	my $is_tool = ($symb =~ /ext\.tool$/);
my $cdom = $env{"course.$env{'request.course.id'}.domain"};	my $cdom = $env{"course.$env{'request.course.id'}.domain"};
my $cnum = $env{"course.$env{'request.course.id'}.num"};	my $cnum = $env{"course.$env{'request.course.id'}.num"};
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};	my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
Line 1103 LISTJAVASCRIPT	Line 1108 LISTJAVASCRIPT
"\n".$table;	"\n".$table;

$gradeTable .= &Apache::lonhtmlcommon::start_pick_box();	$gradeTable .= &Apache::lonhtmlcommon::start_pick_box();
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))	unless ($is_tool) {
.'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n"	$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))
.'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n"	.'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n"
.'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n"	.'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n"
.&Apache::lonhtmlcommon::row_closure();	.'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n"
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Answer'))	.&Apache::lonhtmlcommon::row_closure();
.'<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n"	$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Answer'))
.'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n"	.'<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n"
.'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n"	.'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n"
.&Apache::lonhtmlcommon::row_closure();	.'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n"
	.&Apache::lonhtmlcommon::row_closure();
	}

my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;	my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
$env{'form.Status'} = $saveStatus;	$env{'form.Status'} = $saveStatus;
my %optiontext = &Apache::lonlocal::texthash (	my %optiontext;
	if ($is_tool) {
	%optiontext = &Apache::lonlocal::texthash (
	lastonly => 'last transaction',
	last => 'last transaction with details',
	datesub => 'all transactions',
	all => 'all transactions with details',
	);
	} else {
	%optiontext = &Apache::lonlocal::texthash (
lastonly => 'last submission',	lastonly => 'last submission',
last => 'last submission with details',	last => 'last submission with details',
datesub => 'all submissions',	datesub => 'all submissions',
all => 'all submissions with details',	all => 'all submissions with details',
);	);
	}
my $submission_options =	my $submission_options =
'<span class="LC_nobreak">'.	'<span class="LC_nobreak">'.
'<label><input type="radio" name="lastSub" value="lastonly" /> '.	'<label><input type="radio" name="lastSub" value="lastonly" /> '.
Line 1136 LISTJAVASCRIPT	Line 1153 LISTJAVASCRIPT
'<span class="LC_nobreak">'.	'<span class="LC_nobreak">'.
'<label><input type="radio" name="lastSub" value="all" /> '.	'<label><input type="radio" name="lastSub" value="all" /> '.
$optiontext{'all'}.'</label></span>';	$optiontext{'all'}.'</label></span>';
	my $viewtitle;
	if ($is_tool) {
	$viewtitle = &mt('View Transactions');
	} else {
	$viewtitle = &mt('View Submissions');
	}
my ($compmsg,$nocompmsg);	my ($compmsg,$nocompmsg);
$nocompmsg = ' checked="checked"';	$nocompmsg = ' checked="checked"';
if ($numessay) {	if ($numessay) {
$compmsg = $nocompmsg;	$compmsg = $nocompmsg;
$nocompmsg = '';	$nocompmsg = '';
}	}
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))	$gradeTable .= &Apache::lonhtmlcommon::row_title($viewtitle)
.$submission_options	.$submission_options;
.&Apache::lonhtmlcommon::row_closure()	# Check if any gradable
	my $showmore;
	if ($perm{'mgr'}) {
	my @sections;
	if ($env{'request.course.sec'} ne '') {
	@sections = ($env{'request.course.sec'});
	} elsif ($env{'form.section'} eq '') {
	@sections = ('all');
	} else {
	@sections = &Apache::loncommon::get_env_multiple('form.section');
	}
	if (grep(/^all$/,@sections)) {
	$showmore = 1;
	} else {
	foreach my $sec (@sections) {
	if (&canmodify($sec)) {
	$showmore = 1;
	last;
	}
	}
	}
	}

	if ($showmore) {
	$gradeTable .=
	&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title(&mt('Send Messages'))	.&Apache::lonhtmlcommon::row_title(&mt('Send Messages'))
.'<span class="LC_nobreak">'	.'<span class="LC_nobreak">'
.'<label><input type="radio" name="compmsg" value="0"'.$nocompmsg.' />'	.'<label><input type="radio" name="compmsg" value="0"'.$nocompmsg.' />'
Line 1153 LISTJAVASCRIPT	Line 1201 LISTJAVASCRIPT
.&mt('Yes').(' 'x2).'</label>'	.&mt('Yes').(' 'x2).'</label>'
.&Apache::lonhtmlcommon::row_closure();	.&Apache::lonhtmlcommon::row_closure();

$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))	$gradeTable .=
	&Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
.'<select name="increment">'	.'<select name="increment">'
.'<option value="1">'.&mt('Whole Points').'</option>'	.'<option value="1">'.&mt('Whole Points').'</option>'
.'<option value=".5">'.&mt('Half Points').'</option>'	.'<option value=".5">'.&mt('Half Points').'</option>'
.'<option value=".25">'.&mt('Quarter Points').'</option>'	.'<option value=".25">'.&mt('Quarter Points').'</option>'
.'<option value=".1">'.&mt('Tenths of a Point').'</option>'	.'<option value=".1">'.&mt('Tenths of a Point').'</option>'
.'</select>';	.'</select>';
	}
$gradeTable .=	$gradeTable .=
&build_section_inputs().	&build_section_inputs().
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".	'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
if (exists($env{'form.Status'})) {	if (exists($env{'form.Status'})) {
$gradeTable .= '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";	$gradeTable .= '<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n";
} else {	} else {
$gradeTable .= &Apache::lonhtmlcommon::row_closure()	$gradeTable .= &Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title(&mt('Student Status'))	.&Apache::lonhtmlcommon::row_title(&mt('Student Status'))
Line 1180 LISTJAVASCRIPT	Line 1230 LISTJAVASCRIPT
}	}
$gradeTable .= &Apache::lonhtmlcommon::row_closure(1)	$gradeTable .= &Apache::lonhtmlcommon::row_closure(1)
.&Apache::lonhtmlcommon::end_pick_box();	.&Apache::lonhtmlcommon::end_pick_box();
	my $regrademsg;
	if ($is_tool) {
	$regrademsg =&mt("To view/grade/regrade, click on the check box(es) next to the student's name(s). Then click on the Next button.");
	} else {
	$regrademsg = &mt("To view/grade/regrade a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.");
	}
$gradeTable .= '<p>'	$gradeTable .= '<p>'
.&mt("To view/grade/regrade a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.")."\n"	.$regrademsg."\n"
.'<input type="hidden" name="command" value="processGroup" />'	.'<input type="hidden" name="command" value="processGroup" />'
.'</p>';	.'</p>';

Line 1617 INNERJS	Line 1672 INNERJS
my $end_page_msg_central =	my $end_page_msg_central =
&Apache::loncommon::end_page({'js_ready' => 1});	&Apache::loncommon::end_page({'js_ready' => 1});


my $docopen=&Apache::lonhtmlcommon::javascript_docopen();	my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
$docopen=~s/^document\.//;	$docopen=~s/^document\.//;

Line 2151 sub files_exist {	Line 2205 sub files_exist {
my ($uname,$udom,$fullname) = split(/:/,$student);	my ($uname,$udom,$fullname) = split(/:/,$student);
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
$udom,$uname);	$udom,$uname);
my ($string,$timestamp)= &get_last_submission(\%record);	my ($string)= &get_last_submission(\%record);
foreach my $submission (@$string) {	foreach my $submission (@$string) {
my ($partid,$respid) =	my ($partid,$respid) =
($submission =~ /^resource\.([^\.])\.([^\.])\.submission/);	($submission =~ /^resource\.([^\.])\.([^\.])\.submission/);
Line 2254 sub submission {	Line 2308 sub submission {

if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }	if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
my $probtitle=&Apache::lonnet::gettitle($symb);	my $probtitle=&Apache::lonnet::gettitle($symb);
	my $is_tool = ($symb =~ /ext\.tool$/);
my ($essayurl,%coursedesc_by_cid);	my ($essayurl,%coursedesc_by_cid);

if (!&canview($usec)) {	if (!&canview($usec)) {
Line 2275 sub submission {	Line 2330 sub submission {
}	}

if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; }	if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; }
if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }	unless ($is_tool) {
if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; }	if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }
	if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; }
	}
if (($numessay) && ($calledby eq 'submission') && (!exists($env{'form.compmsg'}))) {	if (($numessay) && ($calledby eq 'submission') && (!exists($env{'form.compmsg'}))) {
$env{'form.compmsg'} = 1;	$env{'form.compmsg'} = 1;
}	}
Line 2469 sub submission {	Line 2526 sub submission {
# Display student info	# Display student info
$request->print(($counter == 0 ? '' : '<br />'));	$request->print(($counter == 0 ? '' : '<br />'));

	my $boxtitle = &mt('Submissions');
	if ($is_tool) {
	$boxtitle = &mt('Transactions')
	}
my $result='<div class="LC_Box">'	my $result='<div class="LC_Box">'
.'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>';	.'<h3 class="LC_hcell">'.$boxtitle.'</h3>';
$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 ($numresp > $numessay) {	if (($numresp > $numessay) && !$is_tool) {
$result.='<p class="LC_info">'	$result.='<p class="LC_info">'
.&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)	.&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)
."</p>\n";	."</p>\n";
Line 2496 sub submission {	Line 2557 sub submission {
# (3) All transactions (by date)	# (3) All transactions (by date)
# (4) The whole record (with detailed information for all transactions)	# (4) The whole record (with detailed information for all transactions)

my ($string,$timestamp)= &get_last_submission(\%record);	my ($string,$timestamp,$lastgradetime,$lastsubmittime) = &get_last_submission(\%record,$is_tool);

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 {
	my ($shownsubmdate,$showngradedate);
	if ($lastsubmittime && $lastgradetime) {
	$shownsubmdate = &Apache::lonlocal::locallocaltime($lastsubmittime);
	if ($lastgradetime > $lastsubmittime) {
	$showngradedate = &Apache::lonlocal::locallocaltime($lastgradetime);
	}
	} else {
	$shownsubmdate = $timestamp;
	}
$lastsubonly =	$lastsubonly =
'<div class="LC_grade_submissions_body">'	'<div class="LC_grade_submissions_body">'
.'<b>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n";	.'<b>'.&mt('Date Submitted:').'</b> '.$shownsubmdate."\n";
	if ($showngradedate) {
	$lastsubonly .= '<br /><b>'.&mt('Date Graded:').'</b> '.$showngradedate."\n";
	}

my %seenparts;	my %seenparts;
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
Line 2705 sub submission {	Line 2778 sub submission {
my %seen = ();	my %seen = ();
my @partlist;	my @partlist;
my @gradePartRespid;	my @gradePartRespid;
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id;
	if ($is_tool) {
	@part_response_id = ([0,'']);
	} else {
	@part_response_id = &flatten_responseType($responseType);
	}
$request->print(	$request->print(
'<div class="LC_Box">'	'<div class="LC_Box">'
.'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>'	.'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>'
Line 2829 sub check_collaborators {	Line 2907 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,$is_tool)=@_;
my (@string,$timestamp,%lasthidden);	my (@string,$timestamp,$lastgradetime,$lastsubmittime);
if ($$returnhash{'version'}) {	if ($$returnhash{'version'}) {
my %lasthash=();	my %lasthash=();
my ($version);	my %prevsolved=();
	my %solved=();
	my $version;
for ($version=1;$version<=$$returnhash{'version'};$version++) {	for ($version=1;$version<=$$returnhash{'version'};$version++) {
	my %handgraded = ();
foreach my $key (sort(split(/\:/,	foreach my $key (sort(split(/\:/,
$$returnhash{$version.':keys'}))) {	$$returnhash{$version.':keys'}))) {
$lasthash{$key}=$$returnhash{$version.':'.$key};	$lasthash{$key}=$$returnhash{$version.':'.$key};
$timestamp =	if ($key =~ /\.([^.]+)\.regrader$/) {
&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});	$handgraded{$1} = 1;
}	} elsif ($key =~ /\.portfiles$/) {
	if (($$returnhash{$version.':'.$key} ne '') &&
	($$returnhash{$version.':'.$key} !~ /\.\d+\.\w+$/)) {
	$lastsubmittime = $$returnhash{$version.':timestamp'};
	}
	} elsif ($key =~ /\.submission$/) {
	if ($$returnhash{$version.':'.$key} ne '') {
	$lastsubmittime = $$returnhash{$version.':timestamp'};
	}
	} elsif ($key =~ /\.([^.]+)\.solved$/) {
	$prevsolved{$1} = $solved{$1};
	$solved{$1} = $lasthash{$key};
	}
	}
	foreach my $partid (keys(%handgraded)) {
	if (($prevsolved{$partid} eq 'ungraded_attempted') &&
	(($solved{$partid} eq 'incorrect_by_override') \|\|
	($solved{$partid} eq 'correct_by_override'))) {
	$lastgradetime = $$returnhash{$version.':timestamp'};
	}
	if ($solved{$partid} ne '') {
	$prevsolved{$partid} = $solved{$partid};
	}
	}
	$timestamp =
	&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
}	}
my (%typeparts,%randombytry);	my (%typeparts,%randombytry);
my $showsurv =	my $showsurv =
Line 2895 sub get_last_submission {	Line 3001 sub get_last_submission {
}	}
}	}
if (!@string) {	if (!@string) {
	my $msg;
	if ($is_tool) {
	$msg = &mt('No grade passed back.');
	} else {
	$msg = &mt('Nothing submitted - no attempts.');
	}
$string[0] =	$string[0] =
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span>';	'<span class="LC_warning">'.$msg.'</span>';
}	}
return (\@string,\$timestamp);	return (\@string,$timestamp,$lastgradetime,$lastsubmittime);
}	}

#--- High light keywords, with style choosen by user.	#--- High light keywords, with style choosen by user.
Line 3104 sub processHandGrade {	Line 3216 sub processHandGrade {
my $ntstu = $env{'form.NTSTU'};	my $ntstu = $env{'form.NTSTU'};
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	my ($res_error,%queueable);
	my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error);
	if ($res_error) {
	$request->print(&navmap_errormsg());
	return;
	} else {
	foreach my $part (@{$partlist}) {
	if (ref($responseType->{$part}) eq 'HASH') {
	foreach my $id (keys(%{$responseType->{$part}})) {
	if (($responseType->{$part}->{$id} eq 'essay') \|\|
	(lc($handgrade->{$part.'_'.$id}) eq 'yes')) {
	$queueable{$part} = 1;
	last;
	}
	}
	}
	}
	}

if ($button eq 'Save & Next') {	if ($button eq 'Save & Next') {
my $ctr = 0;	my $ctr = 0;
while ($ctr < $ngrade) {	while ($ctr < $ngrade) {
my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});	my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
my ($errorflag,$pts,$wgt,$numhidden) =	my ($errorflag,$pts,$wgt,$numhidden) =
&saveHandGrade($request,$symb,$uname,$udom,$ctr);	&saveHandGrade($request,$symb,$uname,$udom,$ctr,undef,undef,\%queueable);
if ($errorflag eq 'no_score') {	if ($errorflag eq 'no_score') {
$ctr++;	$ctr++;
next;	next;
Line 3165 sub processHandGrade {	Line 3295 sub processHandGrade {
foreach my $collaborator (@collaborators) {	foreach my $collaborator (@collaborators) {
my ($errorflag,$pts,$wgt) =	my ($errorflag,$pts,$wgt) =
&saveHandGrade($request,$symb,$collaborator,$udom,$ctr,	&saveHandGrade($request,$symb,$collaborator,$udom,$ctr,
$env{'form.unamedom'.$ctr},$part);	$env{'form.unamedom'.$ctr},$part,\%queueable);
if ($errorflag eq 'not_allowed') {	if ($errorflag eq 'not_allowed') {
$request->print("<span class=\"LC_error\">".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom")."</span>");	$request->print("<span class=\"LC_error\">".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom")."</span>");
next;	next;
Line 3187 sub processHandGrade {	Line 3317 sub processHandGrade {
}	}
}	}

my $res_error;
my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error);
if ($res_error) {
$request->print(&navmap_errormsg());
return;
}

my %keyhash = ();	my %keyhash = ();
if ($numessay) {	if ($numessay) {
# Keywords sorted in alphabatical order	# Keywords sorted in alphabatical order
Line 3345 sub processHandGrade {	Line 3468 sub processHandGrade {

#---- Save the score and award for each student, if changed	#---- Save the score and award for each student, if changed
sub saveHandGrade {	sub saveHandGrade {
my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;	my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part,$queueable) = @_;
my @version_parts;	my @version_parts;
my $usec = &Apache::lonnet::getsection($domain,$stuname,	my $usec = &Apache::lonnet::getsection($domain,$stuname,
$env{'request.course.id'});	$env{'request.course.id'});
Line 3457 sub saveHandGrade {	Line 3580 sub saveHandGrade {
&Apache::lonnet::cstore(\%newrecord,$symb,	&Apache::lonnet::cstore(\%newrecord,$symb,
$env{'request.course.id'},$domain,$stuname);	$env{'request.course.id'},$domain,$stuname);
&check_and_remove_from_queue(\@parts,\%record,\%newrecord,$symb,	&check_and_remove_from_queue(\@parts,\%record,\%newrecord,$symb,
$cdom,$cnum,$domain,$stuname);	$cdom,$cnum,$domain,$stuname,$queueable);
}	}
if ($aggregateflag) {	if ($aggregateflag) {
&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
Line 3497 sub makehidden {	Line 3620 sub makehidden {
}	}

sub check_and_remove_from_queue {	sub check_and_remove_from_queue {
my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname) = @_;	my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname,$queueable) = @_;
my @ungraded_parts;	my @ungraded_parts;
foreach my $part (@{$parts}) {	foreach my $part (@{$parts}) {
if ( $record->{ 'resource.'.$part.'.awarded'} eq ''	if ( $record->{ 'resource.'.$part.'.awarded'} eq ''
Line 3505 sub check_and_remove_from_queue {	Line 3628 sub check_and_remove_from_queue {
&& $newrecord->{'resource.'.$part.'.awarded'} eq ''	&& $newrecord->{'resource.'.$part.'.awarded'} eq ''
&& $newrecord->{'resource.'.$part.'.solved' } ne 'excused'	&& $newrecord->{'resource.'.$part.'.solved' } ne 'excused'
) {	) {
push(@ungraded_parts, $part);	if ($queueable->{$part}) {
	push(@ungraded_parts, $part);
	}
}	}
}	}
if ( !@ungraded_parts ) {	if ( !@ungraded_parts ) {
Line 3959 VIEWJAVASCRIPT	Line 4084 VIEWJAVASCRIPT
#--- show scores for a section or whole class w/ option to change/update a score	#--- show scores for a section or whole class w/ option to change/update a score
sub viewgrades {	sub viewgrades {
my ($request,$symb) = @_;	my ($request,$symb) = @_;
	my ($is_tool,$toolsymb);
	if ($symb =~ /ext\.tool$/) {
	$is_tool = 1;
	$toolsymb = $symb;
	}
&viewgrades_js($request);	&viewgrades_js($request);

#need to make sure we have the correct data for later EXT calls,	#need to make sure we have the correct data for later EXT calls,
Line 3993 sub viewgrades {	Line 4123 sub viewgrades {
}	}

my ($common_header,$specific_header,@sections,$section_display);	my ($common_header,$specific_header,@sections,$section_display);
@sections = &Apache::loncommon::get_env_multiple('form.section');	if ($env{'request.course.sec'} ne '') {
	@sections = ($env{'request.course.sec'});
	} else {
	@sections = &Apache::loncommon::get_env_multiple('form.section');
	}

	# Check if Save button should be usable
	my $disabled = ' disabled="disabled"';
	if ($perm{'mgr'}) {
	if (grep(/^all$/,@sections)) {
	undef($disabled);
	} else {
	foreach my $sec (@sections) {
	if (&canmodify($sec)) {
	undef($disabled);
	last;
	}
	}
	}
	}
if (grep(/^all$/,@sections)) {	if (grep(/^all$/,@sections)) {
@sections = ('all');	@sections = ('all');
if ($group_display) {	if ($group_display) {
Line 4039 sub viewgrades {	Line 4188 sub viewgrades {
if ($env{'form.submitonly'} eq 'all') {	if ($env{'form.submitonly'} eq 'all') {
$result.= '<h3>'.$common_header.'</h3>';	$result.= '<h3>'.$common_header.'</h3>';
} else {	} else {
$result.= '<h3>'.$common_header.' '.&mt('(submission status: "[_1]")',$submission_status).'</h3>';	my $text;
	if ($is_tool) {
	$text = &mt('(transaction status: "[_1]")',$submission_status);
	} else {
	$text = &mt('(submission status: "[_1]")',$submission_status);
	}
	$result.= '<h3>'.$common_header.' '.$text.'</h3>';
}	}
$result .= &Apache::loncommon::start_data_table();	$result .= &Apache::loncommon::start_data_table();
#radio buttons/text box for assigning points for a section or class.	#radio buttons/text box for assigning points for a section or class.
Line 4052 sub viewgrades {	Line 4207 sub viewgrades {
my %weight = ();	my %weight = ();
my $ctsparts = 0;	my $ctsparts = 0;
my %seen = ();	my %seen = ();
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id;
	if ($is_tool) {
	@part_response_id = ([0,'']);
	} else {
	@part_response_id = &flatten_responseType($responseType);
	}
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 4103 sub viewgrades {	Line 4263 sub viewgrades {

#table listing all the students in a section/class	#table listing all the students in a section/class
#header of table	#header of table
if ($env{'form.submitonly'} eq 'all') {	if ($env{'form.submitonly'} eq 'all') {
$result.= '<h3>'.$specific_header.'</h3>';	$result.= '<h3>'.$specific_header.'</h3>';
} else {	} else {
$result.= '<h3>'.$specific_header.' '.&mt('(submission status: "[_1]")',$submission_status).'</h3>';	my $text;
	if ($is_tool) {
	$text = &mt('(transaction status: "[_1]")',$submission_status);
	} else {
	$text = &mt('(submission status: "[_1]")',$submission_status);
	}
	$result.= '<h3>'.$specific_header.' '.$text.'</h3>';
}	}
$result.= &Apache::loncommon::start_data_table().	$result.= &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
Line 4120 sub viewgrades {	Line 4286 sub viewgrades {
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) {
my $display=&Apache::lonnet::metadata($url,$part.'.display');	my $display=&Apache::lonnet::metadata($url,$part.'.display',$toolsymb);
my $narrowtext = &mt('Tries');	my $narrowtext = &mt('Tries');
$display =~ s\|^Number of Attempts\|$narrowtext <br />\|; # makes the column narrower	$display =~ s\|^Number of Attempts\|$narrowtext <br />\|; # makes the column narrower
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }	if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name',$toolsymb); }
my ($partid) = &split_part_type($part);	my ($partid) = &split_part_type($part);
push(@partids,$partid);	push(@partids,$partid);
#	#
Line 4164 sub viewgrades {	Line 4330 sub viewgrades {
return $a cmp $b;	return $a cmp $b;
} (keys(%$fullname))) {	} (keys(%$fullname))) {
$result.=&viewstudentgrade($symb,$env{'request.course.id'},	$result.=&viewstudentgrade($symb,$env{'request.course.id'},
$_,$$fullname{$_},\@parts,\%weight,\$ctr,\%last_resets);	$_,$$fullname{$_},\@parts,\%weight,\$ctr,\%last_resets,$is_tool);
}	}
$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').'"'.$disabled.' '.
'onclick="javascript:submit();" target="_self" /></form>'."\n";	'onclick="javascript:submit();" target="_self" /></form>'."\n";
if ($ctr == 0) {	if ($ctr == 0) {
my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
Line 4252 sub viewgrades {	Line 4418 sub viewgrades {

#--- call by previous routine to display each student who satisfies submission filter.	#--- call by previous routine to display each student who satisfies submission filter.
sub viewstudentgrade {	sub viewstudentgrade {
my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;	my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets,$is_tool) = @_;
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);	my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
my $submitonly = $env{'form.submitonly'};	my $submitonly = $env{'form.submitonly'};
Line 4310 sub viewstudentgrade {	Line 4476 sub viewstudentgrade {
my ($aggtries,$totaltries);	my ($aggtries,$totaltries);
unless (exists($aggregates{$part})) {	unless (exists($aggregates{$part})) {
$totaltries = $record{'resource.'.$part.'.tries'};	$totaltries = $record{'resource.'.$part.'.tries'};

$aggtries = $totaltries;	$aggtries = $totaltries;
if ($$last_resets{$part}) {	if ($$last_resets{$part}) {
$aggtries = &get_num_tries(\%record,$$last_resets{$part},	$aggtries = &get_num_tries(\%record,$$last_resets{$part},
Line 4359 sub viewstudentgrade {	Line 4524 sub viewstudentgrade {
# record does not get update if unchanged	# record does not get update if unchanged
sub editgrades {	sub editgrades {
my ($request,$symb) = @_;	my ($request,$symb) = @_;
	my $toolsymb;
	if ($symb =~ /ext\.tool$/) {
	$toolsymb = $symb;
	}

my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
my $title='<h2>'.&mt('Current Grade Status').'</h2>';	my $title='<h2>'.&mt('Current Grade Status').'</h2>';
Line 4405 sub editgrades {	Line 4574 sub editgrades {
my ($part,$type) = &split_part_type($stores);	my ($part,$type) = &split_part_type($stores);
if ($part !~ m/^\Q$partid\E/) { next;}	if ($part !~ m/^\Q$partid\E/) { next;}
if ($type eq 'awarded' \|\| $type eq 'solved') { next; }	if ($type eq 'awarded' \|\| $type eq 'solved') { next; }
my $display=&Apache::lonnet::metadata($url,$stores.'.display');	my $display=&Apache::lonnet::metadata($url,$stores.'.display',$toolsymb);
$display =~ s/\[Part: \Q$part\E\]//;	$display =~ s/\[Part: \Q$part\E\]//;
my $narrowtext = &mt('Tries');	my $narrowtext = &mt('Tries');
$display =~ s/Number of Attempts/$narrowtext/;	$display =~ s/Number of Attempts/$narrowtext/;
Line 4428 sub editgrades {	Line 4597 sub editgrades {
&Apache::loncommon::end_data_table_header_row();	&Apache::loncommon::end_data_table_header_row();
my @noupdate;	my @noupdate;
my ($updateCtr,$noupdateCtr) = (1,1);	my ($updateCtr,$noupdateCtr) = (1,1);
	my ($got_types,%queueable);
for ($i=0; $i<$env{'form.total'}; $i++) {	for ($i=0; $i<$env{'form.total'}; $i++) {
my $user = $env{'form.ctr'.$i};	my $user = $env{'form.ctr'.$i};
my ($uname,$udom)=split(/:/,$user);	my ($uname,$udom)=split(/:/,$user);
Line 4527 sub editgrades {	Line 4697 sub editgrades {
$udom,$uname);	$udom,$uname);
my $all_graded = 1;	my $all_graded = 1;
my $none_graded = 1;	my $none_graded = 1;
	unless ($got_types) {
	my $error;
	my ($plist,$handgrd,$resptype) = &response_type($symb,\$error);
	unless ($error) {
	foreach my $part (@parts) {
	if (ref($resptype->{$part}) eq 'HASH') {
	foreach my $id (keys(%{$resptype->{$part}})) {
	if (($resptype->{$part}->{$id} eq 'essay') \|\|
	(lc($handgrd->{$part.'_'.$id}) eq 'yes')) {
	$queueable{$part} = 1;
	last;
	}
	}
	}
	}
	}
	$got_types = 1;
	}
foreach my $part (@parts) {	foreach my $part (@parts) {
if ( $record{'resource.'.$part.'.awarded'} eq '' ) {	if ($queueable{$part}) {
$all_graded = 0;	if ( $record{'resource.'.$part.'.awarded'} eq '' ) {
} else {	$all_graded = 0;
$none_graded = 0;	} else {
}	$none_graded = 0;
	}
	}
}	}

if ($all_graded \|\| $none_graded) {	if ($all_graded \|\| $none_graded) {
Line 4716 ENDPICK	Line 4906 ENDPICK

sub csvupload_fields {	sub csvupload_fields {
my ($symb,$errorref) = @_;	my ($symb,$errorref) = @_;
	my $toolsymb;
	if ($symb =~ /ext\.tool$/) {
	$toolsymb = $symb;
	}
my (@parts) = &getpartlist($symb,$errorref);	my (@parts) = &getpartlist($symb,$errorref);
if (ref($errorref)) {	if (ref($errorref)) {
if ($$errorref) {	if ($$errorref) {
Line 4729 sub csvupload_fields {	Line 4923 sub csvupload_fields {
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);	my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
foreach my $part (sort(@parts)) {	foreach my $part (sort(@parts)) {
my @datum;	my @datum;
my $display=&Apache::lonnet::metadata($url,$part.'.display');	my $display=&Apache::lonnet::metadata($url,$part.'.display',$toolsymb);
my $name=$part;	my $name=$part;
if (!$display) { $display = $name; }	if (!$display) { $display = $name; }
@datum=($name,$display);	@datum=($name,$display);
Line 5195 sub getSymbMap {	Line 5389 sub getSymbMap {
my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); },	my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); },
1,0,1);	1,0,1);
for my $sequence ($navmap->getById('0.0'), @sequences) {	for my $sequence ($navmap->getById('0.0'), @sequences) {
if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {	if ($navmap->hasResource($sequence, sub { shift->is_gradable(); }, 0) ) {
my $title = $minder.'.'.	my $title = $minder.'.'.
&HTML::Entities::encode($sequence->compTitle(),'"\'&');	&HTML::Entities::encode($sequence->compTitle(),'"\'&');
push(@titles, $title); # minder in case two titles are identical	push(@titles, $title); # minder in case two titles are identical
Line 5292 sub displayPage {	Line 5486 sub displayPage {
if($curRes == $iterator->BEGIN_MAP) { $depth++; }	if($curRes == $iterator->BEGIN_MAP) { $depth++; }
if($curRes == $iterator->END_MAP) { $depth--; }	if($curRes == $iterator->END_MAP) { $depth--; }

if (ref($curRes) && $curRes->is_problem()) {	if (ref($curRes) && $curRes->is_gradable()) {
my $parts = $curRes->parts();	my $parts = $curRes->parts();
my $title = $curRes->compTitle();	my $title = $curRes->compTitle();
my $symbx = $curRes->symb();	my $symbx = $curRes->symb();
	my $is_tool = ($symbx =~ /ext\.tool$/);
$studentTable.=	$studentTable.=
&Apache::loncommon::start_data_table_row().	&Apache::loncommon::start_data_table_row().
'<td align="center" valign="top" >'.$prob.	'<td align="center" valign="top" >'.$prob.
Line 5306 sub displayPage {	Line 5501 sub displayPage {
'</td>';	'</td>';
$studentTable.='<td valign="top">';	$studentTable.='<td valign="top">';
my %form = ('CODE' => $env{'form.CODE'},);	my %form = ('CODE' => $env{'form.CODE'},);
if ($env{'form.vProb'} eq 'yes' ) {	if ($is_tool) {
$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,	$studentTable.=' <b>'.$title.'</b><br />';
undef,'both',\%form);	} else {
} else {	if ($env{'form.vProb'} eq 'yes' ) {
my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form);	$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
$companswer =~ s\|<form(.*?)>\|\|g;	undef,'both',\%form);
$companswer =~ s\|</form>\|\|g;	} else {
# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>	my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form);
# $companswer =~ s/$1/ /ms;	$companswer =~ s\|<form(.*?)>\|\|g;
# $request->print('match='.$1."<br />\n");	$companswer =~ s\|</form>\|\|g;
# }	# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
# $companswer =~ s\|<table border=\"1\">\|<table border=\"0\">\|g;	# $companswer =~ s/$1/ /ms;
$studentTable.=' <b>'.$title.'</b> <br /> <b>'.&mt('Correct answer').':</b><br />'.$companswer;	# $request->print('match='.$1."<br />\n");
	# }
	# $companswer =~ s\|<table border=\"1\">\|<table border=\"0\">\|g;
	$studentTable.=' <b>'.$title.'</b> <br /> <b>'.&mt('Correct answer').':</b><br />'.$companswer;
	}
}	}

my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);	my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);

if ($env{'form.lastSub'} eq 'datesub') {	if ($env{'form.lastSub'} eq 'datesub') {
if ($record{'version'} eq '') {	if ($record{'version'} eq '') {
$studentTable.='<br /> <span class="LC_warning">'.&mt('No recorded submission for this problem.').'</span><br />';	my $msg = &mt('No recorded submission for this problem.');
	if ($is_tool) {
	$msg = &mt('No recorded transactions for this external tool');
	}
	$studentTable.='<br /> <span class="LC_warning">'.$msg.'</span><br />';
} else {	} else {
my %responseType = ();	my %responseType = ();
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
Line 5364 sub displayPage {	Line 5567 sub displayPage {
}	}
$curRes = $iterator->next();	$curRes = $iterator->next();
}	}
	my $disabled;
	unless (&canmodify($usec)) {
	$disabled = ' disabled="disabled"';
	}

$studentTable.=	$studentTable.=
'</table>'."\n".	'</table>'."\n".
'<input type="button" value="'.&mt('Save').'" '.	'<input type="button" value="'.&mt('Save').'"'.$disabled.' '.
'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.	'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
'</form>'."\n";	'</form>'."\n";
$request->print($studentTable);	$request->print($studentTable);
Line 5379 sub displaySubByDates {	Line 5586 sub displaySubByDates {
my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;	my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
my $isCODE=0;	my $isCODE=0;
my $isTask = ($symb =~/\.task$/);	my $isTask = ($symb =~/\.task$/);
	my $is_tool = ($symb =~/\.tool$/);
if (exists($record->{'resource.CODE'})) { $isCODE=1; }	if (exists($record->{'resource.CODE'})) { $isCODE=1; }
my $studentTable=&Apache::loncommon::start_data_table().	my $studentTable=&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('Date/Time').'</th>'.	'<th>'.&mt('Date/Time').'</th>'.
($isCODE?'<th>'.&mt('CODE').'</th>':'').	($isCODE?'<th>'.&mt('CODE').'</th>':'').
($isTask?'<th>'.&mt('Version').'</th>':'').	($isTask?'<th>'.&mt('Version').'</th>':'').
'<th>'.&mt('Submission').'</th>'.	'<th>'.($is_tool?&mt('Grade'):&mt('Submission')).'</th>'.
'<th>'.&mt('Status').'</th>'.	'<th>'.&mt('Status').'</th>'.
&Apache::loncommon::end_data_table_header_row();	&Apache::loncommon::end_data_table_header_row();
my ($version);	my ($version);
Line 5393 sub displaySubByDates {	Line 5601 sub displaySubByDates {
my %orders;	my %orders;
$mark{'correct_by_student'} = $checkIcon;	$mark{'correct_by_student'} = $checkIcon;
if (!exists($$record{'1:timestamp'})) {	if (!exists($$record{'1:timestamp'})) {
return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />';	if ($is_tool) {
	return '<br /> <span class="LC_warning">'.&mt('No grade passed back.').'</span><br />';
	} else {
	return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />';
	}
}	}

my $interaction;	my $interaction;
Line 5429 sub displaySubByDates {	Line 5641 sub displaySubByDates {
my @matchKey;	my @matchKey;
if ($isTask) {	if ($isTask) {
@matchKey = sort(grep(/^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys));	@matchKey = sort(grep(/^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys));
	} elsif ($is_tool) {
	@matchKey = sort(grep(/^resource\.\Q$partid\E\.awarded$/,@versionKeys));
} else {	} else {
@matchKey = sort(grep(/^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));	@matchKey = sort(grep(/^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));
}	}
Line 5437 sub displaySubByDates {	Line 5651 sub displaySubByDates {
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 '') {
	if ($is_tool) {
my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)	$displaySub[0].=$$record{"$version:resource.$partid.awarded"};
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
$displaySub[0].='<span class="LC_nobreak">';
$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
.' <span class="LC_internal_info">'
.'('.&mt('Response ID: [_1]',$responseId).')'
.'</span>'
.' <b>';
if ($hidden) {
$displaySub[0].= &mt('Anonymous Survey').'</b>';
} else {	} else {
my ($trial,$rndseed,$newvariation);	my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
if ($type eq 'randomizetry') {	: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
$trial = $$record{"$where.$partid.tries"};	$displaySub[0].='<span class="LC_nobreak">';
$rndseed = $$record{"$where.$partid.rndseed"};	$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
}	.' <span class="LC_internal_info">'
if ($$record{"$where.$partid.tries"} eq '') {	.'('.&mt('Response ID: [_1]',$responseId).')'
$displaySub[0].=&mt('Trial not counted');	.'</span>'
} else {	.' <b>';
$displaySub[0].=&mt('Trial: [_1]',	if ($hidden) {
$$record{"$where.$partid.tries"});	$displaySub[0].= &mt('Anonymous Survey').'</b>';
if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) {	} else {
if (($rndseed ne $lastrndseed{$partid}) &&	my ($trial,$rndseed,$newvariation);
(($type eq 'randomizetry') \|\| ($lasttype{$partid} eq 'randomizetry'))) {	if ($type eq 'randomizetry') {
$newvariation = ' ('.&mt('New variation this try').')';	$trial = $$record{"$where.$partid.tries"};
}	$rndseed = $$record{"$where.$partid.rndseed"};
}	}
$lastrndseed{$partid} = $rndseed;	if ($$record{"$where.$partid.tries"} eq '') {
$lasttype{$partid} = $type;	$displaySub[0].=&mt('Trial not counted');
}	} else {
my $responseType=($isTask ? 'Task'	$displaySub[0].=&mt('Trial: [_1]',
: $responseType->{$partid}->{$responseId});	$$record{"$where.$partid.tries"});
if (!exists($orders{$partid})) { $orders{$partid}={}; }	if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) {
if ((!exists($orders{$partid}->{$responseId})) \|\| ($trial)) {	if (($rndseed ne $lastrndseed{$partid}) &&
$orders{$partid}->{$responseId}=	(($type eq 'randomizetry') \|\| ($lasttype{$partid} eq 'randomizetry'))) {
&get_order($partid,$responseId,$symb,$uname,$udom,	$newvariation = ' ('.&mt('New variation this try').')';
$no_increment,$type,$trial,$rndseed);	}
}	}
$displaySub[0].='</b>'.$newvariation.'</span>'; # /nobreak	$lastrndseed{$partid} = $rndseed;
$displaySub[0].='  '.	$lasttype{$partid} = $type;
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'<br />';	}
	my $responseType=($isTask ? 'Task'
	: $responseType->{$partid}->{$responseId});
	if (!exists($orders{$partid})) { $orders{$partid}={}; }
	if ((!exists($orders{$partid}->{$responseId})) \|\| ($trial)) {
	$orders{$partid}->{$responseId}=
	&get_order($partid,$responseId,$symb,$uname,$udom,
	$no_increment,$type,$trial,$rndseed);
	}
	$displaySub[0].='</b>'.$newvariation.'</span>'; # /nobreak
	$displaySub[0].='  '.
	&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'<br />';
	}
}	}
}	}
}	}
Line 5493 sub displaySubByDates {	Line 5710 sub displaySubByDates {
lc($$record{"$where.$partid.award"}).' '.	lc($$record{"$where.$partid.award"}).' '.
$mark{$$record{"$where.$partid.solved"}}.	$mark{$$record{"$where.$partid.solved"}}.
'<br />';	'<br />';
	} elsif (($is_tool) && (exists($$record{"$version:resource.$partid.solved"}))) {
	if ($$record{"$version:resource.$partid.solved"} =~ /^(in\|)correct_by_passback$/) {
	$displaySub[1].=&mt('Grade passed back by external tool');
	}
}	}
if (exists $$record{"$where.$partid.regrader"}) {	if (exists $$record{"$where.$partid.regrader"}) {
$displaySub[2].=$$record{"$where.$partid.regrader"}.	$displaySub[2].=$$record{"$where.$partid.regrader"};
' (<b>'.&mt('Part').':</b> '.$display_part.')';	unless ($is_tool) {
	$displaySub[2].=' (<b>'.&mt('Part').':</b> '.$display_part.')';
	}
} elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) {	} elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) {
$displaySub[2].=	$displaySub[2].=
$$record{"$version:resource.$partid.regrader"}.	$$record{"$version:resource.$partid.regrader"};
' (<b>'.&mt('Part').':</b> '.$display_part.')';	unless ($is_tool) {
	$displaySub[2].=' (<b>'.&mt('Part').':</b> '.$display_part.')';
	}
}	}
}	}
# needed because old essay regrader has not parts info	# needed because old essay regrader has not parts info
Line 5585 sub updateGradeByPage {	Line 5810 sub updateGradeByPage {
my @displayPts=();	my @displayPts=();
my %aggregate = ();	my %aggregate = ();
my $aggregateflag = 0;	my $aggregateflag = 0;
	my %queueable;
if ($env{'form.HIDE'.$prob}) {	if ($env{'form.HIDE'.$prob}) {
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);	my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
my ($version,$parts) = split(/:/,$env{'form.HIDE'.$prob},2);	my ($version,$parts) = split(/:/,$env{'form.HIDE'.$prob},2);
Line 5594 sub updateGradeByPage {	Line 5820 sub updateGradeByPage {
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid};	my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid};
my $oldpts = $env{'form.oldpts'.$question.'_'.$partid};	my $oldpts = $env{'form.oldpts'.$question.'_'.$partid};
	my @types = $curRes->responseType($partid);
	if (grep(/^essay$/,@types)) {
	$queueable{$partid} = 1;
	} else {
	my @ids = $curRes->responseIds($partid);
	for (my $i=0; $i < scalar(@ids); $i++) {
	my $hndgrd = &Apache::lonnet::EXT('resource.'.$partid.'_'.$ids[$i].
	'.handgrade',$symb);
	if (lc($hndgrd) eq 'yes') {
	$queueable{$partid} = 1;
	last;
	}
	}
	}
my $wgt = $env{'form.WGT'.$question.'_'.$partid} != 0 ?	my $wgt = $env{'form.WGT'.$question.'_'.$partid} != 0 ?
$env{'form.WGT'.$question.'_'.$partid} : 1;	$env{'form.WGT'.$question.'_'.$partid} : 1;
my $partial = $newpts/$wgt;	my $partial = $newpts/$wgt;
Line 5660 sub updateGradeByPage {	Line 5899 sub updateGradeByPage {
$env{'request.course.id'},	$env{'request.course.id'},
$udom,$uname);	$udom,$uname);
&check_and_remove_from_queue($parts,\%record,undef,$symbx,	&check_and_remove_from_queue($parts,\%record,undef,$symbx,
$cdom,$cnum,$udom,$uname);	$cdom,$cnum,$udom,$uname,\%queueable);
}	}

if ($aggregateflag) {	if ($aggregateflag) {
Line 6569 sub scantron_parse_scanline {	Line 6808 sub scantron_parse_scanline {
}	}

sub get_master_seq {	sub get_master_seq {
my ($resources,$master_seq,$symb_to_resource) = @_;	my ($resources,$master_seq,$symb_to_resource,$need_symb_in_map,$symb_for_examcode) = @_;
return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') &&	return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') &&
(ref($symb_to_resource) eq 'HASH'));	(ref($symb_to_resource) eq 'HASH'));
	if ($need_symb_in_map) {
	return unless (ref($symb_for_examcode) eq 'HASH');
	}
my $resource_error;	my $resource_error;
foreach my $resource (@{$resources}) {	foreach my $resource (@{$resources}) {
my $ressymb;	my $ressymb;
Line 6579 sub get_master_seq {	Line 6821 sub get_master_seq {
$ressymb = $resource->symb();	$ressymb = $resource->symb();
push(@{$master_seq},$ressymb);	push(@{$master_seq},$ressymb);
$symb_to_resource->{$ressymb} = $resource;	$symb_to_resource->{$ressymb} = $resource;
	if ($need_symb_in_map) {
	unless ($resource->is_map()) {
	my $map=(&Apache::lonnet::decode_symb($ressymb))[0];
	unless (exists($symb_for_examcode->{$map})) {
	$symb_for_examcode->{$map} = $ressymb;
	}
	}
	}
} else {	} else {
$resource_error = 1;	$resource_error = 1;
last;	last;
Line 8395 sub scantron_validate_doublebubble {	Line 8645 sub scantron_validate_doublebubble {
if (ref($map)) {	if (ref($map)) {
$randomorder = $map->randomorder();	$randomorder = $map->randomorder();
$randompick = $map->randompick();	$randompick = $map->randompick();
	unless ($randomorder \|\| $randompick) {
	foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
	if ($res->randomorder()) {
	$randomorder = 1;
	}
	if ($res->randompick()) {
	$randompick = 1;
	}
	last if ($randomorder \|\| $randompick);
	}
	}
if ($randomorder \|\| $randompick) {	if ($randomorder \|\| $randompick) {
$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);	$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
if ($nav_error) {	if ($nav_error) {
Line 8578 sub scantron_validate_missingbubbles {	Line 8839 sub scantron_validate_missingbubbles {
if (ref($map)) {	if (ref($map)) {
$randomorder = $map->randomorder();	$randomorder = $map->randomorder();
$randompick = $map->randompick();	$randompick = $map->randompick();
	unless ($randomorder \|\| $randompick) {
	foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
	if ($res->randomorder()) {
	$randomorder = 1;
	}
	if ($res->randompick()) {
	$randompick = 1;
	}
	last if ($randomorder \|\| $randompick);
	}
	}
if ($randomorder \|\| $randompick) {	if ($randomorder \|\| $randompick) {
$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);	$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
if ($nav_error) {	if ($nav_error) {
Line 8719 sub scantron_process_students {	Line 8991 sub scantron_process_students {
}	}
my $map=$navmap->getResourceByUrl($sequence);	my $map=$navmap->getResourceByUrl($sequence);
my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,	my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,
%grader_randomlists_by_symb);	%grader_randomlists_by_symb,%symb_for_examcode);
if (ref($map)) {	if (ref($map)) {
$randomorder = $map->randomorder();	$randomorder = $map->randomorder();
$randompick = $map->randompick();	$randompick = $map->randompick();
	unless ($randomorder \|\| $randompick) {
	foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
	if ($res->randomorder()) {
	$randomorder = 1;
	}
	if ($res->randompick()) {
	$randompick = 1;
	}
	last if ($randomorder \|\| $randompick);
	}
	}
} else {	} else {
$r->print(&navmap_errormsg());	$r->print(&navmap_errormsg());
return '';	return '';
Line 8730 sub scantron_process_students {	Line 9013 sub scantron_process_students {
my $nav_error;	my $nav_error;
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
if ($randomorder \|\| $randompick) {	if ($randomorder \|\| $randompick) {
$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);	$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource,1,\%symb_for_examcode);
if ($nav_error) {	if ($nav_error) {
$r->print(&navmap_errormsg());	$r->print(&navmap_errormsg());
return '';	return '';
Line 8877 SCANTRONFORM	Line 9160 SCANTRONFORM
}	}

if (($scancode) && ($randomorder \|\| $randompick)) {	if (($scancode) && ($randomorder \|\| $randompick)) {
my $parmresult =	foreach my $key (keys(%symb_for_examcode)) {
&Apache::lonparmset::storeparm_by_symb($symb,	my $symb_in_map = $symb_for_examcode{$key};
'0_examcode',2,$scancode,	if ($symb_in_map ne '') {
'string_examcode',$uname,	my $parmresult =
$udom);	&Apache::lonparmset::storeparm_by_symb($symb_in_map,
	'0_examcode',2,$scancode,
	'string_examcode',$uname,
	$udom);
	}
	}
}	}
$completedstudents{$uname}={'line'=>$line};	$completedstudents{$uname}={'line'=>$line};
if ($env{'form.verifyrecord'}) {	if ($env{'form.verifyrecord'}) {
Line 9196 END	Line 9484 END
my @lines = &Apache::lonnet::get_scantronformat_file();	my @lines = &Apache::lonnet::get_scantronformat_file();
my $count = 0;	my $count = 0;
foreach my $line (@lines) {	foreach my $line (@lines) {
next if ($line =~ /^#/);	next if (($line =~ /^\#/) \|\| ($line eq ''));
$singleline = $line;	$singleline = $line;
$count ++;	$count ++;
}	}
Line 9358 sub validate_uploaded_scantron_file {	Line 9646 sub validate_uploaded_scantron_file {
my %unique_formats;	my %unique_formats;
my @formatlines = &Apache::lonnet::get_scantronformat_file();	my @formatlines = &Apache::lonnet::get_scantronformat_file();
foreach my $line (@formatlines) {	foreach my $line (@formatlines) {
chomp($line);	next if (($line =~ /^\#/) \|\| ($line eq ''));
my @config = split(/:/,$line);	my @config = split(/:/,$line);
my $idstart = $config[5];	my $idstart = $config[5];
my $idlength = $config[6];	my $idlength = $config[6];
Line 9520 sub checkscantron_results {	Line 9808 sub checkscantron_results {
if (ref($map)) {	if (ref($map)) {
$randomorder=$map->randomorder();	$randomorder=$map->randomorder();
$randompick=$map->randompick();	$randompick=$map->randompick();
	unless ($randomorder \|\| $randompick) {
	foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
	if ($res->randomorder()) {
	$randomorder = 1;
	}
	if ($res->randompick()) {
	$randompick = 1;
	}
	last if ($randomorder \|\| $randompick);
	}
	}
}	}
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
my $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);	my $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
Line 9873 sub grading_menu {	Line 10172 sub grading_menu {

$fields{'command'} = 'initialverifyreceipt';	$fields{'command'} = 'initialverifyreceipt';
my $url5 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url5 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);

	my %permissions;
	if ($perm{'mgr'}) {
	$permissions{'either'} = 'F';
	$permissions{'mgr'} = 'F';
	}
	if ($perm{'vgr'}) {
	$permissions{'either'} = 'F';
	$permissions{'vgr'} = 'F';
	}

my @menu = ({ categorytitle=>'Hand Grading',	my @menu = ({ categorytitle=>'Hand Grading',
items =>[	items =>[
{ linktext => 'Select individual students to grade',	{ linktext => 'Select individual students to grade',
url => $url1a,	url => $url1a,
permission => 'F',	permission => $permissions{'either'},
icon => 'grade_students.png',	icon => 'grade_students.png',
linktitle => 'Grade current resource for a selection of students.'	linktitle => 'Grade current resource for a selection of students.'
},	},
{ linktext => 'Grade ungraded submissions',	{ linktext => 'Grade ungraded submissions',
url => $url1b,	url => $url1b,
permission => 'F',	permission => $permissions{'either'},
icon => 'ungrade_sub.png',	icon => 'ungrade_sub.png',
linktitle => 'Grade all submissions that have not been graded yet.'	linktitle => 'Grade all submissions that have not been graded yet.'
},	},

{ linktext => 'Grading table',	{ linktext => 'Grading table',
url => $url1c,	url => $url1c,
permission => 'F',	permission => $permissions{'either'},
icon => 'grading_table.png',	icon => 'grading_table.png',
linktitle => 'Grade current resource for all students.'	linktitle => 'Grade current resource for all students.'
},	},
{ linktext => 'Grade page/folder for one student',	{ linktext => 'Grade page/folder for one student',
url => $url1d,	url => $url1d,
permission => 'F',	permission => $permissions{'either'},
icon => 'grade_PageFolder.png',	icon => 'grade_PageFolder.png',
linktitle => 'Grade all resources in current page/sequence/folder for one student.'	linktitle => 'Grade all resources in current page/sequence/folder for one student.'
},	},
{ linktext => 'Download submitted files',	{ linktext => 'Download submitted files',
url => $url1e,	url => $url1e,
permission => 'F',	permission => $permissions{'either'},
icon => 'download_sub.png',	icon => 'download_sub.png',
linktitle => 'Download all files submitted by students.'	linktitle => 'Download all files submitted by students.'
}]},	}]},
Line 9912 sub grading_menu {	Line 10221 sub grading_menu {

{ linktext => 'Upload Scores',	{ linktext => 'Upload Scores',
url => $url2,	url => $url2,
permission => 'F',	permission => $permissions{'mgr'},
icon => 'uploadscores.png',	icon => 'uploadscores.png',
linktitle => 'Specify a file containing the class scores for current resource.'	linktitle => 'Specify a file containing the class scores for current resource.'
},	},
{ linktext => 'Process Clicker',	{ linktext => 'Process Clicker',
url => $url3,	url => $url3,
permission => 'F',	permission => $permissions{'mgr'},
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 Bubblesheets',	{ linktext => 'Grade/Manage/Review Bubblesheets',
url => $url4,	url => $url4,
permission => 'F',	permission => $permissions{'mgr'},
icon => 'bubblesheet.png',	icon => 'bubblesheet.png',
linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.'	linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.'
},	},
{ linktext => 'Verify Receipt Number',	{ linktext => 'Verify Receipt Number',
url => $url5,	url => $url5,
permission => 'F',	permission => $permissions{'either'},
icon => 'receipt_number.png',	icon => 'receipt_number.png',
linktitle => 'Verify a system-generated receipt number for correct problem solution.'	linktitle => 'Verify a system-generated receipt number for correct problem solution.'
}	}
Line 9975 sub submit_options_table {	Line 10284 sub submit_options_table {
my ($request,$symb) = @_;	my ($request,$symb) = @_;
if (!$symb) {return '';}	if (!$symb) {return '';}
&commonJSfunctions($request);	&commonJSfunctions($request);
	my $is_tool = ($symb =~ /ext\.tool$/);
my $result;	my $result;

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

$result.=&selectfield(1).	$result.=&selectfield(1,$is_tool).
'<input type="hidden" name="command" value="viewgrades" />	'<input type="hidden" name="command" value="viewgrades" />
<div>	<div>
<input type="submit" value="'.&mt('Next').' →" />	<input type="submit" value="'.&mt('Next').' →" />
Line 10012 sub submit_options_download {	Line 10322 sub submit_options_download {
}	}
}	}

	my $is_tool = ($symb =~ /ext\.tool$/);
&commonJSfunctions($request);	&commonJSfunctions($request);

my $result='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".	my $result='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
Line 10020 sub submit_options_download {	Line 10331 sub submit_options_download {
$result.='	$result.='
<h2>	<h2>
'.&mt('Select Students for whom to Download Submitted Files').'	'.&mt('Select Students for whom to Download Submitted Files').'
</h2>'.&selectfield(1).'	</h2>'.&selectfield(1,$is_tool).'
<input type="hidden" name="command" value="downloadfileslink" />	<input type="hidden" name="command" value="downloadfileslink" />
<input type="submit" value="'.&mt('Next').' →" />	<input type="submit" value="'.&mt('Next').' →" />
</div>	</div>
Line 10036 sub submit_options {	Line 10347 sub submit_options {
my ($request,$symb) = @_;	my ($request,$symb) = @_;
if (!$symb) {return '';}	if (!$symb) {return '';}

	my $is_tool = ($symb =~ /ext\.tool$/);
&commonJSfunctions($request);	&commonJSfunctions($request);
my $result;	my $result;

$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".	$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
$result.=&selectfield(1).'	$result.=&selectfield(1,$is_tool).'
<input type="hidden" name="command" value="submission" />	<input type="hidden" name="command" value="submission" />
<input type="submit" value="'.&mt('Next').' →" />	<input type="submit" value="'.&mt('Next').' →" />
</div>	</div>
Line 10051 sub submit_options {	Line 10363 sub submit_options {
}	}

sub selectfield {	sub selectfield {
my ($full)=@_;	my ($full,$is_tool)=@_;
my %options =	my %options;
(&substatus_options,	if ($is_tool) {
'select_form_order' => ['yes','queued','graded','incorrect','all']);	%options =
	(&transtatus_options,
	'select_form_order' => ['yes','incorrect','all']);
	} else {
	%options =
	(&substatus_options,
	'select_form_order' => ['yes','queued','graded','incorrect','all']);
	}

	#
	# PrepareClasslist() needs to be called to avoid getting a sections list
	# for a different course from the @Sections global in lonstatistics.pm,
	# populated by an earlier request.
	#
	&Apache::lonstatistics::PrepareClasslist();

my $result='<div class="LC_columnSection">	my $result='<div class="LC_columnSection">

<fieldset>	<fieldset>
Line 10078 sub selectfield {	Line 10405 sub selectfield {
'.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').'	'.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').'
</fieldset>';	</fieldset>';
if ($full) {	if ($full) {
	my $heading = &mt('Submission Status');
	if ($is_tool) {
	$heading = &mt('Transaction Status');
	}
$result.='	$result.='
<fieldset>	<fieldset>
<legend>	<legend>
'.&mt('Submission Status').'	'.$heading.'
</legend>'.	</legend>'.
&Apache::loncommon::select_form('all','submitonly',\%options).	&Apache::loncommon::select_form('all','submitonly',\%options).
'</fieldset>';	'</fieldset>';
Line 10793 sub startpage {	Line 11124 sub startpage {
$args{'only_body'} = 1;	$args{'only_body'} = 1;
$r->print(&Apache::loncommon::start_page("Student's Version",$head_extra,\%args));	$r->print(&Apache::loncommon::start_page("Student's Version",$head_extra,\%args));
} else {	} else {
unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});	if ($env{'request.course.id'}) {
	unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});
	}
$args{'bread_crumbs'} = $crumbs;	$args{'bread_crumbs'} = $crumbs;
$r->print(&Apache::loncommon::start_page('Grading',$head_extra,\%args));	$r->print(&Apache::loncommon::start_page('Grading',$head_extra,\%args));
}	}
Line 11162 ssi_with_retries()	Line 11495 ssi_with_retries()
- missingbubble - array ref of the bubble lines that have missing	- missingbubble - array ref of the bubble lines that have missing
bubble errors	bubble errors

$randomorder - True if exam folder has randomorder set	$randomorder - True if exam folder (or a sub-folder) has randomorder set
$randompick - True if exam folder has randompick set	$randompick - True if exam folder (or a sub-folder) has randompick set
$respnumlookup - Reference to HASH mapping question numbers in bubble lines	$respnumlookup - Reference to HASH mapping question numbers in bubble lines
for current line to question number used for same question	for current line to question number used for same question
in "Master Seqence" (as seen by Course Coordinator).	in "Master Seqence" (as seen by Course Coordinator).

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

Removed from v.1.596.2.12.2.55
changed lines
	Added in v.1.596.2.12.2.60.2.4