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.713 and 1.746

version 1.713, 2014/01/16 14:57:51	version 1.746, 2017/12/21 23:05:04
Line 116 sub getpartlist {	Line 116 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 297 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 305 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 330 sub cleanRecord {	Line 341 sub cleanRecord {
my $grayFont = '<span class="LC_internal_info">';	my $grayFont = '<span class="LC_internal_info">';
if ($response =~ /^(option\|rank)$/) {	if ($response =~ /^(option\|rank)$/) {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
	my @answer = %answer;
	%answer = map {&HTML::Entities::encode($_, '"<>&')} @answer;
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
my ($toprow,$bottomrow);	my ($toprow,$bottomrow);
foreach my $foil (@$order) {	foreach my $foil (@$order) {
Line 346 sub cleanRecord {	Line 359 sub cleanRecord {
$bottomrow.'</tr></table></blockquote>';	$bottomrow.'</tr></table></blockquote>';
} elsif ($response eq 'match') {	} elsif ($response eq 'match') {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
	my @answer = %answer;
	%answer = map {&HTML::Entities::encode($_, '"<>&')} @answer;
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"});	my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"});
my ($toprow,$middlerow,$bottomrow);	my ($toprow,$middlerow,$bottomrow);
Line 368 sub cleanRecord {	Line 383 sub cleanRecord {
$bottomrow.'</tr></table></blockquote>';	$bottomrow.'</tr></table></blockquote>';
} elsif ($response eq 'radiobutton') {	} elsif ($response eq 'radiobutton') {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
	my @answer = %answer;
	%answer = map {&HTML::Entities::encode($_, '"<>&')} @answer;
my ($toprow,$bottomrow);	my ($toprow,$bottomrow);
my $correct =	my $correct =
&get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed);	&get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed);
Line 400 sub cleanRecord {	Line 417 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.
}	}
$answer =~ s-\n-<br />-g;
return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';	return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';

} elsif ( $response eq 'organic') {	} elsif ( $response eq 'organic') {
my $result='Smile representation: "<tt>'.$answer.'</tt>"';	my $result=&mt('Smile representation: [_1]',
	'"<tt>'.&HTML::Entities::encode($answer, '"<>&').'</tt>"');
my $jme=$record->{$version."resource.$partid.$respid.molecule"};	my $jme=$record->{$version."resource.$partid.$respid.molecule"};
$result.=&Apache::chemresponse::jme_img($jme,$answer,400);	$result.=&Apache::chemresponse::jme_img($jme,$answer,400);
return $result;	return $result;
Line 437 sub cleanRecord {	Line 455 sub cleanRecord {
$result.='</ul>';	$result.='</ul>';
return $result;	return $result;
}	}
} elsif ( $response =~ m/(?:numerical\|formula)/) {	} elsif ( $response =~ m/(?:numerical\|formula\|custom)/) {
	# Respect multiple input fields, see Bug #5409
$answer =	$answer =
&Apache::loncommon::format_previous_attempt_value('submission',	&Apache::loncommon::format_previous_attempt_value('submission',
$answer);	$answer);
	return $answer;
}	}
return $answer;	return &HTML::Entities::encode($answer, '"<>&');
}	}

#-- A couple of common js functions	#-- A couple of common js functions
Line 836 sub verifyreceipt {	Line 856 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 848 sub listStudents {	Line 869 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 862 sub listStudents {	Line 884 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 890 LISTJAVASCRIPT	Line 912 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 929 LISTJAVASCRIPT	Line 979 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 940 LISTJAVASCRIPT	Line 990 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 1168 sub processGroup {	Line 1229 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 1286 sub sub_page_js {	Line 1348 sub sub_page_js {
}	}
}	}
}	}

}	}
}	}

}	}
formname.submit();	formname.submit();
}	}
Line 1415 INNERJS	Line 1475 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 1432 INNERJS	Line 1503 INNERJS
font => 'Font Size',	font => 'Font Size',
fnst => 'Font Style',	fnst => 'Font Style',
);	);
	&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 1463 INNERJS	Line 1537 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 1546 INNERJS	Line 1620 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 1571 INNERJS	Line 1645 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 1579 INNERJS	Line 1653 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 1594 INNERJS	Line 1668 INNERJS
var redsel = "";	var redsel = "";
var grnsel = "";	var grnsel = "";
var blusel = "";	var blusel = "";
if (kwclr=="red") {var redsel="checked"};	var txtcol1 = "$js_lt{'col1'}";
if (kwclr=="green") {var grnsel="checked"};	var txtcol2 = "$js_lt{'col2'}";
if (kwclr=="blue") {var blusel="checked"};	var txtcol3 = "$js_lt{'col3'}";
	var txtsiz1 = "$js_lt{'siz1'}";
	var txtsiz2 = "$js_lt{'siz2'}";
	var txtsiz3 = "$js_lt{'siz3'}";
	var txtsty1 = "$js_lt{'sty1'}";
	var txtsty2 = "$js_lt{'sty2'}";
	var txtsty3 = "$js_lt{'sty3'}";
	if (kwclr=="red") {var redsel="checked='checked'"};
	if (kwclr=="green") {var grnsel="checked='checked'"};
	if (kwclr=="blue") {var blusel="checked='checked'"};
var sznsel = "";	var sznsel = "";
var sz1sel = "";	var sz1sel = "";
var sz2sel = "";	var sz2sel = "";
if (kwsize=="0") {var sznsel="checked"};	if (kwsize=="0") {var sznsel="checked='checked'"};
if (kwsize=="+1") {var sz1sel="checked"};	if (kwsize=="+1") {var sz1sel="checked='checked'"};
if (kwsize=="+2") {var sz2sel="checked"};	if (kwsize=="+2") {var sz2sel="checked='checked'"};
var synsel = "";	var synsel = "";
var syisel = "";	var syisel = "";
var sybsel = "";	var sybsel = "";
if (kwstyle=="") {var synsel="checked"};	if (kwstyle=="") {var synsel="checked='checked'"};
if (kwstyle=="<i>") {var syisel="checked"};	if (kwstyle=="<i>") {var syisel="checked='checked'"};
if (kwstyle=="<b>") {var sybsel="checked"};	if (kwstyle=="<b>") {var sybsel="checked='checked'"};
highlightCentral();	highlightCentral();
highlightbody('red','red',redsel,'0','normal',sznsel,'','normal',synsel);	highlightbody('red',txtcol1,redsel,'0',txtsiz1,sznsel,'',txtsty1,synsel);
highlightbody('green','green',grnsel,'+1','+1',sz1sel,'<i>','italic',syisel);	highlightbody('green',txtcol2,grnsel,'+1',txtsiz2,sz1sel,'<i>',txtsty2,syisel);
highlightbody('blue','blue',blusel,'+2','+2',sz2sel,'<b>','bold',sybsel);	highlightbody('blue',txtcol3,blusel,'+2',txtsiz3,sz2sel,'<b>',txtsty3,sybsel);
highlightend();	highlightend();
return;	return;
}	}
Line 1630 INNERJS	Line 1713 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("<h3><span class=\\"LC_info\\"> $lt{'kehi'}<\\/span><\\/h3><br /><br />");	hDoc.write("<h1>$html_js_lt{'kehi'}<\\/h1>");

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

function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) {	function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) {
var hDoc = hwdWin.document;	var hDoc = hwdWin.document;
hDoc.write("<tr bgcolor=\\"#ffffdd\\">");	hDoc.write("<tr>");
hDoc.write("<td align=\\"left\\">");	hDoc.write("<td align=\\"left\\">");
hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+"> "+clrtxt+"<\\/td>");	hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+" \\/> "+clrtxt+"<\\/td>");
hDoc.write("<td align=\\"left\\">");	hDoc.write("<td align=\\"left\\">");
hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+"> "+sztxt+"<\\/td>");	hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+" \\/> "+sztxt+"<\\/td>");
hDoc.write("<td align=\\"left\\">");	hDoc.write("<td align=\\"left\\">");
hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+"> "+sytxt+"<\\/td>");	hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+" \\/> "+sytxt+"<\\/td>");
hDoc.write("<\\/tr>");	hDoc.write("<\\/tr>");
}	}

function highlightend() {	function highlightend() {
var hDoc = hwdWin.document;	var hDoc = hwdWin.document;
hDoc.write("<\\/table>");	hDoc.write("<\\/table><br \\/>");
hDoc.write("<\\/td><\\/tr><\\/table> ");	hDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\" \\/>  ");
hDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\">  ");	hDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'canc'}\\" onclick=\\"self.close()\\" \\/><br /><br />");
hDoc.write("<input type=\\"button\\" value=\\"$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 1788 sub handback_box {	Line 1869 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 1940 sub submission {	Line 2021 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$/);

if (!&canview($usec)) {	if (!&canview($usec)) {
$request->print(	$request->print(
Line 1952 sub submission {	Line 2034 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 2041 sub submission {	Line 2125 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',
keyw => 'Keyword Options',	keyw => 'Keyword Options',
list => 'List',	list => 'List',
past => 'Paste Selection to List',	past => 'Paste Selection to List',
Line 2052 sub submission {	Line 2137 sub submission {
#	#
# Print out the keyword options line	# Print out the keyword options line
#	#
$request->print(<<KEYWORDS);	$request->print(
<br /><b>$lt{'keyw'}:</b>	'<div class="LC_columnSection">'
<a href="javascript:keywords(document.SCORE);" target="_self">$lt{'list'}</a>	.'<fieldset><legend>'.$lt{'keyh'}.'</legend>'
<a href="#" onmousedown="javascript:getSel(); return false"	.&Apache::lonhtmlcommon::funclist_from_array(
class="page">$lt{'past'}</a>	['<a href="javascript:keywords(document.SCORE);" target="_self">'.$lt{'list'}.'</a>',
<a href="javascript:kwhighlight();" target="_self">$lt{'high'}</a><br /><br />	'<a href="#" onmousedown="javascript:getSel(); return false"
KEYWORDS	class="page">'.$lt{'past'}.'</a>',
	'<a href="javascript:kwhighlight();" target="_self">'.$lt{'high'}.'</a>'],
	{legend => $lt{'keyw'}})
	.'</fieldset></div>'
	);

#	#
# Load the other essays for similarity check	# Load the other essays for similarity check
#	#
Line 2120 KEYWORDS	Line 2210 KEYWORDS
# 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 2135 KEYWORDS	Line 2229 KEYWORDS
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 2150 KEYWORDS	Line 2244 KEYWORDS
# (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 2195 KEYWORDS	Line 2293 KEYWORDS
foreach my $submission (@$string) {	foreach my $submission (@$string) {
my ($partid,$respid) = ($submission =~ /^resource\.([^\.])\.([^\.])\.submission/);	my ($partid,$respid) = ($submission =~ /^resource\.([^\.])\.([^\.])\.submission/);
if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }	if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
my ($ressub,$hide,$subval) = split(/:/,$submission,3);	my ($ressub,$hide,$draft,$subval) = split(/:/,$submission,4);
# Similarity check	# Similarity check
my $similar='';	my $similar='';
my ($type,$trial,$rndseed);	my ($type,$trial,$rndseed);
Line 2264 KEYWORDS	Line 2362 KEYWORDS
if ($hide eq 'anon') {	if ($hide eq 'anon') {
$lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>';	$lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>';
} else {	} else {
$lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>'.	$lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>';
	if ($draft) {
	$lastsubonly.= ' <span class="LC_warning">'.&mt('Draft Copy').'</span>';
	}
	$subval =
&cleanRecord($subval,$responsetype,$symb,$partid,	&cleanRecord($subval,$responsetype,$symb,$partid,
$respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed);	$respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed);
	if ($responsetype eq 'essay') {
	$subval =~ s{\n}{<br />}g;
	}
	$lastsubonly.=$subval."\n";
}	}
if ($similar) {$lastsubonly.="<br /><br />$similar\n";}	if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
$lastsubonly.='</div>';	$lastsubonly.='</div>';
Line 2279 KEYWORDS	Line 2385 KEYWORDS
if ($env{'form.lastSub'} eq 'datesub') {	if ($env{'form.lastSub'} eq 'datesub') {
my ($parts,$handgrade,$responseType) = &response_type($symb,\$res_error);	my ($parts,$handgrade,$responseType) = &response_type($symb,\$res_error);
$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));

}	}
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 2327 KEYWORDS	Line 2436 KEYWORDS
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 2453 sub check_collaborators {	Line 2567 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 2503 sub get_last_submission {	Line 2617 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 2512 sub get_last_submission {	Line 2626 sub get_last_submission {
}	}
}	}
my ($partid,$foo) = split(/submission$/,$key);	my ($partid,$foo) = split(/submission$/,$key);
my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?	my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ? 1 : 0;
'<span class="LC_warning">Draft Copy</span> ' : '';	push(@string, join(':', $key, $hide, $draft, (
push(@string, join(':', $key, $hide, $draft.$lasthash{$key}));	ref($lasthash{$key}) eq 'ARRAY' ?
	join(',', @{$lasthash{$key}}) : $lasthash{$key}) ));
}	}
}	}
if (!@string) {	if (!@string) {
	my $msg;
	if ($is_tool) {
	$msg = &mt('Nothing passed back - no attempts.');
	} 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 2542 sub keywords_highlight {	Line 2663 sub keywords_highlight {
sub show_previous_task_version {	sub show_previous_task_version {
my ($request,$symb) = @_;	my ($request,$symb) = @_;
if ($symb eq '') {	if ($symb eq '') {
$request->print("Unable to handle ambiguous references.");	$request->print(
	'<span class="LC_error">'.
	&mt('Unable to handle ambiguous references.').
	'</span>');
return '';	return '';
}	}
my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});	my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
Line 2731 sub processHandGrade {	Line 2854 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;
}	}
if ($errorflag eq 'not_allowed') {	if ($errorflag eq 'not_allowed') {
$request->print("<span class=\"LC_warning\">Not allowed to modify grades for $uname:$udom</span>");	$request->print(
	'<span class="LC_error">'
	.&mt('Not allowed to modify grades for [_1]',"$uname:$udom")
	.'</span>');
$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 2962 sub saveHandGrade {	Line 3095 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 3067 sub saveHandGrade {	Line 3205 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 3111 sub handback_files {	Line 3279 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 3266 sub version_portfiles {	Line 3434 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 3297 sub version_portfiles {	Line 3450 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 3364 sub viewgrades_js {	Line 3459 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 3531 VIEWJAVASCRIPT	Line 3627 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 3553 sub viewgrades {	Line 3654 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);
	}
	}
	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.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table();	$result .= &Apache::loncommon::start_data_table();
#radio buttons/text box for assigning points for a section or class.	#radio buttons/text box for assigning points for a section or class.
#handles different parts of a problem	#handles different parts of a problem
my $res_error;	my $res_error;
Line 3576 sub viewgrades {	Line 3731 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 3628 sub viewgrades {	Line 3788 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 3641 sub viewgrades {	Line 3811 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 3675 sub viewgrades {	Line 3845 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 3684 sub viewgrades {	Line 3854 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 3724 sub viewstudentgrade {	Line 4001 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 3773 sub viewstudentgrade {	Line 4049 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 3818 sub editgrades {	Line 4098 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 4011 sub split_part_type {	Line 4291 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 4051 ENDPICK	Line 4335 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 4122 ENDPICK	Line 4410 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 4131 sub csvupload_fields {	Line 4423 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 4161 ENDPICK	Line 4454 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 4211 sub csvuploadmap {	Line 4505 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 4301 sub csvuploadassign {	Line 4597 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 4324 sub csvuploadassign {	Line 4623 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 4430 sub pickStudentPage {	Line 4761 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 4588 sub getSymbMap {	Line 4920 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 4685 sub displayPage {	Line 5017 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 4699 sub displayPage {	Line 5032 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' ) {	unless ($is_tool) {
$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,	if ($env{'form.vProb'} eq 'yes' ) {
undef,'both',\%form);	$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
} else {	undef,'both',\%form);
my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form);	} else {
$companswer =~ s\|<form(.*?)>\|\|g;	my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form);
$companswer =~ s\|</form>\|\|g;	$companswer =~ s\|<form(.*?)>\|\|g;
# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>	$companswer =~ s\|</form>\|\|g;
# $companswer =~ s/$1/ /ms;	# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
# $request->print('match='.$1."<br />\n");	# $companswer =~ s/$1/ /ms;
# }	# $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;	# $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 4731 sub displayPage {	Line 5070 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 4789 sub displaySubByDates {	Line 5129 sub displaySubByDates {

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 4847 sub displaySubByDates {	Line 5187 sub displaySubByDates {
} else {	} else {
$displaySub[0].=&mt('Trial: [_1]',	$displaySub[0].=&mt('Trial: [_1]',
$$record{"$where.$partid.tries"});	$$record{"$where.$partid.tries"});
if ($rndseed \|\| $lastrndseed{$partid}) {	if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) {
if ($rndseed ne $lastrndseed{$partid}) {	if (($rndseed ne $lastrndseed{$partid}) &&
	(($type eq 'randomizetry') \|\| ($lasttype{$partid} eq 'randomizetry'))) {
$newvariation = ' ('.&mt('New variation this try').')';	$newvariation = ' ('.&mt('New variation this try').')';
}	}
}	}
$lastrndseed{$partid} = $rndseed;	$lastrndseed{$partid} = $rndseed;
	$lasttype{$partid} = $type;
}	}
my $responseType=($isTask ? 'Task'	my $responseType=($isTask ? 'Task'
: $responseType->{$partid}->{$responseId});	: $responseType->{$partid}->{$responseId});
Line 4950 sub updateGradeByPage {	Line 5292 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 4971 sub updateGradeByPage {	Line 5313 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 5061 sub updateGradeByPage {	Line 5409 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 5454 sub scantron_selectphase {	Line 5805 sub scantron_selectphase {
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);
$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();
Line 5688 sub get_scantron_config {	Line 6041 sub get_scantron_config {
=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 5706 sub username_to_idmap {	Line 6061 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 6577 sub scantron_warning_screen {	Line 6941 sub scantron_warning_screen {
$scantron_config{'CODEstart'} &&	$scantron_config{'CODEstart'} &&
$scantron_config{'CODElength'}) {	$scantron_config{'CODElength'}) {
$CODElist=$env{'form.scantron_CODElist'};	$CODElist=$env{'form.scantron_CODElist'};
if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; }	if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">'.&mt('None').'</span>'; }
$CODElist=	$CODElist=
'<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'.	'<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'.
$env{'form.scantron_CODElist'}.'</tt></td></tr>';	$env{'form.scantron_CODElist'}.'</tt></td></tr>';
Line 7433 sub verify_bubbles_checked {	Line 7797 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 7589 sub prompt_for_corrections {	Line 7954 sub prompt_for_corrections {
}	}
} else {	} else {
$responsenum = $question-1;	$responsenum = $question-1;
$first = $first_bubble_line{$responsenum} + 1;	$first = $first_bubble_line{$responsenum};
}	}
$current_line = $first + 1 ;	$current_line = $first + 1 ;
my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});	my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});
Line 8210 sub hand_bubble_option {	Line 8575 sub hand_bubble_option {
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 />').
'<label><input type="radio" name="scantron_lastbubblepoints" value="'.$bubbles_per_row.'" checked="checked" />'.&mt('[quant,_1,point]',$bubbles_per_row).'</label> '.&mt('or').' '.	'<label><input type="radio" name="scantron_lastbubblepoints" value="'.$bubbles_per_row.'" checked="checked" />'.&mt('[quant,_1,point]',$bubbles_per_row).'</label> '.&mt('or').' '.
'<label><input type="radio" name="scantron_lastbubblepoints" value="0"/>0 points</label></p>';	'<label><input type="radio" name="scantron_lastbubblepoints" value="0" />'.&mt('0 points').'</label></p>';
}	}
return;	return;
}	}
Line 8354 SCANTRONFORM	Line 8719 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 8623 sub scantron_upload_scantron_data {	Line 8993 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 8873 sub scantron_download_scantron_data {	Line 9245 sub scantron_download_scantron_data {
&Apache::lonnet::allowuploaded('/adm/grades',$skipped);	&Apache::lonnet::allowuploaded('/adm/grades',$skipped);
$r->print('	$r->print('
<p>	<p>
'.&mt('[_1]Original[_2] file as uploaded by the bubblesheet office.',	'.&mt('[_1]Original[_2] file as uploaded by the bubblesheet scanning office.',
'<a href="'.$orig.'">','</a>').'	'<a href="'.$orig.'">','</a>').'
</p>	</p>
<p>	<p>
Line 9009 sub checkscantron_results {	Line 9381 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 9044 sub checkscantron_results {	Line 9420 sub checkscantron_results {
'<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".	'<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
'</tr>'."\n".	'</tr>'."\n".
'<tr class="'.$css_class.'">'."\n".	'<tr class="'.$css_class.'">'."\n".
'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n";	'<td>'.&mt('Submissions').'</td><td>'.$showrecord.'</td></tr>'."\n";
$passed ++;	$passed ++;
} else {	} else {
my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row';	my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row';
$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".	$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
'</tr>'."\n".	'</tr>'."\n".
'<tr class="'.$css_class.'">'."\n".	'<tr class="'.$css_class.'">'."\n".
'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".	'<td>'.&mt('Submissions').'</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".
'</tr>'."\n";	'</tr>'."\n";
$failed ++;	$failed ++;
}	}
Line 9384 sub submit_options_table {	Line 9760 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 9403 sub submit_options_download {	Line 9780 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".
Line 9410 sub submit_options_download {	Line 9788 sub submit_options_download {
$result.='	$result.='
<h2>	<h2>
'.&mt('Select Students for Which to Download Submissions').'	'.&mt('Select Students for Which 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 9426 sub submit_options {	Line 9804 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 9443 sub submit_options {	Line 9822 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 9475 sub selectfield {	Line 9856 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 9487 sub selectfield {	Line 9872 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 10117 sub startpage {	Line 10520 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 10362 described at http://www.lon-capa.org.	Line 10765 described at http://www.lon-capa.org.
=head1 OVERVIEW	=head1 OVERVIEW

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

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

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

Removed from v.1.713
changed lines
	Added in v.1.746