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.273 and 1.326

version 1.273, 2005/06/04 19:05:31	version 1.326, 2006/03/02 21:50:30
Line 40 use Apache::lonmsg qw(:user_normal_msg);	Line 40 use Apache::lonmsg qw(:user_normal_msg);
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
use Apache::lonlocal;	use Apache::lonlocal;
use String::Similarity;	use String::Similarity;
	use POSIX qw(floor);

my %oldessays=();	my %oldessays=();
my %perm=();	my %perm=();
Line 48 my %perm=();	Line 49 my %perm=();
#	#
# --- Retrieve the parts from the metadata file.---	# --- Retrieve the parts from the metadata file.---
sub getpartlist {	sub getpartlist {
my ($url,$symb) = @_;	my ($symb) = @_;
	my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
my $partorder = &Apache::lonnet::metadata($url, 'partorder');	my $partorder = &Apache::lonnet::metadata($url, 'partorder');
my @parts;	my @parts;
if ($partorder) {	if ($partorder) {
Line 78 sub getpartlist {	Line 80 sub getpartlist {
}	}

# --- Get the symbolic name of a problem and the url	# --- Get the symbolic name of a problem and the url
sub get_symb_and_url {	sub get_symb {
my ($request,$silent) = @_;	my ($request,$silent) = @_;
(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;	(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;
my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));	my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
Line 88 sub get_symb_and_url {	Line 90 sub get_symb_and_url {
return ();	return ();
}	}
}	}
return ($symb,$url);	return ($symb);
}	}

#--- Format fullname, username:domain if different for display	#--- Format fullname, username:domain if different for display
Line 106 sub nameUserString {	Line 108 sub nameUserString {
#--- Get the partlist and the response type for a given problem. ---	#--- Get the partlist and the response type for a given problem. ---
#--- Indicate if a response type is coded handgraded or not. ---	#--- Indicate if a response type is coded handgraded or not. ---
sub response_type {	sub response_type {
my ($url,$symb) = shift;	my ($symb) = shift;
$symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');	my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
my $allkeys = &Apache::lonnet::metadata($url,'keys');	my $allkeys = &Apache::lonnet::metadata($url,'keys');
my %vPart;	my %vPart;
foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {	foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
Line 135 sub response_type {	Line 137 sub response_type {
push @partlist,$partid;	push @partlist,$partid;
}	}
}	}
return \@partlist,\%handgrade,\%responseType;	return (\@partlist,\%handgrade,\%responseType);
}	}

sub get_display_part {	sub get_display_part {
my ($partID,$url,$symb)=@_;	my ($partID,$symb)=@_;
if (!defined($symb) \|\| $symb eq '') {
$symb=$env{'form.symb'};
if ($symb eq '') { $symb=&Apache::lonnet::symbread($url) }
}
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);	my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
if (defined($display) and $display ne '') {	if (defined($display) and $display ne '') {
$display.= " (<font color=\"#999900\">id $partID</font>)";	$display.= " (<font color=\"#999900\">id $partID</font>)";
Line 156 sub get_display_part {	Line 154 sub get_display_part {
#--- Show resource title	#--- Show resource title
#--- and parts and response type	#--- and parts and response type
sub showResourceInfo {	sub showResourceInfo {
my ($url,$probTitle,$checkboxes) = @_;	my ($symb,$probTitle,$checkboxes) = @_;
my $col=3;	my $col=3;
if ($checkboxes) { $col=4; }	if ($checkboxes) { $col=4; }
my $result ='<table border="0">'.	my $result ='<table border="0">'.
'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'.	'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'.
$probTitle.'</font></td></tr>'."\n";	$probTitle.'</font></td></tr>'."\n";
my ($partlist,$handgrade,$responseType) = &response_type($url);	my ($partlist,$handgrade,$responseType) = &response_type($symb);
my %resptype = ();	my %resptype = ();
my $hdgrade='no';	my $hdgrade='no';
my %partsseen;	my %partsseen;
Line 180 sub showResourceInfo {	Line 178 sub showResourceInfo {
}	}
$partsseen{$partID}=1;	$partsseen{$partID}=1;
}	}
my $display_part=&get_display_part($partID,$url);	my $display_part=&get_display_part($partID,$symb);
$result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.	$result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.
$resID.'</font></td>'.	$resID.'</font></td>'.
'<td><b>Type: </b>'.$responsetype.'</td></tr>';	'<td><b>Type: </b>'.$responsetype.'</td></tr>';
Line 334 COMMONJSFUNCTIONS	Line 332 COMMONJSFUNCTIONS
#--- section, ids and fullnames for each user.	#--- section, ids and fullnames for each user.
sub getclasslist {	sub getclasslist {
my ($getsec,$filterlist) = @_;	my ($getsec,$filterlist) = @_;
$getsec = $getsec eq '' ? 'all' : $getsec;	my @getsec;
	if (!ref($getsec)) {
	if ($getsec ne '' && $getsec ne 'all') {
	@getsec=($getsec);
	}
	} else {
	@getsec=@{$getsec};
	}
	if (grep(/^all$/,@getsec)) { undef(@getsec); }

my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
# Bail out if we were unable to get the classlist	# Bail out if we were unable to get the classlist
return if (! defined($classlist));	return if (! defined($classlist));
Line 363 sub getclasslist {	Line 370 sub getclasslist {
}	}
$section = ($section ne '' ? $section : 'none');	$section = ($section ne '' ? $section : 'none');
if (&canview($section)) {	if (&canview($section)) {
if ($getsec eq 'all' \|\| $getsec eq $section) {	if (!@getsec \|\| grep(/^\Q$section\E$/,@getsec)) {
$sections{$section}++;	$sections{$section}++;
$fullnames{$student}=$fullname;	$fullnames{$student}=$fullname;
} else {	} else {
Line 420 sub canview {	Line 427 sub canview {

#--- Retrieve the grade status of a student for all the parts	#--- Retrieve the grade status of a student for all the parts
sub student_gradeStatus {	sub student_gradeStatus {
my ($url,$symb,$udom,$uname,$partlist) = @_;	my ($symb,$udom,$uname,$partlist) = @_;
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
my %partstatus = ();	my %partstatus = ();
foreach (@$partlist) {	foreach (@$partlist) {
Line 437 sub student_gradeStatus {	Line 444 sub student_gradeStatus {
# Use by verifyscript and viewgrades	# Use by verifyscript and viewgrades
# Shows a student's view of problem and submission	# Shows a student's view of problem and submission
sub jscriptNform {	sub jscriptNform {
my ($url,$symb) = @_;	my ($symb) = @_;
my $jscript='<script type="text/javascript" language="javascript">'."\n".	my $jscript='<script type="text/javascript" language="javascript">'."\n".
' function viewOneStudent(user,domain) {'."\n".	' function viewOneStudent(user,domain) {'."\n".
' document.onestudent.student.value = user;'."\n".	' document.onestudent.student.value = user;'."\n".
Line 447 sub jscriptNform {	Line 454 sub jscriptNform {
'</script>'."\n";	'</script>'."\n";
$jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".	$jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".	'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".
Line 458 sub jscriptNform {	Line 464 sub jscriptNform {
return $jscript;	return $jscript;
}	}

	# Given the score (as a number [0-1] and the weight) what is the final
	# point value? This function will round to the nearest tenth, third,
	# or quarter if one of those is within the tolerance of .00001.
	sub compute_points {
	my ($score, $weight) = @_;

	my $tolerance = .00001;
	my $points = $score * $weight;

	# Check for nearness to 1/x.
	my $check_for_nearness = sub {
	my ($factor) = @_;
	my $num = ($points * $factor) + $tolerance;
	my $floored_num = floor($num);
	if ($num - $floored_num < 2 * $tolerance * $factor) {
	return $floored_num / $factor;
	}
	return $points;
	};

	$points = $check_for_nearness->(10);
	$points = $check_for_nearness->(3);
	$points = $check_for_nearness->(4);

	return $points;
	}

#------------------ End of general use routines --------------------	#------------------ End of general use routines --------------------

#	#
Line 471 sub most_similar {	Line 504 sub most_similar {

$uessay=~s/\W+/ /gs;	$uessay=~s/\W+/ /gs;

	# ignore empty submissions (occuring when only files are sent)

	unless ($uessay=~/\w+/) { return ''; }

# these will be returned. Do not care if not at least 50 percent similar	# these will be returned. Do not care if not at least 50 percent similar
my $limit=0.6;	my $limit=0.6;
my $sname='';	my $sname='';
Line 515 sub verifyreceipt {	Line 552 sub verifyreceipt {
my $receipt = &Apache::lonnet::recprefix($courseid).'-'.	my $receipt = &Apache::lonnet::recprefix($courseid).'-'.
$env{'form.receipt'};	$env{'form.receipt'};
$receipt =~ s/[^\-\d]//g;	$receipt =~ s/[^\-\d]//g;
my $url = $env{'form.url'};	my $symb = &Apache::lonnet::symbread();
my $symb = $env{'form.symb'};
unless ($symb) {
$symb = &Apache::lonnet::symbread($url);
}

my $title.='<h3><font color="#339933">Verifying Submission Receipt '.	my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
$receipt.'</h3></font>'."\n".	$receipt.'</h3></font>'."\n".
'<font size=+1><b>Resource: </b>'.$env{'form.probTitle'}.'</font><br><br>'."\n";	'<font size=+1><b>Resource: </b>'.$env{'form.probTitle'}.'</font><br /><br />'."\n";

my ($string,$contents,$matches) = ('','',0);	my ($string,$contents,$matches) = ('','',0);
my (undef,undef,$fullname) = &getclasslist('all','0');	my (undef,undef,$fullname) = &getclasslist('all','0');
Line 531 sub verifyreceipt {	Line 564 sub verifyreceipt {
my $receiptparts=0;	my $receiptparts=0;
if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }	if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
my $parts=['0'];	my $parts=['0'];
if ($receiptparts) { ($parts)=&response_type($url,$symb); }	if ($receiptparts) { ($parts)=&response_type($symb); }
foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {	foreach (sort
	{
	if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
	return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
	}
	return $a cmp $b;
	} (keys(%$fullname))) {
my ($uname,$udom)=split(/\:/);	my ($uname,$udom)=split(/\:/);
foreach my $part (@$parts) {	foreach my $part (@$parts) {
if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {	if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {
Line 553 sub verifyreceipt {	Line 592 sub verifyreceipt {
if ($matches == 0) {	if ($matches == 0) {
$string = $title.'No match found for the above receipt.';	$string = $title.'No match found for the above receipt.';
} else {	} else {
$string = &jscriptNform($url,$symb).$title.	$string = &jscriptNform($symb).$title.
'The above receipt matches the following student'.	'The above receipt matches the following student'.
($matches <= 1 ? '.' : 's.')."\n".	($matches <= 1 ? '.' : 's.')."\n".
'<table border="0"><tr><td bgcolor="#777777">'."\n".	'<table border="0"><tr><td bgcolor="#777777">'."\n".
Line 567 sub verifyreceipt {	Line 606 sub verifyreceipt {
$string.='</tr>'."\n".$contents.	$string.='</tr>'."\n".$contents.
'</table></td></tr></table>'."\n";	'</table></td></tr></table>'."\n";
}	}
return $string.&show_grading_menu_form($symb,$url);	return $string.&show_grading_menu_form($symb);
}	}

#--- This is called by a number of programs.	#--- This is called by a number of programs.
Line 577 sub verifyreceipt {	Line 616 sub verifyreceipt {
sub listStudents {	sub listStudents {
my ($request) = shift;	my ($request) = shift;

my ($symb,$url) = &get_symb_and_url($request);	my ($symb) = &get_symb($request);
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 590 sub listStudents {	Line 629 sub listStudents {
my $result='<h3><font color="#339933"> '.$viewgrade.	my $result='<h3><font color="#339933"> '.$viewgrade.
' Submissions for a Student or a Group of Students</font></h3>';	' Submissions for a Student or a Group of Students</font></h3>';

my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));	my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));

$request->print(<<LISTJAVASCRIPT);	$request->print(<<LISTJAVASCRIPT);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
Line 656 LISTJAVASCRIPT	Line 695 LISTJAVASCRIPT
'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\n".	'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";

Line 685 LISTJAVASCRIPT	Line 723 LISTJAVASCRIPT
while ($loop < 2) {	while ($loop < 2) {
$gradeTable.='<td><b> No.</b> </td><td><b> Select </b></td>'.	$gradeTable.='<td><b> No.</b> </td><td><b> Select </b></td>'.
'<td>'.&nameUserString('header').' Section/Group</td>';	'<td>'.&nameUserString('header').' Section/Group</td>';
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {	if ($env{'form.showgrading'} eq 'yes'
	&& $submitonly ne 'queued'
	&& $submitonly ne 'all') {
foreach (sort(@$partlist)) {	foreach (sort(@$partlist)) {
my $display_part=&get_display_part((split(/_/))[0],$url,$symb);	my $display_part=&get_display_part((split(/_/))[0],$symb);
$gradeTable.='<td><b> Part: '.$display_part.	$gradeTable.='<td><b> Part: '.$display_part.
' Status </b></td>';	' Status </b></td>';
}	}
	} elsif ($submitonly eq 'queued') {
	$gradeTable.='<td><b> '.&mt('Queue Status').' </b></td>';
}	}
$loop++;	$loop++;
# $gradeTable.='<td></td>' if ($loop%2 ==1);	# $gradeTable.='<td></td>' if ($loop%2 ==1);
Line 698 LISTJAVASCRIPT	Line 740 LISTJAVASCRIPT
$gradeTable.='</tr>'."\n";	$gradeTable.='</tr>'."\n";

my $ctr = 0;	my $ctr = 0;
foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {	foreach my $student (sort
	{
	if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
	return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
	}
	return $a cmp $b;
	}
	(keys(%$fullname))) {
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);

my %status = ();	my %status = ();
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
(%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);	if ($submitonly eq 'queued') {
	my %queue_status =
	&Apache::bridgetask::get_student_status($symb,$cdom,$cnum,
	$udom,$uname);
	next if (!defined($queue_status{'gradingqueue'}));
	$status{'gradingqueue'} = $queue_status{'gradingqueue'};
	}

	if ($env{'form.showgrading'} eq 'yes'
	&& $submitonly ne 'queued'
	&& $submitonly ne 'all') {
	(%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);
my $submitted = 0;	my $submitted = 0;
my $graded = 0;	my $graded = 0;
my $incorrect = 0;	my $incorrect = 0;
Line 743 LISTJAVASCRIPT	Line 804 LISTJAVASCRIPT
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {	if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (sort keys(%status)) {	foreach (sort keys(%status)) {
next if (/^resource.*?submitted_by$/);	next if (/^resource.*?submitted_by$/);
$gradeTable.='<td align="middle"> '.$status{$_}.' </td>'."\n";	$gradeTable.='<td align="center"> '.$status{$_}.' </td>'."\n";
}	}
}	}
# $gradeTable.='<td></td>' if ($ctr%2 ==1);	# $gradeTable.='<td></td>' if ($ctr%2 ==1);
Line 752 LISTJAVASCRIPT	Line 813 LISTJAVASCRIPT
}	}
if ($ctr%2 ==1) {	if ($ctr%2 ==1) {
$gradeTable.='<td> </td><td> </td><td> </td>';	$gradeTable.='<td> </td><td> </td><td> </td>';
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {	if ($env{'form.showgrading'} eq 'yes'
	&& $submitonly ne 'queued'
	&& $submitonly ne 'all') {
foreach (@$partlist) {	foreach (@$partlist) {
$gradeTable.='<td> </td>';	$gradeTable.='<td> </td>';
}	}
	} elsif ($submitonly eq 'queued') {
	$gradeTable.='<td> </td>';
}	}
$gradeTable.='</tr>';	$gradeTable.='</tr>';
}	}
Line 772 LISTJAVASCRIPT	Line 837 LISTJAVASCRIPT
my $submissions='submissions';	my $submissions='submissions';
if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }	if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }
if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; }	if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; }
	if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; }
$gradeTable='<br /> <font color="red">'.	$gradeTable='<br /> <font color="red">'.
'No '.$submissions.' found for this resource for any students. ('.$num_students.	'No '.$submissions.' found for this resource for any students. ('.$num_students.
' students checked for '.$submissions.')</font><br />';	' students checked for '.$submissions.')</font><br />';
Line 779 LISTJAVASCRIPT	Line 845 LISTJAVASCRIPT
} elsif ($ctr == 1) {	} elsif ($ctr == 1) {
$gradeTable =~ s/type=checkbox/type=checkbox checked/;	$gradeTable =~ s/type=checkbox/type=checkbox checked/;
}	}
$gradeTable.=&show_grading_menu_form($symb,$url);	$gradeTable.=&show_grading_menu_form($symb);
$request->print($gradeTable);	$request->print($gradeTable);
return '';	return '';
}	}
Line 1198 sub sub_page_kw_js {	Line 1264 sub sub_page_kw_js {

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("<font color=\\"green\\" size=+1> Compose Message for \"+fullname+\"</font><br><br>");	pDoc.write("<font color=\\"green\\" size=+1> Compose Message for \"+fullname+\"</font><br /><br />");

pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");	pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");	pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
Line 1233 sub sub_page_kw_js {	Line 1299 sub sub_page_kw_js {
pDoc.write("</table>");	pDoc.write("</table>");
pDoc.write("</td></tr></table> ");	pDoc.write("</td></tr></table> ");
pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\">  ");	pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\">  ");
pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");	pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
pDoc.write("</form>");	pDoc.write("</form>");
pDoc.write("</body></html>");	pDoc.write("</body></html>");
pDoc.close();	pDoc.close();
Line 1302 sub sub_page_kw_js {	Line 1368 sub sub_page_kw_js {
hDoc.write("</head><body bgcolor=white>");	hDoc.write("</head><body bgcolor=white>");

hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");	hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
hDoc.write("<font color=\\"green\\" size=+1> Keyword Highlight Options</font><br><br>");	hDoc.write("<font color=\\"green\\" size=+1> Keyword Highlight Options</font><br /><br />");

hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");	hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");	hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
Line 1326 sub sub_page_kw_js {	Line 1392 sub sub_page_kw_js {
hDoc.write("</table>");	hDoc.write("</table>");
hDoc.write("</td></tr></table> ");	hDoc.write("</td></tr></table> ");
hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\">  ");	hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\">  ");
hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");	hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
hDoc.write("</form>");	hDoc.write("</form>");
hDoc.write("</body></html>");	hDoc.write("</body></html>");
hDoc.close();	hDoc.close();
Line 1339 SUBJAVASCRIPT	Line 1405 SUBJAVASCRIPT
#--- displays the grading box, used in essay type problem and grading by page/sequence	#--- displays the grading box, used in essay type problem and grading by page/sequence
sub gradeBox {	sub gradeBox {
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;	my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;

my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').	my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
'/check.gif" height="16" border="0" />';	'/check.gif" height="16" border="0" />';

my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
my $wgtmsg = ($wgt > 0 ? '(problem weight)' :	my $wgtmsg = ($wgt > 0 ? '(problem weight)' :
'<font color="red">problem weight assigned by computer</font>');	'<font color="red">problem weight assigned by computer</font>');
$wgt = ($wgt > 0 ? $wgt : '1');	$wgt = ($wgt > 0 ? $wgt : '1');
my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ?	my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
'' : $$record{'resource.'.$partid.'.awarded'}*$wgt);	'' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));
my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";	my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
	my $display_part=&get_display_part($partid,$symb);
my $display_part=&get_display_part($partid,undef,$symb);

my %last_resets = &get_last_resets($symb,$env{'request.course.id'},	my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
[$partid]);	[$partid]);
my $aggtries = $$record{'resource.'.$partid.'.tries'};	my $aggtries = $$record{'resource.'.$partid.'.tries'};
if ($last_resets{$partid}) {	if ($last_resets{$partid}) {
$aggtries = &get_num_tries($record,$last_resets{$partid},$partid);	$aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
}	}

$result.='<table border="0"><tr><td>'.	$result.='<table border="0"><tr><td>'.
'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";	'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";

my $ctr = 0;	my $ctr = 0;
$result.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across	$result.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across
while ($ctr<=$wgt) {	while ($ctr<=$wgt) {
$result.= '<td><nobr><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.	$result.= '<td><nobr><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.	'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
$ctr.')" value="'.$ctr.'" '.	$ctr.')" value="'.$ctr.'" '.
($score eq $ctr ? 'checked':'').' /> '.$ctr."</nobr></td>\n";	($score eq $ctr ? 'checked':'').' /> '.$ctr."</label></nobr></td>\n";
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
$ctr++;	$ctr++;
}	}
$result.='</tr></table>';	$result.='</tr></table>';

$result.='</td><td> <b>or</b> </td>'."\n";	$result.='</td><td> <b>or</b> </td>'."\n";
$result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.	$result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
($score ne ''? ' value = "'.$score.'"':'').' size="4" '.	($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
Line 1383 sub gradeBox {	Line 1442 sub gradeBox {
$result.='<td>/'.$wgt.' '.$wgtmsg.	$result.='<td>/'.$wgt.' '.$wgtmsg.
($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : '').	($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : '').
' </td><td>'."\n";	' </td><td>'."\n";

$result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.	$result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {	if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
Line 1404 sub gradeBox {	Line 1462 sub gradeBox {
'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.	'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
$aggtries.'" />'."\n";	$aggtries.'" />'."\n";
$result.='</td></tr></table>'."\n";	$result.='</td></tr></table>'."\n";
	$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);
return $result;	return $result;
}	}

	sub handback_box {
	my ($symb,$uname,$udom,$counter,$partid,$record) = @_;
	my ($partlist,$handgrade,$responseType) = &response_type($symb);
	my (@respids);
	foreach my $part_resp (sort(keys(%$handgrade))) {
	my ($part,$resp) = split(/_/,$part_resp);
	if ($part eq $partid) {
	push @respids,$resp;
	}
	}
	my $result;
	foreach my $respid (@respids) {
	my $prefix = $counter.'_'.$partid.'_'.$respid.'_';
	my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record);
	next if (!@$files);
	my $file_counter = 1;
	foreach my $file (@$files) {
	my ($file_disp) = ($file =~ m\|.+/(.+)$\|);
	$result.=&mt('Return commented version of [_1] to student.',
	'<span class="filename">'.$file_disp.'</span>');
	$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
	$result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
	$file_counter++;
	}
	}
	return $result;
	}

sub show_problem {	sub show_problem {
my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode) = @_;	my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode) = @_;
my $rendered;	my $rendered;
Line 1457 sub show_problem {	Line 1544 sub show_problem {
sub submission {	sub submission {
my ($request,$counter,$total) = @_;	my ($request,$counter,$total) = @_;

(my $url=$env{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;
my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});	my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?	$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});	my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';	$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';

my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));	my $symb = &get_symb($request);
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }	if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }

if (!&canview($usec)) {	if (!&canview($usec)) {
$request->print('<font color="red">Unable to view requested student.('.	$request->print('<font color="red">Unable to view requested student.('.
$uname.'@'.$udom.' in section '.$usec.' in course id '.	$uname.'@'.$udom.' in section '.$usec.' in course id '.
$env{'request.course.id'}.')</font>');	$env{'request.course.id'}.')</font>');
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));
return;	return;
}	}

Line 1530 sub submission {	Line 1616 sub submission {
}	}
my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};	my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};

$request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".	$request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\n".
'<input type="hidden" name="command" value="handgrade" />'."\n".	'<input type="hidden" name="command" value="handgrade" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".	'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".
Line 1540 sub submission {	Line 1626 sub submission {
'<input type="hidden" name="studentNo" value="" />'."\n".	'<input type="hidden" name="studentNo" value="" />'."\n".
'<input type="hidden" name="gradeOpt" value="" />'."\n".	'<input type="hidden" name="gradeOpt" value="" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" />'."\n".	'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" />'."\n".
'<input type="hidden" name="vProb" value="'.$env{'form.vProb'}.'" />'."\n".	'<input type="hidden" name="vProb" value="'.$env{'form.vProb'}.'" />'."\n".
'<input type="hidden" name="vAns" value="'.$env{'form.vAns'}.'" />'."\n".	'<input type="hidden" name="vAns" value="'.$env{'form.vAns'}.'" />'."\n".
'<input type="hidden" name="lastSub" value="'.$env{'form.lastSub'}.'" />'."\n".	'<input type="hidden" name="lastSub" value="'.$env{'form.lastSub'}.'" />'."\n".
'<input type="hidden" name="section" value="'.$env{'form.section'}.'">'."\n".	'<input type="hidden" name="section" value="'.$env{'form.section'}.'" />'."\n".
'<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'">'."\n".	'<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'">'."\n".	'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" />'."\n".
'<input type="hidden" name="NCT"'.	'<input type="hidden" name="NCT"'.
' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");	' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");
if ($env{'form.handgrade'} eq 'yes') {	if ($env{'form.handgrade'} eq 'yes') {
Line 1589 KEYWORDS	Line 1674 KEYWORDS
#	#
# Load the other essays for similarity check	# Load the other essays for similarity check
#	#
my $essayurl=&Apache::lonnet::declutter($url);	my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
my ($adom,$aname,$apath)=($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);	my ($adom,$aname,$apath)=($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
$apath=&Apache::lonnet::escape($apath);	$apath=&Apache::lonnet::escape($apath);
$apath=~s/\W/\_/gs;	$apath=~s/\W/\_/gs;
Line 1611 KEYWORDS	Line 1696 KEYWORDS
}	}

my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
my ($partlist,$handgrade,$responseType) = &response_type($url,$symb);	my ($partlist,$handgrade,$responseType) = &response_type($symb);

# Display student info	# Display student info
$request->print(($counter == 0 ? '' : '<br />'));	$request->print(($counter == 0 ? '' : '<br />'));
my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'."\n".	my $result='<table border="0" width="100%"><tr><td bgcolor="#777777">'."\n".
'<table border="0" width=100%><tr bgcolor="#edffff"><td>'."\n";	'<table border="0" width="100%"><tr bgcolor="#edffff"><td>'."\n";

$result.='<b>Fullname: </b>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'<br />'."\n";	$result.='<b>Fullname: </b>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'<br />'."\n";
$result.='<input type="hidden" name="name'.$counter.	$result.='<input type="hidden" name="name'.$counter.
Line 1697 KEYWORDS	Line 1782 KEYWORDS
my %seenparts;	my %seenparts;
for my $part (sort keys(%$handgrade)) {	for my $part (sort keys(%$handgrade)) {
my ($partid,$respid) = split(/_/,$part);	my ($partid,$respid) = split(/_/,$part);
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$symb);
if ($env{"form.$uname:$udom:$partid:submitted_by"}) {	if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
if (exists($seenparts{$partid})) { next; }	if (exists($seenparts{$partid})) { next; }
$seenparts{$partid}=1;	$seenparts{$partid}=1;
Line 1741 KEYWORDS	Line 1826 KEYWORDS
if ($env{'form.lastSub'} eq 'lastonly' \|\|	if ($env{'form.lastSub'} eq 'lastonly' \|\|
($env{'form.lastSub'} eq 'hdgrade' &&	($env{'form.lastSub'} eq 'hdgrade' &&
$$handgrade{$part} eq 'yes')) {	$$handgrade{$part} eq 'yes')) {
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$symb);
$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.	$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
$display_part.' <font color="#999999">( ID '.$respid.	$display_part.' <font color="#999999">( ID '.$respid.
' )</font>   ';	' )</font>   ';
my @files;	my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
if ($record{"resource.$partid.$respid.portfiles"}) {	if (@$files) {
my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
foreach my $file (split(',',$record{"resource.$partid.$respid.portfiles"})) {
push(@files,$file_url.$file);

&Apache::lonnet::logthis("found a portfolio file".$record{"resource.$partid.$respid.portfiles"});
&Apache::lonnet::logthis("uploaded URL file".$record{"resource.$partid.$respid.uploadedurl"});
}
}
if ($record{"resource.$partid.$respid.uploadedurl"}) {
push(@files,$record{"resource.$partid.$respid.uploadedurl"});
}
if (@files) {
$lastsubonly.='<br /><font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';	$lastsubonly.='<br /><font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
foreach my $file (@files) {	my $file_counter = 0;
	foreach my $file (@$files) {
	$file_counter ++;
&Apache::lonnet::allowuploaded('/adm/grades',$file);	&Apache::lonnet::allowuploaded('/adm/grades',$file);
$lastsubonly.='<br /><a href="'.$file.'" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';	$lastsubonly.='<br /><a href="'.$file.'" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0"> '.$file.'</a>';
}	}
$lastsubonly.='<br />';	$lastsubonly.='<br />';
}	}
Line 1777 KEYWORDS	Line 1852 KEYWORDS
$lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";	$lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
$request->print($lastsubonly);	$request->print($lastsubonly);
} elsif ($env{'form.lastSub'} eq 'datesub') {	} elsif ($env{'form.lastSub'} eq 'datesub') {
my (undef,$responseType,undef,$parts) = &showResourceInfo($url);	my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);
$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
} elsif ($env{'form.lastSub'} =~ /^(last\|all)$/) {	} elsif ($env{'form.lastSub'} =~ /^(last\|all)$/) {
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
Line 1797 KEYWORDS	Line 1872 KEYWORDS
$toGrade.='</td></tr></table></td></tr></table>'."\n";	$toGrade.='</td></tr></table></td></tr></table>'."\n";
if (($env{'form.command'} eq 'submission') \|\|	if (($env{'form.command'} eq 'submission') \|\|
($env{'form.command'} eq 'processGroup' && $counter == $total)) {	($env{'form.command'} eq 'processGroup' && $counter == $total)) {
$toGrade.='</form>'.&show_grading_menu_form($symb,$url)	$toGrade.='</form>'.&show_grading_menu_form($symb);
}	}
$request->print($toGrade);	$request->print($toGrade);
return;	return;
Line 1818 KEYWORDS	Line 1893 KEYWORDS
'<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";	'<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
$result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter.	$result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter.
',\''.$msgfor.'\')"; TARGET=_self>'.	',\''.$msgfor.'\')"; TARGET=_self>'.
'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a>  '.	&mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> ('.
	&mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" />)'.
'<img src="'.$request->dir_config('lonIconsURL').	'<img src="'.$request->dir_config('lonIconsURL').
'/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".	'/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
'<br /> (Message will be sent when you click on Save & Next below.)'."\n"	'<br /> ('.
if ($env{'form.handgrade'} eq 'yes');	&mt('Message will be sent when you click on Save & Next below.').")\n";
$request->print($result);	$request->print($result);
}	}
	if ($perm{'vgr'}) {
	$request->print('<br />'.
	&Apache::loncommon::track_student_link(&mt('View recent activity'),
	$uname,$udom,'check'));
	}
	if ($perm{'opa'}) {
	$request->print('<br />'.
	&Apache::loncommon::pprmlink(&mt('Set/Change parameters'),
	$uname,$udom,$symb,'check'));
	}

my %seen = ();	my %seen = ();
my @partlist;	my @partlist;
my @gradePartRespid;	my @gradePartRespid;
for (sort keys(%$handgrade)) {	for my $part_resp (sort(keys(%$handgrade))) {
my ($partid,$respid) = split(/_/);	my ($partid,$respid) = split(/_/, $part_resp);
next if ($seen{$partid} > 0);	next if ($seen{$partid} > 0);
$seen{$partid}++;	$seen{$partid}++;
next if ($$handgrade{$_} =~ /:no$/ && $env{'form.lastSub'} =~ /^(hdgrade)$/);	next if ($$handgrade{$part_resp} =~ /:no$/ && $env{'form.lastSub'} =~ /^(hdgrade)$/);
push @partlist,$partid;	push @partlist,$partid;
push @gradePartRespid,$partid.'.'.$respid;	push @gradePartRespid,$partid.'.'.$respid;

$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
}	}
$result='<input type="hidden" name="partlist'.$counter.	$result='<input type="hidden" name="partlist'.$counter.
Line 1870 KEYWORDS	Line 1955 KEYWORDS
'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self>  ';	'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self>  ';
$endform.='(Next and Previous (student) do not save the scores.)'."\n" ;	$endform.='(Next and Previous (student) do not save the scores.)'."\n" ;
$endform.='</td><tr></table></form>';	$endform.='</td><tr></table></form>';
$endform.=&show_grading_menu_form($symb,$url);	$endform.=&show_grading_menu_form($symb);
$request->print($endform);	$request->print($endform);
}	}
return '';	return '';
Line 1918 sub keywords_highlight {	Line 2003 sub keywords_highlight {
#--- Called from submission routine	#--- Called from submission routine
sub processHandGrade {	sub processHandGrade {
my ($request) = shift;	my ($request) = shift;
my $url = $env{'form.url'};	my $symb = &get_symb($request);
my $symb = $env{'form.symb'};	my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
my $button = $env{'form.gradeOpt'};	my $button = $env{'form.gradeOpt'};
my $ngrade = $env{'form.NCT'};	my $ngrade = $env{'form.NCT'};
my $ntstu = $env{'form.NTSTU'};	my $ntstu = $env{'form.NTSTU'};
	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};

if ($button eq 'Save & Next') {	if ($button eq 'Save & Next') {
my $ctr = 0;	my $ctr = 0;
while ($ctr < $ngrade) {	while ($ctr < $ngrade) {
my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});	my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);	my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$symb,$uname,$udom,$ctr);
if ($errorflag eq 'no_score') {	if ($errorflag eq 'no_score') {
$ctr++;	$ctr++;
next;	next;
Line 1940 sub processHandGrade {	Line 2028 sub processHandGrade {
my $includemsg = $env{'form.includemsg'.$ctr};	my $includemsg = $env{'form.includemsg'.$ctr};
my ($subject,$message,$msgstatus) = ('','','');	my ($subject,$message,$msgstatus) = ('','','');
if ($includemsg =~ /savemsg\|newmsg\Q$ctr\E/) {	if ($includemsg =~ /savemsg\|newmsg\Q$ctr\E/) {
$subject = $env{'form.msgsub'} if ($includemsg =~ /^msgsub/);	$subject = $env{'form.msgsub'} if ($includemsg =~ /msgsub/);
	unless ($subject=~/\w/) { $subject=&mt('Grading Feedback'); }
my (@msgnum) = split(/,/,$includemsg);	my (@msgnum) = split(/,/,$includemsg);
foreach (@msgnum) {	foreach (@msgnum) {
$message.=$env{'form.'.$_} if ($_ =~ /savemsg\|newmsg/ && $_ ne '');	$message.=$env{'form.'.$_} if ($_ =~ /savemsg\|newmsg/ && $_ ne '');
}	}
$message =&Apache::lonfeedback::clear_out_html($message);	$message =&Apache::lonfeedback::clear_out_html($message);
$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;	if ($env{'form.withgrades'.$ctr}) {
$message.=" for <a href=\"".	$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
	$message.=" for <a href=\"".
&Apache::lonnet::clutter($url).	&Apache::lonnet::clutter($url).
"?symb=$symb\">$env{'form.probTitle'}</a>";	"?symb=$symb\">$env{'form.probTitle'}</a>";
$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,	}
$env{'form.msgsub'},$message);	$msgstatus = &Apache::lonmsg::user_normal_msg($uname,$udom,
	$subject.' ['.
	&Apache::lonnet::declutter($url).']',$message);
	$request->print('<br />'.&mt('Sending message to [_1]@[_2]',$uname,$udom).': '.
	$msgstatus);
}	}
if ($env{'form.collaborator'.$ctr}) {	if ($env{'form.collaborator'.$ctr}) {
my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");	my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");
foreach my $collabstr (@collabstrs) {	foreach my $collabstr (@collabstrs) {
my ($part,@collaborators) = split(/:/,$collabstr);	my ($part,@collaborators) = split(/:/,$collabstr);
foreach (@collaborators) {	foreach my $collaborator (@collaborators) {
my ($errorflag,$pts,$wgt) =	my ($errorflag,$pts,$wgt) =
&saveHandGrade($request,$url,$symb,$_,$udom,$ctr,	&saveHandGrade($request,$symb,$collaborator,$udom,$ctr,
$env{'form.unamedom'.$ctr},$part);	$env{'form.unamedom'.$ctr},$part);
if ($errorflag eq 'not_allowed') {	if ($errorflag eq 'not_allowed') {
$request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");	$request->print("<font color=\"red\">Not allowed to modify grades for $collaborator:$udom</font>");
next;	next;
} else {	} else {
if ($message ne '') {	if ($message ne '') {
$msgstatus = &Apache::lonmsg::user_normal_msg($_,$udom,$env{'form.msgsub'},$message);	$msgstatus = &Apache::lonmsg::user_normal_msg($collaborator,$udom,$env{'form.msgsub'},$message);
}	}

}	}
}	}
}	}
Line 2014 sub processHandGrade {	Line 2107 sub processHandGrade {
$env{'form.savemsgN'} = --$idx;	$env{'form.savemsgN'} = --$idx;
$keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'};	$keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'};
my $putresult = &Apache::lonnet::put	my $putresult = &Apache::lonnet::put
('nohist_handgrade',\%keyhash,	('nohist_handgrade',\%keyhash,$cdom,$cnum);
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
}	}
# Called by Save & Refresh from Highlight Attribute Window	# Called by Save & Refresh from Highlight Attribute Window
my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');	my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
Line 2040 sub processHandGrade {	Line 2131 sub processHandGrade {

# Go directly to grade student - from submission or link from chart page	# Go directly to grade student - from submission or link from chart page
if ($button eq 'Grade Student') {	if ($button eq 'Grade Student') {
(undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($url);	(undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb);
my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};	my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};
($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);	($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
$env{'form.fullname'} = $$fullname{$processUser};	$env{'form.fullname'} = $$fullname{$processUser};
Line 2060 sub processHandGrade {	Line 2151 sub processHandGrade {

my (@parsedlist,@nextlist);	my (@parsedlist,@nextlist);
my ($nextflg) = 0;	my ($nextflg) = 0;
foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {	foreach (sort
	{
	if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
	return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
	}
	return $a cmp $b;
	} (keys(%$fullname))) {
if ($nextflg == 1 && $button =~ /Next$/) {	if ($nextflg == 1 && $button =~ /Next$/) {
push @parsedlist,$_;	push @parsedlist,$_;
}	}
Line 2072 sub processHandGrade {	Line 2169 sub processHandGrade {
}	}
$ctr = 0;	$ctr = 0;
@parsedlist = reverse @parsedlist if ($button eq 'Previous');	@parsedlist = reverse @parsedlist if ($button eq 'Previous');
my ($partlist) = &response_type($url);	my ($partlist) = &response_type($symb);
foreach my $student (@parsedlist) {	foreach my $student (@parsedlist) {
my $submitonly=$env{'form.submitonly'};	my $submitonly=$env{'form.submitonly'};
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);

	if ($submitonly eq 'queued') {
	my %queue_status =
	&Apache::bridgetask::get_student_status($symb,$cdom,$cnum,
	$udom,$uname);
	next if (!defined($queue_status{'gradingqueue'}));
	}

if ($submitonly =~ /^(yes\|graded\|incorrect)$/) {	if ($submitonly =~ /^(yes\|graded\|incorrect)$/) {
# my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);	# my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
my %status=&student_gradeStatus($url,$symb,$udom,$uname,$partlist);	my %status=&student_gradeStatus($symb,$udom,$uname,$partlist);
my $submitted = 0;	my $submitted = 0;
my $ungraded = 0;	my $ungraded = 0;
my $incorrect = 0;	my $incorrect = 0;
Line 2117 sub processHandGrade {	Line 2222 sub processHandGrade {
my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n";	my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n";
$the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";	$the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
$the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";	$the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
$the_end.=&show_grading_menu_form ($symb,$url);	$the_end.=&show_grading_menu_form($symb);
$request->print($the_end);	$request->print($the_end);
}	}
return '';	return '';
Line 2125 sub processHandGrade {	Line 2230 sub processHandGrade {

#---- Save the score and award for each student, if changed	#---- Save the score and award for each student, if changed
sub saveHandGrade {	sub saveHandGrade {
my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;	my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
my @v_flag;	my @v_flag;
my $usec = &Apache::lonnet::getsection($domain,$stuname,	my $usec = &Apache::lonnet::getsection($domain,$stuname,
$env{'request.course.id'});	$env{'request.course.id'});
Line 2136 sub saveHandGrade {	Line 2241 sub saveHandGrade {
my ($pts,$wgt) = ('','');	my ($pts,$wgt) = ('','');
my %aggregate = ();	my %aggregate = ();
my $aggregateflag = 0;	my $aggregateflag = 0;
foreach my $new_part (split(/:/,$env{'form.partlist'.$newflg})) {
	my @parts = split(/:/,$env{'form.partlist'.$newflg});
	foreach my $new_part (@parts) {
#collaborator may vary for different parts	#collaborator may vary for different parts
if ($submitter && $new_part ne $part) { next; }	if ($submitter && $new_part ne $part) { next; }
my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part};	my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part};
Line 2206 sub saveHandGrade {	Line 2313 sub saveHandGrade {
$newrecord{'resource.'.$new_part.'.regrader'}=	$newrecord{'resource.'.$new_part.'.regrader'}=
"$env{'user.name'}:$env{'user.domain'}";	"$env{'user.name'}:$env{'user.domain'}";
}	}
	my ($partlist,$handgrade,$responseType) = &response_type($symb);
	foreach my $part_resp (sort(keys(%$handgrade))) {
	my ($part_id, $resp_id) = split(/_/,$part_resp);
	&Apache::lonnet::logthis('form.'.$newflg.'_'.$part_resp.'_returndoc1');
	&Apache::lonnet::logthis("new part is $new_part and partid is $part_id");
	if (($env{'form.'.$newflg.'_'.$part_resp.'_returndoc1'}) && ($new_part == $part_id)) {
	# if multiple files are uploaded names will be 'returndoc2','returndoc3'
	my $file_counter = 1;
	while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) {
	my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'};
	$newrecord{"resource.$new_part.$resp_id.handback"} = $env{'form.returndocorig'.$file_counter};
	$request->print("<br />".$fname." will be the uploaded file name");
	$request->print("<font color=\"red\">Will upload document</font>".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
	$file_counter++;
	}
	}
	}

# unless problem has been graded, set flag to version the submitted files	# unless problem has been graded, set flag to version the submitted files
unless ($record{'resource.'.$new_part.'.solved'} =~ /^correct_/ \|\| $record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override') {	unless ($record{'resource.'.$new_part.'.solved'} =~ /^correct_/ \|\|
	$record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' \|\|
	$dropMenu eq 'reset status')
	{
push (@v_flag,$new_part);	push (@v_flag,$new_part);
}	}
}	}
	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};

if (scalar(keys(%newrecord)) > 0) {	if (scalar(keys(%newrecord)) > 0) {
if (scalar(@v_flag)) {	if (scalar(@v_flag)) {
&version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@v_flag);	&version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@v_flag);
}	}
&Apache::lonnet::cstore(\%newrecord,$symb,	&Apache::lonnet::cstore(\%newrecord,$symb,
$env{'request.course.id'},$domain,$stuname);	$env{'request.course.id'},$domain,$stuname);

	my @ungraded_parts;
	foreach my $part (@parts) {
	if ( !defined($record{'resource.'.$part.'.awarded'})
	&& !defined($newrecord{'resource.'.$part.'.awarded'}) ) {
	push(@ungraded_parts, $part);
	}
	}
	if ( !@ungraded_parts ) {
	&Apache::bridgetask::remove_from_queue('gradingqueue',$symb,$cdom,
	$cnum,$domain,$stuname);
	}
}	}
if ($aggregateflag) {	if ($aggregateflag) {
&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
$env{'course.'.$env{'request.course.id'}.'.domain'},	$cdom,$cnum);
$env{'course.'.$env{'request.course.id'}.'.num'});	}
	return ('',$pts,$wgt);
	}

	sub get_submitted_files {
	my ($udom,$uname,$partid,$respid,$record) = @_;
	my @files;
	if ($$record{"resource.$partid.$respid.portfiles"}) {
	my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
	foreach my $file (split(',',$$record{"resource.$partid.$respid.portfiles"})) {
	push(@files,$file_url.$file);
	}
	}
	if ($$record{"resource.$partid.$respid.uploadedurl"}) {
	push(@files,$$record{"resource.$partid.$respid.uploadedurl"});
}	}
return '',$pts,$wgt;	return (\@files);
}	}

# ----------- Provides number of tries since last reset.	# ----------- Provides number of tries since last reset.
Line 2287 sub get_last_resets {	Line 2444 sub get_last_resets {

# ----------- Handles creating versions for portfolio files as answers	# ----------- Handles creating versions for portfolio files as answers
sub version_portfiles {	sub version_portfiles {
my ($record, $parts_graded, $courseid, $symb, $domain, $stuname, $v_flag) = @_;	my ($record, $parts_graded, $courseid, $symb, $domain, $stu_name, $v_flag) = @_;
my $version_parts = join('\|',@$v_flag);	my $version_parts = join('\|',@$v_flag);
my $parts = join('\|', @$parts_graded);	my $parts = join('\|', @$parts_graded);
my $portfolio_root = &Apache::loncommon::propath($domain,	my $portfolio_root = &Apache::loncommon::propath($domain,
$stuname).	$stu_name).
'/userfiles/portfolio';	'/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 @v_portfiles;	my @v_portfiles;
my @portfiles = split(/,/,$$record{$key});	my @portfiles = split(/,/,$$record{$key});
# &Apache::lonnet::logthis("should be unmarking and remarking");
foreach my $file (@portfiles) {	foreach my $file (@portfiles) {
&Apache::lonnet::unmark_as_readonly($domain,$stuname,[$symb,$env{'request.course.id'}],$file);	&Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);
my ($directory,$answer_file) =($file =~ /^(.?)([^\/]$)/);	my ($directory,$answer_file) =($file =~ /^(.?)([^\/])$/);
my $version = 0;	my $version = 0;
my @answer_file_parts = split(/\./, $answer_file);	my ($answer_name,$answer_ver,$answer_ext) =
my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stuname,$portfolio_root);	&file_name_version_ext($answer_file);
my @file_names;	my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stu_name,$portfolio_root);
my @file_name_parts;	$version = &get_next_version($answer_name, $answer_ext, \@dir_list);
foreach my $row (@dir_list) {	my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
@file_names = split(/\&/,$row,2);	if ($new_answer ne 'problem getting file') {
@file_name_parts = split(/\./, $file_names[0]);	push(@v_portfiles, $directory.$new_answer);
# ($file_name_parts[scalar @file_name_parts] eq $answer_file_parts[scalar @answer_file_parts])	&Apache::lonnet::mark_as_readonly($domain,$stu_name,
if (($file_name_parts[0] eq $answer_file_parts[0]) &&	['/portfolio'.$directory.$new_answer],
($file_name_parts[-1] eq $answer_file_parts[-1])) {	[$symb,$env{'request.course.id'},'graded']);
# gets here if filename and extension match, regardless of version
if (scalar @file_name_parts == 3) { # a versioned file is found
# so save it for later
if ($file_name_parts[1] > $version) {$version = $file_name_parts[1]};
}
}
}
$version++;
my $home_server = &Apache::lonnet::homeserver($stuname,$domain,undef);
$env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stuname/portfolio$directory$answer_file");
if($env{'form.copy'} eq '-1') {
&Apache::lonnet::logthis('problem getting file '.$directory.$answer_file);
} else {
my $copy_result = &Apache::lonnet::finishuserfileupload($stuname,$domain,$home_server,'copy',
'/portfolio'.$directory.$answer_file_parts[0].'.'.$version.'.'.$answer_file_parts[-1]);
push(@v_portfiles, $answer_file_parts[0].'.'.$version.'.'.$answer_file_parts[-1]);
&Apache::lonnet::mark_as_readonly($domain,$stuname,
['/portfolio'.$directory.$answer_file_parts[0].'.'.$version.'.'.$answer_file_parts[-1]],
[$symb,$env{'request.course.id'},'graded']);
}	}

}	}
$$record{$key} = join(',',@v_portfiles);	$$record{$key} = join(',',@v_portfiles);
}	}
}	}
return 'ok';	return 'ok';
	}

	sub get_next_version {
	my ($answer_name, $answer_ext, $dir_list);
	my $version;
	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') {
	&Apache::lonnet::logthis('problem getting file '.$file_name);
	$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);
}	}

#--------------------------------------------------------------------------------------	#--------------------------------------------------------------------------------------
Line 2390 sub viewgrades_js {	Line 2583 sub viewgrades_js {
}	}
for (i=0;i<document.classgrade.total.value;i++) {	for (i=0;i<document.classgrade.total.value;i++) {
var user = document.classgrade["ctr"+i].value;	var user = document.classgrade["ctr"+i].value;
	user = user.replace(new RegExp(':', 'g'),"_");
var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];	var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;	var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];	var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
Line 2417 sub viewgrades_js {	Line 2611 sub viewgrades_js {

for (i=0;i<document.classgrade.total.value;i++) {	for (i=0;i<document.classgrade.total.value;i++) {
var user = document.classgrade["ctr"+i].value;	var user = document.classgrade["ctr"+i].value;
	user = user.replace(new RegExp(':', 'g'),"_");
var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];	var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;	var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];	var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
Line 2434 sub viewgrades_js {	Line 2629 sub viewgrades_js {
} else {	} else {
for (i=0;i<document.classgrade.total.value;i++) {	for (i=0;i<document.classgrade.total.value;i++) {
var user = document.classgrade["ctr"+i].value;	var user = document.classgrade["ctr"+i].value;
	user = user.replace(new RegExp(':', 'g'),"_");
var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];	var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;	var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];	var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
Line 2492 sub viewgrades_js {	Line 2688 sub viewgrades_js {

for (i=0;i<document.classgrade.total.value;i++) {	for (i=0;i<document.classgrade.total.value;i++) {
var user = document.classgrade["ctr"+i].value;	var user = document.classgrade["ctr"+i].value;
	user = user.replace(new RegExp(':', 'g'),"_");
var resetscore = document.classgrade["GD_"+user+"_"+partid+"_awarded"];	var resetscore = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
resetscore.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;	resetscore.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
var resettries = document.classgrade["GD_"+user+"_"+partid+"_tries"];	var resettries = document.classgrade["GD_"+user+"_"+partid+"_tries"];
Line 2516 sub viewgrades {	Line 2713 sub viewgrades {
my ($request) = shift;	my ($request) = shift;
&viewgrades_js($request);	&viewgrades_js($request);

my ($symb,$url) = ($env{'form.symb'},$env{'form.url'});	my ($symb) = &get_symb($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,
#thus invalidate the cache	#thus invalidate the cache
&Apache::lonnet::devalidatecourseresdata(	&Apache::lonnet::devalidatecourseresdata(
Line 2528 sub viewgrades {	Line 2725 sub viewgrades {
$result.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n";	$result.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n";

#view individual student submission form - called using Javascript viewOneStudent	#view individual student submission form - called using Javascript viewOneStudent
$result.=&jscriptNform($url,$symb);	$result.=&jscriptNform($symb);

#beginning of class grading form	#beginning of class grading form
$result.= '<form action="/adm/grades" method="post" name="classgrade">'."\n".	$result.= '<form action="/adm/grades" method="post" name="classgrade">'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="command" value="editgrades" />'."\n".	'<input type="hidden" name="command" value="editgrades" />'."\n".
'<input type="hidden" name="section" value="'.$env{'form.section'}.'" />'."\n".	'<input type="hidden" name="section" value="'.$env{'form.section'}.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
Line 2553 sub viewgrades {	Line 2749 sub viewgrades {
'<table border=0><tr bgcolor="#ffffdd"><td>';	'<table border=0><tr bgcolor="#ffffdd"><td>';
#radio buttons/text box for assigning points for a section or class.	#radio buttons/text box for assigning points for a section or class.
#handles different parts of a problem	#handles different parts of a problem
my ($partlist,$handgrade) = &response_type($url,$symb);	my ($partlist,$handgrade) = &response_type($symb);
my %weight = ();	my %weight = ();
my $ctsparts = 0;	my $ctsparts = 0;
$result.='<table border="0">';	$result.='<table border="0">';
Line 2570 sub viewgrades {	Line 2766 sub viewgrades {
$ctsparts.'" value="'.$partid.'" />'."\n";	$ctsparts.'" value="'.$partid.'" />'."\n";
$result.='<input type="hidden" name="weight_'.	$result.='<input type="hidden" name="weight_'.
$partid.'" value="'.$weight{$partid}.'" />'."\n";	$partid.'" value="'.$weight{$partid}.'" />'."\n";
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$symb);
$result.='<tr><td><b>Part:</b> '.$display_part.'   <b>Point:</b> </td><td>';	$result.='<tr><td><b>Part:</b> '.$display_part.'   <b>Point:</b> </td><td>';
$result.='<table border="0"><tr>';	$result.='<table border="0"><tr>';
my $ctr = 0;	my $ctr = 0;
while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across	while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across
$result.= '<td><input type="radio" name="RADVAL_'.$partid.'" '.	$result.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '.
'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}.	'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}.
','.$ctr.')" />'.$ctr."</td>\n";	','.$ctr.')" />'.$ctr."</label></td>\n";
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
$ctr++;	$ctr++;
}	}
Line 2606 sub viewgrades {	Line 2802 sub viewgrades {
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".	$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
'<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'.	'<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'.
'<td>'.&nameUserString('header')."</td>\n";	'<td>'.&nameUserString('header')."</td>\n";
my (@parts) = sort(&getpartlist($url,$symb));	my (@parts) = sort(&getpartlist($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');
Line 2614 sub viewgrades {	Line 2811 sub viewgrades {
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }	if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
my ($partid) = &split_part_type($part);	my ($partid) = &split_part_type($part);
push(@partids, $partid);	push(@partids, $partid);
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$symb);
if ($display =~ /^Partial Credit Factor/) {	if ($display =~ /^Partial Credit Factor/) {
$result.='<td><b>Score Part:</b> '.$display_part.	$result.='<td><b>Score Part:</b> '.$display_part.
' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n";	' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n";
Line 2634 sub viewgrades {	Line 2831 sub viewgrades {
#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($env{'form.section'},'1');
my $ctr = 0;	my $ctr = 0;
foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {	foreach (sort
	{
	if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
	return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
	}
	return $a cmp $b;
	} (keys(%$fullname))) {
$ctr++;	$ctr++;
$result.=&viewstudentgrade($url,$symb,$env{'request.course.id'},	$result.=&viewstudentgrade($symb,$env{'request.course.id'},
$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);	$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
}	}
$result.='</table></td></tr></table>';	$result.='</table></td></tr></table>';
Line 2648 sub viewgrades {	Line 2851 sub viewgrades {
$result='<font color="red">There are no students in section "'.$env{'form.section'}.	$result='<font color="red">There are no students in section "'.$env{'form.section'}.
'" with enrollment status "'.$env{'form.Status'}.'" to modify or grade.</font>';	'" with enrollment status "'.$env{'form.Status'}.'" to modify or grade.</font>';
}	}
$result.=&show_grading_menu_form($symb,$url);	$result.=&show_grading_menu_form($symb);
return $result;	return $result;
}	}

#--- call by previous routine to display each student	#--- call by previous routine to display each student
sub viewstudentgrade {	sub viewstudentgrade {
my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;	my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);
$student=~s/:/_/;
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);	my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
my %aggregates = ();	my %aggregates = ();
my $result='<tr bgcolor="#ffffdd"><td align="right">'.	my $result='<tr bgcolor="#ffffdd"><td align="right">'.
Line 2665 sub viewstudentgrade {	Line 2867 sub viewstudentgrade {
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
'\')"; TARGET=_self>'.$fullname.'</a> '.	'\')"; TARGET=_self>'.$fullname.'</a> '.
'<font color="#999999">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";	'<font color="#999999">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
	$student=~s/:/_/; # colon doen't work in javascript for names
foreach my $apart (@$parts) {	foreach my $apart (@$parts) {
my ($part,$type) = &split_part_type($apart);	my ($part,$type) = &split_part_type($apart);
my $score=$record{"resource.$part.$type"};	my $score=$record{"resource.$part.$type"};
$result.='<td align="middle">';	$result.='<td align="center">';
my ($aggtries,$totaltries);	my ($aggtries,$totaltries);
unless (exists($aggregates{$part})) {	unless (exists($aggregates{$part})) {
$totaltries = $record{'resource.'.$part.'.tries'};	$totaltries = $record{'resource.'.$part.'.tries'};
Line 2685 sub viewstudentgrade {	Line 2888 sub viewstudentgrade {
$aggregates{$part} = 1;	$aggregates{$part} = 1;
}	}
if ($type eq 'awarded') {	if ($type eq 'awarded') {
my $pts = $score eq '' ? '' : $score*$$weight{$part};	my $pts = $score eq '' ? '' : &compute_points($score,$$weight{$part});
$result.='<input type="hidden" name="'.	$result.='<input type="hidden" name="'.
'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";	'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
$result.='<input type="text" name="'.	$result.='<input type="text" name="'.
Line 2722 sub viewstudentgrade {	Line 2925 sub viewstudentgrade {
sub editgrades {	sub editgrades {
my ($request) = @_;	my ($request) = @_;

my $symb=$env{'form.symb'};	my $symb=&get_symb($request);
my $url =$env{'form.url'};
my $title='<h3><font color="#339933">Current Grade Status</font></h3>';	my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
$title.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font><br />'."\n";	$title.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font><br />'."\n";
$title.='<font size=+1><b>Section: </b>'.$env{'form.section'}.'</font>'."\n";	$title.='<font size=+1><b>Section: </b>'.$env{'form.section'}.'</font>'."\n";
Line 2747 sub editgrades {	Line 2949 sub editgrades {
my %columns = ();	my %columns = ();
my ($i,$ctr,$count,$rec_update) = (0,0,0,0);	my ($i,$ctr,$count,$rec_update) = (0,0,0,0);

my (@parts) = sort(&getpartlist($url,$symb));	my (@parts) = sort(&getpartlist($symb));
my $header;	my $header;
while ($ctr < $env{'form.totalparts'}) {	while ($ctr < $env{'form.totalparts'}) {
my $partid = $env{'form.partid_'.$ctr};	my $partid = $env{'form.partid_'.$ctr};
Line 2755 sub editgrades {	Line 2957 sub editgrades {
$weight{$partid} = $env{'form.weight_'.$partid};	$weight{$partid} = $env{'form.weight_'.$partid};
$ctr++;	$ctr++;
}	}
	my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
foreach my $partid (@partid) {	foreach my $partid (@partid) {
$header .= '<td align="center"> <b>Old Score</b> </td>'.	$header .= '<td align="center"> <b>Old Score</b> </td>'.
'<td align="center"> <b>New Score</b> </td>';	'<td align="center"> <b>New Score</b> </td>';
Line 2772 sub editgrades {	Line 2975 sub editgrades {
}	}
}	}
foreach my $partid (@partid) {	foreach my $partid (@partid) {
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$symb);
$result .= '<td colspan="'.$columns{$partid}.	$result .= '<td colspan="'.$columns{$partid}.
'" align="center"><b>Part:</b> '.$display_part.	'" align="center"><b>Part:</b> '.$display_part.
' (Weight = '.$weight{$partid}.')</td>';	' (Weight = '.$weight{$partid}.')</td>';
Line 2786 sub editgrades {	Line 2989 sub editgrades {
for ($i=0; $i<$env{'form.total'}; $i++) {	for ($i=0; $i<$env{'form.total'}; $i++) {
my $line;	my $line;
my $user = $env{'form.ctr'.$i};	my $user = $env{'form.ctr'.$i};
my $usercolon = $user;	my ($uname,$udom)=split(/:/,$user);
$usercolon =~s/_/:/;
my ($uname,$udom)=split(/_/,$user);
my %newrecord;	my %newrecord;
my $updateflag = 0;	my $updateflag = 0;
$line .= '<td>'.&nameUserString(undef,$$fullname{$usercolon},$uname,$udom).'</td>';	$line .= '<td>'.&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
my $usec=$classlist->{"$uname:$udom"}[5];	my $usec=$classlist->{"$uname:$udom"}[5];
if (!&canmodify($usec)) {	if (!&canmodify($usec)) {
my $numcols=scalar(@partid)*4+2;	my $numcols=scalar(@partid)*4+2;
Line 2800 sub editgrades {	Line 3001 sub editgrades {
}	}
my %aggregate = ();	my %aggregate = ();
my $aggregateflag = 0;	my $aggregateflag = 0;
	$user=~s/:/_/; # colon doen't work in javascript for names
foreach (@partid) {	foreach (@partid) {
my $old_aw = $env{'form.GD_'.$user.'_'.$_.'_awarded_s'};	my $old_aw = $env{'form.GD_'.$user.'_'.$_.'_awarded_s'};
my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1);	my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1);
Line 2819 sub editgrades {	Line 3021 sub editgrades {
my $dropMenu = $env{'form.GD_'.$user.'_'.$_.'_solved'};	my $dropMenu = $env{'form.GD_'.$user.'_'.$_.'_solved'};
$score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));	$score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));

	$newrecord{'resource.'.$_.'.regrader'}=
	"$env{'user.name'}:$env{'user.domain'}";
if ($dropMenu eq 'reset status' &&	if ($dropMenu eq 'reset status' &&
$old_score ne '') { # ignore if no previous attempts => nothing to reset	$old_score ne '') { # ignore if no previous attempts => nothing to reset
$newrecord{'resource.'.$_.'.tries'} = 0;	$newrecord{'resource.'.$_.'.tries'} = '';
$newrecord{'resource.'.$_.'.solved'} = '';	$newrecord{'resource.'.$_.'.solved'} = '';
$newrecord{'resource.'.$_.'.award'} = '';	$newrecord{'resource.'.$_.'.award'} = '';
$newrecord{'resource.'.$_.'.awarded'} = 0;	$newrecord{'resource.'.$_.'.awarded'} = '';
$newrecord{'resource.'.$_.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
$updateflag = 1;	$updateflag = 1;
if ($env{'form.GD_'.$user.'_'.$_.'_aggtries'} > 0) {	if ($env{'form.GD_'.$user.'_'.$_.'_aggtries'} > 0) {
my $aggtries = $env{'form.GD_'.$user.'_'.$_.'_aggtries'};	my $aggtries = $env{'form.GD_'.$user.'_'.$_.'_aggtries'};
Line 2863 sub editgrades {	Line 3066 sub editgrades {
}	}
}	}
$line.='</tr>'."\n";	$line.='</tr>'."\n";

	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};

if ($updateflag) {	if ($updateflag) {
$count++;	$count++;
&Apache::lonnet::cstore(\%newrecord,$symb,$env{'request.course.id'},	&Apache::lonnet::cstore(\%newrecord,$symb,$env{'request.course.id'},
$udom,$uname);	$udom,$uname);

	if (&Apache::bridgetask::in_queue('gradingqueue',$symb,$cdom,
	$cnum,$udom,$uname)) {
	# need to figure out if should be in queue.
	my %record =
	&Apache::lonnet::restore($symb,$env{'request.course.id'},
	$udom,$uname);
	my $all_graded = 1;
	my $none_graded = 1;
	foreach my $part (@parts) {
	if ( $record{'resource.'.$part.'.awarded'} eq '' ) {
	$all_graded = 0;
	} else {
	$none_graded = 0;
	}
	}

	if ($all_graded \|\| $none_graded) {
	&Apache::bridgetask::remove_from_queue('gradingqueue',
	$symb,$cdom,$cnum,
	$udom,$uname);
	}
	}

$result.='<tr bgcolor="#ffffde"><td align="right"> '.$updateCtr.' </td>'.$line;	$result.='<tr bgcolor="#ffffde"><td align="right"> '.$updateCtr.' </td>'.$line;
$updateCtr++;	$updateCtr++;
} else {	} else {
Line 2875 sub editgrades {	Line 3106 sub editgrades {
}	}
if ($aggregateflag) {	if ($aggregateflag) {
&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
$env{'course.'.$env{'request.course.id'}.'.domain'},	$cdom,$cnum);
$env{'course.'.$env{'request.course.id'}.'.num'});
}	}
}	}
if ($noupdate) {	if ($noupdate) {
Line 2885 sub editgrades {	Line 3115 sub editgrades {
$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr><tr bgcolor="#ffffde">'.$noupdate;	$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr><tr bgcolor="#ffffde">'.$noupdate;
}	}
$result .= '</table></td></tr></table>'."\n".	$result .= '</table></td></tr></table>'."\n".
&show_grading_menu_form ($symb,$url);	&show_grading_menu_form ($symb);
my $msg = '<br /><b>Number of records updated = '.$rec_update.	my $msg = '<br /><b>Number of records updated = '.$rec_update.
' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'.	' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'.
'<b>Total number of students = '.$env{'form.total'}.'</b><br />';	'<b>Total number of students = '.$env{'form.total'}.'</b><br />';
Line 2988 ENDPICK	Line 3218 ENDPICK
}	}

sub csvuploadmap_header {	sub csvuploadmap_header {
my ($request,$symb,$url,$datatoken,$distotal)= @_;	my ($request,$symb,$datatoken,$distotal)= @_;
my $javascript;	my $javascript;
if ($env{'form.upfile_associate'} eq 'reverse') {	if ($env{'form.upfile_associate'} eq 'reverse') {
$javascript=&csvupload_javascript_reverse_associate();	$javascript=&csvupload_javascript_reverse_associate();
Line 2996 sub csvuploadmap_header {	Line 3226 sub csvuploadmap_header {
$javascript=&csvupload_javascript_forward_associate();	$javascript=&csvupload_javascript_forward_associate();
}	}

my ($result) = &showResourceInfo($url,$env{'form.probTitle'});	my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');	my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
my $ignore=&mt('Ignore First Line');	my $ignore=&mt('Ignore First Line');
$request->print(<<ENDPICK);	$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<h3><font color="#339933">Uploading Class Grades</font></h3>	<h3><font color="#339933">Uploading Class Grades</font></h3>
$result	$result
<hr>	<hr />
<h3>Identify fields</h3>	<h3>Identify fields</h3>
Total number of records found in file: $distotal <hr />	Total number of records found in file: $distotal <hr />
Enter as many fields as you can. The system will inform you and bring you back	Enter as many fields as you can. The system will inform you and bring you back
Line 3018 to this page if the data selected is ins	Line 3248 to this page if the data selected is ins
<input type="hidden" name="upfile_associate"	<input type="hidden" name="upfile_associate"
value="$env{'form.upfile_associate'}" />	value="$env{'form.upfile_associate'}" />
<input type="hidden" name="symb" value="$symb" />	<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="url" value="$url" />
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />	<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="command" value="csvuploadoptions" />	<input type="hidden" name="command" value="csvuploadoptions" />
Line 3032 ENDPICK	Line 3261 ENDPICK
}	}

sub csvupload_fields {	sub csvupload_fields {
my ($url,$symb) = @_;	my ($symb) = @_;
my (@parts) = &getpartlist($url,$symb);	my (@parts) = &getpartlist($symb);
my @fields=(['ID','Student ID'],	my @fields=(['ID','Student ID'],
['username','Student Username'],	['username','Student Username'],
['domain','Student Domain']);	['domain','Student Domain']);
	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');
Line 3062 sub csvuploadmap_footer {	Line 3292 sub csvuploadmap_footer {
ENDPICK	ENDPICK
}	}

sub upcsvScores_form {	sub checkforfile_js {
my ($request) = shift;
my ($symb,$url)=&get_symb_and_url($request);
if (!$symb) {return '';}
my $result =<<CSVFORMJS;	my $result =<<CSVFORMJS;
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function checkUpload(formname) {	function checkUpload(formname) {
Line 3077 sub upcsvScores_form {	Line 3304 sub upcsvScores_form {
}	}
</script>	</script>
CSVFORMJS	CSVFORMJS
	return $result;
	}

	sub upcsvScores_form {
	my ($request) = shift;
	my ($symb)=&get_symb($request);
	if (!$symb) {return '';}
	my $result=&checkforfile_js();
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);	$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
my ($table) = &showResourceInfo($url,$env{'form.probTitle'});	my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
$result.=$table;	$result.=$table;
$result.='<br /><table width=100% border=0><tr><td bgcolor="#777777">'."\n";	$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
$result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";	$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
$result.=' <b>Specify a file containing the class scores for current resource'.	$result.=' <b>Specify a file containing the class scores for current resource'.
'.</b></td></tr>'."\n";	'.</b></td></tr>'."\n";
$result.='<tr bgcolor=#ffffe6><td>'."\n";	$result.='<tr bgcolor=#ffffe6><td>'."\n";
Line 3090 CSVFORMJS	Line 3325 CSVFORMJS
$result.=<<ENDUPFORM;	$result.=<<ENDUPFORM;
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<input type="hidden" name="symb" value="$symb" />	<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="url" value="$url" />
<input type="hidden" name="command" value="csvuploadmap" />	<input type="hidden" name="command" value="csvuploadmap" />
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />	<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
$upfile_select	$upfile_select
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />	<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />
<label><input type="checkbox" name="noFirstLine" />$ignore</lable>	<label><input type="checkbox" name="noFirstLine" />$ignore</label>
</form>	</form>
ENDUPFORM	ENDUPFORM
$result.='</td></tr></table>'."\n";	$result.='</td></tr></table>'."\n";
$result.='</td></tr></table><br /><br />'."\n";	$result.='</td></tr></table><br /><br />'."\n";
$result.=&show_grading_menu_form($symb,$url);	$result.=&show_grading_menu_form($symb);
return $result;	return $result;
}	}


sub csvuploadmap {	sub csvuploadmap {
my ($request)= @_;	my ($request)= @_;
my ($symb,$url)=&get_symb_and_url($request);	my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}

my $datatoken;	my $datatoken;
Line 3120 sub csvuploadmap {	Line 3354 sub csvuploadmap {
}	}
my @records=&Apache::loncommon::upfile_record_sep();	my @records=&Apache::loncommon::upfile_record_sep();
if ($env{'form.noFirstLine'}) { shift(@records); }	if ($env{'form.noFirstLine'}) { shift(@records); }
&csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);	&csvuploadmap_header($request,$symb,$datatoken,$#records+1);
my ($i,$keyfields);	my ($i,$keyfields);
if (@records) {	if (@records) {
my @fields=&csvupload_fields($url,$symb);	my @fields=&csvupload_fields($symb);

if ($env{'form.upfile_associate'} eq 'reverse') {	if ($env{'form.upfile_associate'} eq 'reverse') {
&Apache::loncommon::csv_print_samples($request,\@records);	&Apache::loncommon::csv_print_samples($request,\@records);
Line 3135 sub csvuploadmap {	Line 3369 sub csvuploadmap {
unshift(@fields,['none','']);	unshift(@fields,['none','']);
$i=&Apache::loncommon::csv_samples_select_table($request,\@records,	$i=&Apache::loncommon::csv_samples_select_table($request,\@records,
\@fields);	\@fields);
my %sone=&Apache::loncommon::record_sep($records[0]);	foreach my $rec (@records) {
$keyfields=join(',',sort(keys(%sone)));	my %temp = &Apache::loncommon::record_sep($rec);
	if (%temp) {
	$keyfields=join(',',sort(keys(%temp)));
	last;
	}
	}
}	}
}	}
&csvuploadmap_footer($request,$i,$keyfields);	&csvuploadmap_footer($request,$i,$keyfields);
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));

return '';	return '';
}	}

sub csvuploadoptions {	sub csvuploadoptions {
my ($request)= @_;	my ($request)= @_;
my ($symb,$url)=&get_symb_and_url($request);	my ($symb)=&get_symb($request);
my $checked=(($env{'form.noFirstLine'})?'1':'0');	my $checked=(($env{'form.noFirstLine'})?'1':'0');
my $ignore=&mt('Ignore First Line');	my $ignore=&mt('Ignore First Line');
$request->print(<<ENDPICK);	$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<h3><font color="#339933">Uploading Class Grade Options</font></h3>	<h3><font color="#339933">Uploading Class Grade Options</font></h3>
<input type="hidden" name="command" value="csvuploadassign" />	<input type="hidden" name="command" value="csvuploadassign" />
<input type="submit" value="Assign Grades" /><br />	<!--
<p>	<p>
<label>	<label>
<input type="checkbox" name="show_full_results" />	<input type="checkbox" name="show_full_results" />
Show a table of all changes	Show a table of all changes
</label>	</label>
</p>	</p>
	-->
<p>	<p>
<label>	<label>
<input type="checkbox" name="overwite_scores" checked="checked" />	<input type="checkbox" name="overwite_scores" checked="checked" />
Line 3182 ENDPICK	Line 3422 ENDPICK
}	}
# FIXME do a check for any duplicated user ids...	# FIXME do a check for any duplicated user ids...
# FIXME do a check for any invalid user ids?...	# FIXME do a check for any invalid user ids?...
$request->print("<hr /></form>\n");	$request->print('<input type="submit" value="Assign Grades" /><br />
$request->print(&show_grading_menu_form($symb,$url));	<hr /></form>'."\n");
	$request->print(&show_grading_menu_form($symb));
return '';	return '';
}	}

Line 3206 sub get_fields {	Line 3447 sub get_fields {

sub csvuploadassign {	sub csvuploadassign {
my ($request)= @_;	my ($request)= @_;
my ($symb,$url)=&get_symb_and_url($request);	my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
&Apache::loncommon::load_tmp_file($request);	&Apache::loncommon::load_tmp_file($request);
my @gradedata = &Apache::loncommon::upfile_record_sep();	my @gradedata = &Apache::loncommon::upfile_record_sep();
Line 3278 sub csvuploadassign {	Line 3519 sub csvuploadassign {
if (! %grades) { push(@skipped,"$username:$domain no data to store"); }	if (! %grades) { push(@skipped,"$username:$domain no data to store"); }
$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";	$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
# &Apache::lonnet::logthis(" storing ".(join('-',%grades)));	# &Apache::lonnet::logthis(" storing ".(join('-',%grades)));
&Apache::lonnet::cstore(\%grades,$symb,$env{'request.course.id'},	my $result=&Apache::lonnet::cstore(\%grades,$symb,
$domain,$username);	$env{'request.course.id'},
$request->print('.');	$domain,$username);
	if ($result eq 'ok') {
	$request->print('.');
	} else {
	$request->print("<p>
	<font color='red'>
	Failed to store student $username\@$domain.
	Message when trying to store was ($result)
	</font>
	</p>" );
	}
$request->rflush();	$request->rflush();
$countdone++;	$countdone++;
}	}
$request->print("<br />Stored $countdone students\n");	$request->print("<br />Stored $countdone students\n");
if (@skipped) {	if (@skipped) {
$request->print('<p<font size="+1"><b>Skipped Students</b></font></p>');	$request->print('<p><font size="+1"><b>Skipped Students</b></font></p>');
foreach my $student (@skipped) { $request->print("$student<br />\n"); }	foreach my $student (@skipped) { $request->print("$student<br />\n"); }
}	}
if (@notallowed) {	if (@notallowed) {
Line 3294 sub csvuploadassign {	Line 3545 sub csvuploadassign {
foreach my $student (@notallowed) { $request->print("$student<br />\n"); }	foreach my $student (@notallowed) { $request->print("$student<br />\n"); }
}	}
$request->print("<br />\n");	$request->print("<br />\n");
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));
return '';	return '';
}	}
#------------- end of section for handling csv file upload ---------	#------------- end of section for handling csv file upload ---------
Line 3324 function checkPickOne(formname) {	Line 3575 function checkPickOne(formname) {
</script>	</script>
LISTJAVASCRIPT	LISTJAVASCRIPT
&commonJSfunctions($request);	&commonJSfunctions($request);
my ($symb,$url) = &get_symb_and_url($request);	my ($symb) = &get_symb($request);
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 3346 LISTJAVASCRIPT	Line 3597 LISTJAVASCRIPT
'>'.$showtitle.'</option>'."\n";	'>'.$showtitle.'</option>'."\n";
$ctr++;	$ctr++;
}	}
$result.= '</select>'."<br>\n";	$result.= '</select>'."<br />\n";
$ctr=0;	$ctr=0;
foreach (@$titles) {	foreach (@$titles) {
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
Line 3357 LISTJAVASCRIPT	Line 3608 LISTJAVASCRIPT
$result.='<input type="hidden" name="page" />'."\n".	$result.='<input type="hidden" name="page" />'."\n".
'<input type="hidden" name="title" />'."\n";	'<input type="hidden" name="title" />'."\n";

$result.=' <b>View Problems Text: </b><input type="radio" name="vProb" value="no" checked="on" /> no '."\n".	$result.=' <b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".
'<input type="radio" name="vProb" value="yes" /> yes '."<br>\n";	'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n";

$result.=' <b>Submission Details: </b>'.	$result.=' <b>Submission Details: </b>'.
'<input type="radio" name="lastSub" value="none" /> none'."\n".	'<label><input type="radio" name="lastSub" value="none" /> none</label>'."\n".
'<input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions'."\n".	'<label><input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions</label>'."\n".
'<input type="radio" name="lastSub" value="all" /> all details'."\n";	'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n";

$result.='<input type="hidden" name="section" value="'.$getsec.'" />'."\n".	$result.='<input type="hidden" name="section" value="'.$getsec.'" />'."\n".
'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".	'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".
'<input type="hidden" name="command" value="displayPage" />'."\n".	'<input type="hidden" name="command" value="displayPage" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";

Line 3377 LISTJAVASCRIPT	Line 3627 LISTJAVASCRIPT

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

my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</b><br>'.	my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</b><br />'.
'<table border="0"><tr><td bgcolor="#777777">'.	'<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">'.	'<table border="0"><tr bgcolor="#e6ffff">'.
'<td align="right"> <b>No.</b></td>'.	'<td align="right"> <b>No.</b></td>'.
Line 3387 LISTJAVASCRIPT	Line 3637 LISTJAVASCRIPT

my (undef,undef,$fullname) = &getclasslist($getsec,'1');	my (undef,undef,$fullname) = &getclasslist($getsec,'1');
my $ptr = 1;	my $ptr = 1;
foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {	foreach my $student (sort
	{
	if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
	return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
	}
	return $a cmp $b;
	} (keys(%$fullname))) {
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);
$studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>');	$studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>');
$studentTable.='<td align="right">'.$ptr.' </td>';	$studentTable.='<td align="right">'.$ptr.' </td>';
$studentTable.='<td> <input type="radio" name="student" value="'.$student.'" /> '	$studentTable.='<td> <label><input type="radio" name="student" value="'.$student.'" /> '
.&nameUserString(undef,$$fullname{$student},$uname,$udom)."\n";	.&nameUserString(undef,$$fullname{$student},$uname,$udom)."</label>\n";
$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');	$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
$ptr++;	$ptr++;
}	}
Line 3401 LISTJAVASCRIPT	Line 3657 LISTJAVASCRIPT
$studentTable.='<input type="button" '.	$studentTable.='<input type="button" '.
'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";	'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";

$studentTable.=&show_grading_menu_form($symb,$url);	$studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);	$request->print($studentTable);

return '';	return '';
Line 3434 sub getSymbMap {	Line 3690 sub getSymbMap {
sub displayPage {	sub displayPage {
my ($request) = shift;	my ($request) = shift;

my ($symb,$url) = &get_symb_and_url($request);	my ($symb) = &get_symb($request);
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 3452 sub displayPage {	Line 3708 sub displayPage {

if (!&canview($usec)) {	if (!&canview($usec)) {
$request->print('<font color="red">Unable to view requested student.('.$env{'form.student'}.')</font>');	$request->print('<font color="red">Unable to view requested student.('.$env{'form.student'}.')</font>');
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>';	my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>';
Line 3464 sub displayPage {	Line 3720 sub displayPage {
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});	my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
	if (!$map) {
	$request->print('<font color="red">Unable to view requested sequence. ('.$resUrl.')</font>');
	$request->print(&show_grading_menu_form($symb));
	return;
	}
my $iterator = $navmap->getIterator($map->map_start(),	my $iterator = $navmap->getIterator($map->map_start(),
$map->map_finish());	$map->map_finish());

Line 3474 sub displayPage {	Line 3734 sub displayPage {
'<input type="hidden" name="student" value="'.$env{'form.student'}.'" />'."\n".	'<input type="hidden" name="student" value="'.$env{'form.student'}.'" />'."\n".
'<input type="hidden" name="page" value="'.$pageTitle.'" />'."\n".	'<input type="hidden" name="page" value="'.$pageTitle.'" />'."\n".
'<input type="hidden" name="title" value="'.$env{'form.title'}.'" />'."\n".	'<input type="hidden" name="title" value="'.$env{'form.title'}.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="overRideScore" value="no" />'."\n".	'<input type="hidden" name="overRideScore" value="no" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";
Line 3501 sub displayPage {	Line 3760 sub displayPage {
my $title = $curRes->compTitle();	my $title = $curRes->compTitle();
my $symbx = $curRes->symb();	my $symbx = $curRes->symb();
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.	$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).' parts)').'</td>';	(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';
$studentTable.='<td valign="top">';	$studentTable.='<td valign="top">';
if ($env{'form.vProb'} eq 'yes' ) {	if ($env{'form.vProb'} eq 'yes' ) {
$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,	$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
Line 3512 sub displayPage {	Line 3771 sub displayPage {
$companswer =~ s\|</form>\|\|g;	$companswer =~ s\|</form>\|\|g;
# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>	# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
# $companswer =~ s/$1/ /ms;	# $companswer =~ s/$1/ /ms;
# $request->print('match='.$1."<br>\n");	# $request->print('match='.$1."<br />\n");
# }	# }
# $companswer =~ s\|<table border=\"1\">\|<table border=\"0\">\|g;	# $companswer =~ s\|<table border=\"1\">\|<table border=\"0\">\|g;
$studentTable.=' <b>'.$title.'</b> <br> <b>Correct answer:</b><br>'.$companswer;	$studentTable.=' <b>'.$title.'</b> <br /> <b>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);
Line 3562 sub displayPage {	Line 3821 sub displayPage {
'<input type="button" value="Save" '.	'<input type="button" value="Save" '.
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
'</form>'."\n";	'</form>'."\n";
$studentTable.=&show_grading_menu_form($symb,$url);	$studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);	$request->print($studentTable);

return '';	return '';
Line 3596 sub displaySubByDates {	Line 3855 sub displaySubByDates {
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
my @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);	my @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);
# next if ($$record{"$version:resource.$partid.solved"} eq '');	# next if ($$record{"$version:resource.$partid.solved"} eq '');
my $display_part=&get_display_part($partid,undef,$symb);	my $display_part=&get_display_part($partid,$symb);
foreach my $matchKey (@matchKey) {	foreach my $matchKey (@matchKey) {
if (exists($$record{$version.':'.$matchKey}) &&	if (exists($$record{$version.':'.$matchKey}) &&
$$record{$version.':'.$matchKey} ne '') {	$$record{$version.':'.$matchKey} ne '') {
Line 3658 sub updateGradeByPage {	Line 3917 sub updateGradeByPage {
my $usec=$classlist->{$env{'form.student'}}[5];	my $usec=$classlist->{$env{'form.student'}}[5];
if (!&canmodify($usec)) {	if (!&canmodify($usec)) {
$request->print('<font color="red">Unable to modify requested student.('.$env{'form.student'}.'</font>');	$request->print('<font color="red">Unable to modify requested student.('.$env{'form.student'}.'</font>');
$request->print(&show_grading_menu_form($env{'form.symb'},$env{'form.url'}));	$request->print(&show_grading_menu_form($env{'form.symb'}));
return;	return;
}	}
my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>';	my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>';
Line 3670 sub updateGradeByPage {	Line 3929 sub updateGradeByPage {
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});	my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
	if (!$map) {
	$request->print('<font color="red">Unable to grade requested sequence. ('.$resUrl.')</font>');
	my ($symb)=&get_symb($request);
	$request->print(&show_grading_menu_form($symb));
	return;
	}
my $iterator = $navmap->getIterator($map->map_start(),	my $iterator = $navmap->getIterator($map->map_start(),
$map->map_finish());	$map->map_finish());

Line 3693 sub updateGradeByPage {	Line 3957 sub updateGradeByPage {
my $title = $curRes->compTitle();	my $title = $curRes->compTitle();
my $symbx = $curRes->symb();	my $symbx = $curRes->symb();
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.	$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).' parts)').'</td>';	(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';	$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';

my %newrecord=();	my %newrecord=();
Line 3735 sub updateGradeByPage {	Line 3999 sub updateGradeByPage {
$aggregateflag = 1;	$aggregateflag = 1;
}	}
}	}
my $display_part=&get_display_part($partid,undef,	my $display_part=&get_display_part($partid,$curRes->symb());
$curRes->symb());
my $oldstatus = $env{'form.solved'.$question.'_'.$partid};	my $oldstatus = $env{'form.solved'.$question.'_'.$partid};
$displayPts[0].=' <b>Part:</b> '.$display_part.' = '.	$displayPts[0].=' <b>Part:</b> '.$display_part.' = '.
(($oldstatus eq 'excused') ? 'excused' : $oldpts).	(($oldstatus eq 'excused') ? 'excused' : $oldpts).
' <br>';	' <br />';
$displayPts[1].=' <b>Part:</b> '.$display_part.' = '.	$displayPts[1].=' <b>Part:</b> '.$display_part.' = '.
(($score eq 'excused') ? 'excused' : $newpts).	(($score eq 'excused') ? 'excused' : $newpts).
' <br>';	' <br />';

$question++;	$question++;
next if ($dropMenu eq 'reset status' \|\| ($newpts == $oldpts && $score ne 'excused'));	next if ($dropMenu eq 'reset status' \|\| ($newpts == $oldpts && $score ne 'excused'));
Line 3775 sub updateGradeByPage {	Line 4038 sub updateGradeByPage {
}	}

$studentTable.='</td></tr></table></td></tr></table>';	$studentTable.='</td></tr></table></td></tr></table>';
$studentTable.=&show_grading_menu_form($env{'form.symb'},$env{'form.url'});	$studentTable.=&show_grading_menu_form($env{'form.symb'});
my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :	my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
'The scores were changed for '.	'The scores were changed for '.
$changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));	$changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
Line 3793 sub updateGradeByPage {	Line 4056 sub updateGradeByPage {
#------ start of section for handling grading by page/sequence ---------	#------ start of section for handling grading by page/sequence ---------

sub defaultFormData {	sub defaultFormData {
my ($symb,$url)=@_;	my ($symb)=@_;
return '	return '
<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
}	}
Line 3865 sub scantron_CODElist {	Line 4127 sub scantron_CODElist {
my $namechoice='<option></option>';	my $namechoice='<option></option>';
foreach my $name (sort {uc($a) cmp uc($b)} @names) {	foreach my $name (sort {uc($a) cmp uc($b)} @names) {
if ($name =~ /^error: 2 /) { next; }	if ($name =~ /^error: 2 /) { next; }
	if ($name =~ /^type\0/) { next; }
$namechoice.='<option value="'.$name.'">'.$name.'</option>';	$namechoice.='<option value="'.$name.'">'.$name.'</option>';
}	}
$namechoice='<select name="scantron_CODElist">'.$namechoice.'</select>';	$namechoice='<select name="scantron_CODElist">'.$namechoice.'</select>';
Line 3874 sub scantron_CODElist {	Line 4137 sub scantron_CODElist {
sub scantron_CODEunique {	sub scantron_CODEunique {
my $result='<nobr>	my $result='<nobr>
<label><input type="radio" name="scantron_CODEunique"	<label><input type="radio" name="scantron_CODEunique"
value="Yes" checked="on" /> Yes </label>	value="yes" checked="checked" /> Yes </label>
</nobr>	</nobr>
<nobr>	<nobr>
<label><input type="radio" name="scantron_CODEunique"	<label><input type="radio" name="scantron_CODEunique"
value="No" /> No </label>	value="no" /> No </label>
</nobr>';	</nobr>';
return $result;	return $result;
}	}

sub scantron_selectphase {	sub scantron_selectphase {
my ($r,$file2grade) = @_;	my ($r,$file2grade) = @_;
my ($symb,$url)=&get_symb_and_url($r);	my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $sequence_selector=&getSequenceDropDown($r,$symb);	my $sequence_selector=&getSequenceDropDown($r,$symb);
my $default_form_data=&defaultFormData($symb,$url);	my $default_form_data=&defaultFormData($symb);
my $grading_menu_button=&show_grading_menu_form($symb,$url);	my $grading_menu_button=&show_grading_menu_form($symb);
my $file_selector=&scantron_uploads($file2grade);	my $file_selector=&scantron_uploads($file2grade);
my $format_selector=&scantron_scantab();	my $format_selector=&scantron_scantab();
my $CODE_selector=&scantron_CODElist();	my $CODE_selector=&scantron_CODElist();
Line 3960 SCANTRONFORM	Line 4223 SCANTRONFORM
<tr bgcolor="#ffffe6">	<tr bgcolor="#ffffe6">
<td>	<td>
SCANTRONFORM	SCANTRONFORM
my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));	my $default_form_data=&defaultFormData(&get_symb($r,1));
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'};
$r->print(<<UPLOAD);	$r->print(<<UPLOAD);
Line 4009 SCANTRONFORM	Line 4272 SCANTRONFORM
</tr>	</tr>
<tr bgcolor="#ffffe6">	<tr bgcolor="#ffffe6">
<td colspan="2">	<td colspan="2">
<input type="submit" value="Show List of Files" />	<input type="submit" value="Download: Show List of Associated Files" />
</td>	</td>
</tr>	</tr>
</table>	</table>
Line 4108 sub scantron_fixup_scanline {	Line 4371 sub scantron_fixup_scanline {
&scan_data($scan_data,	&scan_data($scan_data,
"$whichline.no_bubble.".$args->{'question'},'1');	"$whichline.no_bubble.".$args->{'question'},'1');
} else {	} else {
substr($answer,$args->{'response'},1)=$on;	if ($on eq 'letter') {
	my @alphabet=('A'..'Z');
	$answer=$alphabet[$args->{'response'}];
	} elsif ($on eq 'number') {
	$answer=$args->{'response'}+1;
	} else {
	substr($answer,$args->{'response'},1)=$on;
	}
&scan_data($scan_data,	&scan_data($scan_data,
"$whichline.no_bubble.".$args->{'question'},undef,'1');	"$whichline.no_bubble.".$args->{'question'},undef,'1');
}	}
Line 4133 sub scantron_parse_scanline {	Line 4403 sub scantron_parse_scanline {
my %record;	my %record;
my $questions=substr($line,$$scantron_config{'Qstart'}-1);	my $questions=substr($line,$$scantron_config{'Qstart'}-1);
my $data=substr($line,0,$$scantron_config{'Qstart'}-1);	my $data=substr($line,0,$$scantron_config{'Qstart'}-1);
if ($$scantron_config{'CODElocation'} ne 0) {	if (!($$scantron_config{'CODElocation'} eq 0 \|\|
if ($$scantron_config{'CODElocation'} < 0) {	$$scantron_config{'CODElocation'} eq 'none')) {
	if ($$scantron_config{'CODElocation'} < 0 \|\|
	$$scantron_config{'CODElocation'} eq 'letter' \|\|
	$$scantron_config{'CODElocation'} eq 'number') {
$record{'scantron.CODE'}=substr($data,	$record{'scantron.CODE'}=substr($data,
$$scantron_config{'CODEstart'}-1,	$$scantron_config{'CODEstart'}-1,
$$scantron_config{'CODElength'});	$$scantron_config{'CODElength'});
Line 4169 sub scantron_parse_scanline {	Line 4442 sub scantron_parse_scanline {
substr($questions,0,$$scantron_config{'Qlength'})='';	substr($questions,0,$$scantron_config{'Qlength'})='';
if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }	if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }
if ($$scantron_config{'Qon'} eq 'letter') {	if ($$scantron_config{'Qon'} eq 'letter') {
if (!$currentquest \|\| $currentquest eq $$scantron_config{'Qoff'} \|\|	if ($currentquest eq '?') {
$currentquest !~ /^[A-Z]$/) {	push(@{$record{'scantron.doubleerror'}},$questnum);
	$record{"scantron.$questnum.answer"}='';
	} elsif (!$currentquest
	\|\| $currentquest eq $$scantron_config{'Qoff'}
	\|\| $currentquest !~ /^[A-Z]$/) {
$record{"scantron.$questnum.answer"}='';	$record{"scantron.$questnum.answer"}='';
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {	if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);	push(@{$record{"scantron.missingerror"}},$questnum);
Line 4179 sub scantron_parse_scanline {	Line 4456 sub scantron_parse_scanline {
$record{"scantron.$questnum.answer"}=$currentquest;	$record{"scantron.$questnum.answer"}=$currentquest;
}	}
} elsif ($$scantron_config{'Qon'} eq 'number') {	} elsif ($$scantron_config{'Qon'} eq 'number') {
if (!$currentquest \|\| $currentquest eq $$scantron_config{'Qoff'} \|\|	if ($currentquest eq '?') {
$currentquest !~ /^\d$/) {	push(@{$record{'scantron.doubleerror'}},$questnum);
	$record{"scantron.$questnum.answer"}='';
	} elsif (!$currentquest
	\|\| $currentquest eq $$scantron_config{'Qoff'}
	\|\| $currentquest !~ /^\d$/) {
$record{"scantron.$questnum.answer"}='';	$record{"scantron.$questnum.answer"}='';
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {	if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);	push(@{$record{"scantron.missingerror"}},$questnum);
Line 4297 sub scantron_process_corrections {	Line 4578 sub scantron_process_corrections {
}	}
}	}
if ($err) {	if ($err) {
$r->print("Unable to accept last correction, an error occurred :$errmsg:");	$r->print("<font color='red'>Unable to accept last correction, an error occurred :$errmsg:</font>");
} else {	} else {
&scantron_put_line($scanlines,$scan_data,$which,$line,$skip);	&scantron_put_line($scanlines,$scan_data,$which,$line,$skip);
&scantron_putfile($scanlines,$scan_data);	&scantron_putfile($scanlines,$scan_data);
Line 4351 sub check_for_error {	Line 4632 sub check_for_error {
sub scantron_warning_screen {	sub scantron_warning_screen {
my ($button_text)=@_;	my ($button_text)=@_;
my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});	my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
	my $CODElist="a";
	if ($scantron_config{'CODElocation'} &&
	$scantron_config{'CODEstart'} &&
	$scantron_config{'CODElength'}) {
	$CODElist=$env{'form.scantron_CODElist'};
	if ($CODElist eq '') { $CODElist='<font color="red">None</font>'; }
	$CODElist=
	'<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.
	$CODElist.'</tt></td></tr>';
	}
return (<<STUFF);	return (<<STUFF);
<p>	<p>
<font color="red">Please double check the information	<font color="red">Please double check the information
below before clicking on '$button_text'</font>	below before clicking on '$button_text'</font>
</p>	</p>
<table>	<table>
<tr><td><b>Sequence To be Graded:</b></td><td>$title</td></tr>	<tr><td><b>Sequence to be Graded:</b></td><td>$title</td></tr>
<tr><td><b>Data File that will be used:</b></td><td><tt>$env{'form.scantron_selectfile'}</tt></td></tr>	<tr><td><b>Data File that will be used:</b></td><td><tt>$env{'form.scantron_selectfile'}</tt></td></tr>
	$CODElist
</table>	</table>
</font>	</font>
<br />	<br />
Line 4371 STUFF	Line 4664 STUFF

sub scantron_do_warning {	sub scantron_do_warning {
my ($r)=@_;	my ($r)=@_;
my ($symb,$url)=&get_symb_and_url($r);	my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $default_form_data=&defaultFormData($symb,$url);	my $default_form_data=&defaultFormData($symb);
$r->print(&scantron_form_start().$default_form_data);	$r->print(&scantron_form_start().$default_form_data);
if ( $env{'form.selectpage'} eq '' \|\|	if ( $env{'form.selectpage'} eq '' \|\|
$env{'form.scantron_selectfile'} eq '' \|\|	$env{'form.scantron_selectfile'} eq '' \|\|
Line 4396 $warning	Line 4689 $warning
<input type="hidden" name="command" value="scantron_validate" />	<input type="hidden" name="command" value="scantron_validate" />
STUFF	STUFF
}	}
$r->print("</form><br />".&show_grading_menu_form($symb,$url)."</body></html>");	$r->print("</form><br />".&show_grading_menu_form($symb)."</body></html>");
return '';	return '';
}	}

Line 4418 SCANTRONFORM	Line 4711 SCANTRONFORM

sub scantron_validate_file {	sub scantron_validate_file {
my ($r) = @_;	my ($r) = @_;
my ($symb,$url)=&get_symb_and_url($r);	my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $default_form_data=&defaultFormData($symb,$url);	my $default_form_data=&defaultFormData($symb);

# do the detection of only doing skipped records first befroe we delete	# do the detection of only doing skipped records first befroe we delete
# them when doing the corrections reset	# them when doing the corrections reset
Line 4488 STUFF	Line 4781 STUFF
$r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");	$r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");
$r->print(" this scanline saving it for later.");	$r->print(" this scanline saving it for later.");
}	}
$r->print(" </form><br />".&show_grading_menu_form($symb,$url).	$r->print(" </form><br />".&show_grading_menu_form($symb).
"</body></html>");	"</body></html>");
return '';	return '';
}	}
Line 4565 sub lonnet_putfile {	Line 4858 sub lonnet_putfile {
my ($contents,$filename)=@_;	my ($contents,$filename)=@_;
my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};	my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $docuhome=$env{'course.'.$env{'request.course.id'}.'.home'};
$env{'form.sillywaytopassafilearound'}=$contents;	$env{'form.sillywaytopassafilearound'}=$contents;
&Apache::lonnet::finishuserfileupload($docuname,$docudom,$docuhome,'sillywaytopassafilearound',$filename);	&Apache::lonnet::finishuserfileupload($docuname,$docudom,'sillywaytopassafilearound',$filename);

}	}

Line 4738 sub scantron_get_correction {	Line 5030 sub scantron_get_correction {
if ($error eq 'incorrectCODE'	if ($error eq 'incorrectCODE'
&& $$scan_record{'scantron.CODE'}=~/\S/ ) {	&& $$scan_record{'scantron.CODE'}=~/\S/ ) {
my ($max,$closest)=&scantron_get_closely_matching_CODEs($arg,$$scan_record{'scantron.CODE'});	my ($max,$closest)=&scantron_get_closely_matching_CODEs($arg,$$scan_record{'scantron.CODE'});
foreach my $testcode (@{$closest}) {	if ($closest > 0) {
my $checked='';	foreach my $testcode (@{$closest}) {
if (!$i) { $checked=' checked="on" '; }	my $checked='';
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");	if (!$i) { $checked=' checked="on" '; }
$r->print("\n<br />");	$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
$i++;	$r->print("\n<br />");
	$i++;
	}
}	}
}	}
if ($$scan_record{'scantron.CODE'}=~/\S/ ) {	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
Line 4804 ENDSCRIPT	Line 5098 ENDSCRIPT
sub scantron_bubble_selector {	sub scantron_bubble_selector {
my ($r,$scan_config,$quest,@selected)=@_;	my ($r,$scan_config,$quest,@selected)=@_;
my $max=$$scan_config{'Qlength'};	my $max=$$scan_config{'Qlength'};

	my $scmode=$$scan_config{'Qon'};
	if ($scmode eq 'number' \|\| $scmode eq 'letter') { $max=10; }

my @alphabet=('A'..'Z');	my @alphabet=('A'..'Z');
$r->print("<table border='1'><tr><td rowspan='2'>$quest</td>");	$r->print("<table border='1'><tr><td rowspan='2'>$quest</td>");
for (my $i=0;$i<$max+1;$i++) {	for (my $i=0;$i<$max+1;$i++) {
$r->print('<td align="center">');	$r->print("\n".'<td align="center">');
if ($selected[0] eq $alphabet[$i]) { $r->print('X'); shift(@selected) }	if ($selected[0] eq $alphabet[$i]) { $r->print('X'); shift(@selected) }
else { $r->print(' '); }	else { $r->print(' '); }
$r->print('</td>');	$r->print('</td>');
}	}
$r->print('<td></td></tr><tr>');	$r->print('</tr><tr>');
for (my $i=0;$i<$max;$i++) {	for (my $i=0;$i<$max;$i++) {
$r->print('<td><label><input type="radio" name="scantron_correct_Q_'.	$r->print("\n".
	'<td><label><input type="radio" name="scantron_correct_Q_'.
$quest.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");	$quest.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");
}	}
$r->print('<td><label><input type="radio" name="scantron_correct_Q_'.	$r->print('<td><label><input type="radio" name="scantron_correct_Q_'.
Line 4844 sub scantron_get_closely_matching_CODEs	Line 5143 sub scantron_get_closely_matching_CODEs
}	}

sub get_codes {	sub get_codes {
my $old_name=$env{'form.scantron_CODElist'};	my ($old_name, $cdom, $cnum) = @_;
my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};	if (!$old_name) {
my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};	$old_name=$env{'form.scantron_CODElist'};
my %result=&Apache::lonnet::get('CODEs',[$old_name],$cdom,$cnum);	}
my %allcodes=map {(&Apache::lonprintout::num_to_letters($_),1)} split(',',$result{$old_name});	if (!$cdom) {
	$cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
	}
	if (!$cnum) {
	$cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
	}
	my %result=&Apache::lonnet::get('CODEs',[$old_name,"type\0$old_name"],
	$cdom,$cnum);
	my %allcodes;
	if ($result{"type\0$old_name"} eq 'number') {
	%allcodes=map {($_,1)} split(',',$result{$old_name});
	} else {
	%allcodes=map {(&Apache::lonprintout::num_to_letters($_),1)} split(',',$result{$old_name});
	}
return %allcodes;	return %allcodes;
}	}

Line 4986 sub scantron_validate_missingbubbles {	Line 5298 sub scantron_validate_missingbubbles {
sub scantron_process_students {	sub scantron_process_students {
my ($r) = @_;	my ($r) = @_;
my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'});	my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'});
my ($symb,$url)=&get_symb_and_url($r);	my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $default_form_data=&defaultFormData($symb,$url);	my $default_form_data=&defaultFormData($symb);

my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
Line 5077 SCANTRONFORM	Line 5389 SCANTRONFORM
# $r->print("<p>took $lasttime</p>");	# $r->print("<p>took $lasttime</p>");

$r->print("</form>");	$r->print("</form>");
$r->print(&show_grading_menu_form($symb,$url));	$r->print(&show_grading_menu_form($symb));
return '';	return '';
}	}

Line 5089 sub scantron_upload_scantron_data {	Line 5401 sub scantron_upload_scantron_data {
'coursename');	'coursename');
my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},	my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},
'domainid');	'domainid');
my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));	my $default_form_data=&defaultFormData(&get_symb($r,1));
$r->print(<<UPLOAD);	$r->print(<<UPLOAD);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function checkUpload(formname) {	function checkUpload(formname) {
Line 5119 UPLOAD	Line 5431 UPLOAD

sub scantron_upload_scantron_data_save {	sub scantron_upload_scantron_data_save {
my($r)=@_;	my($r)=@_;
my ($symb,$url)=&get_symb_and_url($r,1);	my ($symb)=&get_symb($r,1);
my $doanotherupload=	my $doanotherupload=
'<br /><form action="/adm/grades" method="post">'."\n".	'<br /><form action="/adm/grades" method="post">'."\n".
'<input type="hidden" name="command" value="scantronupload" />'."\n".	'<input type="hidden" name="command" value="scantronupload" />'."\n".
Line 5130 sub scantron_upload_scantron_data_save {	Line 5442 sub scantron_upload_scantron_data_save {
$env{'form.domainid'}.'_'.$env{'form.courseid'})) {	$env{'form.domainid'}.'_'.$env{'form.courseid'})) {
$r->print("You are not allowed to upload Scantron data to the requested course.<br />");	$r->print("You are not allowed to upload Scantron data to the requested course.<br />");
if ($symb) {	if ($symb) {
$r->print(&show_grading_menu_form($symb,$url));	$r->print(&show_grading_menu_form($symb));
} else {	} else {
$r->print($doanotherupload);	$r->print($doanotherupload);
}	}
Line 5138 sub scantron_upload_scantron_data_save {	Line 5450 sub scantron_upload_scantron_data_save {
}	}
my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});	my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
$r->print("Doing upload to ".$coursedata{'description'}." <br />");	$r->print("Doing upload to ".$coursedata{'description'}." <br />");
my $home=&Apache::lonnet::homeserver($env{'form.courseid'},
$env{'form.domainid'});
my $fname=$env{'form.upfile.filename'};	my $fname=$env{'form.upfile.filename'};
#FIXME	#FIXME
#copied from lonnet::userfileupload()	#copied from lonnet::userfileupload()
Line 5159 sub scantron_upload_scantron_data_save {	Line 5469 sub scantron_upload_scantron_data_save {
if (length($env{'form.upfile'}) < 2) {	if (length($env{'form.upfile'}) < 2) {
$r->print("<font color='red'>Error:</font> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");	$r->print("<font color='red'>Error:</font> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");
} else {	} else {
my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},$home,'upfile',$fname);	my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);
if ($result =~ m\|^/uploaded/\|) {	if ($result =~ m\|^/uploaded/\|) {
$r->print("<font color='green'>Success:</font> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");	$r->print("<font color='green'>Success:</font> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
} else {	} else {
Line 5185 sub valid_file {	Line 5495 sub valid_file {

sub scantron_download_scantron_data {	sub scantron_download_scantron_data {
my ($r)=@_;	my ($r)=@_;
my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));	my $default_form_data=&defaultFormData(&get_symb($r,1));
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};	my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $file=$env{'form.scantron_selectfile'};	my $file=$env{'form.scantron_selectfile'};
Line 5195 sub scantron_download_scantron_data {	Line 5505 sub scantron_download_scantron_data {
The requested file name was invalid.	The requested file name was invalid.
</p>	</p>
ERROR	ERROR
$r->print(&show_grading_menu_form(&get_symb_and_url($r,1)));	$r->print(&show_grading_menu_form(&get_symb($r,1)));
return;	return;
}	}
my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;	my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
Line 5215 ERROR	Line 5525 ERROR
<a href="$skipped">Skipped</a>, a file of records that were skipped.	<a href="$skipped">Skipped</a>, a file of records that were skipped.
</p>	</p>
DOWNLOAD	DOWNLOAD
$r->print(&show_grading_menu_form(&get_symb_and_url($r,1)));	$r->print(&show_grading_menu_form(&get_symb($r,1)));
return '';	return '';
}	}

Line 5227 DOWNLOAD	Line 5537 DOWNLOAD
#	#
#--- Show a Grading Menu button - Calls the next routine ---	#--- Show a Grading Menu button - Calls the next routine ---
sub show_grading_menu_form {	sub show_grading_menu_form {
my ($symb,$url)=@_;	my ($symb)=@_;
my $result.='<br /><form action="/adm/grades" method="post">'."\n".	my $result.='<br /><form action="/adm/grades" method="post">'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="command" value="gradingmenu" />'."\n".	'<input type="hidden" name="command" value="gradingmenu" />'."\n".
'<input type="submit" name="submit" value="Grading Menu" />'."\n".	'<input type="submit" name="submit" value="Grading Menu" />'."\n".
Line 5253 sub savedState {	Line 5562 sub savedState {
#--- Displays the main menu page -------	#--- Displays the main menu page -------
sub gradingmenu {	sub gradingmenu {
my ($request) = @_;	my ($request) = @_;
my ($symb,$url)=&get_symb_and_url($request);	my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $probTitle = &Apache::lonnet::gettitle($symb);	my $probTitle = &Apache::lonnet::gettitle($symb);

Line 5295 sub gradingmenu {	Line 5604 sub gradingmenu {
GRADINGMENUJS	GRADINGMENUJS
&commonJSfunctions($request);	&commonJSfunctions($request);
my $result='<h3> <font color="#339933">Manual Grading/View Submission</font></h3>';	my $result='<h3> <font color="#339933">Manual Grading/View Submission</font></h3>';
my ($table,undef,$hdgrade) = &showResourceInfo($url,$probTitle);	my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
$result.=$table;	$result.=$table;
my (undef,$sections) = &getclasslist('all','0');	my (undef,$sections) = &getclasslist('all','0');
my $savedState = &savedState();	my $savedState = &savedState();
Line 5306 GRADINGMENUJS	Line 5615 GRADINGMENUJS

$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="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".	'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".	'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".
'<input type="hidden" name="command" value="" />'."\n".	'<input type="hidden" name="command" value="" />'."\n".
Line 5314 GRADINGMENUJS	Line 5622 GRADINGMENUJS
'<input type="hidden" name="gradingMenu" value="1" />'."\n".	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";	'<input type="hidden" name="showgrading" value="yes" />'."\n";

$result.='<table width="100%" border=0><tr><td bgcolor=#777777>'."\n".	$result.='<table width="100%" border="0"><tr><td bgcolor=#777777>'."\n".
'<table width=100% border=0><tr bgcolor="#e6ffff"><td colspan="2">'."\n".	'<table width="100%" border="0"><tr bgcolor="#e6ffff"><td colspan="2">'."\n".
' <b>Select a Grading/Viewing Option</b></td></tr>'."\n".	' <b>Select a Grading/Viewing Option</b></td></tr>'."\n".
'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";	'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";

$result.='<table width="100%" border=0>';	$result.='<table width="100%" border="0">';
$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".	$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
' '.&mt('Select Section').': <select name="section">'."\n";	' '.&mt('Select Section').': <select name="section">'."\n";
if (ref($sections)) {	if (ref($sections)) {
Line 5334 GRADINGMENUJS	Line 5642 GRADINGMENUJS

$result.='</td></tr>';	$result.='</td></tr>';

$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.	$result.='<tr bgcolor="#ffffe6"valign="top"><td><label>'.
'<input type="radio" name="radioChoice" value="submission" '.	'<input type="radio" name="radioChoice" value="submission" '.
($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').	($saveCmd eq 'submission' ? 'checked' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
' <select name="submitonly">'.	'</label> <select name="submitonly">'.
'<option value="yes" '.	'<option value="yes" '.
($saveSub eq 'yes' ? 'selected="on"' : '').'>with submissions</option>'.	($saveSub eq 'yes' ? 'selected="on"' : '').' />'.&mt('with submissions').'</option>'.
	'<option value="queued" '.
	($saveSub eq 'queued' ? 'selected="on"' : '').' />'.&mt('in grading queue').'</option>'.
'<option value="graded" '.	'<option value="graded" '.
($saveSub eq 'graded' ? 'selected="on"' : '').'>with ungraded submissions</option>'.	($saveSub eq 'graded' ? 'selected="on"' : '').' />'.&mt('with ungraded submissions').'</option>'.
'<option value="incorrect" '.	'<option value="incorrect" '.
($saveSub eq 'incorrect' ? 'selected="on"' : '').'>with incorrect submissions</option>'.	($saveSub eq 'incorrect' ? 'selected="on"' : '').' />'.&mt('with incorrect submissions').'</option>'.
'<option value="all" '.	'<option value="all" '.
($saveSub eq 'all' ? 'selected="on"' : '').'>with any status</option></select></td></tr>'."\n";	($saveSub eq 'all' ? 'selected="on"' : '').' />'.&mt('with any status').'</option></select></td></tr>'."\n";

$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
'<input type="radio" name="radioChoice" value="viewgrades" '.	'<label><input type="radio" name="radioChoice" value="viewgrades" '.
($saveCmd eq 'viewgrades' ? 'checked' : '').'> '.	($saveCmd eq 'viewgrades' ? 'checked' : '').' /> '.
'<b>Current Resource:</b> For all students in selected section or course</td></tr>'."\n";	'<b>Current Resource:</b> For all students in selected section or course</label></td></tr>'."\n";

$result.='<tr bgcolor="#ffffe6" valign="top"><td>'.	$result.='<tr bgcolor="#ffffe6" valign="top"><td>'.
'<input type="radio" name="radioChoice" value="pickStudentPage" '.	'<label><input type="radio" name="radioChoice" value="pickStudentPage" '.
($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.	($saveCmd eq 'pickStudentPage' ? 'checked' : '').' /> '.
'The <b>complete</b> set/page/sequence: For one student</td></tr>'."\n";	'The <b>complete</b> set/page/sequence: For one student</label></td></tr>'."\n";

$result.='<tr bgcolor="#ffffe6"><td><br />'.	$result.='<tr bgcolor="#ffffe6"><td><br />'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.	'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
Line 5363 GRADINGMENUJS	Line 5673 GRADINGMENUJS

$result.='</td><td valign="top">';	$result.='</td><td valign="top">';

$result.='<table width="100%" border=0>';	$result.='<table width="100%" border="0">';
$result.='<tr bgcolor="#ffffe6"><td>'.	$result.='<tr bgcolor="#ffffe6"><td>'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
' '.&mt('scores from file').' </td></tr>'."\n";	' '.&mt('scores from file').' </td></tr>'."\n";
Line 5377 GRADINGMENUJS	Line 5687 GRADINGMENUJS
'<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.	'<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
' '.&mt('receipt').': '.	' '.&mt('receipt').': '.
&Apache::lonnet::recprefix($env{'request.course.id'}).	&Apache::lonnet::recprefix($env{'request.course.id'}).
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')">'.	'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'.
'</td></tr>'."\n";	'</td></tr>'."\n";
}	}
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.	$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
'<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.	'<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
'" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";	'" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";
	$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
	'<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'.
	'" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";

$result.='</form></td></tr></table>'."\n".	$result.='</form></td></tr></table>'."\n".
'</td></tr></table>'."\n".	'</td></tr></table>'."\n".
Line 5390 GRADINGMENUJS	Line 5703 GRADINGMENUJS
return $result;	return $result;
}	}

	sub reset_perm {
	undef(%perm);
	}

	sub init_perm {
	&reset_perm();
	foreach my $test_perm ('vgr','mgr','opa') {

	my $scope = $env{'request.course.id'};
	if (!($perm{$test_perm}=&Apache::lonnet::allowed($test_perm,$scope))) {

	$scope .= '/'.$env{'request.course.sec'};
	if ( $perm{$test_perm}=
	&Apache::lonnet::allowed($test_perm,$scope)) {
	$perm{$test_perm.'_section'}=$env{'request.course.sec'};
	} else {
	delete($perm{$test_perm});
	}
	}
	}
	}

sub handler {	sub handler {
my $request=$_[0];	my $request=$_[0];

undef(%perm);	&reset_perm();
if ($env{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($request,'text/xml');	&Apache::loncommon::content_type($request,'text/xml');
} else {	} else {
Line 5402 sub handler {	Line 5737 sub handler {
$request->send_http_header;	$request->send_http_header;
return '' if $request->header_only;	return '' if $request->header_only;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
my $url=$env{'form.url'};	my $symb=&get_symb($request,1);
my $symb=$env{'form.symb'};
my @commands=&Apache::loncommon::get_env_multiple('form.command');	my @commands=&Apache::loncommon::get_env_multiple('form.command');
my $command=$commands[0];	my $command=$commands[0];
if ($#commands > 0) {	if ($#commands > 0) {
&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));	&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
}	}
if (!$url) {
my ($temp1,$temp2);
($temp1,$temp2,$env{'form.url'})=&Apache::lonnet::decode_symb($symb);
$url = $env{'form.url'};
}
&send_header($request);	&send_header($request);
if ($url eq '' && $symb eq '' && $command eq '') {	if ($symb eq '' && $command eq '') {
if ($env{'user.adv'}) {	if ($env{'user.adv'}) {
if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&	if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
($env{'form.codethree'})) {	($env{'form.codethree'})) {
Line 5442 sub handler {	Line 5771 sub handler {
}	}
}	}
} else {	} else {
if (!($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {	&init_perm();
if ($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
$perm{'vgr_section'}=$env{'request.course.sec'};
} else {
delete($perm{'vgr'});
}
}
if (!($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$env{'request.course.id'}))) {
if ($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
$perm{'mgr_section'}=$env{'request.course.sec'};
} else {
delete($perm{'mgr'});
}
}
if ($command eq 'submission' && $perm{'vgr'}) {	if ($command eq 'submission' && $perm{'vgr'}) {
($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));	($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {

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

Removed from v.1.273
changed lines
	Added in v.1.326