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.725 and 1.756

version 1.725, 2014/08/25 22:12:58	version 1.756, 2019/01/28 21:36:53
Line 46 use Apache::lonenc;	Line 46 use Apache::lonenc;
use Apache::lonstathelpers;	use Apache::lonstathelpers;
use Apache::lonquickgrades;	use Apache::lonquickgrades;
use Apache::bridgetask();	use Apache::bridgetask();
	use Apache::lontexconvert();
use String::Similarity;	use String::Similarity;
use LONCAPA;	use LONCAPA;

Line 116 sub getpartlist {	Line 117 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 293 sub reset_caches {	Line 298 sub reset_caches {
}	}

sub scantron_partids_tograde {	sub scantron_partids_tograde {
my ($resource,$cid,$uname,$udom,$check_for_randomlist,$bubbles_per_row) = @_;	my ($resource,$cid,$uname,$udom,$check_for_randomlist,$bubbles_per_row,$scancode) = @_;
my (%analysis,@parts);	my (%analysis,@parts);
if (ref($resource)) {	if (ref($resource)) {
my $symb = $resource->symb();	my $symb = $resource->symb();
Line 301 sub reset_caches {	Line 306 sub reset_caches {
if ($check_for_randomlist) {	if ($check_for_randomlist) {
$add_to_form = { 'check_parts_withrandomlist' => 1,};	$add_to_form = { 'check_parts_withrandomlist' => 1,};
}	}
	if ($scancode) {
	if (ref($add_to_form) eq 'HASH') {
	$add_to_form->{'code_for_randomlist'} = $scancode;
	} else {
	$add_to_form = { 'code_for_randomlist' => $scancode,};
	}
	}
my $analyze =	my $analyze =
&get_analyze($symb,$uname,$udom,undef,$add_to_form,	&get_analyze($symb,$uname,$udom,undef,$add_to_form,
undef,undef,undef,$bubbles_per_row);	undef,undef,undef,$bubbles_per_row);
Line 406 sub cleanRecord {	Line 418 sub cleanRecord {
$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';	$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
$env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.	$env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
}	}
return '<br /><br /><blockquote><tt>'.&keywords_highlight(&HTML::Entities::encode($answer, '"<>&')).'</tt></blockquote>';	$answer = &Apache::lontexconvert::msgtexconverted($answer);
	return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';

} elsif ( $response eq 'organic') {	} elsif ( $response eq 'organic') {
my $result=&mt('Smile representation: [_1]',	my $result=&mt('Smile representation: [_1]',
Line 491 COMMONJSFUNCTIONS	Line 504 COMMONJSFUNCTIONS
#--- Dumps the class list with usernames,list of sections,	#--- Dumps the class list with usernames,list of sections,
#--- section, ids and fullnames for each user.	#--- section, ids and fullnames for each user.
sub getclasslist {	sub getclasslist {
my ($getsec,$filterlist,$getgroup) = @_;	my ($getsec,$filterbyaccstatus,$getgroup,$symb,$submitonly,$filterbysubmstatus) = @_;
my @getsec;	my @getsec;
my @getgroup;	my @getgroup;
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
Line 519 sub getclasslist {	Line 532 sub getclasslist {
#	#
my %sections;	my %sections;
my %fullnames;	my %fullnames;
	my ($cdom,$cnum,$partlist);
	if (($filterbysubmstatus) && ($submitonly ne 'all') && ($symb ne '')) {
	$cdom = $env{"course.$env{'request.course.id'}.domain"};
	$cnum = $env{"course.$env{'request.course.id'}.num"};
	my $res_error;
	($partlist,my $handgrade,my $responseType) = &response_type($symb,\$res_error);
	}
foreach my $student (keys(%$classlist)) {	foreach my $student (keys(%$classlist)) {
my $end =	my $end =
$classlist->{$student}->[&Apache::loncoursedata::CL_END()];	$classlist->{$student}->[&Apache::loncoursedata::CL_END()];
Line 535 sub getclasslist {	Line 555 sub getclasslist {
my $group =	my $group =
$classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];	$classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
# filter students according to status selected	# filter students according to status selected
if ($filterlist && (!($stu_status =~ /Any/))) {	if ($filterbyaccstatus && (!($stu_status =~ /Any/))) {
if (!($stu_status =~ $status)) {	if (!($stu_status =~ $status)) {
delete($classlist->{$student});	delete($classlist->{$student});
next;	next;
Line 552 sub getclasslist {	Line 572 sub getclasslist {
}	}
}	}
if (($grp eq 'none') && !$group) {	if (($grp eq 'none') && !$group) {
$exclude = 0;	$exclude = 0;
}	}
}	}
if ($exclude) {	if ($exclude) {
delete($classlist->{$student});	delete($classlist->{$student});
	next;
}	}
}	}
	if (($filterbysubmstatus) && ($submitonly ne 'all') && ($symb ne '')) {
	my $udom =
	$classlist->{$student}->[&Apache::loncoursedata::CL_SDOM()];
	my $uname =
	$classlist->{$student}->[&Apache::loncoursedata::CL_SNAME()];
	if (($symb ne '') && ($udom ne '') && ($uname ne '')) {
	if ($submitonly eq 'queued') {
	my %queue_status =
	&Apache::bridgetask::get_student_status($symb,$cdom,$cnum,
	$udom,$uname);
	if (!defined($queue_status{'gradingqueue'})) {
	delete($classlist->{$student});
	next;
	}
	} else {
	my (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);
	my $submitted = 0;
	my $graded = 0;
	my $incorrect = 0;
	foreach (keys(%status)) {
	$submitted = 1 if ($status{$_} ne 'nothing');
	$graded = 1 if ($status{$_} =~ /^ungraded/);
	$incorrect = 1 if ($status{$_} =~ /^incorrect/);

	my ($foo,$partid,$foo1) = split(/\./,$_);
	if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
	$submitted = 0;
	}
	}
	if (!$submitted && ($submitonly eq 'yes' \|\|
	$submitonly eq 'incorrect' \|\|
	$submitonly eq 'graded')) {
	delete($classlist->{$student});
	next;
	} elsif (!$graded && ($submitonly eq 'graded')) {
	delete($classlist->{$student});
	next;
	} elsif (!$incorrect && $submitonly eq 'incorrect') {
	delete($classlist->{$student});
	next;
	}
	}
	}
	}
$section = ($section ne '' ? $section : 'none');	$section = ($section ne '' ? $section : 'none');
if (&canview($section)) {	if (&canview($section)) {
if (!@getsec \|\| grep(/^\Q$section\E$/,@getsec)) {	if (!@getsec \|\| grep(/^\Q$section\E$/,@getsec)) {
Line 573 sub getclasslist {	Line 638 sub getclasslist {
delete($classlist->{$student});	delete($classlist->{$student});
}	}
}	}
my %seen = ();
my @sections = sort(keys(%sections));	my @sections = sort(keys(%sections));
return ($classlist,\@sections,\%fullnames);	return ($classlist,\@sections,\%fullnames);
}	}
Line 845 sub verifyreceipt {	Line 909 sub verifyreceipt {
sub listStudents {	sub listStudents {
my ($request,$symb,$submitonly) = @_;	my ($request,$symb,$submitonly) = @_;

	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 857 sub listStudents {	Line 922 sub listStudents {
my $res_error;	my $res_error;
my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);	my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);

my %lt = &Apache::lonlocal::texthash (	my %js_lt = &Apache::lonlocal::texthash (
'multiple' => 'Please select a student or group of students before clicking on the Next button.',	'multiple' => 'Please select a student or group of students before clicking on the Next button.',
'single' => 'Please select the student before clicking on the Next button.',	'single' => 'Please select the student before clicking on the Next button.',
);	);
	&js_escape(\%js_lt);
$request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));	$request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
function checkSelect(checkBox) {	function checkSelect(checkBox) {
var ctr=0;	var ctr=0;
Line 871 sub listStudents {	Line 937 sub listStudents {
ctr++;	ctr++;
}	}
}	}
sense = '$lt{'multiple'}';	sense = '$js_lt{'multiple'}';
} else {	} else {
if (checkBox.checked) {	if (checkBox.checked) {
ctr = 1;	ctr = 1;
}	}
sense = '$lt{'single'}';	sense = '$js_lt{'single'}';
}	}
if (ctr == 0) {	if (ctr == 0) {
alert(sense);	alert(sense);
Line 899 LISTJAVASCRIPT	Line 965 LISTJAVASCRIPT
"\n";	"\n";

$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 $submission_options;	my $submission_options;
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;
	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',
	last => 'last submission with details',
	datesub => 'all submissions',
	all => 'all submissions with details',
	);
	}
$submission_options.=	$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" /> '.
&mt('last submission').' </label></span>'."\n".	$optiontext{'lastonly'}.' </label></span>'."\n".
'<span class="LC_nobreak">'.	'<span class="LC_nobreak">'.
'<label><input type="radio" name="lastSub" value="last" /> '.	'<label><input type="radio" name="lastSub" value="last" /> '.
&mt('last submission with details').' </label></span>'."\n".	$optiontext{'last'}.' </label></span>'."\n".
'<span class="LC_nobreak">'.	'<span class="LC_nobreak">'.
'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.
&mt('all submissions').'</label></span>'."\n".	$optiontext{'datesub'}.'</label></span>'."\n".
'<span class="LC_nobreak">'.	'<span class="LC_nobreak">'.
'<label><input type="radio" name="lastSub" value="all" /> '.	'<label><input type="radio" name="lastSub" value="all" /> '.
&mt('all submissions with details').'</label></span>';	$optiontext{'all'}.'</label></span>';
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Submissions'))	my $viewtitle;
	if ($is_tool) {
	$viewtitle = &mt('View Transactions');
	} else {
	$viewtitle = &mt('View Submissions');
	}
	$gradeTable .= &Apache::lonhtmlcommon::row_title($viewtitle)
.$submission_options	.$submission_options
.&Apache::lonhtmlcommon::row_closure();	.&Apache::lonhtmlcommon::row_closure();

	my $closure;
	if (($is_tool) && (exists($env{'form.Status'}))) {
	$closure = 1;
	}
$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>'
Line 938 LISTJAVASCRIPT	Line 1032 LISTJAVASCRIPT
.'<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>'
.&Apache::lonhtmlcommon::row_closure();	.&Apache::lonhtmlcommon::row_closure($closure);

$gradeTable .=	$gradeTable .=
&build_section_inputs().	&build_section_inputs().
Line 949 LISTJAVASCRIPT	Line 1043 LISTJAVASCRIPT
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="'.$stu_status.'" />'."\n";
} else {	} else {
	if ($is_tool) {
	$closure = 1;
	}
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))	$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))
.&Apache::lonhtmlcommon::StatusOptions(	.&Apache::lonhtmlcommon::StatusOptions(
$saveStatus,undef,1,'javascript:reLoadList(this.form);')	$saveStatus,undef,1,'javascript:reLoadList(this.form);')
.&Apache::lonhtmlcommon::row_closure();	.&Apache::lonhtmlcommon::row_closure($closure);
}	}

$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))	unless ($is_tool) {
.'<input type="checkbox" name="checkPlag" checked="checked" />'	$closure = 1;
.&Apache::lonhtmlcommon::row_closure(1)	$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
.&Apache::lonhtmlcommon::end_pick_box();	.'<input type="checkbox" name="checkPlag" checked="checked" />'
	.&Apache::lonhtmlcommon::row_closure($closure);
	}
	$gradeTable .= &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 1177 sub processGroup {	Line 1282 sub processGroup {
#--- Javascript to handle the submission page functionality ---	#--- Javascript to handle the submission page functionality ---
sub sub_page_js {	sub sub_page_js {
my $request = shift;	my $request = shift;
my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');	my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
	&js_escape(\$alertmsg);
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));	$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
function updateRadio(formname,id,weight) {	function updateRadio(formname,id,weight) {
var gradeBox = formname["GD_BOX"+id];	var gradeBox = formname["GD_BOX"+id];
Line 1295 sub sub_page_js {	Line 1401 sub sub_page_js {
}	}
}	}
}	}

}	}
}	}

}	}
formname.submit();	formname.submit();
}	}
Line 1424 INNERJS	Line 1528 INNERJS

my $docopen=&Apache::lonhtmlcommon::javascript_docopen();	my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
$docopen=~s/^document\.//;	$docopen=~s/^document\.//;
my %lt = &Apache::lonlocal::texthash(	my %js_lt = &Apache::lonlocal::texthash(
keyw => 'Keywords list, separated by a space. Add/delete to list if desired.',	keyw => 'Keywords list, separated by a space. Add/delete to list if desired.',
plse => 'Please select a word or group of words from document and then click this link.',	plse => 'Please select a word or group of words from document and then click this link.',
adds => 'Add selection to keyword list? Edit if desired.',	adds => 'Add selection to keyword list? Edit if desired.',
	col1 => 'red',
	col2 => 'green',
	col3 => 'blue',
	siz1 => 'normal',
	siz2 => '+1',
	siz3 => '+2',
	sty1 => 'normal',
	sty2 => 'italic',
	sty3 => 'bold',
	);
	my %html_js_lt = &Apache::lonlocal::texthash(
comp => 'Compose Message for: ',	comp => 'Compose Message for: ',
incl => 'Include',	incl => 'Include',
type => 'Type',	type => 'Type',
Line 1440 INNERJS	Line 1555 INNERJS
txtc => 'Text Color',	txtc => 'Text Color',
font => 'Font Size',	font => 'Font Size',
fnst => 'Font Style',	fnst => 'Font Style',
col1 => 'red',
col2 => 'green',
col3 => 'blue',
siz1 => 'normal',
siz2 => '+1',
siz3 => '+2',
sty1 => 'normal',
sty2 => 'italic',
sty3 => 'bold',
);	);
	&js_escape(\%js_lt);
	&html_escape(\%html_js_lt);
	&js_escape(\%html_js_lt);
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));	$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));

//===================== Show list of keywords ====================	//===================== Show list of keywords ====================
function keywords(formname) {	function keywords(formname) {
var nret = prompt("$lt{'keyw'}",formname.keywords.value);	var nret = prompt("$js_lt{'keyw'}",formname.keywords.value);
if (nret==null) return;	if (nret==null) return;
formname.keywords.value = nret;	formname.keywords.value = nret;

Line 1481 INNERJS	Line 1590 INNERJS
else return;	else return;
var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");	var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
if (cleantxt=="") {	if (cleantxt=="") {
alert("$lt{'plse'}");	alert("$js_lt{'plse'}");
return;	return;
}	}
var nret = prompt("$lt{'adds'}",cleantxt);	var nret = prompt("$js_lt{'adds'}",cleantxt);
if (nret==null) return;	if (nret==null) return;
document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;	document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
if (document.SCORE.keywords.value != "") {	if (document.SCORE.keywords.value != "") {
Line 1564 INNERJS	Line 1673 INNERJS

pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");	pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");	pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
pDoc.write("<h1> $lt{'comp'}\"+fullname+\"<\\/h1>");	pDoc.write("<h1> $html_js_lt{'comp'}\"+fullname+\"<\\/h1>");

pDoc.write('<table style="border:1px solid black;"><tr>');	pDoc.write('<table style="border:1px solid black;"><tr>');
pDoc.write("<td><b>$lt{'incl'}<\\/b><\\/td><td><b>$lt{'type'}<\\/b><\\/td><td><b>$lt{'mesa'}<\\/td><\\/tr>");	pDoc.write("<td><b>$html_js_lt{'incl'}<\\/b><\\/td><td><b>$html_js_lt{'type'}<\\/b><\\/td><td><b>$html_js_lt{'mesa'}<\\/td><\\/tr>");
}	}
function displaySubject(msg,shwsel) {	function displaySubject(msg,shwsel) {
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.write("<tr>");	pDoc.write("<tr>");
pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");	pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
pDoc.write("<td>$lt{'subj'}<\\/td>");	pDoc.write("<td>$html_js_lt{'subj'}<\\/td>");
pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"40\\" maxlength=\\"80\\"><\\/td><\\/tr>");	pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"40\\" maxlength=\\"80\\"><\\/td><\\/tr>");
}	}

Line 1589 INNERJS	Line 1698 INNERJS
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.write("<tr>");	pDoc.write("<tr>");
pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");	pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
pDoc.write("<td align=\\"center\\">$lt{'new'}<\\/td>");	pDoc.write("<td align=\\"center\\">$html_js_lt{'new'}<\\/td>");
pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>");	pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>");
}	}

Line 1597 INNERJS	Line 1706 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=\\"$lt{'save'}\\" onclick=\\"javascript:checkInput()\\">  ");	pDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'save'}\\" onclick=\\"javascript:checkInput()\\">  ");
pDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />");	pDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />");
pDoc.write("<\\/form>");	pDoc.write("<\\/form>");
pDoc.write('$end_page_msg_central');	pDoc.write('$end_page_msg_central');
pDoc.close();	pDoc.close();
Line 1612 INNERJS	Line 1721 INNERJS
var redsel = "";	var redsel = "";
var grnsel = "";	var grnsel = "";
var blusel = "";	var blusel = "";
var txtcol1 = "$lt{'col1'}";	var txtcol1 = "$js_lt{'col1'}";
var txtcol2 = "$lt{'col2'}";	var txtcol2 = "$js_lt{'col2'}";
var txtcol3 = "$lt{'col3'}";	var txtcol3 = "$js_lt{'col3'}";
var txtsiz1 = "$lt{'siz1'}";	var txtsiz1 = "$js_lt{'siz1'}";
var txtsiz2 = "$lt{'siz2'}";	var txtsiz2 = "$js_lt{'siz2'}";
var txtsiz3 = "$lt{'siz3'}";	var txtsiz3 = "$js_lt{'siz3'}";
var txtsty1 = "$lt{'sty1'}";	var txtsty1 = "$js_lt{'sty1'}";
var txtsty2 = "$lt{'sty2'}";	var txtsty2 = "$js_lt{'sty2'}";
var txtsty3 = "$lt{'sty3'}";	var txtsty3 = "$js_lt{'sty3'}";
if (kwclr=="red") {var redsel="checked='checked'"};	if (kwclr=="red") {var redsel="checked='checked'"};
if (kwclr=="green") {var grnsel="checked='checked'"};	if (kwclr=="green") {var grnsel="checked='checked'"};
if (kwclr=="blue") {var blusel="checked='checked'"};	if (kwclr=="blue") {var blusel="checked='checked'"};
Line 1657 INNERJS	Line 1766 INNERJS
hDoc.$docopen;	hDoc.$docopen;
hDoc.write('$start_page_highlight_central');	hDoc.write('$start_page_highlight_central');
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");	hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
hDoc.write("<h1>$lt{'kehi'}<\\/h1>");	hDoc.write("<h1>$html_js_lt{'kehi'}<\\/h1>");

hDoc.write('<table border="0" width="100%"><tr style="background-color:#A1D676">');	hDoc.write('<table border="0" width="100%"><tr style="background-color:#A1D676">');
hDoc.write("<th>$lt{'txtc'}<\\/th><th>$lt{'font'}<\\/th><th>$lt{'fnst'}<\\/th><\\/tr>");	hDoc.write("<th>$html_js_lt{'txtc'}<\\/th><th>$html_js_lt{'font'}<\\/th><th>$html_js_lt{'fnst'}<\\/th><\\/tr>");
}	}

function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) {	function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) {
Line 1678 INNERJS	Line 1787 INNERJS
function highlightend() {	function highlightend() {
var hDoc = hwdWin.document;	var hDoc = hwdWin.document;
hDoc.write("<\\/table><br \\/>");	hDoc.write("<\\/table><br \\/>");
hDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\" \\/>  ");	hDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\" \\/>  ");
hDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\" \\/><br /><br />");	hDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'canc'}\\" onclick=\\"self.close()\\" \\/><br /><br />");
hDoc.write("<\\/form>");	hDoc.write("<\\/form>");
hDoc.write('$end_page_highlight_central');	hDoc.write('$end_page_highlight_central');
hDoc.close();	hDoc.close();
Line 1813 sub handback_box {	Line 1922 sub handback_box {
if ($file =~ /\/portfolio\//) {	if ($file =~ /\/portfolio\//) {
$file_counter++;	$file_counter++;
my ($file_path, $file_disp) = ($file =~ m\|(.+/)(.+)$\|);	my ($file_path, $file_disp) = ($file =~ m\|(.+/)(.+)$\|);
my ($name,$version,$ext) = &file_name_version_ext($file_disp);	my ($name,$version,$ext) = &Apache::lonnet::file_name_version_ext($file_disp);
$file_disp = "$name.$ext";	$file_disp = "$name.$ext";
$file = $file_path.$file_disp;	$file = $file_path.$file_disp;
$result.=&mt('Return commented version of [_1] to student.',	$result.=&mt('Return commented version of [_1] to student.',
Line 1896 sub show_problem {	Line 2005 sub show_problem {
sub files_exist {	sub files_exist {
my ($r, $symb) = @_;	my ($r, $symb) = @_;
my @students = &Apache::loncommon::get_env_multiple('form.stuinfo');	my @students = &Apache::loncommon::get_env_multiple('form.stuinfo');

foreach my $student (@students) {	foreach my $student (@students) {
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'},
Line 1919 sub download_all_link {	Line 2027 sub download_all_link {
$r->print(&mt('There are currently no submitted documents.'));	$r->print(&mt('There are currently no submitted documents.'));
return;	return;
}	}

my $all_students =	my $all_students =
join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));	join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));

Line 1939 sub submit_download_link {	Line 2046 sub submit_download_link {
my ($request,$symb) = @_;	my ($request,$symb) = @_;
if (!$symb) { return ''; }	if (!$symb) { return ''; }
#FIXME: Figure out which type of problem this is and provide appropriate download	#FIXME: Figure out which type of problem this is and provide appropriate download
&download_all_link($request,$symb);	my $res_error;
	my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
	if (ref($res_error)) {
	if ($$res_error) {
	$request->print(&mt('An error occurred retrieving response types'));
	return;
	}
	}
	my ($numupload,$numessay) = (0,0);
	if (ref($responseType) eq 'HASH') {
	foreach my $part (sort(keys(%$responseType))) {
	foreach my $id (sort(keys(%{ $responseType->{$part} }))) {
	my $responsetype = $responseType->{$part}->{$id};
	if ($responsetype eq 'essay') {
	my $uploadedfiletypes =
	&Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes",$symb);
	if ($uploadedfiletypes) {
	$numupload++;
	} else {
	$numessay++;
	}
	}
	}
	}
	}
	if (($numupload) \|\| ($numessay)) {
	my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
	my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
	my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
	(undef,undef,my $fullname) = &getclasslist($getsec,1,$getgroup,$symb,$submitonly,1);
	if (ref($fullname) eq 'HASH') {
	my @students = map { $_.':'.$fullname->{$_} } (keys(%{$fullname}));
	if (@students) {
	@{$env{'form.stuinfo'}} = @students;
	if ($numupload) {
	&download_all_link($request,$symb);
	}
	# FIXME Need to provide a mechanism to download essays, i.e., if $numessay > 0
	# Needs to omit user's identity if resource instance is for an anonymous survey.
	} else {
	$request->print(&mt('No students match the criteria you selected'));
	}
	} else {
	$request->print(&mt('Could not retrieve student information'));
	}
	} else {
	$request->print(&mt('No essayresponse items found'));
	}
	return;
}	}

sub build_section_inputs {	sub build_section_inputs {
Line 1965 sub submission {	Line 2120 sub submission {

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

if (!&canview($usec)) {	if (!&canview($usec)) {
$request->print(	$request->print(
Line 1977 sub submission {	Line 2134 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'; }
	}
my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');	my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
my $checkIcon = '<img alt="'.&mt('Check Mark').	my $checkIcon = '<img alt="'.&mt('Check Mark').
'" src="'.$request->dir_config('lonIconsURL').	'" src="'.$request->dir_config('lonIconsURL').
Line 2066 sub submission {	Line 2225 sub submission {
$request->print($prnmsg);	$request->print($prnmsg);

# if ($env{'form.handgrade'} eq 'yes') {	# if ($env{'form.handgrade'} eq 'yes') {
if (1) {	unless ($is_tool) {

my %lt = &Apache::lonlocal::texthash(	my %lt = &Apache::lonlocal::texthash(
keyh => 'Keyword Highlighting for Essays',	keyh => 'Keyword Highlighting for Essays',
Line 2093 sub submission {	Line 2252 sub submission {
#	#
# Load the other essays for similarity check	# Load the other essays for similarity check
#	#
my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);	(undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);	if ($essayurl eq 'lib/templates/simpleproblem.problem') {
$apath=&escape($apath);	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$apath=~s/\W/\_/gs;	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
&init_old_essays($symb,$apath,$adom,$aname);	if ($cdom ne '' && $cnum ne '') {
	my ($map,$id,$res) = &Apache::lonnet::decode_symb($symb);
	if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(default(?:\|_\d+)\.(?:sequence\|page))$}) {
	my $apath = $1.'_'.$id;
	$apath=~s/\W/\_/gs;
	&init_old_essays($symb,$apath,$cdom,$cnum);
	}
	}
	} else {
	my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
	$apath=&escape($apath);
	$apath=~s/\W/\_/gs;
	&init_old_essays($symb,$apath,$adom,$aname);
	}
}	}
}	}

Line 2151 sub submission {	Line 2323 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 ($env{'form.handgrade'} eq 'no') {	# if ($env{'form.handgrade'} eq 'no') {
if (1) {	unless ($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 2166 sub submission {	Line 2342 sub submission {
my $fullname;	my $fullname;
my $col_fullnames = [];	my $col_fullnames = [];
# if ($env{'form.handgrade'} eq 'yes') {	# if ($env{'form.handgrade'} eq 'yes') {
if (1) {	unless ($is_tool) {
(my $sub_result,$fullname,$col_fullnames)=	(my $sub_result,$fullname,$col_fullnames)=
&check_collaborators($symb,$uname,$udom,\%record,$handgrade,	&check_collaborators($symb,$uname,$udom,\%record,$handgrade,
$counter);	$counter);
Line 2181 sub submission {	Line 2357 sub submission {
# (3) Last submission plus the parts info	# (3) Last submission plus the parts info
# (4) The whole record for this student	# (4) The whole record for this student

my ($string,$timestamp)= &get_last_submission(\%record);	my ($string,$timestamp)= &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>';
	} elsif ($is_tool) {
	$lastsubonly =
	'<div class="LC_grade_submissions_body">'
	.'<b>'.&mt('Date Grade Passed Back:').'</b> '.$$timestamp."</div>\n";
} else {	} else {
$lastsubonly =	$lastsubonly =
'<div class="LC_grade_submissions_body">'	'<div class="LC_grade_submissions_body">'
Line 2240 sub submission {	Line 2420 sub submission {
&most_similar($uname,$udom,$symb,$subval);	&most_similar($uname,$udom,$symb,$subval);
if ($osim) {	if ($osim) {
$osim=int($osim*100.0);	$osim=int($osim*100.0);
my %old_course_desc =
&Apache::lonnet::coursedescription($ocrsid,
{'one_time' => 1});

if ($hide eq 'anon') {	if ($hide eq 'anon') {
$similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.	$similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.
&mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';	&mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';
} else {	} else {
$similar="<hr /><h3><span class=\"LC_warning\">".	$similar='<hr />';
&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',	if ($essayurl eq 'lib/templates/simpleproblem.problem') {
$osim,	$similar .= '<h3><span class="LC_warning">'.
&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',	&mt('Essay is [_1]% similar to an essay by [_2]',
$old_course_desc{'description'},	$osim,
$old_course_desc{'num'},	&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')').
$old_course_desc{'domain'}).	'</span></h3>';
'</span></h3><blockquote><i>'.	} else {
&keywords_highlight($oessay).	my %old_course_desc;
'</i></blockquote><hr />';	if ($ocrsid ne '') {
	if (ref($coursedesc_by_cid{$ocrsid}) eq 'HASH') {
	%old_course_desc = %{$coursedesc_by_cid{$ocrsid}};
	} else {
	my $args;
	if ($ocrsid ne $env{'request.course.id'}) {
	$args = {'one_time' => 1};
	}
	%old_course_desc =
	&Apache::lonnet::coursedescription($ocrsid,$args);
	$coursedesc_by_cid{$ocrsid} = \%old_course_desc;
	}
	$similar .=
	'<h3><span class="LC_warning">'.
	&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
	$osim,
	&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
	$old_course_desc{'description'},
	$old_course_desc{'num'},
	$old_course_desc{'domain'}).
	'</span></h3>';
	} else {
	$similar .=
	'<h3><span class="LC_warning">'.
	&mt('Essay is [_1]% similar to an essay by [_2] in an unknown course',
	$osim,
	&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')').
	'</span></h3>';
	}
	}
	$similar .= '<blockquote><i>'.
	&keywords_highlight($oessay).
	'</i></blockquote><hr />';
}	}
}	}
}	}
Line 2321 sub submission {	Line 2529 sub submission {

}	}
if ($env{'form.lastSub'} =~ /^(last\|all)$/) {	if ($env{'form.lastSub'} =~ /^(last\|all)$/) {
	my $identifier = (&canmodify($usec)? $counter : '');
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
$env{'request.course.id'},	$env{'request.course.id'},
$last,'.submission',	$last,'.submission',
'Apache::grades::keywords_highlight'));	'Apache::grades::keywords_highlight',
	$usec,$identifier));
}	}
$request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'	$request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
.$udom.'" />'."\n");	.$udom.'" />'."\n");
Line 2367 sub submission {	Line 2577 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 2493 sub check_collaborators {	Line 2708 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,%lasthidden);
if ($$returnhash{'version'}) {	if ($$returnhash{'version'}) {
my %lasthash=();	my %lasthash=();
Line 2543 sub get_last_submission {	Line 2758 sub get_last_submission {
}	}
unless ($hide) {	unless ($hide) {
if (@randomize) {	if (@randomize) {
foreach my $id (@hidden) {	foreach my $id (@randomize) {
if ($key =~ /^\Q$id\E/) {	if ($key =~ /^\Q$id\E/) {
$hide = 'rand';	$hide = 'rand';
last;	last;
Line 2559 sub get_last_submission {	Line 2774 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);
}	}
Line 2774 sub processHandGrade {	Line 2995 sub processHandGrade {
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) = &saveHandGrade($request,$symb,$uname,$udom,$ctr);	my ($errorflag,$pts,$wgt,$numhidden) =
	&saveHandGrade($request,$symb,$uname,$udom,$ctr);
if ($errorflag eq 'no_score') {	if ($errorflag eq 'no_score') {
$ctr++;	$ctr++;
next;	next;
Line 2787 sub processHandGrade {	Line 3009 sub processHandGrade {
$ctr++;	$ctr++;
next;	next;
}	}
	if ($numhidden) {
	$request->print(
	'<span class="LC_info">'
	.&mt('For [_1]: [quant,_2,transaction] hidden',"$uname:$udom",$numhidden)
	.'</span><br />');
	}
my $includemsg = $env{'form.includemsg'.$ctr};	my $includemsg = $env{'form.includemsg'.$ctr};
my ($subject,$message,$msgstatus) = ('','','');	my ($subject,$message,$msgstatus) = ('','','');
my $restitle = &Apache::lonnet::gettitle($symb);	my $restitle = &Apache::lonnet::gettitle($symb);
Line 3008 sub saveHandGrade {	Line 3236 sub saveHandGrade {
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
my @parts_graded;	my @parts_graded;
my %newrecord = ();	my %newrecord = ();
my ($pts,$wgt) = ('','');	my ($pts,$wgt,$totchg) = ('','',0);
my %aggregate = ();	my %aggregate = ();
my $aggregateflag = 0;	my $aggregateflag = 0;
	if ($env{'form.HIDE'.$newflg}) {
	my ($version,$parts) = split(/:/,$env{'form.HIDE'.$newflg},2);
	my $numchgs = &makehidden($version,$parts,\%record,$symb,$domain,$stuname,1);
	$totchg += $numchgs;
	}
my @parts = split(/:/,$env{'form.partlist'.$newflg});	my @parts = split(/:/,$env{'form.partlist'.$newflg});
foreach my $new_part (@parts) {	foreach my $new_part (@parts) {
#collaborator ($submi may vary for different parts	#collaborator ($submi may vary for different parts
Line 3113 sub saveHandGrade {	Line 3346 sub saveHandGrade {
&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
$cdom,$cnum);	$cdom,$cnum);
}	}
return ('',$pts,$wgt);	return ('',$pts,$wgt,$totchg);
	}

	sub makehidden {
	my ($version,$parts,$record,$symb,$domain,$stuname,$tolog) = @_;
	return unless (ref($record) eq 'HASH');
	my %modified;
	my $numchanged = 0;
	if (exists($record->{$version.':keys'})) {
	my $partsregexp = $parts;
	$partsregexp =~ s/,/\|/g;
	foreach my $key (split(/\:/,$record->{$version.':keys'})) {
	if ($key =~ /^resource\.(?:$partsregexp)\.([^\.]+)$/) {
	my $item = $1;
	unless (($item eq 'solved') \|\| ($item =~ /^award(\|msg\|ed)$/)) {
	$modified{$key} = $record->{$version.':'.$key};
	}
	} elsif ($key =~ m{^(resource\.(?:$partsregexp)\.[^\.]+\.)(.+)$}) {
	$modified{$1.'hidden'.$2} = $record->{$version.':'.$key};
	} elsif ($key =~ /^(ip\|timestamp\|host)$/) {
	$modified{$key} = $record->{$version.':'.$key};
	}
	}
	if (keys(%modified)) {
	if (&Apache::lonnet::putstore($env{'request.course.id'},$symb,$version,\%modified,
	$domain,$stuname,$tolog) eq 'ok') {
	$numchanged ++;
	}
	}
	}
	return $numchanged;
}	}

sub check_and_remove_from_queue {	sub check_and_remove_from_queue {
Line 3157 sub handback_files {	Line 3420 sub handback_files {
my ($directory,$answer_file) =	my ($directory,$answer_file) =
($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter} =~ /^(.?)([^\/])$/);	($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter} =~ /^(.?)([^\/])$/);
my ($answer_name,$answer_ver,$answer_ext) =	my ($answer_name,$answer_ver,$answer_ext) =
&file_name_version_ext($answer_file);	&Apache::lonnet::file_name_version_ext($answer_file);
my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);	my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
my $getpropath = 1;	my $getpropath = 1;
my ($dir_list,$listerror) =	my ($dir_list,$listerror) =
&Apache::lonnet::dirlist($portfolio_root.$portfolio_path,	&Apache::lonnet::dirlist($portfolio_root.$portfolio_path,
$domain,$stuname,$getpropath);	$domain,$stuname,$getpropath);
my $version = &get_next_version($answer_name,$answer_ext,$dir_list);	my $version = &Apache::lonnet::get_next_version($answer_name,$answer_ext,$dir_list);
# fix filename	# fix filename
my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);	my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,	my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,
Line 3312 sub version_portfiles {	Line 3575 sub version_portfiles {
my $version_parts = join('\|',@$v_flag);	my $version_parts = join('\|',@$v_flag);
my @returned_keys;	my @returned_keys;
my $parts = join('\|', @$parts_graded);	my $parts = join('\|', @$parts_graded);
my $portfolio_root = '/userfiles/portfolio';
foreach my $key (keys(%$record)) {	foreach my $key (keys(%$record)) {
my $new_portfiles;	my $new_portfiles;
if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {	if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
my @versioned_portfiles;	my @versioned_portfiles;
my @portfiles = split(/\s,\s/,$$record{$key});	my @portfiles = split(/\s,\s/,$$record{$key});
foreach my $file (@portfiles) {	if (@portfiles) {
&Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);	&Apache::lonnet::portfiles_versioning($symb,$domain,$stu_name,\@portfiles,
my ($directory,$answer_file) =($file =~ /^(.?)([^\/])$/);	\@versioned_portfiles);
my ($answer_name,$answer_ver,$answer_ext) =
&file_name_version_ext($answer_file);
my $getpropath = 1;
my ($dir_list,$listerror) =
&Apache::lonnet::dirlist($portfolio_root.$directory,$domain,
$stu_name,$getpropath);
my $version = &get_next_version($answer_name,$answer_ext,$dir_list);
my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
if ($new_answer ne 'problem getting file') {
push(@versioned_portfiles, $directory.$new_answer);
&Apache::lonnet::mark_as_readonly($domain,$stu_name,
[$directory.$new_answer],
[$symb,$env{'request.course.id'},'graded']);
}
}	}
$$record{$key} = join(',',@versioned_portfiles);	$$record{$key} = join(',',@versioned_portfiles);
push(@returned_keys,$key);	push(@returned_keys,$key);
Line 3343 sub version_portfiles {	Line 3591 sub version_portfiles {
return (@returned_keys);	return (@returned_keys);
}	}

sub get_next_version {
my ($answer_name, $answer_ext, $dir_list) = @_;
my $version;
if (ref($dir_list) eq 'ARRAY') {
foreach my $row (@{$dir_list}) {
my ($file) = split(/\&/,$row,2);
my ($file_name,$file_version,$file_ext) =
&file_name_version_ext($file);
if (($file_name eq $answer_name) &&
($file_ext eq $answer_ext)) {
# gets here if filename and extension match,
# regardless of version
if ($file_version ne '') {
# a versioned file is found so save it for later
if ($file_version > $version) {
$version = $file_version;
}
}
}
}
}
$version ++;
return($version);
}

sub version_selected_portfile {
my ($domain,$stu_name,$directory,$file_name,$version) = @_;
my ($answer_name,$answer_ver,$answer_ext) =
&file_name_version_ext($file_name);
my $new_answer;
$env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stu_name/portfolio$directory$file_name");
if($env{'form.copy'} eq '-1') {
$new_answer = 'problem getting file';
} else {
$new_answer = $answer_name.'.'.$version.'.'.$answer_ext;
my $copy_result = &Apache::lonnet::finishuserfileupload(
$stu_name,$domain,'copy',
'/portfolio'.$directory.$new_answer);
}
return ($new_answer);
}

sub file_name_version_ext {
my ($file)=@_;
my @file_parts = split(/\./, $file);
my ($name,$version,$ext);
if (@file_parts > 1) {
$ext=pop(@file_parts);
if (@file_parts > 1 && $file_parts[-1] =~ /^\d+$/) {
$version=pop(@file_parts);
}
$name=join('.',@file_parts);
} else {
$name=join('.',@file_parts);
}
return($name,$version,$ext);
}

#--------------------------------------------------------------------------------------	#--------------------------------------------------------------------------------------
#	#
#-------------------------- Next few routines handles grading by section or whole class	#-------------------------- Next few routines handles grading by section or whole class
Line 3410 sub viewgrades_js {	Line 3600 sub viewgrades_js {
my ($request) = shift;	my ($request) = shift;

my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');	my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
	&js_escape(\$alertmsg);
$request->print(&Apache::lonhtmlcommon::scripttag(<<VIEWJAVASCRIPT));	$request->print(&Apache::lonhtmlcommon::scripttag(<<VIEWJAVASCRIPT));
function writePoint(partid,weight,point) {	function writePoint(partid,weight,point) {
var radioButton = document.classgrade["RADVAL_"+partid];	var radioButton = document.classgrade["RADVAL_"+partid];
Line 3577 VIEWJAVASCRIPT	Line 3768 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 3599 sub viewgrades {	Line 3795 sub viewgrades {
&build_section_inputs().	&build_section_inputs().
'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".	'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".

my ($common_header,$specific_header);	#retrieve selected groups
if ($env{'form.section'} eq 'all') {	my (@groups,$group_display);
$common_header = &mt('Assign Common Grade to Class');	@groups = &Apache::loncommon::get_env_multiple('form.group');
$specific_header = &mt('Assign Grade to Specific Students in Class');	if (grep(/^all$/,@groups)) {
} elsif ($env{'form.section'} eq 'none') {	@groups = ('all');
$common_header = &mt('Assign Common Grade to Students in no Section');	} elsif (grep(/^none$/,@groups)) {
$specific_header = &mt('Assign Grade to Specific Students in no Section');	@groups = ('none');
} else {	} elsif (@groups > 0) {
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));	$group_display = join(', ',@groups);
$common_header = &mt('Assign Common Grade to Students in Section(s) [_1]',$section_display);	}
$specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1]',$section_display);
	my ($common_header,$specific_header,@sections,$section_display);
	@sections = &Apache::loncommon::get_env_multiple('form.section');
	if (grep(/^all$/,@sections)) {
	@sections = ('all');
	if ($group_display) {
	$common_header = &mt('Assign Common Grade to Students in Group(s) [_1]',$group_display);
	$specific_header = &mt('Assign Grade to Specific Students in Group(s) [_1]',$group_display);
	} elsif (grep(/^none$/,@groups)) {
	$common_header = &mt('Assign Common Grade to Students not assigned to any groups');
	$specific_header = &mt('Assign Grade to Specific Students not assigned to any groups');
	} else {
	$common_header = &mt('Assign Common Grade to Class');
	$specific_header = &mt('Assign Grade to Specific Students in Class');
	}
	} elsif (grep(/^none$/,@sections)) {
	@sections = ('none');
	if ($group_display) {
	$common_header = &mt('Assign Common Grade to Students in no Section and in Group(s) [_1]',$group_display);
	$specific_header = &mt('Assign Grade to Specific Students in no Section and in Group(s)',$group_display);
	} elsif (grep(/^none$/,@groups)) {
	$common_header = &mt('Assign Common Grade to Students in no Section and in no Group');
	$specific_header = &mt('Assign Grade to Specific Students in no Section and in no Group');
	} else {
	$common_header = &mt('Assign Common Grade to Students in no Section');
	$specific_header = &mt('Assign Grade to Specific Students in no Section');
	}
	} else {
	$section_display = join (", ",@sections);
	if ($group_display) {
	$common_header = &mt('Assign Common Grade to Students in Section(s) [_1], and in Group(s) [_2]',
	$section_display,$group_display);
	$specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1], and in Group(s) [_2]',
	$section_display,$group_display);
	} elsif (grep(/^none$/,@groups)) {
	$common_header = &mt('Assign Common Grade to Students in Section(s) [_1] and no Group',$section_display);
	$specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1] and no Group',$section_display);
	} else {
	$common_header = &mt('Assign Common Grade to Students in Section(s) [_1]',$section_display);
	$specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1]',$section_display);
	}
}	}
$result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table();	my %submit_types = &substatus_options();
	my $submission_status = $submit_types{$env{'form.submitonly'}};

	if ($env{'form.submitonly'} eq 'all') {
	$result.= '<h3>'.$common_header.'</h3>';
	} else {
	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();
#radio buttons/text box for assigning points for a section or class.	#radio buttons/text box for assigning points for a section or class.
#handles different parts of a problem	#handles different parts of a problem
my $res_error;	my $res_error;
Line 3622 sub viewgrades {	Line 3872 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 });
next if $seen{$partid};	next if $seen{$partid};
$seen{$partid}++;	$seen{$partid}++;
my $handgrade=$$handgrade{$part_resp};	# my $handgrade=$$handgrade{$part_resp};
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
$weight{$partid} = $wgt eq '' ? '1' : $wgt;	$weight{$partid} = $wgt eq '' ? '1' : $wgt;

Line 3674 sub viewgrades {	Line 3929 sub viewgrades {

#table listing all the students in a section/class	#table listing all the students in a section/class
#header of table	#header of table
$result.= '<h3>'.$specific_header.'</h3>'.	if ($env{'form.submitonly'} eq 'all') {
&Apache::loncommon::start_data_table().	$result.= '<h3>'.$specific_header.'</h3>';
	} else {
	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().
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('No.').'</th>'.	'<th>'.&mt('No.').'</th>'.
'<th>'.&nameUserString('header')."</th>\n";	'<th>'.&nameUserString('header')."</th>\n";
Line 3687 sub viewgrades {	Line 3952 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 3721 sub viewgrades {	Line 3986 sub viewgrades {

#get info for each student	#get info for each student
#list all the students - with points and grade status	#list all the students - with points and grade status
my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');	my (undef,undef,$fullname) = &getclasslist(\@sections,'1',\@groups);
my $ctr = 0;	my $ctr = 0;
foreach (sort	foreach (sort
{	{
Line 3730 sub viewgrades {	Line 3995 sub viewgrades {
}	}
return $a cmp $b;	return $a cmp $b;
} (keys(%$fullname))) {	} (keys(%$fullname))) {
$ctr++;
$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').'" '.
'onclick="javascript:submit();" target="_self" /></form>'."\n";	'onclick="javascript:submit();" target="_self" /></form>'."\n";
if (scalar(%$fullname) eq 0) {	if ($ctr == 0) {
my $colspan=3+scalar(@parts);
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
$result='<span class="LC_warning">'.	$result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>'.
&mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',	'<span class="LC_warning">';
$section_display, $stu_status).	if ($env{'form.submitonly'} eq 'all') {
'</span>';	if (grep(/^all$/,@sections)) {
	if (grep(/^all$/,@groups)) {
	$result .= &mt('There are no students with enrollment status [_1] to modify or grade.',
	$stu_status);
	} elsif (grep(/^none$/,@groups)) {
	$result .= &mt('There are no students with no group assigned and with enrollment status [_1] to modify or grade.',
	$stu_status);
	} else {
	$result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] to modify or grade.',
	$group_display,$stu_status);
	}
	} elsif (grep(/^none$/,@sections)) {
	if (grep(/^all$/,@groups)) {
	$result .= &mt('There are no students in no section with enrollment status [_1] to modify or grade.',
	$stu_status);
	} elsif (grep(/^none$/,@groups)) {
	$result .= &mt('There are no students in no section and no group with enrollment status [_1] to modify or grade.',
	$stu_status);
	} else {
	$result .= &mt('There are no students in no section in group(s) [_1] with enrollment status [_2] to modify or grade.',
	$group_display,$stu_status);
	}
	} else {
	if (grep(/^all$/,@groups)) {
	$result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
	$section_display,$stu_status);
	} elsif (grep(/^none$/,@groups)) {
	$result .= &mt('There are no students in section(s) [_1] and no group with enrollment status [_2] to modify or grade.',
	$section_display,$stu_status);
	} else {
	$result .= &mt('There are no students in section(s) [_1] and group(s) [_2] with enrollment status [_3] to modify or grade.',
	$section_display,$group_display,$stu_status);
	}
	}
	} else {
	if (grep(/^all$/,@sections)) {
	if (grep(/^all$/,@groups)) {
	$result .= &mt('There are no students with enrollment status [_1] and submission status "[_2]" to modify or grade.',
	$stu_status,$submission_status);
	} elsif (grep(/^none$/,@groups)) {
	$result .= &mt('There are no students with no group assigned with enrollment status [_1] and submission status "[_2]" to modify or grade.',
	$stu_status,$submission_status);
	} else {
	$result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',
	$group_display,$stu_status,$submission_status);
	}
	} elsif (grep(/^none$/,@sections)) {
	if (grep(/^all$/,@groups)) {
	$result .= &mt('There are no students in no section with enrollment status [_1] and submission status "[_2]" to modify or grade.',
	$stu_status,$submission_status);
	} elsif (grep(/^none$/,@groups)) {
	$result .= &mt('There are no students in no section and no group with enrollment status [_1] and submission status "[_2]" to modify or grade.',
	$stu_status,$submission_status);
	} else {
	$result .= &mt('There are no students in no section in group(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',
	$group_display,$stu_status,$submission_status);
	}
	} else {
	if (grep(/^all$/,@groups)) {
	$result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',
	$section_display,$stu_status,$submission_status);
	} elsif (grep(/^none$/,@groups)) {
	$result .= &mt('There are no students in section(s) [_1] and no group with enrollment status [_2] and submission status "[_3]" to modify or grade.',
	$section_display,$stu_status,$submission_status);
	} else {
	$result .= &mt('There are no students in section(s) [_1] and group(s) [_2] with enrollment status [_3] and submission status "[_4]" to modify or grade.',
	$section_display,$group_display,$stu_status,$submission_status);
	}
	}
	}
	$result .= '</span><br />';
}	}
return $result;	return $result;
}	}

#--- call by previous routine to display each student	#--- 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 %aggregates = ();	my $submitonly = $env{'form.submitonly'};
	unless (($submitonly eq 'all') \|\| ($submitonly eq 'queued')) {
	my %partstatus = ();
	if (ref($parts) eq 'ARRAY') {
	foreach my $apart (@{$parts}) {
	my ($part,$type) = &split_part_type($apart);
	my ($status,undef) = split(/_/,$record{"resource.$part.solved"},2);
	$status = 'nothing' if ($status eq '');
	$partstatus{$part} = $status;
	my $subkey = "resource.$part.submitted_by";
	$partstatus{$subkey} = $record{$subkey} if ($record{$subkey} ne '');
	}
	my $submitted = 0;
	my $graded = 0;
	my $incorrect = 0;
	foreach my $key (keys(%partstatus)) {
	$submitted = 1 if ($partstatus{$key} ne 'nothing');
	$graded = 1 if ($partstatus{$key} =~ /^ungraded/);
	$incorrect = 1 if ($partstatus{$key} =~ /^incorrect/);

	my $partid = (split(/\./,$key))[1];
	if ($partstatus{'resource.'.$partid.'.'.$key.'.submitted_by'} ne '') {
	$submitted = 0;
	}
	}
	return if (!$submitted && ($submitonly eq 'yes' \|\|
	$submitonly eq 'incorrect' \|\|
	$submitonly eq 'graded'));
	return if (!$graded && ($submitonly eq 'graded'));
	return if (!$incorrect && $submitonly eq 'incorrect');
	}
	}
	if ($submitonly eq 'queued') {
	my ($cdom,$cnum) = split(/_/,$courseid);
	my %queue_status =
	&Apache::bridgetask::get_student_status($symb,$cdom,$cnum,
	$udom,$uname);
	return if (!defined($queue_status{'gradingqueue'}));
	}
	$$ctr++;
	my %aggregates = ();
my $result=&Apache::loncommon::start_data_table_row().'<td align="right">'.	my $result=&Apache::loncommon::start_data_table_row().'<td align="right">'.
'<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'.	'<input type="hidden" name="ctr'.($$ctr-1).'" value="'.$student.'" />'.
"\n".$ctr.' </td><td> '.	"\n".$$ctr.' </td><td> '.
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
'\');" target="_self">'.$fullname.'</a> '.	'\');" target="_self">'.$fullname.'</a> '.
'<span class="LC_internal_info">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</span></td>'."\n";	'<span class="LC_internal_info">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</span></td>'."\n";
Line 3770 sub viewstudentgrade {	Line 4142 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 3819 sub viewstudentgrade {	Line 4190 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 3856 sub editgrades {	Line 4231 sub editgrades {
$ctr++;	$ctr++;
}	}
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);	my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
	my $totcolspan = 0;
foreach my $partid (@partid) {	foreach my $partid (@partid) {
$header .= '<th align="center">'.&mt('Old Score').'</th>'.	$header .= '<th align="center">'.&mt('Old Score').'</th>'.
'<th align="center">'.&mt('New Score').'</th>';	'<th align="center">'.&mt('New Score').'</th>';
Line 3864 sub editgrades {	Line 4240 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 3872 sub editgrades {	Line 4248 sub editgrades {
'<th align="center">'.&mt('New').' '.$display.'</th>';	'<th align="center">'.&mt('New').' '.$display.'</th>';
$columns{$partid}+=2;	$columns{$partid}+=2;
}	}
	$totcolspan += $columns{$partid};
}	}
foreach my $partid (@partid) {	foreach my $partid (@partid) {
my $display_part=&get_display_part($partid,$symb);	my $display_part=&get_display_part($partid,$symb);
Line 3887 sub editgrades {	Line 4264 sub editgrades {
my @noupdate;	my @noupdate;
my ($updateCtr,$noupdateCtr) = (1,1);	my ($updateCtr,$noupdateCtr) = (1,1);
for ($i=0; $i<$env{'form.total'}; $i++) {	for ($i=0; $i<$env{'form.total'}; $i++) {
my $line;
my $user = $env{'form.ctr'.$i};	my $user = $env{'form.ctr'.$i};
my ($uname,$udom)=split(/:/,$user);	my ($uname,$udom)=split(/:/,$user);
my %newrecord;	my %newrecord;
my $updateflag = 0;	my $updateflag = 0;
$line .= '<td>'.&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
my $usec=$classlist->{"$uname:$udom"}[5];	my $usec=$classlist->{"$uname:$udom"}[5];
if (!&canmodify($usec)) {	my $canmodify = &canmodify($usec);
my $numcols=scalar(@partid)*4+2;	my $line = '<td'.($canmodify?'':' colspan="2"').'>'.
	&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
	if (!$canmodify) {
push(@noupdate,	push(@noupdate,
$line."<td colspan=\"$numcols\"><span class=\"LC_warning\">".	$line."<td colspan=\"$totcolspan\"><span class=\"LC_warning\">".
&mt('Not allowed to modify student')."</span></td></tr>");	&mt('Not allowed to modify student')."</span></td>");
next;	next;
}	}
my %aggregate = ();	my %aggregate = ();
Line 4015 sub editgrades {	Line 4392 sub editgrades {
}	}
}	}
if (@noupdate) {	if (@noupdate) {
# my $numcols=(scalar(@partid)(scalar(@parts)-1)2)+3;	my $numcols=$totcolspan+2;
my $numcols=scalar(@partid)*4+2;
$result .= &Apache::loncommon::start_data_table_row('LC_empty_row').	$result .= &Apache::loncommon::start_data_table_row('LC_empty_row').
'<td align="center" colspan="'.$numcols.'">'.	'<td align="center" colspan="'.$numcols.'">'.
&mt('No Changes Occurred For the Students Below').	&mt('No Changes Occurred For the Students Below').
Line 4057 sub split_part_type {	Line 4433 sub split_part_type {
#	#
#--- Javascript to handle csv upload	#--- Javascript to handle csv upload
sub csvupload_javascript_reverse_associate {	sub csvupload_javascript_reverse_associate {
my $error1=&mt('You need to specify the username or the student/employee ID');	my $error1=&mt('You need to specify the username, the student/employee ID, or the clicker ID');
my $error2=&mt('You need to specify at least one grading field');	my $error2=&mt('You need to specify at least one grading field');
	&js_escape(\$error1);
	&js_escape(\$error2);
return(<<ENDPICK);	return(<<ENDPICK);
function verify(vf) {	function verify(vf) {
var foundsomething=0;	var foundsomething=0;
var founduname=0;	var founduname=0;
var foundID=0;	var foundID=0;
	var foundclicker=0;
for (i=0;i<=vf.nfields.value;i++) {	for (i=0;i<=vf.nfields.value;i++) {
tw=eval('vf.f'+i+'.selectedIndex');	tw=eval('vf.f'+i+'.selectedIndex');
if (i==0 && tw!=0) { foundID=1; }	if (i==0 && tw!=0) { foundID=1; }
if (i==1 && tw!=0) { founduname=1; }	if (i==1 && tw!=0) { founduname=1; }
if (i!=0 && i!=1 && i!=2 && tw!=0) { foundsomething=1; }	if (i==2 && tw!=0) { foundclicker=1; }
	if (i!=0 && i!=1 && i!=2 && i!=3 && tw!=0) { foundsomething=1; }
}	}
if (founduname==0 && foundID==0) {	if (founduname==0 && foundID==0 && foundclicker==0) {
alert('$error1');	alert('$error1');
return;	return;
}	}
Line 4097 ENDPICK	Line 4477 ENDPICK
}	}

sub csvupload_javascript_forward_associate {	sub csvupload_javascript_forward_associate {
my $error1=&mt('You need to specify the username or the student/employee ID');	my $error1=&mt('You need to specify the username, the student/employee ID, or the clicker ID');
my $error2=&mt('You need to specify at least one grading field');	my $error2=&mt('You need to specify at least one grading field');
	&js_escape(\$error1);
	&js_escape(\$error2);
return(<<ENDPICK);	return(<<ENDPICK);
function verify(vf) {	function verify(vf) {
var foundsomething=0;	var foundsomething=0;
var founduname=0;	var founduname=0;
var foundID=0;	var foundID=0;
	var foundclicker=0;
for (i=0;i<=vf.nfields.value;i++) {	for (i=0;i<=vf.nfields.value;i++) {
tw=eval('vf.f'+i+'.selectedIndex');	tw=eval('vf.f'+i+'.selectedIndex');
if (tw==1) { foundID=1; }	if (tw==1) { foundID=1; }
if (tw==2) { founduname=1; }	if (tw==2) { founduname=1; }
if (tw>3) { foundsomething=1; }	if (tw==3) { foundclicker=1; }
	if (tw>4) { foundsomething=1; }
}	}
if (founduname==0 && foundID==0) {	if (founduname==0 && foundID==0 && ƒoundclicker==0) {
alert('$error1');	alert('$error1');
return;	return;
}	}
Line 4168 ENDPICK	Line 4552 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 4177 sub csvupload_fields {	Line 4565 sub csvupload_fields {

my @fields=(['ID','Student/Employee ID'],	my @fields=(['ID','Student/Employee ID'],
['username','Student Username'],	['username','Student Username'],
	['clicker','Clicker ID'],
['domain','Student Domain']);	['domain','Student Domain']);
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);
if ($name=~/^stores_(.*)_awarded/) {	if ($name=~/^stores_(.*)_awarded/) {
push(@fields,['stores_'.$1.'_points',"Points [Part: $1]"]);	push(@fields,['stores_'.$1.'_points',"Points [Part: $1]"]);
Line 4207 ENDPICK	Line 4596 ENDPICK

sub checkforfile_js {	sub checkforfile_js {
my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');	my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
	&js_escape(\$alertmsg);
my $result = &Apache::lonhtmlcommon::scripttag(<<CSVFORMJS);	my $result = &Apache::lonhtmlcommon::scripttag(<<CSVFORMJS);
function checkUpload(formname) {	function checkUpload(formname) {
if (formname.upfile.value == "") {	if (formname.upfile.value == "") {
Line 4257 sub csvuploadmap {	Line 4647 sub csvuploadmap {
if (!$env{'form.datatoken'}) {	if (!$env{'form.datatoken'}) {
$datatoken=&Apache::loncommon::upfile_store($request);	$datatoken=&Apache::loncommon::upfile_store($request);
} else {	} else {
$datatoken=$env{'form.datatoken'};	$datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
&Apache::loncommon::load_tmp_file($request);	if ($datatoken ne '') {
	&Apache::loncommon::load_tmp_file($request,$datatoken);
	}
}	}
my @records=&Apache::loncommon::upfile_record_sep();	my @records=&Apache::loncommon::upfile_record_sep();
&csvuploadmap_header($request,$symb,$datatoken,$#records+1);	&csvuploadmap_header($request,$symb,$datatoken,$#records+1);
Line 4347 sub csvuploadassign {	Line 4739 sub csvuploadassign {
my ($request,$symb)= @_;	my ($request,$symb)= @_;
if (!$symb) {return '';}	if (!$symb) {return '';}
my $error_msg = '';	my $error_msg = '';
&Apache::loncommon::load_tmp_file($request);	my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'});
	if ($datatoken ne '') {
	&Apache::loncommon::load_tmp_file($request,$datatoken);
	}
my @gradedata = &Apache::loncommon::upfile_record_sep();	my @gradedata = &Apache::loncommon::upfile_record_sep();
my %fields=&get_fields();	my %fields=&get_fields();
my $courseid=$env{'request.course.id'};	my $courseid=$env{'request.course.id'};
Line 4370 sub csvuploadassign {	Line 4765 sub csvuploadassign {
if (!$username) {	if (!$username) {
my $id=$entries{$fields{'ID'}};	my $id=$entries{$fields{'ID'}};
$id=~s/\s//g;	$id=~s/\s//g;
my %ids=&Apache::lonnet::idget($domain,$id);	if ($id ne '') {
$username=$ids{$id};	my %ids=&Apache::lonnet::idget($domain,[$id]);
	$username=$ids{$id};
	} else {
	if ($entries{$fields{'clicker'}}) {
	my $clicker = $entries{$fields{'clicker'}};
	$clicker=~s/\s//g;
	if ($clicker ne '') {
	my %clickers = &Apache::lonnet::idget($domain,[$clicker],'clickers');
	if ($clickers{$clicker} ne '') {
	my $match = 0;
	my @inclass;
	foreach my $poss (split(/,/,$clickers{$clicker})) {
	if (exists($$classlist{"$poss:$domain"})) {
	$username = $poss;
	push(@inclass,$poss);
	$match ++;

	}
	}
	if ($match > 1) {
	undef($username);
	$request->print('<p class="LC_warning">'.
	&mt('Score not saved for clicker: [_1] (matched multiple usernames: [_2])',
	$clicker,join(', ',@inclass)).'</p>');
	}
	}
	}
	}
	}
}	}
if (!exists($$classlist{"$username:$domain"})) {	if (!exists($$classlist{"$username:$domain"})) {
my $id=$entries{$fields{'ID'}};	my $id=$entries{$fields{'ID'}};
$id=~s/\s//g;	$id=~s/\s//g;
if ($id) {	my $clicker = $entries{$fields{'clicker'}};
	$clicker=~s/\s//g;
	if ($clicker) {
	push(@skipped,"$clicker:$domain");
	} elsif ($id) {
push(@skipped,"$id:$domain");	push(@skipped,"$id:$domain");
} else {	} else {
push(@skipped,"$username:$domain");	push(@skipped,"$username:$domain");
Line 4476 sub pickStudentPage {	Line 4903 sub pickStudentPage {
my ($request,$symb) = @_;	my ($request,$symb) = @_;

my $alertmsg = &mt('Please select the student you wish to grade.');	my $alertmsg = &mt('Please select the student you wish to grade.');
	&js_escape(\$alertmsg);
$request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));	$request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));

function checkPickOne(formname) {	function checkPickOne(formname) {
Line 4634 sub getSymbMap {	Line 5062 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 4731 sub displayPage {	Line 5159 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 4745 sub displayPage {	Line 5174 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 4777 sub displayPage {	Line 5214 sub displayPage {
$responseType{$partid} = \%responseIds;	$responseType{$partid} = \%responseIds;
}	}
$studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);	$studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);

}	}
} elsif ($env{'form.lastSub'} eq 'all') {	} elsif ($env{'form.lastSub'} eq 'all') {
my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');	my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
	my $identifier = (&canmodify($usec)? $prob : '');
$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,	$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,
$env{'request.course.id'},	$env{'request.course.id'},
'','.submission');	'','.submission',undef,
	$usec,$identifier);

}	}
if (&canmodify($usec)) {	if (&canmodify($usec)) {
Line 4816 sub displaySubByDates {	Line 5254 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 4830 sub displaySubByDates {	Line 5269 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;
my $no_increment = 1;	my $no_increment = 1;
my %lastrndseed;	my (%lastrndseed,%lasttype);
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 4863 sub displaySubByDates {	Line 5306 sub displaySubByDates {
if (($type eq 'anonsurvey') \|\| ($type eq 'anonsurveycred')) {	if (($type eq 'anonsurvey') \|\| ($type eq 'anonsurveycred')) {
$hidden = 1;	$hidden = 1;
}	}
my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)	my @matchKey;
: sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));	if ($isTask) {
	@matchKey = sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys);
	} elsif ($is_tool) {
	@matchKey = sort(grep /^resource\.\Q$partid\E\.awarded$/,@versionKeys);
	} else {
	@matchKey = 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 '') {
	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 \|\| $lastrndseed{$partid}) {	} else {
if ($rndseed ne $lastrndseed{$partid}) {	my ($trial,$rndseed,$newvariation);
$newvariation = ' ('.&mt('New variation this try').')';	if ($type eq 'randomizetry') {
}	$trial = $$record{"$where.$partid.tries"};
	$rndseed = $$record{"$where.$partid.rndseed"};
}	}
$lastrndseed{$partid} = $rndseed;	if ($$record{"$where.$partid.tries"} eq '') {
}	$displaySub[0].=&mt('Trial not counted');
my $responseType=($isTask ? 'Task'	} else {
	$displaySub[0].=&mt('Trial: [_1]',
	$$record{"$where.$partid.tries"});
	if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) {
	if (($rndseed ne $lastrndseed{$partid}) &&
	(($type eq 'randomizetry') \|\| ($lasttype{$partid} eq 'randomizetry'))) {
	$newvariation = ' ('.&mt('New variation this try').')';
	}
	}
	$lastrndseed{$partid} = $rndseed;
	$lasttype{$partid} = $type;
	}
	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})) \|\| ($trial)) {	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,$type,$trial,$rndseed);	$no_increment,$type,$trial,$rndseed);
}	}
$displaySub[0].='</b>'.$newvariation.'</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,$type,$trial,$rndseed).'<br />';	&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'<br />';
	}
}	}
}	}
}	}
Line 4925 sub displaySubByDates {	Line 5378 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 4996 sub updateGradeByPage {	Line 5457 sub updateGradeByPage {

$iterator->next(); # skip the first BEGIN_MAP	$iterator->next(); # skip the first BEGIN_MAP
my $curRes = $iterator->next(); # for "current resource"	my $curRes = $iterator->next(); # for "current resource"
my ($depth,$question,$prob,$changeflag)= (1,1,1,0);	my ($depth,$question,$prob,$changeflag,$hideflag)= (1,1,1,0,0);
while ($depth > 0) {	while ($depth > 0) {
if($curRes == $iterator->BEGIN_MAP) { $depth++; }	if($curRes == $iterator->BEGIN_MAP) { $depth++; }
if($curRes == $iterator->END_MAP) { $depth--; }	if($curRes == $iterator->END_MAP) { $depth--; }
Line 5017 sub updateGradeByPage {	Line 5478 sub updateGradeByPage {
my @displayPts=();	my @displayPts=();
my %aggregate = ();	my %aggregate = ();
my $aggregateflag = 0;	my $aggregateflag = 0;
	if ($env{'form.HIDE'.$prob}) {
	my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
	my ($version,$parts) = split(/:/,$env{'form.HIDE'.$prob},2);
	my $numchgs = &makehidden($version,$parts,\%record,$symbx,$udom,$uname,1);
	$hideflag += $numchgs;
	}
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};
Line 5107 sub updateGradeByPage {	Line 5574 sub updateGradeByPage {
$studentTable.=&Apache::loncommon::end_data_table();	$studentTable.=&Apache::loncommon::end_data_table();
my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :	my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :
&mt('The scores were changed for [quant,_1,problem].',	&mt('The scores were changed for [quant,_1,problem].',
$changeflag));	$changeflag).'<br />');
$request->print($grademsg.$studentTable);	my $hidemsg=($hideflag == 0 ? '' :
	&mt('Submissions were marked "hidden" for [quant,_1,transaction].',
	$hideflag).'<br />');
	$request->print($hidemsg.$grademsg.$studentTable);

return '';	return '';
}	}
Line 5335 sub scantron_uploads {	Line 5805 sub scantron_uploads {
sub scantron_scantab {	sub scantron_scantab {
my $result='<select name="scantron_format">'."\n";	my $result='<select name="scantron_format">'."\n";
$result.='<option></option>'."\n";	$result.='<option></option>'."\n";
my @lines = &get_scantronformat_file();	my @lines = &Apache::lonnet::get_scantronformat_file();
if (@lines > 0) {	if (@lines > 0) {
foreach my $line (@lines) {	foreach my $line (@lines) {
next if (($line =~ /^\#/) \|\| ($line eq ''));	next if (($line =~ /^\#/) \|\| ($line eq ''));
Line 5347 sub scantron_scantab {	Line 5817 sub scantron_scantab {
return $result;	return $result;
}	}

=pod

=item get_scantronformat_file

Returns an array containing lines from the scantron format file for
the domain of the course.

If a url for a custom.tab file is listed in domain's configuration.db,
lines are from this file.

Otherwise, if a default.tab has been published in RES space by the
domainconfig user, lines are from this file.

Otherwise, fall back to getting lines from the legacy file on the
local server: /home/httpd/lonTabs/default_scantronformat.tab

=cut

sub get_scantronformat_file {
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$cdom);
my $gottab = 0;
my @lines;
if (ref($domconfig{'scantron'}) eq 'HASH') {
if ($domconfig{'scantron'}{'scantronformat'} ne '') {
my $formatfile = &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.$domconfig{'scantron'}{'scantronformat'});
if ($formatfile ne '-1') {
@lines = split("\n",$formatfile,-1);
$gottab = 1;
}
}
}
if (!$gottab) {
my $confname = $cdom.'-domainconfig';
my $default = $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cdom.'/'.$confname.'/default.tab';
my $formatfile = &Apache::lonnet::getfile($default);
if ($formatfile ne '-1') {
@lines = split("\n",$formatfile,-1);
$gottab = 1;
}
}
if (!$gottab) {
my @domains = &Apache::lonnet::current_machine_domains();
if (grep(/^\Q$cdom\E$/,@domains)) {
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
@lines = <$fh>;
close($fh);
} else {
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab');
@lines = <$fh>;
close($fh);
}
}
return @lines;
}

=pod	=pod

=item scantron_CODElist	=item scantron_CODElist
Line 5487 sub scantron_selectphase {	Line 5901 sub scantron_selectphase {
# Chunk of form to prompt for a scantron file upload.	# Chunk of form to prompt for a scantron file upload.

$r->print('	$r->print('
<br />	<br />');
'.&Apache::loncommon::start_data_table('LC_scantron_action').'
'.&Apache::loncommon::start_data_table_header_row().'
<th>
'.&mt('Specify a bubblesheet data file to upload.').'
</th>
'.&Apache::loncommon::end_data_table_header_row().'
'.&Apache::loncommon::start_data_table_row().'
<td>
');
my $default_form_data=&defaultFormData($symb);	my $default_form_data=&defaultFormData($symb);
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 $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
	&js_escape(\$alertmsg);
	my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom);
$r->print(&Apache::lonhtmlcommon::scripttag('	$r->print(&Apache::lonhtmlcommon::scripttag('
function checkUpload(formname) {	function checkUpload(formname) {
if (formname.upfile.value == "") {	if (formname.upfile.value == "") {
alert("'.&mt('Please use the browse button to select a file from your local directory.').'");	alert("'.$alertmsg.'");
return false;	return false;
}	}
formname.submit();	formname.submit();
}'));	}'."\n".$formatjs));
$r->print('	$r->print('
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">	<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
'.$default_form_data.'	'.$default_form_data.'
<input name="courseid" type="hidden" value="'.$cnum.'" />	<input name="courseid" type="hidden" value="'.$cnum.'" />
<input name="domainid" type="hidden" value="'.$cdom.'" />	<input name="domainid" type="hidden" value="'.$cdom.'" />
<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" />').'	'.&Apache::loncommon::start_data_table('LC_scantron_action').'
<br />	'.&Apache::loncommon::start_data_table_header_row().'
<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />	<th>
</form>	'.&mt('Specify a bubblesheet data file to upload.').'
');	</th>
	'.&Apache::loncommon::end_data_table_header_row().'
	'.&Apache::loncommon::start_data_table_row().'
	<td>
	'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'<br />'."\n");
	if ($formatoptions) {
	$r->print('</td>
	'.&Apache::loncommon::end_data_table_row().'
	'.&Apache::loncommon::start_data_table_row().'
	<td>'.$formattitle.(' 'x2).$formatoptions.'
	</td>
	'.&Apache::loncommon::end_data_table_row().'
	'.&Apache::loncommon::start_data_table_row().'
	<td>'
	);
	} else {
	$r->print(' <br />');
	}
	$r->print('<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
	</td>
	'.&Apache::loncommon::end_data_table_row().'
	'.&Apache::loncommon::end_data_table().'
	</form>'
	);

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

# Chunk of form to prompt for a file to grade and how:	# Chunk of form to prompt for a file to grade and how:
Line 5637 sub scantron_selectphase {	Line 6063 sub scantron_selectphase {
return;	return;
}	}

=pod

=item get_scantron_config

Parse and return the bubblesheet configuration line selected as a
hash of configuration file fields.

Arguments:
which - the name of the configuration to parse from the file.


Returns:
If the named configuration is not in the file, an empty
hash is returned.
a hash with the fields
name - internal name for the this configuration setup
description - text to display to operator that describes this config
CODElocation - if 0 or the string 'none'
- no CODE exists for this config
if -1 \|\| the string 'letter'
- a CODE exists for this config and is
a string of letters
Unsupported value (but planned for future support)
if a positive integer
- The CODE exists as the first n items from
the question section of the form
if the string 'number'
- The CODE exists for this config and is
a string of numbers
CODEstart - (only matter if a CODE exists) column in the line where
the CODE starts
CODElength - length of the CODE
IDstart - column where the student/employee ID starts
IDlength - length of the student/employee ID info
Qstart - column where the information from the bubbled
'questions' start
Qlength - number of columns comprising a single bubble line from
the sheet. (usually either 1 or 10)
Qon - either a single character representing the character used
to signal a bubble was chosen in the positional setup, or
the string 'letter' if the letter of the chosen bubble is
in the final, or 'number' if a number representing the
chosen bubble is in the file (1->A 0->J)
Qoff - the character used to represent that a bubble was
left blank
PaperID - if the scanning process generates a unique number for each
sheet scanned the column that this ID number starts in
PaperIDlength - number of columns that comprise the unique ID number
for the sheet of paper
FirstName - column that the first name starts in
FirstNameLength - number of columns that the first name spans

LastName - column that the last name starts in
LastNameLength - number of columns that the last name spans
BubblesPerRow - number of bubbles available in each row used to
bubble an answer. (If not specified, 10 assumed).

=cut

sub get_scantron_config {
my ($which) = @_;
my @lines = &get_scantronformat_file();
my %config;
#FIXME probably should move to XML it has already gotten a bit much now
foreach my $line (@lines) {
my ($name,$descrip)=split(/:/,$line);
if ($name ne $which ) { next; }
chomp($line);
my @config=split(/:/,$line);
$config{'name'}=$config[0];
$config{'description'}=$config[1];
$config{'CODElocation'}=$config[2];
$config{'CODEstart'}=$config[3];
$config{'CODElength'}=$config[4];
$config{'IDstart'}=$config[5];
$config{'IDlength'}=$config[6];
$config{'Qstart'}=$config[7];
$config{'Qlength'}=$config[8];
$config{'Qoff'}=$config[9];
$config{'Qon'}=$config[10];
$config{'PaperID'}=$config[11];
$config{'PaperIDlength'}=$config[12];
$config{'FirstName'}=$config[13];
$config{'FirstNamelength'}=$config[14];
$config{'LastName'}=$config[15];
$config{'LastNamelength'}=$config[16];
$config{'BubblesPerRow'}=$config[17];
last;
}
return %config;
}

=pod	=pod

=item username_to_idmap	=item username_to_idmap

creates a hash keyed by student/employee ID with values of the corresponding	creates a hash keyed by student/employee ID with values of the corresponding
student username:domain.	student username:domain. If a single ID occurs for more than one student,
	the status of the student is checked, and if Active, the value in the hash
	will be set to the Active student.

Arguments:	Arguments:

Line 5752 sub username_to_idmap {	Line 6088 sub username_to_idmap {
my ($classlist)= @_;	my ($classlist)= @_;
my %idmap;	my %idmap;
foreach my $student (keys(%$classlist)) {	foreach my $student (keys(%$classlist)) {
$idmap{$classlist->{$student}->[&Apache::loncoursedata::CL_ID]}=	my $id = $classlist->{$student}->[&Apache::loncoursedata::CL_ID];
$student;	unless ($id eq '') {
	if (!exists($idmap{$id})) {
	$idmap{$id} = $student;
	} else {
	my $status = $classlist->{$student}->[&Apache::loncoursedata::CL_STATUS];
	if ($status eq 'Active') {
	$idmap{$id} = $student;
	}
	}
	}
}	}
return %idmap;	return %idmap;
}	}
Line 5765 sub username_to_idmap {	Line 6110 sub username_to_idmap {
Process a requested correction to a scanline.	Process a requested correction to a scanline.

Arguments:	Arguments:
$scantron_config - hash from &get_scantron_config()	$scantron_config - hash from &Apache::lonnet::get_scantron_config()
$scan_data - hash of correction information	$scan_data - hash of correction information
(see &scantron_getfile())	(see &scantron_getfile())
$line - existing scanline	$line - existing scanline
Line 6448 sub scantron_filter {	Line 6793 sub scantron_filter {

sub scantron_process_corrections {	sub scantron_process_corrections {
my ($r) = @_;	my ($r) = @_;
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
my $which=$env{'form.scantron_line'};	my $which=$env{'form.scantron_line'};
Line 6617 sub check_for_error {	Line 6962 sub check_for_error {
sub scantron_warning_screen {	sub scantron_warning_screen {
my ($button_text,$symb)=@_;	my ($button_text,$symb)=@_;
my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});	my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
my $CODElist;	my $CODElist;
if ($scantron_config{'CODElocation'} &&	if ($scantron_config{'CODElocation'} &&
$scantron_config{'CODEstart'} &&	$scantron_config{'CODEstart'} &&
Line 6773 sub scantron_validate_file {	Line 7118 sub scantron_validate_file {
#get the student pick code ready	#get the student pick code ready
$r->print(&Apache::loncommon::studentbrowser_javascript());	$r->print(&Apache::loncommon::studentbrowser_javascript());
my $nav_error;	my $nav_error;
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config);	my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config);
if ($nav_error) {	if ($nav_error) {
$r->print(&navmap_errormsg());	$r->print(&navmap_errormsg());
Line 7233 sub scantron_validate_ID {	Line 7578 sub scantron_validate_ID {
my %idmap=&username_to_idmap($classlist);	my %idmap=&username_to_idmap($classlist);

#get scantron line setup	#get scantron line setup
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();

my $nav_error;	my $nav_error;
Line 7479 sub verify_bubbles_checked {	Line 7824 sub verify_bubbles_checked {
my (@ansnums) = @_;	my (@ansnums) = @_;
my $ansnumstr = join('","',@ansnums);	my $ansnumstr = join('","',@ansnums);
my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines.");	my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines.");
	&js_escape(\$warning);
my $output = &Apache::lonhtmlcommon::scripttag((<<ENDSCRIPT));	my $output = &Apache::lonhtmlcommon::scripttag((<<ENDSCRIPT));
function verify_bubble_radio(form) {	function verify_bubble_radio(form) {
var ansnumArray = new Array ("$ansnumstr");	var ansnumArray = new Array ("$ansnumstr");
Line 7702 sub prompt_for_corrections {	Line 8048 sub prompt_for_corrections {

Arguments:	Arguments:
$r - Apache request object	$r - Apache request object
$scan_config - hash from &get_scantron_config()	$scan_config - hash from &Apache::lonnet::get_scantron_config()
$line - Number of the line being displayed.	$line - Number of the line being displayed.
$questionnum - Question number (may include subquestion)	$questionnum - Question number (may include subquestion)
$error - Type of error.	$error - Type of error.
Line 7866 sub get_codes {	Line 8212 sub get_codes {

sub scantron_validate_CODE {	sub scantron_validate_CODE {
my ($r,$currentphase) = @_;	my ($r,$currentphase) = @_;
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
if ($scantron_config{'CODElocation'} &&	if ($scantron_config{'CODElocation'} &&
$scantron_config{'CODEstart'} &&	$scantron_config{'CODEstart'} &&
$scantron_config{'CODElength'}) {	$scantron_config{'CODElength'}) {
Line 7940 sub scantron_validate_doublebubble {	Line 8286 sub scantron_validate_doublebubble {
&Apache::lonnet::decode_symb($env{'form.selectpage'});	&Apache::lonnet::decode_symb($env{'form.selectpage'});

#get scantron line setup	#get scantron line setup
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();

my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
Line 8122 sub scantron_validate_missingbubbles {	Line 8468 sub scantron_validate_missingbubbles {
&Apache::lonnet::decode_symb($env{'form.selectpage'});	&Apache::lonnet::decode_symb($env{'form.selectpage'});

#get scantron line setup	#get scantron line setup
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();

my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
Line 8251 sub hand_bubble_option {	Line 8597 sub hand_bubble_option {
}	}
}	}
if ($needs_hand_bubbles) {	if ($needs_hand_bubbles) {
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);	my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
return &mt('The sequence to be graded contains response types which are handgraded.').'<p>'.	return &mt('The sequence to be graded contains response types which are handgraded.').'<p>'.
&mt('If you have already graded these by bubbling sheets to indicate points awarded, [_1]what point value is assigned to a filled last bubble in each row?','<br />').	&mt('If you have already graded these by bubbling sheets to indicate points awarded, [_1]what point value is assigned to a filled last bubble in each row?','<br />').
Line 8270 sub scantron_process_students {	Line 8616 sub scantron_process_students {
}	}
my $default_form_data=&defaultFormData($symb);	my $default_form_data=&defaultFormData($symb);

my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);	my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
Line 8338 SCANTRONFORM	Line 8684 SCANTRONFORM
return ''; # Dunno why the other returns return '' rather than just returning.	return ''; # Dunno why the other returns return '' rather than just returning.
}	}

my %lettdig = &letter_to_digits();	my %lettdig = &Apache::lonnet::letter_to_digits();
my $numletts = scalar(keys(%lettdig));	my $numletts = scalar(keys(%lettdig));
my %orderedforcode;	my %orderedforcode;

Line 8400 SCANTRONFORM	Line 8746 SCANTRONFORM
}	}
if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|	if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {	(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
	my $currcode;
	if (exists($grader_randomlists_by_symb{$ressymb})) {
	$currcode = $scancode;
	}
my ($analysis,$parts) =	my ($analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},	&scantron_partids_tograde($resource,$env{'request.course.id'},
$uname,$udom,undef,$bubbles_per_row);	$uname,$udom,undef,$bubbles_per_row,
	$currcode);
$partids_by_symb{$ressymb} = $parts;	$partids_by_symb{$ressymb} = $parts;
} else {	} else {
$partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb};	$partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb};
Line 8660 sub grade_student_bubbles {	Line 9011 sub grade_student_bubbles {
sub scantron_upload_scantron_data {	sub scantron_upload_scantron_data {
my ($r,$symb)=@_;	my ($r,$symb)=@_;
my $dom = $env{'request.role.domain'};	my $dom = $env{'request.role.domain'};
	my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($dom);
my $domdesc = &Apache::lonnet::domain($dom,'description');	my $domdesc = &Apache::lonnet::domain($dom,'description');
$r->print(&Apache::loncommon::coursebrowser_javascript($dom));	$r->print(&Apache::loncommon::coursebrowser_javascript($dom));
my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',	my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
Line 8669 sub scantron_upload_scantron_data {	Line 9021 sub scantron_upload_scantron_data {
('&nbsp'x2).&mt('(shows course personnel)');	('&nbsp'x2).&mt('(shows course personnel)');
my $default_form_data=&defaultFormData($symb);	my $default_form_data=&defaultFormData($symb);
my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');	my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');
	&js_escape(\$nofile_alert);
my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");	my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");
	&js_escape(\$nocourseid_alert);
$r->print(&Apache::lonhtmlcommon::scripttag('	$r->print(&Apache::lonhtmlcommon::scripttag('
function checkUpload(formname) {	function checkUpload(formname) {
if (formname.upfile.value == "") {	if (formname.upfile.value == "") {
Line 8697 sub scantron_upload_scantron_data {	Line 9051 sub scantron_upload_scantron_data {
return;	return;
}	}

	'.$formatjs.'
'));	'));
$r->print('	$r->print('
<h3>'.&mt('Send bubblesheet data to a course').'</h3>	<h3>'.&mt('Send bubblesheet data to a course').'</h3>
Line 8712 sub scantron_upload_scantron_data {	Line 9067 sub scantron_upload_scantron_data {
&Apache::lonhtmlcommon::row_closure().	&Apache::lonhtmlcommon::row_closure().
&Apache::lonhtmlcommon::row_title(&mt('Domain')).	&Apache::lonhtmlcommon::row_title(&mt('Domain')).
'<input name="domainid" type="hidden" />'.$domdesc.	'<input name="domainid" type="hidden" />'.$domdesc.
&Apache::lonhtmlcommon::row_closure().	&Apache::lonhtmlcommon::row_closure());
	if ($formatoptions) {
	$r->print(&Apache::lonhtmlcommon::row_title($formattitle).$formatoptions.
	&Apache::lonhtmlcommon::row_closure());
	}
	$r->print(
&Apache::lonhtmlcommon::row_title(&mt('File to upload')).	&Apache::lonhtmlcommon::row_title(&mt('File to upload')).
'<input type="file" name="upfile" size="50" />'.	'<input type="file" name="upfile" size="50" />'.
&Apache::lonhtmlcommon::row_closure(1).	&Apache::lonhtmlcommon::row_closure(1).
Line 8725 sub scantron_upload_scantron_data {	Line 9085 sub scantron_upload_scantron_data {
return '';	return '';
}	}

	sub scantron_upload_dataformat {
	my ($dom) = @_;
	my ($formatoptions,$formattitle,$formatjs);
	$formatjs = <<'END';
	function toggleScantab(form) {
	return;
	}
	END
	my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$dom);
	if (ref($domconfig{'scantron'}) eq 'HASH') {
	if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {
	if (keys(%{$domconfig{'scantron'}{'config'}}) > 1) {
	if (($domconfig{'scantron'}{'config'}{'dat'}) &&
	(ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH')) {
	if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
	if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) {
	my ($onclick,$formatextra,$singleline);
	my @lines = &Apache::lonnet::get_scantronformat_file();
	my $count = 0;
	foreach my $line (@lines) {
	next if ($line =~ /^#/);
	$singleline = $line;
	$count ++;
	}
	if ($count > 1) {
	$formatextra = '<div style="display:none" id="bubbletype">'.
	&scantron_scantab().'</div>';
	$onclick = ' onclick="toggleScantab(this.form);"';
	$formatjs = <<"END";
	function toggleScantab(form) {
	var divid = 'bubbletype';
	if (document.getElementById(divid)) {
	var radioname = 'fileformat';
	var num = form.elements[radioname].length;
	if (num) {
	for (var i=0; i<num; i++) {
	if (form.elements[radioname][i].checked) {
	var chosen = form.elements[radioname][i].value;
	if (chosen == 'dat') {
	document.getElementById(divid).style.display = 'none';
	} else if (chosen == 'csv') {
	document.getElementById(divid).style.display = 'inline-block';
	}
	}
	}
	}
	}
	return;
	}

	END
	} elsif ($count == 1) {
	my $formatname = (split(/:/,$singleline,2))[0];
	$formatextra = '<input type="hidden" name="scantron_format" value="'.$formatname.'" />';
	}
	$formattitle = &mt('File format');
	$formatoptions = '<label><input name="fileformat" type="radio" value="dat" checked="checked"'.$onclick.' />'.
	&mt('Plain Text (no delimiters)').
	'</label>'.(' 'x2).
	'<label><input name="fileformat" type="radio" value="csv"'.$onclick.' />'.
	&mt('Comma separated values').'</label>'.$formatextra;
	}
	}
	}
	} elsif (keys(%{$domconfig{'scantron'}{'config'}}) == 1) {
	if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
	if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) {
	$formattitle = &mt('Format of bubblesheet data file:');
	$formatoptions = &scantron_scantab();
	}
	}
	}
	}
	}
	return ($formatoptions,$formattitle,$formatjs);
	}

sub scantron_upload_scantron_data_save {	sub scantron_upload_scantron_data_save {
my($r,$symb)=@_;	my($r,$symb)=@_;
Line 8751 sub scantron_upload_scantron_data_save {	Line 9187 sub scantron_upload_scantron_data_save {
&mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.',	&mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.',
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'),1));	'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'),1));
} else {	} else {
my $result =	my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$env{'form.domainid'});
&Apache::lonnet::userfileupload('upfile','','scantron','','','',	my $parser;
	if (ref($domconfig{'scantron'}) eq 'HASH') {
	if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {
	my $is_csv;
	my @possibles = keys(%{$domconfig{'scantron'}{'config'}});
	if (@possibles > 1) {
	if ($env{'form.fileformat'} eq 'csv') {
	if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {
	if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
	if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) {
	$is_csv = 1;
	}
	}
	}
	}
	} elsif (@possibles == 1) {
	if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {
	if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
	if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) {
	$is_csv = 1;
	}
	}
	}
	}
	if ($is_csv) {
	$parser = $domconfig{'scantron'}{'config'}{'csv'};
	}
	}
	}
	my $result =
	&Apache::lonnet::userfileupload('upfile','scantron','scantron',$parser,'','',
$env{'form.courseid'},$env{'form.domainid'});	$env{'form.courseid'},$env{'form.domainid'});
if ($result =~ m{^/uploaded/}) {	if ($result =~ m{^/uploaded/}) {
$r->print(	$r->print(
Line 8797 sub validate_uploaded_scantron_file {	Line 9263 sub validate_uploaded_scantron_file {
$idmap{$lckey} = $idmap{$key};	$idmap{$lckey} = $idmap{$key};
}	}
my %unique_formats;	my %unique_formats;
my @formatlines = &get_scantronformat_file();	my @formatlines = &Apache::lonnet::get_scantronformat_file();
foreach my $line (@formatlines) {	foreach my $line (@formatlines) {
chomp($line);	chomp($line);
my @config = split(/:/,$line);	my @config = split(/:/,$line);
Line 8938 sub checkscantron_results {	Line 9404 sub checkscantron_results {
my ($r,$symb) = @_;	my ($r,$symb) = @_;
if (!$symb) {return '';}	if (!$symb) {return '';}
my $cid = $env{'request.course.id'};	my $cid = $env{'request.course.id'};
my %lettdig = &letter_to_digits();	my %lettdig = &Apache::lonnet::letter_to_digits();
my $numletts = scalar(keys(%lettdig));	my $numletts = scalar(keys(%lettdig));
my $cnum = $env{'course.'.$cid.'.num'};	my $cnum = $env{'course.'.$cid.'.num'};
my $cdom = $env{'course.'.$cid.'.domain'};	my $cdom = $env{'course.'.$cid.'.domain'};
my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'});	my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'});
my %record;	my %record;
my %scantron_config =	my %scantron_config =
&Apache::grades::get_scantron_config($env{'form.scantron_format'});	&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);	my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();	my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
Line 9055 sub checkscantron_results {	Line 9521 sub checkscantron_results {
my $ressymb = $resource->symb();	my $ressymb = $resource->symb();
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 $currcode;
	if (exists($grader_randomlists_by_symb{$ressymb})) {
	$currcode = $scancode;
	}
(my $analysis,$parts) =	(my $analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},	&scantron_partids_tograde($resource,$env{'request.course.id'},
$username,$domain,undef,	$username,$domain,undef,
$bubbles_per_row);	$bubbles_per_row,$currcode);
} else {	} else {
$parts = $grader_partids_by_symb{$ressymb};	$parts = $grader_partids_by_symb{$ressymb};
}	}
Line 9265 sub verify_scantron_grading {	Line 9735 sub verify_scantron_grading {
return ($counter,$record);	return ($counter,$record);
}	}

sub letter_to_digits {
my %lettdig = (
A => 1,
B => 2,
C => 3,
D => 4,
E => 5,
F => 6,
G => 7,
H => 8,
I => 9,
J => 0,
);
return %lettdig;
}


#-------- end of section for handling grading scantron forms -------	#-------- end of section for handling grading scantron forms -------
#	#
Line 9430 sub submit_options_table {	Line 9884 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(0).	$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 9449 sub submit_options_download {	Line 9904 sub submit_options_download {
my ($request,$symb) = @_;	my ($request,$symb) = @_;
if (!$symb) {return '';}	if (!$symb) {return '';}

	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".
'<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.='	$result.='
<h2>	<h2>
'.&mt('Select Students for Which to Download Submissions').'	'.&mt('Select Students for whom to Download Submissions').'
</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 9472 sub submit_options {	Line 9928 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 9489 sub submit_options {	Line 9946 sub submit_options {
}	}

sub selectfield {	sub selectfield {
my ($full)=@_;	my ($full,$is_tool)=@_;
my %options =	my %options;
(&Apache::lonlocal::texthash(	if ($is_tool) {
'yes' => 'with submissions',	%options =
'queued' => 'in grading queue',	(&transtatus_options,
'graded' => 'with ungraded submissions',	'select_form_order' => ['yes','incorrect','all']);
'incorrect' => 'with incorrect submissions',	} else {
'all' => 'with any status'),	%options =
'select_form_order' => ['yes','queued','graded','incorrect','all']);	(&substatus_options,
	'select_form_order' => ['yes','queued','graded','incorrect','all']);
	}
my $result='<div class="LC_columnSection">	my $result='<div class="LC_columnSection">

<fieldset>	<fieldset>
Line 9521 sub selectfield {	Line 9980 sub selectfield {
'.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').'	'.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').'
</fieldset>';	</fieldset>';
if ($full) {	if ($full) {
$result.='	my $heading = &mt('Submission Status');
	if ($is_tool) {
	$heading = &mt('Transaction Status');
	}
	$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 9533 sub selectfield {	Line 9996 sub selectfield {
return $result;	return $result;
}	}

	sub substatus_options {
	return &Apache::lonlocal::texthash(
	'yes' => 'with submissions',
	'queued' => 'in grading queue',
	'graded' => 'with ungraded submissions',
	'incorrect' => 'with incorrect submissions',
	'all' => 'with any status',
	);
	}

	sub transtatus_options {
	return &Apache::lonlocal::texthash(
	'yes' => 'with score transactions',
	'incorrect' => 'with less than full credit',
	'all' => 'with any status',
	);
	}

sub reset_perm {	sub reset_perm {
undef(%perm);	undef(%perm);
}	}
Line 10146 sub navmap_errormsg {	Line 10627 sub navmap_errormsg {
}	}

sub startpage {	sub startpage {
my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js) = @_;	my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js,$onload) = @_;
	my %args;
	if ($onload) {
	my %loaditems = (
	'onload' => $onload,
	);
	$args{'add_entries'} = \%loaditems;
	}
if ($nomenu) {	if ($nomenu) {
$r->print(&Apache::loncommon::start_page("Student's Version",$js,{'only_body' => '1'}));	$args{'only_body'} = 1;
	$r->print(&Apache::loncommon::start_page("Student's Version",$js,\%args);
} else {	} else {
unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});	unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});
$r->print(&Apache::loncommon::start_page('Grading',$js,	$args{'bread_crumbs'} = $crumbs;
{'bread_crumbs' => $crumbs}));	$r->print(&Apache::loncommon::start_page('Grading',$js,\%args));
&Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading'));	&Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading'));
}	}
unless ($nodisplayflag) {	unless ($nodisplayflag) {
Line 10163 sub startpage {	Line 10652 sub startpage {
sub select_problem {	sub select_problem {
my ($r)=@_;	my ($r)=@_;
$r->print('<h3>'.&mt('Select the problem or one of the problems you want to grade').'</h3><form action="/adm/grades">');	$r->print('<h3>'.&mt('Select the problem or one of the problems you want to grade').'</h3><form action="/adm/grades">');
$r->print(&Apache::lonstathelpers::problem_selector('.',undef,1));	$r->print(&Apache::lonstathelpers::problem_selector('.',undef,1,undef,undef,undef,undef,1));
$r->print('<input type="hidden" name="command" value="gradingmenu" />');	$r->print('<input type="hidden" name="command" value="gradingmenu" />');
$r->print('<input type="submit" value="'.&mt('Next').' →" /></form>');	$r->print('<input type="submit" value="'.&mt('Next').' →" /></form>');
}	}
Line 10336 sub handler {	Line 10825 sub handler {
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);	&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
$request->print(&csvuploadassign($request,$symb));	$request->print(&csvuploadassign($request,$symb));
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);	&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1,
	undef,undef,undef,undef,'toggleScantab(document.rules);');
$request->print(&scantron_selectphase($request,undef,$symb));	$request->print(&scantron_selectphase($request,undef,$symb));
} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);	&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
Line 10350 sub handler {	Line 10840 sub handler {
} elsif ($command eq 'scantronupload' &&	} elsif ($command eq 'scantronupload' &&
(&Apache::lonnet::allowed('usc',$env{'request.role.domain'})\|\|	(&Apache::lonnet::allowed('usc',$env{'request.role.domain'})\|\|
&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {	&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);	&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1,
	undef,undef,undef,undef,'toggleScantab(document.rules);');
$request->print(&scantron_upload_scantron_data($request,$symb));	$request->print(&scantron_upload_scantron_data($request,$symb));
} elsif ($command eq 'scantronupload_save' &&	} elsif ($command eq 'scantronupload_save' &&
(&Apache::lonnet::allowed('usc',$env{'request.role.domain'})\|\|	(&Apache::lonnet::allowed('usc',$env{'request.role.domain'})\|\|
Line 10370 sub handler {	Line 10861 sub handler {
} elsif ($command eq 'downloadfileslink' && $perm{'vgr'}) {	} elsif ($command eq 'downloadfileslink' && $perm{'vgr'}) {
&startpage($request,$symb,	&startpage($request,$symb,
[{href=>&href_symb_cmd($symb,'downloadfilesselect'), text=>'Select which submissions to download'},	[{href=>&href_symb_cmd($symb,'downloadfilesselect'), text=>'Select which submissions to download'},
{href=>'', text=>'Download submissions'}]);	{href=>'', text=>'Download submitted files'}]);
&submit_download_link($request,$symb);	&submit_download_link($request,$symb);
} elsif ($command) {	} elsif ($command) {
&startpage($request,$symb,[{href=>'', text=>'Access denied'}]);	&startpage($request,$symb,[{href=>'', text=>'Access denied'}]);

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

Removed from v.1.725
changed lines
	Added in v.1.756