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.302.2.1 and 1.404

version 1.302.2.1, 2006/01/25 22:58:26	version 1.404, 2007/06/14 21:36:12
Line 36 use Apache::lonhtmlcommon;	Line 36 use Apache::lonhtmlcommon;
use Apache::lonnavmaps;	use Apache::lonnavmaps;
use Apache::lonhomework;	use Apache::lonhomework;
use Apache::loncoursedata;	use Apache::loncoursedata;
use Apache::lonmsg qw(:user_normal_msg);	use Apache::lonmsg();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
use Apache::lonlocal;	use Apache::lonlocal;
	use Apache::lonenc;
use String::Similarity;	use String::Similarity;
	use lib '/home/httpd/lib/perl';
	use LONCAPA;

	use POSIX qw(floor);

my %oldessays=();	my %oldessays=();
my %perm=();	my %perm=();
Line 48 my %perm=();	Line 53 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 84 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 94 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 96 sub get_symb_and_url {	Line 102 sub get_symb_and_url {
sub nameUserString {	sub nameUserString {
my ($type,$fullname,$uname,$udom) = @_;	my ($type,$fullname,$uname,$udom) = @_;
if ($type eq 'header') {	if ($type eq 'header') {
return '<b> Fullname </b><font color="#999999">(Username)</font>';	return '<b> Fullname </b><span class="LC_internal_info">(Username)</span>';
} else {	} else {
return ' '.$fullname.'<font color="#999999"> ('.$uname.	return ' '.$fullname.'<span class="LC_internal_info"> ('.$uname.
($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';	($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>';
}	}
}	}

#--- 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 $allkeys = &Apache::lonnet::metadata($url,'keys');	my $navmap = Apache::lonnavmaps::navmap->new();
my %vPart;	my $res = $navmap->getBySymb($symb);
foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {	my $partlist = $res->parts();
$vPart{$partid}=1;	my %vPart =
}	map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));
my %seen = ();	my (%response_types,%handgrade);
my (@partlist,%handgrade,%responseType);	foreach my $part (@{ $partlist }) {
foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {	next if (%vPart && !exists($vPart{$part}));
if (/^\w+response_.*/) {
my ($responsetype,$part) = split(/_/,$_,2);	my @types = $res->responseType($part);
my ($partid,$respid) = split(/_/,$part);	my @ids = $res->responseIds($part);
if (&Apache::loncommon::check_if_partid_hidden($partid,$symb)) {	for (my $i=0; $i < scalar(@ids); $i++) {
next;	$response_types{$part}{$ids[$i]} = $types[$i];
}	$handgrade{$part.'_'.$ids[$i]} =
if (%vPart && !exists($vPart{$partid})) {	&Apache::lonnet::EXT('resource.'.$part.'_'.$ids[$i].
next;	'.handgrade',$symb);
}	}
$responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!	}
my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb);	return ($partlist,\%handgrade,\%response_types);
$handgrade{$part} = ($value eq 'yes' ? 'yes' : 'no');	}
if (!exists($responseType{$partid})) { $responseType{$partid}={}; }
$responseType{$partid}->{$respid}=$responsetype;	sub flatten_responseType {
next if ($seen{$partid} > 0);	my ($responseType) = @_;
$seen{$partid}++;	my @part_response_id =
push @partlist,$partid;	map {
}	my $part = $_;
}	map {
return \@partlist,\%handgrade,\%responseType;	[$part,$_]
	} sort(keys(%{ $responseType->{$part} }));
	} sort(keys(%$responseType));
	return @part_response_id;
}	}

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.= " (<span class=\"LC_internal_info\">id $partID</span>)";
} else {	} else {
$display=$partID;	$display=$partID;
}	}
Line 156 sub get_display_part {	Line 161 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 = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";
'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'.	$result .='<table border="0">';
$probTitle.'</font></td></tr>'."\n";	my ($partlist,$handgrade,$responseType) = &response_type($symb);
my ($partlist,$handgrade,$responseType) = &response_type($url);
my %resptype = ();	my %resptype = ();
my $hdgrade='no';	my $hdgrade='no';
my %partsseen;	my %partsseen;
for my $part_resID (sort keys(%$handgrade)) {	foreach my $partID (sort keys(%$responseType)) {
my $handgrade=$$handgrade{$part_resID};	foreach my $resID (sort keys(%{ $responseType->{$partID} })) {
my ($partID,$resID) = split(/_/,$part_resID);	my $handgrade=$$handgrade{$partID.'_'.$resID};
my $responsetype = $responseType->{$partID}->{$resID};	my $responsetype = $responseType->{$partID}->{$resID};
$hdgrade = $handgrade if ($handgrade eq 'yes');	$hdgrade = $handgrade if ($handgrade eq 'yes');
$result.='<tr>';	$result.='<tr>';
if ($checkboxes) {	if ($checkboxes) {
if (exists($partsseen{$partID})) {	if (exists($partsseen{$partID})) {
$result.="<td> </td>";	$result.="<td> </td>";
} else {	} else {
$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='on' /></td>";	$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>";
	}
	$partsseen{$partID}=1;
}	}
$partsseen{$partID}=1;	my $display_part=&get_display_part($partID,$symb);
}	$result.='<td><b>Part: </b>'.$display_part.' <span class="LC_internal_info">'.
my $display_part=&get_display_part($partID,$url);	$resID.'</span></td>'.
$result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.	'<td><b>Type: </b>'.$responsetype.'</td></tr>';
$resID.'</font></td>'.
'<td><b>Type: </b>'.$responsetype.'</td></tr>';
# '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';	# '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
	}
}	}
$result.='</table>'."\n";	$result.='</table>'."\n";
return $result,$responseType,$hdgrade,$partlist,$handgrade;	return $result,$responseType,$hdgrade,$partlist,$handgrade;
Line 207 sub get_order {	Line 212 sub get_order {
return ($analyze{"$partid.$respid.shown"});	return ($analyze{"$partid.$respid.shown"});
}	}
#--- Clean response type for display	#--- Clean response type for display
#--- Currently filters option/rank/radiobutton/match/essay response types only.	#--- Currently filters option/rank/radiobutton/match/essay/Task
	# response types only.
sub cleanRecord {	sub cleanRecord {
my ($answer,$response,$symb,$partid,$respid,$record,$order,$version) = @_;	my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,
my $grayFont = '<font color="#999999">';	$uname,$udom) = @_;
	my $grayFont = '<span class="LC_internal_info">';
if ($response =~ /^(option\|rank)$/) {	if ($response =~ /^(option\|rank)$/) {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
Line 221 sub cleanRecord {	Line 228 sub cleanRecord {
} else {	} else {
$toprow.='<td><i>'.$answer{$foil}.' </i></td>';	$toprow.='<td><i>'.$answer{$foil}.' </i></td>';
}	}
$bottomrow.='<td>'.$grayFont.$foil.'</font> </td>';	$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';
}	}
return '<blockquote><table border="1">'.	return '<blockquote><table border="1">'.
'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.	'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.	'<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';	$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'match') {	} elsif ($response eq 'match') {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
Line 236 sub cleanRecord {	Line 243 sub cleanRecord {
my $item=shift(@items);	my $item=shift(@items);
if ($grading{$foil} == 1) {	if ($grading{$foil} == 1) {
$toprow.='<td><b>'.$item.' </b></td>';	$toprow.='<td><b>'.$item.' </b></td>';
$middlerow.='<td><b>'.$grayFont.$answer{$foil}.' </font></b></td>';	$middlerow.='<td><b>'.$grayFont.$answer{$foil}.' </span></b></td>';
} else {	} else {
$toprow.='<td><i>'.$item.' </i></td>';	$toprow.='<td><i>'.$item.' </i></td>';
$middlerow.='<td><i>'.$grayFont.$answer{$foil}.' </font></i></td>';	$middlerow.='<td><i>'.$grayFont.$answer{$foil}.' </span></i></td>';
}	}
$bottomrow.='<td>'.$grayFont.$foil.'</font> </td>';	$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';
}	}
return '<blockquote><table border="1">'.	return '<blockquote><table border="1">'.
'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.	'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.'Item ID</font></td>'.	'<tr valign="top"><td>'.$grayFont.'Item ID</span></td>'.
$middlerow.'</tr>'.	$middlerow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.	'<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
$bottomrow.'</tr>'.'</table></blockquote>';	$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'radiobutton') {	} elsif ($response eq 'radiobutton') {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
Line 264 sub cleanRecord {	Line 271 sub cleanRecord {
} else {	} else {
$toprow.='<td>false</td>';	$toprow.='<td>false</td>';
}	}
$bottomrow.='<td>'.$grayFont.$foil.'</font> </td>';	$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';
}	}
return '<blockquote><table border="1">'.	return '<blockquote><table border="1">'.
'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.	'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.	'<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';	$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'essay') {	} elsif ($response eq 'essay') {
if (! exists ($env{'form.'.$symb})) {	if (! exists ($env{'form.'.$symb})) {
Line 290 sub cleanRecord {	Line 297 sub cleanRecord {
my $jme=$record->{$version."resource.$partid.$respid.molecule"};	my $jme=$record->{$version."resource.$partid.$respid.molecule"};
$result.=&Apache::chemresponse::jme_img($jme,$answer,400);	$result.=&Apache::chemresponse::jme_img($jme,$answer,400);
return $result;	return $result;
	} elsif ( $response eq 'Task') {
	if ( $answer eq 'SUBMITTED') {
	my $files = $record->{$version."resource.$respid.$partid.bridgetask.portfiles"};
	my $result = &Apache::bridgetask::file_list($files,$uname,$udom);
	return $result;
	} elsif ( grep(/^\Q$version\E.*?\.instance$/, keys(%{$record})) ) {
	my @matches = grep(/^\Q$version\E.*?\.instance$/,
	keys(%{$record}));
	return join('<br />',($version,@matches));


	} else {
	my $result =
	'<p>'
	.&mt('Overall result: [_1]',
	$record->{$version."resource.$respid.$partid.status"})
	.'</p>';

	$result .= '<ul>';
	my @grade = grep(/^\Q${version}resource.$respid.$partid.\E[^.]*[.]status$/,
	keys(%{$record}));
	foreach my $grade (sort(@grade)) {
	my ($dim) = ($grade =~/[.]([^.]+)[.]status$/);
	$result.= '<li>'.&mt("Dimension: [_1], status [_2] ",
	$dim, $record->{$grade}).
	'</li>';
	}
	$result.='</ul>';
	return $result;
	}

}	}
return $answer;	return $answer;
}	}
Line 429 sub canview {	Line 467 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 446 sub student_gradeStatus {	Line 484 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 456 sub jscriptNform {	Line 494 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 467 sub jscriptNform {	Line 504 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 528 sub verifyreceipt {	Line 592 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) = &get_symb($request);
my $symb = $env{'form.symb'};
unless ($symb) {
$symb = &Apache::lonnet::symbread($url);
}

my $title.='<h3><font color="#339933">Verifying Submission Receipt '.	my $title.='<h3><span class="LC_info">Verifying Submission Receipt '.
$receipt.'</h3></font>'."\n".	$receipt.'</h3></span>'."\n".
'<font size=+1><b>Resource: </b>'.$env{'form.probTitle'}.'</font><br><br>'."\n";	'<h4><b>Resource: </b>'.$env{'form.probTitle'}.'</h4><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');

my $receiptparts=0;	my $receiptparts=0;
if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }	if ($env{"course.$courseid.receiptalg"} eq 'receipt2' \|\|
	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
my $parts=['0'];	my $parts=['0'];
if ($receiptparts) { ($parts)=&response_type($url,$symb); }	if ($receiptparts) { ($parts)=&response_type($symb); }
foreach (sort	foreach (sort
{	{
if (lc($$fullname{$a}) ne lc($$fullname{$b})) {	if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
Line 572 sub verifyreceipt {	Line 633 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 586 sub verifyreceipt {	Line 647 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 596 sub verifyreceipt {	Line 657 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 606 sub listStudents {	Line 667 sub listStudents {
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?	$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};

my $result='<h3><font color="#339933"> '.$viewgrade.	my $result='<h3><span class="LC_info"> '.$viewgrade.
' Submissions for a Student or a Group of Students</font></h3>';	' Submissions for a Student or a Group of Students</span></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 647 LISTJAVASCRIPT	Line 708 LISTJAVASCRIPT
&commonJSfunctions($request);	&commonJSfunctions($request);
$request->print($result);	$request->print($result);

my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : '';	my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : '';
my $checklastsub = $checkhdgrade eq '' ? 'checked' : '';	my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : '';
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.	my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
"\n".$table.	"\n".$table.
' <b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".	' <b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
'<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n".	'<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n".
'<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n".	'<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n".
' <b>View Answer: </b><label><input type="radio" name="vAns" value="no" /> no </label>'."\n".	' <b>View Answer: </b><label><input type="radio" name="vAns" value="no" /> no </label>'."\n".
'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n".	'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n".
'<label><input type="radio" name="vAns" value="all" checked="on" /> all students </label><br />'."\n".	'<label><input type="radio" name="vAns" value="all" checked="checked" /> all students </label><br />'."\n".
' <b>Submissions: </b>'."\n";	' <b>Submissions: </b>'."\n";
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {	if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n";	$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n";
Line 668 LISTJAVASCRIPT	Line 729 LISTJAVASCRIPT
$gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".	$gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".	'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".
'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".	'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".
'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n".	'<label><input type="radio" name="lastSub" value="all" /> all details</label><br />'."\n".
	' <b>Grading Increments:</b> <select name="increment">'.
	'<option value="1">Whole Points</option>'.
	'<option value=".5">Half Points</option>'.
	'<option value=".25">Quarter Points</option>'.
	'<option value=".1">Tenths of a Point</option>'.
	'</select>'.

'<input type="hidden" name="section" value="'.$getsec.'" />'."\n".	'<input type="hidden" name="section" value="'.$getsec.'" />'."\n".
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".	'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n".	'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n".
'<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 696 LISTJAVASCRIPT	Line 763 LISTJAVASCRIPT
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
'value="Next->" /> <br />'."\n";	'value="Next->" /> <br />'."\n";
$gradeTable.=&check_buttons();	$gradeTable.=&check_buttons();
$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="on" />Check For Plagiarism</label>';	$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />Check For Plagiarism</label>';
my ($classlist, undef, $fullname) = &getclasslist($getsec,'1');	my ($classlist, undef, $fullname) = &getclasslist($getsec,'1');
$gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.	$gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">';	'<table border="0"><tr bgcolor="#e6ffff">';
Line 708 LISTJAVASCRIPT	Line 775 LISTJAVASCRIPT
&& $submitonly ne 'queued'	&& $submitonly ne 'queued'
&& $submitonly ne 'all') {	&& $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>';
}	}
Line 744 LISTJAVASCRIPT	Line 811 LISTJAVASCRIPT
if ($env{'form.showgrading'} eq 'yes'	if ($env{'form.showgrading'} eq 'yes'
&& $submitonly ne 'queued'	&& $submitonly ne 'queued'
&& $submitonly ne 'all') {	&& $submitonly ne 'all') {
(%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);	(%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 813 LISTJAVASCRIPT	Line 880 LISTJAVASCRIPT
if ($ctr == 0) {	if ($ctr == 0) {
my $num_students=(scalar(keys(%$fullname)));	my $num_students=(scalar(keys(%$fullname)));
if ($num_students eq 0) {	if ($num_students eq 0) {
$gradeTable='<br /> <font color="red">There are no students currently enrolled.</font>';	$gradeTable='<br /> <span class="LC_warning">There are no students currently enrolled.</span>';
} else {	} else {
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'; }	if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; }
$gradeTable='<br /> <font color="red">'.	$gradeTable='<br /> <span class="LC_warning">'.
'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.')</span><br />';
}	}
} 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 885 sub processGroup {	Line 952 sub processGroup {
my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');	my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');
my $total = scalar(@stuchecked)-1;	my $total = scalar(@stuchecked)-1;

foreach (@stuchecked) {	foreach my $student (@stuchecked) {
my ($uname,$udom,$fullname) = split(/:/);	my ($uname,$udom,$fullname) = split(/:/,$student);
$env{'form.student'} = $uname;	$env{'form.student'} = $uname;
$env{'form.userdom'} = $udom;	$env{'form.userdom'} = $udom;
$env{'form.fullname'} = $fullname;	$env{'form.fullname'} = $fullname;
Line 1082 sub sub_page_kw_js {	Line 1149 sub sub_page_kw_js {
my $request = shift;	my $request = shift;
my $iconpath = $request->dir_config('lonIconsURL');	my $iconpath = $request->dir_config('lonIconsURL');
&commonJSfunctions($request);	&commonJSfunctions($request);

	my $inner_js_msg_central=<<INNERJS;
	<script text="text/javascript">
	function checkInput() {
	opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);
	var nmsg = opener.document.SCORE.savemsgN.value;
	var usrctr = document.msgcenter.usrctr.value;
	var newval = opener.document.SCORE["newmsg"+usrctr];
	newval.value = opener.checkEntities(document.msgcenter.newmsg.value);

	var msgchk = "";
	if (document.msgcenter.subchk.checked) {
	msgchk = "msgsub,";
	}
	var includemsg = 0;
	for (var i=1; i<=nmsg; i++) {
	var opnmsg = opener.document.SCORE["savemsg"+i];
	var frmmsg = document.msgcenter["msg"+i];
	opnmsg.value = opener.checkEntities(frmmsg.value);
	var showflg = opener.document.SCORE["shownOnce"+i];
	showflg.value = "1";
	var chkbox = document.msgcenter["msgn"+i];
	if (chkbox.checked) {
	msgchk += "savemsg"+i+",";
	includemsg = 1;
	}
	}
	if (document.msgcenter.newmsgchk.checked) {
	msgchk += "newmsg"+usrctr;
	includemsg = 1;
	}
	imgformname = opener.document.SCORE["mailicon"+usrctr];
	imgformname.src = "$iconpath/"+((includemsg) ? "mailto.gif" : "mailbkgrd.gif");
	var includemsg = opener.document.SCORE["includemsg"+usrctr];
	includemsg.value = msgchk;

	self.close()

	}
	</script>
	INNERJS

	my $inner_js_highlight_central=<<INNERJS;
	<script type="text/javascript">
	function updateChoice(flag) {
	opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
	opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
	opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);
	opener.document.SCORE.refresh.value = "on";
	if (opener.document.SCORE.keywords.value!=""){
	opener.document.SCORE.submit();
	}
	self.close()
	}
	</script>
	INNERJS

	my $start_page_msg_central =
	&Apache::loncommon::start_page('Message Central',$inner_js_msg_central,
	{'js_ready' => 1,
	'only_body' => 1,
	'bgcolor' =>'#FFFFFF',});
	my $end_page_msg_central =
	&Apache::loncommon::end_page({'js_ready' => 1});


	my $start_page_highlight_central =
	&Apache::loncommon::start_page('Highlight Central',
	$inner_js_highlight_central,
	{'js_ready' => 1,
	'only_body' => 1,
	'bgcolor' =>'#FFFFFF',});
	my $end_page_highlight_central =
	&Apache::loncommon::end_page({'js_ready' => 1});

my $docopen=&Apache::lonhtmlcommon::javascript_docopen();	my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
$docopen=~s/^document\.//;	$docopen=~s/^document\.//;
$request->print(<<SUBJAVASCRIPT);	$request->print(<<SUBJAVASCRIPT);
Line 1197 sub sub_page_kw_js {	Line 1339 sub sub_page_kw_js {
pWin.focus();	pWin.focus();
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.$docopen;	pDoc.$docopen;
pDoc.write("<html><head>");	pDoc.write('$start_page_msg_central');
pDoc.write("<title>Message Central</title>");

pDoc.write("<script language=javascript>");
pDoc.write("function checkInput() {");
pDoc.write(" opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);");
pDoc.write(" var nmsg = opener.document.SCORE.savemsgN.value;");
pDoc.write(" var usrctr = document.msgcenter.usrctr.value;");
pDoc.write(" var newval = opener.document.SCORE[\\"newmsg\\"+usrctr];");
pDoc.write(" newval.value = opener.checkEntities(document.msgcenter.newmsg.value);");

pDoc.write(" var msgchk = \\"\\";");
pDoc.write(" if (document.msgcenter.subchk.checked) {");
pDoc.write(" msgchk = \\"msgsub,\\";");
pDoc.write(" }");
pDoc.write(" var includemsg = 0;");
pDoc.write(" for (var i=1; i<=nmsg; i++) {");
pDoc.write(" var opnmsg = opener.document.SCORE[\\"savemsg\\"+i];");
pDoc.write(" var frmmsg = document.msgcenter[\\"msg\\"+i];");
pDoc.write(" opnmsg.value = opener.checkEntities(frmmsg.value);");
pDoc.write(" var showflg = opener.document.SCORE[\\"shownOnce\\"+i];");
pDoc.write(" showflg.value = \\"1\\";");
pDoc.write(" var chkbox = document.msgcenter[\\"msgn\\"+i];");
pDoc.write(" if (chkbox.checked) {");
pDoc.write(" msgchk += \\"savemsg\\"+i+\\",\\";");
pDoc.write(" includemsg = 1;");
pDoc.write(" }");
pDoc.write(" }");
pDoc.write(" if (document.msgcenter.newmsgchk.checked) {");
pDoc.write(" msgchk += \\"newmsg\\"+usrctr;");
pDoc.write(" includemsg = 1;");
pDoc.write(" }");
pDoc.write(" imgformname = opener.document.SCORE[\\"mailicon\\"+usrctr];");
pDoc.write(" imgformname.src = \\"$iconpath/\\"+((includemsg) ? \\"mailto.gif\\" : \\"mailbkgrd.gif\\");");
pDoc.write(" var includemsg = opener.document.SCORE[\\"includemsg\\"+usrctr];");
pDoc.write(" includemsg.value = msgchk;");

pDoc.write(" self.close()");

pDoc.write("}");

pDoc.write("<");
pDoc.write("/script>");

pDoc.write("</head><body bgcolor=white>");

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("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"</span></h3><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 1280 sub sub_page_kw_js {	Line 1378 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('$end_page_msg_central');
pDoc.close();	pDoc.close();
}	}

Line 1328 sub sub_page_kw_js {	Line 1426 sub sub_page_kw_js {
hwdWin.focus();	hwdWin.focus();
var hDoc = hwdWin.document;	var hDoc = hwdWin.document;
hDoc.$docopen;	hDoc.$docopen;
hDoc.write("<html><head>");	hDoc.write('$start_page_highlight_central');
hDoc.write("<title>Highlight Central</title>");

hDoc.write("<script language=javascript>");
hDoc.write("function updateChoice(flag) {");
hDoc.write(" opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);");
hDoc.write(" opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);");
hDoc.write(" opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);");
hDoc.write(" opener.document.SCORE.refresh.value = \\"on\\";");
hDoc.write(" if (opener.document.SCORE.keywords.value!=\\"\\"){");
hDoc.write(" opener.document.SCORE.submit();");
hDoc.write(" }");
hDoc.write(" self.close()");
hDoc.write("}");

hDoc.write("<");
hDoc.write("/script>");

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("<h3><span class=\\"LC_info\\"> Keyword Highlight Options</span></h3><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 1373 sub sub_page_kw_js {	Line 1452 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('$end_page_highlight_central');
hDoc.close();	hDoc.close();
}	}

Line 1383 sub sub_page_kw_js {	Line 1462 sub sub_page_kw_js {
SUBJAVASCRIPT	SUBJAVASCRIPT
}	}

	sub get_increment {
	my $increment = $env{'form.increment'};
	if ($increment != 1 && $increment != .5 && $increment != .25 &&
	$increment != .1) {
	$increment = 1;
	}
	return $increment;
	}

#--- 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 alt="'.&mt('Check Mark').
my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').	'" 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>');	'<span class="LC_info">problem weight assigned by computer</span>');
$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;
	my $thisweight = 0;
	my $increment = &get_increment();
$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 ($thisweight<=$wgt) {
$result.= '<td><nobr><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.	$result.= '<td><span style="white-space: nowrap;"><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.'" '.	$thisweight.')" value="'.$thisweight.'" '.
($score eq $ctr ? 'checked':'').' /> '.$ctr."</label></nobr></td>\n";	($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
	$thisweight += $increment;
$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 1430 sub gradeBox {	Line 1515 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') {
$result.='<option> </option>'.	$result.='<option></option>'.
'<option selected="on">excused</option>';	'<option selected="selected">excused</option>';
} else {	} else {
$result.='<option selected="on"> </option>'.	$result.='<option selected="selected"></option>'.
'<option>excused</option>';	'<option>excused</option>';
}	}
$result.='<option>reset status</option></select>'."\n";	$result.='<option>reset status</option></select>'."\n";
$result.="&nbsp&nbsp\n";	$result.="  \n";
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".	$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.	'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
Line 1451 sub gradeBox {	Line 1535 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);
	my @part_response_id = &flatten_responseType($responseType);
	foreach my $part_response_id (@part_response_id) {
	my ($part,$resp) = @{ $part_response_id };
	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) {
	if ($file =~ /\/portfolio\//) {
	my ($file_path, $file_disp) = ($file =~ m\|(.+/)(.+)$\|);
	my ($name,$version,$ext) = &file_name_version_ext($file_disp);
	$file_disp = "$name.$ext";
	$file = $file_path.$file_disp;
	$result.=&mt('Return commented version of [_1] to student.',
	'<span class="LC_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 />';
	$result.='(File will be uploaded when you click on Save & Next below.)<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,$form) = @_;
my $rendered;	my $rendered;
	my %form = ((ref($form) eq 'HASH')? %{$form} : ());
	&Apache::lonxml::remember_problem_counter();
if ($mode eq 'both' or $mode eq 'text') {	if ($mode eq 'both' or $mode eq 'text') {
$rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,	$rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
$env{'request.course.id'});	$env{'request.course.id'},
	undef,\%form);
}	}
if ($removeform) {	if ($removeform) {
$rendered=~s\|<form(.*?)>\|\|g;	$rendered=~s\|<form(.*?)>\|\|g;
$rendered=~s\|</form>\|\|g;	$rendered=~s\|</form>\|\|g;
$rendered=~s\|name="submit"\|name="would_have_been_submit"\|g;	$rendered=~s\|(<input[^>]name\s=\s*"?)(\w+)("?)\|$1would_have_been_$2$3\|g;
}	}
my $companswer;	my $companswer;
if ($mode eq 'both' or $mode eq 'answer') {	if ($mode eq 'both' or $mode eq 'answer') {
$companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,	&Apache::lonxml::restore_problem_counter();
$env{'request.course.id'});	$companswer=
	&Apache::loncommon::get_student_answers($symb,$uname,$udom,
	$env{'request.course.id'},
	%form);
}	}
if ($removeform) {	if ($removeform) {
$companswer=~s\|<form(.*?)>\|\|g;	$companswer=~s\|<form(.*?)>\|\|g;
Line 1500 sub show_problem {	Line 1626 sub show_problem {
return $result;	return $result;
}	}

	sub files_exist {
	my ($r, $symb) = @_;
	my @students = &Apache::loncommon::get_env_multiple('form.stuinfo');

	foreach my $student (@students) {
	my ($uname,$udom,$fullname) = split(/:/,$student);
	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
	$udom,$uname);
	my ($string,$timestamp)= &get_last_submission(\%record);
	foreach my $submission (@$string) {
	my ($partid,$respid) =
	($submission =~ /^resource\.([^\.])\.([^\.])\.submission/);
	my $files=&get_submitted_files($udom,$uname,$partid,$respid,
	\%record);
	return 1 if (@$files);
	}
	}
	return 0;
	}

	sub download_all_link {
	my ($r,$symb) = @_;
	my $all_students =
	join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));

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

	my $identifier = &Apache::loncommon::get_cgi_id();
	&Apache::lonnet::appenv('cgi.'.$identifier.'.students' => $all_students,
	'cgi.'.$identifier.'.symb' => $symb,
	'cgi.'.$identifier.'.parts' => $parts,);
	$r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'.
	&mt('Download All Submitted Documents').'</a>');
	return
	}

# --------------------------- show submissions of a student, option to grade	# --------------------------- show submissions of a student, option to grade
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('<span class="LC_warning">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'}.')</span>');
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));
return;	return;
}	}

Line 1525 sub submission {	Line 1687 sub submission {
if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }	if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }
if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; }	if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; }
my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');	my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').	my $checkIcon = '<img alt="'.&mt('Check Mark').
	'" src="'.$request->dir_config('lonIconsURL').
'/check.gif" height="16" border="0" />';	'/check.gif" height="16" border="0" />';

# header info	# header info
Line 1534 sub submission {	Line 1697 sub submission {
&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');	&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?	$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
	if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) {
$request->print('<h3> <font color="#339933">Submission Record</font></h3>'."\n".	&download_all_link($request, $symb);
'<font size=+1> <b>Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n");	}
	$request->print('<h3> <span class="LC_info">Submission Record</span></h3>'."\n".
	'<h4> <b>Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n");

if ($env{'form.handgrade'} eq 'no') {	if ($env{'form.handgrade'} eq 'no') {
my $checkMark='<br /><br /> <b>Note:</b> Part(s) graded correct by the computer is marked with a '.	my $checkMark='<br /><br /> <b>Note:</b> Part(s) graded correct by the computer is marked with a '.
Line 1555 sub submission {	Line 1720 sub submission {
} elsif ($env{'form.vAns'} eq 'yes') {	} elsif ($env{'form.vAns'} eq 'yes') {
$mode='answer';	$mode='answer';
}	}
	&Apache::lonxml::clear_problem_counter();
$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));	$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
}	}

Line 1577 sub submission {	Line 1743 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 1587 sub submission {	Line 1753 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 1636 KEYWORDS	Line 1801 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=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
$apath=&Apache::lonnet::escape($apath);	$apath=&escape($apath);
$apath=~s/\W/\_/gs;	$apath=~s/\W/\_/gs;
%oldessays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);	%oldessays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
}	}
Line 1654 KEYWORDS	Line 1819 KEYWORDS
} elsif ($env{'form.vAns'} eq 'all') {	} elsif ($env{'form.vAns'} eq 'all') {
$mode='answer';	$mode='answer';
}	}
	&Apache::lonxml::clear_problem_counter();
$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode));	$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode));
}	}

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 1742 KEYWORDS	Line 1908 KEYWORDS
$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0];	$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0];
} else {	} else {
my %seenparts;	my %seenparts;
for my $part (sort keys(%$handgrade)) {	my @part_response_id = &flatten_responseType($responseType);
my ($partid,$respid) = split(/_/,$part);	foreach my $part (@part_response_id) {
my $display_part=&get_display_part($partid,$url,$symb);	next if ($env{'form.lastSub'} eq 'hdgrade'
	&& $$handgrade{$$part[0].'_'.$$part[1]} ne 'yes');

	my ($partid,$respid) = @{ $part };
	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 1760 KEYWORDS	Line 1930 KEYWORDS
my $responsetype = $responseType->{$partid}->{$respid};	my $responsetype = $responseType->{$partid}->{$respid};
if (!exists($record{"resource.$partid.$respid.submission"})) {	if (!exists($record{"resource.$partid.$respid.submission"})) {
$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.' <span class="LC_internal_info">( ID '.$respid.
' )</font>   '.	' )</span>   '.
'<font color="red">Nothing submitted - no attempts</font><br /><br />';	'<span class="LC_warning">Nothing submitted - no attempts</span><br /><br />';
next;	next;
}	}
foreach (@$string) {	foreach (@$string) {
my ($partid,$respid) = /^resource\.([^\.])\.([^\.])\.submission/;	my ($partid,$respid) = /^resource\.([^\.])\.([^\.])\.submission/;
if ($part ne ($partid.'_'.$respid)) { next; }	if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
my ($ressub,$subval) = split(/:/,$_,2);	my ($ressub,$subval) = split(/:/,$_,2);
# Similarity check	# Similarity check
my $similar='';	my $similar='';
Line 1776 KEYWORDS	Line 1946 KEYWORDS
&most_similar($uname,$udom,$subval);	&most_similar($uname,$udom,$subval);
if ($osim) {	if ($osim) {
$osim=int($osim*100.0);	$osim=int($osim*100.0);
$similar="<hr /><h3><font color=\"#FF0000\">Essay".	$similar="<hr /><h3><span class=\"LC_warning\">Essay".
" is $osim% similar to an essay by ".	" is $osim% similar to an essay by ".
&Apache::loncommon::plainname($oname,$odom).	&Apache::loncommon::plainname($oname,$odom).
'</font></h3><blockquote><i>'.	'</span></h3><blockquote><i>'.
&keywords_highlight($oessay).	&keywords_highlight($oessay).
'</i></blockquote><hr />';	'</i></blockquote><hr />';
}	}
Line 1787 KEYWORDS	Line 1957 KEYWORDS
my $order=&get_order($partid,$respid,$symb,$uname,$udom);	my $order=&get_order($partid,$respid,$symb,$uname,$udom);
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[0].'_'.$$part[1]} 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.' <span class="LC_internal_info">( ID '.$respid.
' )</font>   ';	' )</span>   ';
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';	$lastsubonly.='<br /><span class="LC_warning">Like all files provided by users, this file may contain virusses</span><br />';
foreach my $file (split(',',$record{"resource.$partid.$respid.portfiles"})) {	my $file_counter = 0;
push(@files,$file_url.$file);	foreach my $file (@$files) {
	$file_counter ++;
&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 />';
foreach my $file (@files) {
&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.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
}	}
$lastsubonly.='<br />';	$lastsubonly.='<br />';
}	}
Line 1824 KEYWORDS	Line 1984 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 1844 KEYWORDS	Line 2004 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 1865 KEYWORDS	Line 2025 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>'.
&mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> ('.	&mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a><label> ('.
&mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" />)'.	&mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.
'<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 /> ('.	'<br /> ('.
Line 1887 KEYWORDS	Line 2047 KEYWORDS
my %seen = ();	my %seen = ();
my @partlist;	my @partlist;
my @gradePartRespid;	my @gradePartRespid;
for (sort keys(%$handgrade)) {	my @part_response_id = &flatten_responseType($responseType);
my ($partid,$respid) = split(/_/);	foreach my $part_response_id (@part_response_id) {
	my ($partid,$respid) = @{ $part_response_id };
	my $part_resp = join('_',@{ $part_response_id });
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} ne 'yes'
	&& $env{'form.lastSub'} eq '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 1920 KEYWORDS	Line 2082 KEYWORDS
'<option>3</option><option>5</option>'.	'<option>3</option><option>5</option>'.
'<option>7</option><option>10</option></select>'."\n";	'<option>7</option><option>10</option></select>'."\n";
my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
$ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
$endform.=$ntstu.'student(s)   ';	$endform.=$ntstu.'student(s)   ';
$endform.='<input type="button" value="Previous" '.	$endform.='<input type="button" value="Previous" '.
'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self>  '."\n".	'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self>  '."\n".
'<input type="button" value="Next" '.	'<input type="button" value="Next" '.
'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.="<input type='hidden' value='".&get_increment().
	"' name='increment' />";
$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 1942 sub get_last_submission {	Line 2106 sub get_last_submission {
my %lasthash=();	my %lasthash=();
my ($version);	my ($version);
for ($version=1;$version<=$$returnhash{'version'};$version++) {	for ($version=1;$version<=$$returnhash{'version'};$version++) {
foreach (sort(split(/\:/,$$returnhash{$version.':keys'}))) {	foreach my $key (sort(split(/\:/,
$lasthash{$_}=$$returnhash{$version.':'.$_};	$$returnhash{$version.':keys'}))) {
$timestamp = scalar(localtime($$returnhash{$version.':timestamp'}));	$lasthash{$key}=$$returnhash{$version.':'.$key};
	$timestamp =
	scalar(localtime($$returnhash{$version.':timestamp'}));
}	}
}	}
foreach ((keys %lasthash)) {	foreach my $key (keys(%lasthash)) {
if ($_ =~ /\.submission$/) {	next if ($key !~ /\.submission$/);
my ($partid,$foo) = split(/submission$/,$_);
my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?	my ($partid,$foo) = split(/submission$/,$key);
'<font color="red">Draft Copy</font> ' : '';	my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
push @string, (join(':',$_,$draft.$lasthash{$_}));	'<span class="LC_warning">Draft Copy</span> ' : '';
}	push(@string, join(':', $key, $draft.$lasthash{$key}));
}	}
}	}
@string = $string[0] eq '' ? '<font color="red">Nothing submitted - no attempts.</font>' : @string;	if (!@string) {
return \@string,\$timestamp;	$string[0] =
	'<span class="LC_warning">Nothing submitted - no attempts.</span>';
	}
	return (\@string,\$timestamp);
}	}

#--- High light keywords, with style choosen by user.	#--- High light keywords, with style choosen by user.
Line 1967 sub keywords_highlight {	Line 2136 sub keywords_highlight {
my $styleon = $env{'form.kwstyle'} eq '' ? '' : $env{'form.kwstyle'};	my $styleon = $env{'form.kwstyle'} eq '' ? '' : $env{'form.kwstyle'};
(my $styleoff = $styleon) =~ s/\</\<\//;	(my $styleoff = $styleon) =~ s/\</\<\//;
my @keylist = split(/[,\s+]/,$env{'form.keywords'});	my @keylist = split(/[,\s+]/,$env{'form.keywords'});
foreach (@keylist) {	foreach my $keyword (@keylist) {
$string =~ s/\b\Q$_\E(\b\|\.)/<font color\=$env{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi;	$string =~ s/\b\Q$keyword\E(\b\|\.)/<font color\=$env{'form.kwclr'} $size\>$styleon$keyword$styleoff<\/font>/gi;
}	}
return $string;	return $string;
}	}
Line 1976 sub keywords_highlight {	Line 2145 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'};
Line 1988 sub processHandGrade {	Line 2157 sub processHandGrade {
my $ctr = 0;	my $ctr = 0;
while ($ctr < $ngrade) {	while ($ctr < $ngrade) {
my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});	my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$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;
}	}
if ($errorflag eq 'not_allowed') {	if ($errorflag eq 'not_allowed') {
$request->print("<font color=\"red\">Not allowed to modify grades for $uname:$udom</font>");	$request->print("<span class=\"LC_warning\">Not allowed to modify grades for $uname:$udom</span>");
$ctr++;	$ctr++;
next;	next;
}	}
my $includemsg = $env{'form.includemsg'.$ctr};	my $includemsg = $env{'form.includemsg'.$ctr};
my ($subject,$message,$msgstatus) = ('','','');	my ($subject,$message,$msgstatus) = ('','','');
	my $restitle = &Apache::lonnet::gettitle($symb);
	my $encrypturl=&Apache::lonnet::EXT('resource.0.encrypturl',
	$symb,$udom,$uname);
	my ($feedurl,$baseurl,$showsymb,$messagetail);
	$feedurl = &Apache::lonnet::clutter($url);
	if ($encrypturl =~ /^yes$/i) {
	$baseurl = &Apache::lonenc::encrypted($feedurl,1);
	$showsymb = &Apache::lonenc::encrypted($symb,1);
	} else {
	$baseurl = $feedurl;
	$showsymb = $symb;
	}
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'); }	unless ($subject=~/\w/) { $subject=&mt('Grading Feedback'); }
	$subject.=' ['.$restitle.']';
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 '');
Line 2010 sub processHandGrade {	Line 2192 sub processHandGrade {
$message =&Apache::lonfeedback::clear_out_html($message);	$message =&Apache::lonfeedback::clear_out_html($message);
if ($env{'form.withgrades'.$ctr}) {	if ($env{'form.withgrades'.$ctr}) {
$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;	$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
$message.=" for <a href=\"".	$messagetail = " for <a href=\"".
&Apache::lonnet::clutter($url).	$baseurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";
"?symb=$symb\">$env{'form.probTitle'}</a>";	}
}	$msgstatus =
$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,	&Apache::lonmsg::user_normal_msg($uname,$udom,$subject,
$subject.' ['.	$message.$messagetail,
&Apache::lonnet::declutter($url).']',$message);	undef,$baseurl,undef,
$request->print('<br />'.&mt('Sending message to [_1]@[_2]',$uname,$udom).': '.	undef,undef,$showsymb,
	$restitle);
	$request->print('<br />'.&mt('Sending message to [_1]:[_2]',$uname,$udom).': '.
$msgstatus);	$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("<span class=\"LC_error\">".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom")."</span>");
next;	next;
} else {	} else {
if ($message ne '') {	if ($message ne '') {
$msgstatus = &Apache::lonmsg::user_normal_msg($_,$udom,$env{'form.msgsub'},$message);	$encrypturl=
	&Apache::lonnet::EXT('resource.0.encrypturl',
	$symb,$udom,$collaborator);
	if ($encrypturl =~ /^yes$/i) {
	$baseurl = &Apache::lonenc::encrypted($feedurl,1);
	$showsymb = &Apache::lonenc::encrypted($symb,1);
	} else {
	$baseurl = $feedurl;
	$showsymb = $symb;
	}
	if ($env{'form.withgrades'.$ctr}) {
	$messagetail = " for <a href=\"".
	$baseurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";

	}
	$msgstatus =
	&Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);
}	}

}	}
}	}
}	}
Line 2105 sub processHandGrade {	Line 2304 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 2143 sub processHandGrade {	Line 2342 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);
Line 2157 sub processHandGrade {	Line 2356 sub processHandGrade {

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 2193 sub processHandGrade {	Line 2392 sub processHandGrade {
$ctr++;	$ctr++;
}	}
if ($total < 0) {	if ($total < 0) {
my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n";	my $the_end = '<h3><span class="LC_info">LON-CAPA User Message</span></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 2204 sub processHandGrade {	Line 2403 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 @version_parts;
my $usec = &Apache::lonnet::getsection($domain,$stuname,	my $usec = &Apache::lonnet::getsection($domain,$stuname,
$env{'request.course.id'});	$env{'request.course.id'});
if (!&canmodify($usec)) { return('not_allowed'); }	if (!&canmodify($usec)) { return('not_allowed'); }
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
my @parts_graded;	my @parts_graded;
my %newrecord = ();	my %newrecord = ();
my ($pts,$wgt) = ('','');	my ($pts,$wgt) = ('','');
my %aggregate = ();	my %aggregate = ();
my $aggregateflag = 0;	my $aggregateflag = 0;

my @parts = split(/:/,$env{'form.partlist'.$newflg});	my @parts = split(/:/,$env{'form.partlist'.$newflg});
foreach my $new_part (@parts) {	foreach my $new_part (@parts) {
#collaborator may vary for different parts	#collaborator ($submi 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};
if ($dropMenu eq 'excused') {	if ($dropMenu eq 'excused') {
Line 2227 sub saveHandGrade {	Line 2425 sub saveHandGrade {
if (exists($record{'resource.'.$new_part.'.awarded'})) {	if (exists($record{'resource.'.$new_part.'.awarded'})) {
$newrecord{'resource.'.$new_part.'.awarded'} = '';	$newrecord{'resource.'.$new_part.'.awarded'} = '';
}	}
$newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";	$newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
}	}
} elsif ($dropMenu eq 'reset status'	} elsif ($dropMenu eq 'reset status'
&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts	&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts
Line 2248 sub saveHandGrade {	Line 2446 sub saveHandGrade {

my $solvedstatus = $record{'resource.'.$new_part.'.solved'};	my $solvedstatus = $record{'resource.'.$new_part.'.solved'};
if ($aggtries > 0) {	if ($aggtries > 0) {
&decrement($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);	&decrement_aggs($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);
$aggregateflag = 1;	$aggregateflag = 1;
}	}
} elsif ($dropMenu eq '') {	} elsif ($dropMenu eq '') {
Line 2263 sub saveHandGrade {	Line 2461 sub saveHandGrade {
my $partial= $pts/$wgt;	my $partial= $pts/$wgt;
if ($partial eq $record{'resource.'.$new_part.'.awarded'}) {	if ($partial eq $record{'resource.'.$new_part.'.awarded'}) {
#do not update score for part if not changed.	#do not update score for part if not changed.
	&handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord);
next;	next;
} else {	} else {
push @parts_graded, $new_part;	push @parts_graded, $new_part;
Line 2288 sub saveHandGrade {	Line 2487 sub saveHandGrade {
"$env{'user.name'}:$env{'user.domain'}";	"$env{'user.name'}:$env{'user.domain'}";
}	}
# 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_/ \|\|
push (@v_flag,$new_part);	$record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' \|\|
	$dropMenu eq 'reset status')
	{
	push (@version_parts,$new_part);
}	}
}	}
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'};

if (scalar(keys(%newrecord)) > 0) {	if (%newrecord) {
if (scalar(@v_flag)) {	if (@version_parts) {
&version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@v_flag);	my @changed_keys = &version_portfiles(\%record, \@parts_graded,
	$env{'request.course.id'}, $symb, $domain, $stuname, \@version_parts);
	@newrecord{@changed_keys} = @record{@changed_keys};
	foreach my $new_part (@version_parts) {
	&handback_files($request,$symb,$stuname,$domain,$newflg,
	$new_part,\%newrecord);
	}
}	}
&Apache::lonnet::cstore(\%newrecord,$symb,	&Apache::lonnet::cstore(\%newrecord,$symb,
$env{'request.course.id'},$domain,$stuname);	$env{'request.course.id'},$domain,$stuname);
	&check_and_remove_from_queue(\@parts,\%record,\%newrecord,$symb,
my @ungraded_parts;	$cdom,$cnum,$domain,$stuname);
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,
Line 2321 sub saveHandGrade {	Line 2519 sub saveHandGrade {
return ('',$pts,$wgt);	return ('',$pts,$wgt);
}	}

	sub check_and_remove_from_queue {
	my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname) = @_;
	my @ungraded_parts;
	foreach my $part (@{$parts}) {
	if ( $record->{ 'resource.'.$part.'.awarded'} eq ''
	&& $record->{ 'resource.'.$part.'.solved' } ne 'excused'
	&& $newrecord->{'resource.'.$part.'.awarded'} eq ''
	&& $newrecord->{'resource.'.$part.'.solved' } ne 'excused'
	) {
	push(@ungraded_parts, $part);
	}
	}
	if ( !@ungraded_parts ) {
	&Apache::bridgetask::remove_from_queue('gradingqueue',$symb,$cdom,
	$cnum,$domain,$stuname);
	}
	}

	sub handback_files {
	my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;
	my $portfolio_root = &propath($domain,$stuname).'/userfiles/portfolio';
	my ($partlist,$handgrade,$responseType) = &response_type($symb);

	my @part_response_id = &flatten_responseType($responseType);
	foreach my $part_response_id (@part_response_id) {
	my ($part_id,$resp_id) = @{ $part_response_id };
	my $part_resp = join('_',@{ $part_response_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;
	my $file_msg;
	while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) {
	my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'};
	my ($directory,$answer_file) =
	($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter} =~ /^(.?)([^\/])$/);
	my ($answer_name,$answer_ver,$answer_ext) =
	&file_name_version_ext($answer_file);
	my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
	my @dir_list = &Apache::lonnet::dirlist($portfolio_path,$domain,$stuname,$portfolio_root);
	my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
	# fix file name
	my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
	my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,
	$newflg.'_'.$part_resp.'_returndoc'.$file_counter,
	$save_file_name);
	if ($result !~ m\|^/uploaded/\|) {
	$request->print('<span class="LC_error">An error occurred ('.$result.
	') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</span><br />');
	} else {
	# mark the file as read only
	my @files = ($save_file_name);
	my @what = ($symb,$env{'request.course.id'},'handback');
	&Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what);
	if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) {
	$$newrecord{"resource.$new_part.$resp_id.handback"}.=',';
	}
	$$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name;
	$file_msg.= "\n".'<br /><span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span><br />";

	}
	$request->print("<br />".$fname." will be the uploaded file name");
	$request->print(" ".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
	$file_counter++;
	}
	my $subject = "File Handed Back by Instructor ";
	my $message = "A file has been returned that was originally submitted in reponse to: <br />";
	$message .= "<strong>".&Apache::lonnet::gettitle($symb)."</strong><br />";
	$message .= ' The returned file(s) are named: '. $file_msg;
	$message .= " and can be found in your portfolio space.";
	my $url = (&Apache::lonnet::decode_symb($symb))[2];
	my $feedurl = &Apache::lonnet::clutter($url);
	my $encrypturl=&Apache::lonnet::EXT('resource.0.encrypturl',
	$symb,$domain,$stuname);
	my ($baseurl,$showsymb);
	if ($encrypturl =~ /^yes$/i) {
	$baseurl = &Apache::lonenc::encrypted($feedurl,1);
	$showsymb = &Apache::lonenc::encrypted($symb,1);
	} else {
	$baseurl = $feedurl;
	$showsymb = $symb;
	}
	my $restitle = &Apache::lonnet::gettitle($symb);
	my $msgstatus =
	&Apache::lonmsg::user_normal_msg($stuname,$domain,$subject.
	' (File Returned) ['.$restitle.']',$message,undef,
	$baseurl,undef,undef,undef,$showsymb,$restitle);
	}
	}
	return;
	}

	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 (\@files);
	}

# ----------- Provides number of tries since last reset.	# ----------- Provides number of tries since last reset.
sub get_num_tries {	sub get_num_tries {
my ($record,$last_reset,$part) = @_;	my ($record,$last_reset,$part) = @_;
Line 2382 sub get_last_resets {	Line 2686 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 @returned_keys;
my $parts = join('\|', @$parts_graded);	my $parts = join('\|', @$parts_graded);
my $portfolio_root = &Apache::loncommon::propath($domain,	my $portfolio_root = &propath($domain,$stu_name).
$stuname).	'/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 @versioned_portfiles;
my @portfiles = split(/,/,$$record{$key});	my @portfiles = split(/\s,\s/,$$record{$key});
&Apache::lonnet::logthis("should be unmarking and remarking $key",@portfiles);
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 ($answer_name,$answer_ver,$answer_ext) =	my ($answer_name,$answer_ver,$answer_ext) =
&file_name_version_ext($answer_file);	&file_name_version_ext($answer_file);
my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stuname,$portfolio_root);	my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stu_name,$portfolio_root);
foreach my $row (@dir_list) {	my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
my ($file) = split(/\&/,$row,2);	my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
my ($file_name,$file_version,$file_ext) =	if ($new_answer ne 'problem getting file') {
&file_name_version_ext($file);	push(@versioned_portfiles, $directory.$new_answer);
if (($file_name eq $answer_name) &&	&Apache::lonnet::mark_as_readonly($domain,$stu_name,
($file_ext eq $answer_ext)) {	[$directory.$new_answer],
# gets here if filename and extension match, regardless of version	[$symb,$env{'request.course.id'},'graded']);
if ($file_version ne '') {
# a versioned file is found so save it for later
if ($file_version > $version) {
$version = $file_version;
}
}
}
}
$version++;
$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 $new_answer = $answer_name.'.'.$version.'.'.$answer_ext;
my $copy_result = &Apache::lonnet::finishuserfileupload(
$stuname,$domain,'copy',
'/portfolio'.$directory.$new_answer);
push(@v_portfiles, $directory.$new_answer);
&Apache::lonnet::mark_as_readonly($domain,$stuname,
['/portfolio'.$directory.$new_answer],
[$symb,$env{'request.course.id'},'graded']);
}	}
}	}
$$record{$key} = join(',',@v_portfiles);	$$record{$key} = join(',',@versioned_portfiles);
	push(@returned_keys,$key);
}	}
}	}
return 'ok';	return (@returned_keys);
	}

	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 {	sub file_name_version_ext {
Line 2634 sub viewgrades {	Line 2954 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 2642 sub viewgrades {	Line 2962 sub viewgrades {
$env{'course.'.$env{'request.course.id'}.'.domain'});	$env{'course.'.$env{'request.course.id'}.'.domain'});
&Apache::lonnet::clear_EXT_cache_status();	&Apache::lonnet::clear_EXT_cache_status();

my $result='<h3><font color="#339933">'.&mt('Manual Grading').'</font></h3>';	my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';
$result.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n";	$result.='<h4><b>Current Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\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 2671 sub viewgrades {	Line 2990 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,$responseType) = &response_type($symb);
my %weight = ();	my %weight = ();
my $ctsparts = 0;	my $ctsparts = 0;
$result.='<table border="0">';	$result.='<table border="0">';
my %seen = ();	my %seen = ();
for (sort keys(%$handgrade)) {	my @part_response_id = &flatten_responseType($responseType);
my ($partid,$respid) = split (/_/,$_,2);	foreach my $part_response_id (@part_response_id) {
	my ($partid,$respid) = @{ $part_response_id };
	my $part_resp = join('_',@{ $part_response_id });
next if $seen{$partid};	next if $seen{$partid};
$seen{$partid}++;	$seen{$partid}++;
my $handgrade=$$handgrade{$_};	my $handgrade=$$handgrade{$part_resp};
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
$weight{$partid} = $wgt eq '' ? '1' : $wgt;	$weight{$partid} = $wgt eq '' ? '1' : $wgt;

Line 2688 sub viewgrades {	Line 3009 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;
Line 2707 sub viewgrades {	Line 3028 sub viewgrades {
$result.= '</td><td><select name="SELVAL_'.$partid.'"'.	$result.= '</td><td><select name="SELVAL_'.$partid.'"'.
'onChange="javascript:writeRadText(\''.$partid.'\','.	'onChange="javascript:writeRadText(\''.$partid.'\','.
$weight{$partid}.')"> '.	$weight{$partid}.')"> '.
'<option selected="on"> </option>'.	'<option selected="selected"> </option>'.
'<option>excused</option>'.	'<option>excused</option>'.
'<option>reset status</option></select></td>'.	'<option>reset status</option></select></td>'.
'<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n";	'<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n";
Line 2715 sub viewgrades {	Line 3036 sub viewgrades {
}	}
$result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".	$result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
$result.='<input type="button" value="Reset" '.	$result.='<input type="button" value="Revert to Default" '.
'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self>';	'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self>';

#table listing all the students in a section/class	#table listing all the students in a section/class
Line 2724 sub viewgrades {	Line 3045 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 2732 sub viewgrades {	Line 3054 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 2760 sub viewgrades {	Line 3082 sub viewgrades {
return $a cmp $b;	return $a cmp $b;
} (keys(%$fullname))) {	} (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 2769 sub viewgrades {	Line 3091 sub viewgrades {
'onClick="javascript:submit();" TARGET=_self /></form>'."\n";	'onClick="javascript:submit();" TARGET=_self /></form>'."\n";
if (scalar(%$fullname) eq 0) {	if (scalar(%$fullname) eq 0) {
my $colspan=3+scalar(@parts);	my $colspan=3+scalar(@parts);
$result='<font color="red">There are no students in section "'.$env{'form.section'}.	$result='<span class="LC_warning">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.</span>';
}	}
$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);
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);	my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
my %aggregates = ();	my %aggregates = ();
Line 2787 sub viewstudentgrade {	Line 3109 sub viewstudentgrade {
"\n".$ctr.' </td><td> '.	"\n".$ctr.' </td><td> '.
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
'\')"; TARGET=_self>'.$fullname.'</a> '.	'\')"; TARGET=_self>'.$fullname.'</a> '.
'<font color="#999999">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";	'<span class="LC_internal_info">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</span></td>'."\n";
$student=~s/:/_/; # colon doen't work in javascript for names	$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);
Line 2809 sub viewstudentgrade {	Line 3131 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 2824 sub viewstudentgrade {	Line 3146 sub viewstudentgrade {
$result.=' <select name="'.	$result.=' <select name="'.
'GD_'.$student.'_'.$part.'_solved" '.	'GD_'.$student.'_'.$part.'_solved" '.
'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";	'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
$result.= (($status eq 'excused') ? '<option> </option><option selected="on">excused</option>'	$result.= (($status eq 'excused') ? '<option> </option><option selected="selected">excused</option>'
: '<option selected="on"> </option><option>excused</option>')."\n";	: '<option selected="selected"> </option><option>excused</option>')."\n";
$result.='<option>reset status</option>';	$result.='<option>reset status</option>';
$result.="</select> </td>\n";	$result.="</select> </td>\n";
} else {	} else {
Line 2846 sub viewstudentgrade {	Line 3168 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><span class="LC_info">Current Grade Status</span></h3>';
my $title='<h3><font color="#339933">Current Grade Status</font></h3>';	$title.='<h4><b>Current Resource: </b>'.$env{'form.probTitle'}.'</h4><br />'."\n";
$title.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font><br />'."\n";	$title.='<h4><b>Section: </b>'.$env{'form.section'}.'</h4>'."\n";
$title.='<font size=+1><b>Section: </b>'.$env{'form.section'}.'</font>'."\n";

my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";	my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
$result.= '<table border="0"><tr bgcolor="#deffff">'.	$result.= '<table border="0"><tr bgcolor="#deffff">'.
Line 2871 sub editgrades {	Line 3192 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 2879 sub editgrades {	Line 3200 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 2896 sub editgrades {	Line 3218 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 2917 sub editgrades {	Line 3239 sub editgrades {
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;
$noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";	$noupdate.=$line."<td colspan=\"$numcols\"><span class=\"LC_warning\">Not allowed to modify student</span></td></tr>";
next;	next;
}	}
my %aggregate = ();	my %aggregate = ();
Line 3036 sub editgrades {	Line 3358 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 3139 ENDPICK	Line 3461 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 3147 sub csvuploadmap_header {	Line 3469 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><span class="LC_info">Uploading Class Grades</span></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 3169 to this page if the data selected is ins	Line 3491 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 3183 ENDPICK	Line 3504 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 3230 CSVFORMJS	Line 3552 CSVFORMJS

sub upcsvScores_form {	sub upcsvScores_form {
my ($request) = shift;	my ($request) = shift;
my ($symb,$url)=&get_symb_and_url($request);	my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $result=&checkforfile_js();	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>'.&mt('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";
	my $upload=&mt("Upload Scores");
my $upfile_select=&Apache::loncommon::upfile_select_html();	my $upfile_select=&Apache::loncommon::upfile_select_html();
my $ignore=&mt('Ignore First Line');	my $ignore=&mt('Ignore First Line');
$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" />
<label><input type="checkbox" name="noFirstLine" />$ignore</label>	<label><input type="checkbox" name="noFirstLine" />$ignore</label>
</form>	</form>
ENDUPFORM	ENDUPFORM
$result.='</td></tr></table>'."\n";	$result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
	&mt("How do I create a CSV file from a spreadsheet"))
	.'</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 3276 sub csvuploadmap {	Line 3600 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 3291 sub csvuploadmap {	Line 3615 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><span class="LC_info">Uploading Class Grade Options</span></h3>
<input type="hidden" name="command" value="csvuploadassign" />	<input type="hidden" name="command" value="csvuploadassign" />
<!--	<!--
<p>	<p>
Line 3341 ENDPICK	Line 3670 ENDPICK
# FIXME do a check for any invalid user ids?...	# FIXME do a check for any invalid user ids?...
$request->print('<input type="submit" value="Assign Grades" /><br />	$request->print('<input type="submit" value="Assign Grades" /><br />
<hr /></form>'."\n");	<hr /></form>'."\n");
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));
return '';	return '';
}	}

Line 3364 sub get_fields {	Line 3693 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 '';}
	my $error_msg = '';
&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();
if ($env{'form.noFirstLine'}) { shift(@gradedata); }	if ($env{'form.noFirstLine'}) { shift(@gradedata); }
Line 3418 sub csvuploadassign {	Line 3748 sub csvuploadassign {
my $part=$1;	my $part=$1;
my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',	my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',
$symb,$domain,$username);	$symb,$domain,$username);
$entries{$fields{$dest}}=~s/\s//g;	if ($wgt) {
my $pcr=$entries{$fields{$dest}} / $wgt;	$entries{$fields{$dest}}=~s/\s//g;
my $award='correct_by_override';	my $pcr=$entries{$fields{$dest}} / $wgt;
$grades{"resource.$part.awarded"}=$pcr;	my $award='correct_by_override';
$grades{"resource.$part.solved"}=$award;	$grades{"resource.$part.awarded"}=$pcr;
$points{$part}=1;	$grades{"resource.$part.solved"}=$award;
	$points{$part}=1;
	} else {
	$error_msg = "<br />" .
	&mt("Some point values were assigned"
	." for problems with a weight "
	."of zero. These values were "
	."ignored.");
	}
} else {	} else {
if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} }	if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} }
if ($dest=~/stores_(.*)_solved/) { if ($points{$1}) {next;} }	if ($dest=~/stores_(.*)_solved/) { if ($points{$1}) {next;} }
Line 3433 sub csvuploadassign {	Line 3771 sub csvuploadassign {
$grades{$store_key}=$entries{$fields{$dest}};	$grades{$store_key}=$entries{$fields{$dest}};
}	}
}	}
if (! %grades) { push(@skipped,"$username:$domain no data to store"); }	if (! %grades) { push(@skipped,"$username:$domain no data to save"); }
$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)));
my $result=&Apache::lonnet::cstore(\%grades,$symb,	my $result=&Apache::lonnet::cstore(\%grades,$symb,
Line 3443 sub csvuploadassign {	Line 3781 sub csvuploadassign {
$request->print('.');	$request->print('.');
} else {	} else {
$request->print("<p>	$request->print("<p>
<font color='red'>	<span class=\"LC_error\">
Failed to store student $username\@$domain.	Failed to save student $username:$domain.
Message when trying to store was ($result)	Message when trying to save was ($result)
</font>	</span>
</p>" );	</p>" );
}	}
$request->rflush();	$request->rflush();
$countdone++;	$countdone++;
}	}
$request->print("<br />Stored $countdone students\n");	$request->print("<br />Saved $countdone students\n");
if (@skipped) {	if (@skipped) {
$request->print('<p<font size="+1"><b>Skipped Students</b></font></p>');	$request->print('<p><h4><b>Skipped Students</b></h4></p>');
foreach my $student (@skipped) { $request->print("$student<br />\n"); }	foreach my $student (@skipped) { $request->print("$student<br />\n"); }
}	}
if (@notallowed) {	if (@notallowed) {
$request->print('<p><font size="+1" color="red"><b>Students Not Allowed to Modify</b></font></p>');	$request->print('<p><span class="LC_error">Students Not Allowed to Modify</span></p>');
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 $error_msg;
}	}
#------------- end of section for handling csv file upload ---------	#------------- end of section for handling csv file upload ---------
#	#
Line 3492 function checkPickOne(formname) {	Line 3830 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'};

my $result='<h3><font color="#339933"> '.	my $result='<h3><span class="LC_info"> '.
'Manual Grading by Page or Sequence</font></h3>';	'Manual Grading by Page or Sequence</span></h3>';

$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";	$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
$result.=' <b>Problems from:</b> <select name="selectpage">'."\n";	$result.=' <b>Problems from:</b> <select name="selectpage">'."\n";
Line 3510 LISTJAVASCRIPT	Line 3848 LISTJAVASCRIPT
foreach (@$titles) {	foreach (@$titles) {
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
$result.='<option value="'.$ctr.'" '.	$result.='<option value="'.$ctr.'" '.
($$symbx{$_} =~ /$curpage$/ ? 'selected="on"' : '').	($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
'>'.$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 3525 LISTJAVASCRIPT	Line 3863 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><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".	$result.=' <b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n";	'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n";

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

	$result.=' <b>'.&mt('Use CODE:').' </b>'.
	'<input type="text" name="CODE" value="" /><br />'."\n";

$result.=' <input type="button" '.	$result.=' <input type="button" '.
'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";	'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";

$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 3570 LISTJAVASCRIPT	Line 3910 LISTJAVASCRIPT
$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');	$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
$ptr++;	$ptr++;
}	}
$studentTable.='</td><td> </td><td> ' if ($ptr%2 == 0);	$studentTable.='</td><td> </td><td> </td></tr>' if ($ptr%2 == 0);
$studentTable.='</td></tr></table></td></tr></table>'."\n";	$studentTable.='</table></td></tr></table>'."\n";
$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 3594 sub getSymbMap {	Line 3934 sub getSymbMap {
1,0,1);	1,0,1);
for my $sequence ($navmap->getById('0.0'), @sequences) {	for my $sequence ($navmap->getById('0.0'), @sequences) {
if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {	if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
my $title = $minder.'.'.$sequence->compTitle();	my $title = $minder.'.'.
push @titles, $title; # minder in case two titles are identical	&HTML::Entities::encode($sequence->compTitle(),'"\'&');
$symbx{$title} = $sequence->symb();	push(@titles, $title); # minder in case two titles are identical
	$symbx{$title} = &HTML::Entities::encode($sequence->symb(),'"\'&');
$minder++;	$minder++;
}	}
}	}
Line 3608 sub getSymbMap {	Line 3949 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 3625 sub displayPage {	Line 3966 sub displayPage {
&Apache::lonnet::clear_EXT_cache_status();	&Apache::lonnet::clear_EXT_cache_status();

if (!&canview($usec)) {	if (!&canview($usec)) {
$request->print('<font color="red">Unable to view requested student.('.$env{'form.student'}.')</font>');	$request->print('<span class="LC_warning">Unable to view requested student.('.$env{'form.student'}.')</span>');
$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><span class="LC_info"> '.$env{'form.title'}.'</span></h3>';
$result.='<h3> Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).	$result.='<h3> Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).
'</h3>'."\n";	'</h3>'."\n";
	if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
	$result.='<h3> CODE: '.$env{'form.CODE'}.'</h3>'."\n";
	} else {
	delete($env{'form.CODE'});
	}
&sub_page_js($request);	&sub_page_js($request);
$request->print($result);	$request->print($result);

Line 3639 sub displayPage {	Line 3985 sub displayPage {
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) {	if (!$map) {
$request->print('<font color="red">Unable to view requested sequence. ('.$resUrl.')</font>');	$request->print('<span class="LC_warning">Unable to view requested sequence. ('.$resUrl.')</span>');
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
my $iterator = $navmap->getIterator($map->map_start(),	my $iterator = $navmap->getIterator($map->map_start(),
Line 3652 sub displayPage {	Line 3998 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";

my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').	if (defined($env{'form.CODE'})) {
	$studentTable.=
	'<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n";
	}
	my $checkIcon = '<img alt="'.&mt('Check Mark').
	'" src="'.$request->dir_config('lonIconsURL').
'/check.gif" height="16" border="0" />';	'/check.gif" height="16" border="0" />';

$studentTable.=' <b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.	$studentTable.=' <b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
Line 3667 sub displayPage {	Line 4017 sub displayPage {
'<td align="center"><b> Prob. </b></td>'.	'<td align="center"><b> Prob. </b></td>'.
'<td><b> '.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';	'<td><b> '.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';

	&Apache::lonxml::clear_problem_counter();
my ($depth,$question,$prob) = (1,1,1);	my ($depth,$question,$prob) = (1,1,1);
$iterator->next(); # skip the first BEGIN_MAP	$iterator->next(); # skip the first BEGIN_MAP
my $curRes = $iterator->next(); # for "current resource"	my $curRes = $iterator->next(); # for "current resource"
Line 3674 sub displayPage {	Line 4025 sub displayPage {
if($curRes == $iterator->BEGIN_MAP) { $depth++; }	if($curRes == $iterator->BEGIN_MAP) { $depth++; }
if($curRes == $iterator->END_MAP) { $depth--; }	if($curRes == $iterator->END_MAP) { $depth--; }

if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {	if (ref($curRes) && $curRes->is_problem()) {
my $parts = $curRes->parts();	my $parts = $curRes->parts();
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">';
	my %form = ('CODE' => $env{'form.CODE'},);
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,
undef,'both');	undef,'both',\%form);
} else {	} else {
my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'});	my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form);
$companswer =~ s\|<form(.*?)>\|\|g;	$companswer =~ s\|<form(.*?)>\|\|g;
$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);

if ($env{'form.lastSub'} eq 'datesub') {	if ($env{'form.lastSub'} eq 'datesub') {
if ($record{'version'} eq '') {	if ($record{'version'} eq '') {
$studentTable.='<br /> <font color="red">No recorded submission for this problem</font><br />';	$studentTable.='<br /> <span class="LC_warning">No recorded submission for this problem</span><br />';
} else {	} else {
my %responseType = ();	my %responseType = ();
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
Line 3736 sub displayPage {	Line 4088 sub displayPage {
$curRes = $iterator->next();	$curRes = $iterator->next();
}	}

$studentTable.='</td></tr></table></td></tr></table>'."\n".	$studentTable.='</table></td></tr></table>'."\n".
'<input type="button" value="Save" '.	'<input type="button" value="Save" '.
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
'</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 3749 sub displayPage {	Line 4101 sub displayPage {
sub displaySubByDates {	sub displaySubByDates {
my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;	my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
my $isCODE=0;	my $isCODE=0;
	my $isTask = ($symb =~/\.task$/);
if (exists($record->{'resource.CODE'})) { $isCODE=1; }	if (exists($record->{'resource.CODE'})) { $isCODE=1; }
my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.	my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
'<table border="0" width="100%"><tr bgcolor="#e6ffff">'.	'<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
Line 3761 sub displaySubByDates {	Line 4114 sub displaySubByDates {
my %orders;	my %orders;
$mark{'correct_by_student'} = $checkIcon;	$mark{'correct_by_student'} = $checkIcon;
if (!exists($$record{'1:timestamp'})) {	if (!exists($$record{'1:timestamp'})) {
return '<br /> <font color="red">Nothing submitted - no attempts</font><br />';	return '<br /> <span class="LC_warning">Nothing submitted - no attempts</span><br />';
}	}

	my $interaction;
for ($version=1;$version<=$$record{'version'};$version++) {	for ($version=1;$version<=$$record{'version'};$version++) {
my $timestamp = scalar(localtime($$record{$version.':timestamp'}));	my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
	if (exists($$record{$version.':resource.0.version'})) {
	$interaction = $$record{$version.':resource.0.version'};
	}

	my $where = ($isTask ? "$version:resource.$interaction"
	: "$version:resource");
	#&Apache::lonnet::logthis(" got $where");
$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';	$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
if ($isCODE) {	if ($isCODE) {
$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';	$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
Line 3772 sub displaySubByDates {	Line 4134 sub displaySubByDates {
my @versionKeys = split(/\:/,$$record{$version.':keys'});	my @versionKeys = split(/\:/,$$record{$version.':keys'});
my @displaySub = ();	my @displaySub = ();
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
my @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);	my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)
	: sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));


# next if ($$record{"$version:resource.$partid.solved"} eq '');	# next if ($$record{"$version:resource.$partid.solved"} eq '');
my $display_part=&get_display_part($partid,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 '') {
my ($responseId)=($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/);
	my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
	: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
	#&Apache::lonnet::logthis("match $matchKey $responseId (".$$record{$version.':'.$matchKey});
$displaySub[0].='<b>Part:</b> '.$display_part.' ';	$displaySub[0].='<b>Part:</b> '.$display_part.' ';
$displaySub[0].='<font color="#999999">(ID '.	$displaySub[0].='<span class="LC_internal_info">(ID '.
$responseId.')</font> <b>';	$responseId.')</span> <b>';
if ($$record{"$version:resource.$partid.tries"} eq '') {	if ($$record{"$where.$partid.tries"} eq '') {
$displaySub[0].='Trial not counted';	$displaySub[0].='Trial not counted';
} else {	} else {
$displaySub[0].='Trial '.	$displaySub[0].='Trial '.
$$record{"$version:resource.$partid.tries"};	$$record{"$where.$partid.tries"};
}	}
my $responseType=$responseType->{$partid}->{$responseId};	my $responseType=($isTask ? 'Task'
	: $responseType->{$partid}->{$responseId});
if (!exists($orders{$partid})) { $orders{$partid}={}; }	if (!exists($orders{$partid})) { $orders{$partid}={}; }
if (!exists($orders{$partid}->{$responseId})) {	if (!exists($orders{$partid}->{$responseId})) {
$orders{$partid}->{$responseId}=	$orders{$partid}->{$responseId}=
&get_order($partid,$responseId,$symb,$uname,$udom);	&get_order($partid,$responseId,$symb,$uname,$udom);
}	}
$displaySub[0].='</b>  '.	$displaySub[0].='</b>  '.
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:").'<br />';	&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
}	}
}	}
if (exists $$record{"$version:resource.$partid.award"}) {	if (exists($$record{"$where.$partid.checkedin"})) {
	$displaySub[1].='Checked in by '.
	$$record{"$where.$partid.checkedin"}.' into slot '.
	$$record{"$where.$partid.checkedin.slot"}.
	'<br />';
	}
	if (exists $$record{"$where.$partid.award"}) {
$displaySub[1].='<b>Part:</b> '.$display_part.'  '.	$displaySub[1].='<b>Part:</b> '.$display_part.'  '.
lc($$record{"$version:resource.$partid.award"}).' '.	lc($$record{"$where.$partid.award"}).' '.
$mark{$$record{"$version:resource.$partid.solved"}}.	$mark{$$record{"$where.$partid.solved"}}.
'<br />';	'<br />';
}	}
if (exists $$record{"$version:resource.$partid.regrader"}) {	if (exists $$record{"$where.$partid.regrader"}) {
$displaySub[2].=$$record{"$version:resource.$partid.regrader"}.	$displaySub[2].=$$record{"$where.$partid.regrader"}.
	' (<b>'.&mt('Part').':</b> '.$display_part.')';
	} elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) {
	$displaySub[2].=
	$$record{"$version:resource.$partid.regrader"}.
' (<b>'.&mt('Part').':</b> '.$display_part.')';	' (<b>'.&mt('Part').':</b> '.$display_part.')';
}	}
}	}
Line 3835 sub updateGradeByPage {	Line 4214 sub updateGradeByPage {
my ($uname,$udom) = split(/:/,$env{'form.student'});	my ($uname,$udom) = split(/:/,$env{'form.student'});
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('<span class="LC_warning">Unable to modify requested student.('.$env{'form.student'}.'</span>');
$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><span class="LC_info"> '.$env{'form.title'}.'</span></h3>';
$result.='<h3> Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).	$result.='<h3> Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
'</h3>'."\n";	'</h3>'."\n";

Line 3849 sub updateGradeByPage {	Line 4228 sub updateGradeByPage {
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) {	if (!$map) {
$request->print('<font color="red">Unable to grade requested sequence. ('.$resUrl.')</font>');	$request->print('<span class="LC_warning">Unable to grade requested sequence. ('.$resUrl.')</span>');
my ($symb,$url)=&get_symb_and_url($request);	my ($symb)=&get_symb($request);
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
my $iterator = $navmap->getIterator($map->map_start(),	my $iterator = $navmap->getIterator($map->map_start(),
Line 3871 sub updateGradeByPage {	Line 4250 sub updateGradeByPage {
if($curRes == $iterator->BEGIN_MAP) { $depth++; }	if($curRes == $iterator->BEGIN_MAP) { $depth++; }
if($curRes == $iterator->END_MAP) { $depth--; }	if($curRes == $iterator->END_MAP) { $depth--; }

if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {	if (ref($curRes) && $curRes->is_problem()) {
my $parts = $curRes->parts();	my $parts = $curRes->parts();
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 3918 sub updateGradeByPage {	Line 4297 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 eq $oldpts && $score ne 'excused'));

$newrecord{'resource.'.$partid.'.awarded'} = $partial if $partial ne '';	$newrecord{'resource.'.$partid.'.awarded'} = $partial if $partial ne '';
$newrecord{'resource.'.$partid.'.solved'} = $score if $score ne '';	$newrecord{'resource.'.$partid.'.solved'} = $score if $score ne '';
Line 3939 sub updateGradeByPage {	Line 4316 sub updateGradeByPage {
$changeflag++;	$changeflag++;
}	}
if (scalar(keys(%newrecord)) > 0) {	if (scalar(keys(%newrecord)) > 0) {
	my %record =
	&Apache::lonnet::restore($symbx,$env{'request.course.id'},
	$udom,$uname);

	if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
	$newrecord{'resource.CODE'} = $env{'form.CODE'};
	} elsif (&Apache::lonnet::validCODE($record{'resource.CODE'})) {
	$newrecord{'resource.CODE'} = '';
	}
&Apache::lonnet::cstore(\%newrecord,$symbx,$env{'request.course.id'},	&Apache::lonnet::cstore(\%newrecord,$symbx,$env{'request.course.id'},
$udom,$uname);	$udom,$uname);
	%record = &Apache::lonnet::restore($symbx,
	$env{'request.course.id'},
	$udom,$uname);
	&check_and_remove_from_queue($parts,\%record,undef,$symbx,
	$cdom,$cnum,$udom,$uname);
}	}

if ($aggregateflag) {	if ($aggregateflag) {
&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
$env{'course.'.$env{'request.course.id'}.'.domain'},	$env{'course.'.$env{'request.course.id'}.'.domain'},
Line 3958 sub updateGradeByPage {	Line 4350 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 3976 sub updateGradeByPage {	Line 4368 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 3993 sub getSequenceDropDown {	Line 4384 sub getSequenceDropDown {
foreach (@$titles) {	foreach (@$titles) {
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
$result.='<option value="'.$$symbx{$_}.'" '.	$result.='<option value="'.$$symbx{$_}.'" '.
($$symbx{$_} =~ /$curpage$/ ? 'selected="on"' : '').	($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
'>'.$showtitle.'</option>'."\n";	'>'.$showtitle.'</option>'."\n";
$ctr++;	$ctr++;
}	}
Line 4005 sub scantron_filenames {	Line 4396 sub scantron_filenames {
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};	my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,	my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
&Apache::loncommon::propath($cdom,$cname));	&propath($cdom,$cname));
my @possiblenames;	my @possiblenames;
foreach my $filename (sort(@files)) {	foreach my $filename (sort(@files)) {
($filename)=split(/&/,$filename);	($filename)=split(/&/,$filename);
Line 4021 sub scantron_uploads {	Line 4412 sub scantron_uploads {
my $result= '<select name="scantron_selectfile">';	my $result= '<select name="scantron_selectfile">';
$result.="<option></option>";	$result.="<option></option>";
foreach my $filename (sort(&scantron_filenames())) {	foreach my $filename (sort(&scantron_filenames())) {
$result.="<option".($filename eq $file2grade ? ' selected="on"':'').">$filename</option>\n";	$result.="<option".($filename eq $file2grade ? ' selected="selected"':'').">$filename</option>\n";
}	}
$result.="</select>";	$result.="</select>";
return $result;	return $result;
Line 4056 sub scantron_CODElist {	Line 4447 sub scantron_CODElist {
}	}

sub scantron_CODEunique {	sub scantron_CODEunique {
my $result='<nobr>	my $result='<span style="white-space: nowrap;">
<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>	</span>
<nobr>	<span style="white-space: nowrap;">
<label><input type="radio" name="scantron_CODEunique"	<label><input type="radio" name="scantron_CODEunique"
value="No" /> No </label>	value="no" /> No </label>
</nobr>';	</span>';
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 4113 sub scantron_selectphase {	Line 4504 sub scantron_selectphase {
<td> Options: </td>	<td> Options: </td>
<td>	<td>
<label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />	<label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />
<label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections</label>	<label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections</label> <br />
	<label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> Skip hidden resources when grading</label>
</td>	</td>
</tr>	</tr>
<tr bgcolor="#ffffe6">	<tr bgcolor="#ffffe6">
Line 4144 SCANTRONFORM	Line 4536 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 4181 SCANTRONFORM	Line 4573 SCANTRONFORM
<tr>	<tr>
<form action='/adm/grades' name='scantron_download'>	<form action='/adm/grades' name='scantron_download'>
<td bgcolor="#777777">	<td bgcolor="#777777">
	$default_form_data
<input type="hidden" name="command" value="scantron_download" />	<input type="hidden" name="command" value="scantron_download" />
<table width="100%" border="0">	<table width="100%" border="0">
<tr bgcolor="#e6ffff">	<tr bgcolor="#e6ffff">
Line 4297 sub scantron_fixup_scanline {	Line 4690 sub scantron_fixup_scanline {
$answer=$alphabet[$args->{'response'}];	$answer=$alphabet[$args->{'response'}];
} elsif ($on eq 'number') {	} elsif ($on eq 'number') {
$answer=$args->{'response'}+1;	$answer=$args->{'response'}+1;
	if ($answer == 10) { $answer = '0'; }
} else {	} else {
substr($answer,$args->{'response'},1)=$on;	substr($answer,$args->{'response'},1)=$on;
}	}
Line 4363 sub scantron_parse_scanline {	Line 4757 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 eq '?') {	if ($currentquest eq '?'
	\|\| $currentquest eq '*') {
push(@{$record{'scantron.doubleerror'}},$questnum);	push(@{$record{'scantron.doubleerror'}},$questnum);
$record{"scantron.$questnum.answer"}='';	$record{"scantron.$questnum.answer"}='';
} elsif (!$currentquest	} elsif (!defined($currentquest)
\|\| $currentquest eq $$scantron_config{'Qoff'}	\|\| $currentquest eq $$scantron_config{'Qoff'}
\|\| $currentquest !~ /^[A-Z]$/) {	\|\| $currentquest !~ /^[A-Z]$/) {
$record{"scantron.$questnum.answer"}='';	$record{"scantron.$questnum.answer"}='';
Line 4377 sub scantron_parse_scanline {	Line 4772 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 eq '?') {	if ($currentquest eq '?'
	\|\| $currentquest eq '*') {
push(@{$record{'scantron.doubleerror'}},$questnum);	push(@{$record{'scantron.doubleerror'}},$questnum);
$record{"scantron.$questnum.answer"}='';	$record{"scantron.$questnum.answer"}='';
} elsif (!$currentquest	} elsif (!defined($currentquest)
\|\| $currentquest eq $$scantron_config{'Qoff'}	\|\| $currentquest eq $$scantron_config{'Qoff'}
\|\| $currentquest !~ /^\d$/) {	\|\| $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);
}	}
} else {	} else {
$record{"scantron.$questnum.answer"}=	# wrap zero back to J
$alphabet[$currentquest-1];	if ($currentquest eq '0') {
	$record{"scantron.$questnum.answer"}=
	$alphabet[9];
	} else {
	$record{"scantron.$questnum.answer"}=
	$alphabet[$currentquest-1];
	}
}	}
} else {	} else {
my @array=split($$scantron_config{'Qon'},$currentquest,-1);	my @array=split($$scantron_config{'Qon'},$currentquest,-1);
Line 4442 sub scantron_find_student {	Line 4844 sub scantron_find_student {

sub scantron_filter {	sub scantron_filter {
my ($curres)=@_;	my ($curres)=@_;
# randomout is dysfunctional at best for this purpose
if (ref($curres) && $curres->is_problem()) { #&& !$curres->randomout) {	if (ref($curres) && $curres->is_problem()) {
	# if the user has asked to not have either hidden
	# or 'randomout' controlled resources to be graded
	# don't include them
	if ($env{'form.scantron_options_hidden'} eq 'ignore_hidden'
	&& $curres->randomout) {
	return 0;
	}
return 1;	return 1;
}	}
return 0;	return 0;
Line 4499 sub scantron_process_corrections {	Line 4908 sub scantron_process_corrections {
}	}
}	}
if ($err) {	if ($err) {
$r->print("<font color='red'>Unable to accept last correction, an error occurred :$errmsg:</font>");	$r->print("<span class=\"LC_warning\">Unable to accept last correction, an error occurred :$errmsg:</span>");
} 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 4512 sub reset_skipping_status {	Line 4921 sub reset_skipping_status {
&scantron_putfile(undef,$scan_data);	&scantron_putfile(undef,$scan_data);
}	}

sub allow_skipping {	sub start_skipping {
my ($scan_data,$i)=@_;	my ($scan_data,$i)=@_;
my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));	my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
delete($remembered{$i});	if ($env{'form.scantron_options_redo'} =~ /^redo_/) {
	$remembered{$i}=2;
	} else {
	$remembered{$i}=1;
	}
&scan_data($scan_data,'remember_skipping',join(':',%remembered));	&scan_data($scan_data,'remember_skipping',join(':',%remembered));
}	}

sub should_be_skipped {	sub should_be_skipped {
my ($scan_data,$i)=@_;	my ($scanlines,$scan_data,$i)=@_;
if ($env{'form.scantron_options_redo'} !~ /^redo_/) {	if ($env{'form.scantron_options_redo'} !~ /^redo_/) {
# not redoing old skips	# not redoing old skips
	if ($scanlines->{'skipped'}[$i]) { return 1; }
return 0;	return 0;
}	}
my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));	my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
if (exists($remembered{$i})) { return 0; }
	if (exists($remembered{$i}) && $remembered{$i} != 2 ) {
	return 0;
	}
return 1;	return 1;
}	}

Line 4538 sub remember_current_skipped {	Line 4955 sub remember_current_skipped {
$to_remember{$i}=1;	$to_remember{$i}=1;
}	}
}	}
&Apache::lonnet::logthis('remembering '.join(':',%to_remember));
&scan_data($scan_data,'remember_skipping',join(':',%to_remember));	&scan_data($scan_data,'remember_skipping',join(':',%to_remember));
&scantron_putfile(undef,$scan_data);	&scantron_putfile(undef,$scan_data);
}	}
Line 4546 sub remember_current_skipped {	Line 4963 sub remember_current_skipped {
sub check_for_error {	sub check_for_error {
my ($r,$result)=@_;	my ($r,$result)=@_;
if ($result ne 'ok' && $result ne 'not_found' ) {	if ($result ne 'ok' && $result ne 'not_found' ) {
$r->print("An error occured ($result) when trying to Remove the existing corrections.");	$r->print("An error occurred ($result) when trying to Remove the existing corrections.");
}	}
}	}

Line 4554 sub scantron_warning_screen {	Line 4971 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 %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my $CODElist="a";	my $CODElist;
if ($scantron_config{'CODElocation'} &&	if ($scantron_config{'CODElocation'} &&
$scantron_config{'CODEstart'} &&	$scantron_config{'CODEstart'} &&
$scantron_config{'CODElength'}) {	$scantron_config{'CODElength'}) {
$CODElist=$env{'form.scantron_CODElist'};	$CODElist=$env{'form.scantron_CODElist'};
if ($CODElist eq '') { $CODElist='<font color="red">None</font>'; }	if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; }
$CODElist=	$CODElist=
'<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.	'<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.
$CODElist.'</tt></td></tr>';	$env{'form.scantron_CODElist'}.'</tt></td></tr>';
}	}
return (<<STUFF);	return (<<STUFF);
<p>	<p>
<font color="red">Please double check the information	<span class="LC_warning">Please double check the information
below before clicking on '$button_text'</font>	below before clicking on '$button_text'</span>
</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	$CODElist
</table>	</table>
</font>
<br />	<br />
<p> If this information is correct, please click on '$button_text'.</p>	<p> If this information is correct, please click on '$button_text'.</p>
<p> If something is incorrect, please click the 'Grading Menu' button to start over.</p>	<p> If something is incorrect, please click the 'Grading Menu' button to start over.</p>
Line 4585 STUFF	Line 5001 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 '' \|\|
$env{'form.scantron_format'} eq '' ) {	$env{'form.scantron_format'} eq '' ) {
$r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>");	$r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>");
if ( $env{'form.selectpage'} eq '') {	if ( $env{'form.selectpage'} eq '') {
$r->print('<p><font color="red">You have not selected a Sequence to grade</font></p>');	$r->print('<p><span class="LC_error">You have not selected a Sequence to grade</span></p>');
}	}
if ( $env{'form.scantron_selectfile'} eq '') {	if ( $env{'form.scantron_selectfile'} eq '') {
$r->print('<p><font color="red">You have not selected a file that contains the student\'s response data.</font></p>');	$r->print('<p><span class="LC_error">You have not selected a file that contains the student\'s response data.</span></p>');
}	}
if ( $env{'form.scantron_format'} eq '') {	if ( $env{'form.scantron_format'} eq '') {
$r->print('<p><font color="red">You have not selected a the format of the student\'s response data.</font></p>');	$r->print('<p><span class="LC_error">You have not selected a the format of the student\'s response data.</span></p>');
}	}
} else {	} else {
my $warning=&scantron_warning_screen('Grading: Validate Records');	my $warning=&scantron_warning_screen('Grading: Validate Records');
Line 4610 $warning	Line 5026 $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));
return '';	return '';
}	}

Line 4626 sub scantron_form_start {	Line 5042 sub scantron_form_start {
<input type="hidden" name="scantron_CODEunique" value="$env{'form.scantron_CODEunique'}" />	<input type="hidden" name="scantron_CODEunique" value="$env{'form.scantron_CODEunique'}" />
<input type="hidden" name="scantron_options_redo" value="$env{'form.scantron_options_redo'}" />	<input type="hidden" name="scantron_options_redo" value="$env{'form.scantron_options_redo'}" />
<input type="hidden" name="scantron_options_ignore" value="$env{'form.scantron_options_ignore'}" />	<input type="hidden" name="scantron_options_ignore" value="$env{'form.scantron_options_ignore'}" />
	<input type="hidden" name="scantron_options_hidden" value="$env{'form.scantron_options_hidden'}" />
SCANTRONFORM	SCANTRONFORM
return $result;	return $result;
}	}

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 4643 sub scantron_validate_file {	Line 5060 sub scantron_validate_file {
}	}
if ($env{'form.scantron_options_redo'} eq 'redo_skipped') {	if ($env{'form.scantron_options_redo'} eq 'redo_skipped') {
&remember_current_skipped();	&remember_current_skipped();
&scantron_remove_file('skipped');
$env{'form.scantron_options_redo'}='redo_skipped_ready';	$env{'form.scantron_options_redo'}='redo_skipped_ready';
}	}

Line 4660 sub scantron_validate_file {	Line 5076 sub scantron_validate_file {
$r->print("<p>Gathering neccessary info.</p>");$r->rflush();	$r->print("<p>Gathering neccessary info.</p>");$r->rflush();
#get the student pick code ready	#get the student pick code ready
$r->print(&Apache::loncommon::studentbrowser_javascript());	$r->print(&Apache::loncommon::studentbrowser_javascript());
my $max_bubble=&scantron_get_maxbubble($r);	my $max_bubble=&scantron_get_maxbubble();
my $result=&scantron_form_start($max_bubble).$default_form_data;	my $result=&scantron_form_start($max_bubble).$default_form_data;
$r->print($result);	$r->print($result);

my @validate_phases=( 'ID',	my @validate_phases=( 'sequence',
	'ID',
'CODE',	'CODE',
'doublebubble',	'doublebubble',
'missingbubbles');	'missingbubbles');
Line 4697 STUFF	Line 5114 STUFF
$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");	$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
}	}
if ($stop) {	if ($stop) {
$r->print('<input type="submit" name="submit" value="Continue ->" />');	if ($validate_phases[$currentphase] eq 'sequence') {
$r->print(' using corrected info <br />');	$r->print('<input type="submit" name="submit" value="Ignore -> " />');
$r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");	$r->print(' this error <br />');
$r->print(" this scanline saving it for later.");
	$r->print(" <p>Or click the 'Grading Menu' button to start over.</p>");
	} else {
	$r->print('<input type="submit" name="submit" value="Continue ->" />');
	$r->print(' using corrected info <br />');
	$r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");
	$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>");
return '';	return '';
}	}

Line 4806 sub scantron_putfile {	Line 5229 sub scantron_putfile {

sub scantron_get_line {	sub scantron_get_line {
my ($scanlines,$scan_data,$i)=@_;	my ($scanlines,$scan_data,$i)=@_;
if (&should_be_skipped($scan_data,$i)) { return undef; }	if (&should_be_skipped($scanlines,$scan_data,$i)) { return undef; }
if ($scanlines->{'skipped'}[$i]) { return undef; }	#if ($scanlines->{'skipped'}[$i]) { return undef; }
if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}	if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}
return $scanlines->{'orig'}[$i];	return $scanlines->{'orig'}[$i];
}	}
Line 4827 sub scantron_put_line {	Line 5250 sub scantron_put_line {
my ($scanlines,$scan_data,$i,$newline,$skip)=@_;	my ($scanlines,$scan_data,$i,$newline,$skip)=@_;
if ($skip) {	if ($skip) {
$scanlines->{'skipped'}[$i]=$newline;	$scanlines->{'skipped'}[$i]=$newline;
&allow_skipping($scan_data,$i);	&start_skipping($scan_data,$i);
return;	return;
}	}
$scanlines->{'corrected'}[$i]=$newline;	$scanlines->{'corrected'}[$i]=$newline;
}	}

	sub scantron_clear_skip {
	my ($scanlines,$scan_data,$i)=@_;
	if (exists($scanlines->{'skipped'}[$i])) {
	undef($scanlines->{'skipped'}[$i]);
	return 1;
	}
	return 0;
	}

	sub scantron_filter_not_exam {
	my ($curres)=@_;

	if (ref($curres) && $curres->is_problem() && !$curres->is_exam()) {
	# if the user has asked to not have either hidden
	# or 'randomout' controlled resources to be graded
	# don't include them
	if ($env{'form.scantron_options_hidden'} eq 'ignore_hidden'
	&& $curres->randomout) {
	return 0;
	}
	return 1;
	}
	return 0;
	}

	sub scantron_validate_sequence {
	my ($r,$currentphase) = @_;

	my $navmap=Apache::lonnavmaps::navmap->new();
	my (undef,undef,$sequence)=
	&Apache::lonnet::decode_symb($env{'form.selectpage'});

	my $map=$navmap->getResourceByUrl($sequence);

	$r->print('<input type="hidden" name="validate_sequence_exam"
	value="ignore" />');
	if ($env{'form.validate_sequence_exam'} ne 'ignore') {
	my @resources=
	$navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0);
	if (@resources) {
	$r->print("<p>".&mt('Some resources in the sequence currently are not set to exam mode. Grading these resources currently may not work correctly.')."</p>");
	return (1,$currentphase);
	}
	}

	return (0,$currentphase+1);
	}

sub scantron_validate_ID {	sub scantron_validate_ID {
my ($r,$currentphase) = @_;	my ($r,$currentphase) = @_;

Line 4903 sub scantron_get_correction {	Line 5374 sub scantron_get_correction {
#the previous one or the current one	#the previous one or the current one

$r->print("<p><b>An error was detected ($error)</b>");	$r->print("<p><b>An error was detected ($error)</b>");
if ( defined($$scan_record{'scantron.PaperID'}) ) {	if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {
$r->print(" for PaperID <tt>".	$r->print(" for PaperID <tt>".
$$scan_record{'scantron.PaperID'}."</tt> \n");	$$scan_record{'scantron.PaperID'}."</tt> \n");
} else {	} else {
Line 4954 sub scantron_get_correction {	Line 5425 sub scantron_get_correction {
if ($closest > 0) {	if ($closest > 0) {
foreach my $testcode (@{$closest}) {	foreach my $testcode (@{$closest}) {
my $checked='';	my $checked='';
if (!$i) { $checked=' checked="on" '; }	if (!$i) { $checked=' checked="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' />");	$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' />");
$r->print("\n<br />");	$r->print("\n<br />");
$i++;	$i++;
Line 4962 sub scantron_get_correction {	Line 5433 sub scantron_get_correction {
}	}
}	}
if ($$scan_record{'scantron.CODE'}=~/\S/ ) {	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
my $checked; if (!$i) { $checked=' checked="on" '; }	my $checked; if (!$i) { $checked=' checked="checked" '; }
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.</label>");	$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.</label>");
$r->print("\n<br />");	$r->print("\n<br />");
}	}
Line 4979 function change_radio(field) {	Line 5450 function change_radio(field) {
</script>	</script>
ENDSCRIPT	ENDSCRIPT
my $href="/adm/pickcode?".	my $href="/adm/pickcode?".
"form=".&Apache::lonnet::escape("scantronupload").	"form=".&escape("scantronupload").
"&scantron_format=".&Apache::lonnet::escape($env{'form.scantron_format'}).	"&scantron_format=".&escape($env{'form.scantron_format'}).
"&scantron_CODElist=".&Apache::lonnet::escape($env{'form.scantron_CODElist'}).	"&scantron_CODElist=".&escape($env{'form.scantron_CODElist'}).
"&curCODE=".&Apache::lonnet::escape($$scan_record{'scantron.CODE'}).	"&curCODE=".&escape($$scan_record{'scantron.CODE'}).
"&scantron_selectfile=".&Apache::lonnet::escape($env{'form.scantron_selectfile'});	"&scantron_selectfile=".&escape($env{'form.scantron_selectfile'});
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");	if ($env{'form.scantron_CODElist'} =~ /\S/) {
$r->print("\n<br />");	$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");
	$r->print("\n<br />");
	}
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use </label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" /> as the CODE.");	$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use </label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" /> as the CODE.");
$r->print("\n<br /><br />");	$r->print("\n<br /><br />");
} elsif ($error eq 'doublebubble') {	} elsif ($error eq 'doublebubble') {
Line 5159 sub scantron_validate_doublebubble {	Line 5632 sub scantron_validate_doublebubble {
return (0,$currentphase+1);	return (0,$currentphase+1);
}	}

sub scantron_get_maxbubble {	sub scantron_get_maxbubble {
my ($r)=@_;
if (defined($env{'form.scantron_maxbubble'}) &&	if (defined($env{'form.scantron_maxbubble'}) &&
$env{'form.scantron_maxbubble'}) {	$env{'form.scantron_maxbubble'}) {
return $env{'form.scantron_maxbubble'};	return $env{'form.scantron_maxbubble'};
}	}

my $navmap=Apache::lonnavmaps::navmap->new();	my $navmap=Apache::lonnavmaps::navmap->new();
my (undef,undef,$sequence)=	my (undef,undef,$sequence)=
&Apache::lonnet::decode_symb($env{'form.selectpage'});	&Apache::lonnet::decode_symb($env{'form.selectpage'});

my $map=$navmap->getResourceByUrl($sequence);	my $map=$navmap->getResourceByUrl($sequence);
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
&Apache::lonnet::delenv('form.counter');
	&Apache::lonxml::clear_problem_counter();

foreach my $resource (@resources) {	foreach my $resource (@resources) {
my $result=&Apache::lonnet::ssi($resource->src().'?symb='.&Apache::lonnet::escape($resource->symb()));	my $result=&Apache::lonnet::ssi($resource->src(),
	('symb' => $resource->symb()));
}	}
&Apache::lonnet::delenv('scantron\.');	&Apache::lonnet::delenv('scantron\.');
my $envfile=$env{'user.environment'};	$env{'form.scantron_maxbubble'} =
$envfile=~/\/([^\/]+)\.id$/;	&Apache::lonxml::get_problem_counter()-1;
$envfile=$1;
&Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
$envfile);
$env{'form.scantron_maxbubble'}=$env{'form.counter'}-1;
return $env{'form.scantron_maxbubble'};	return $env{'form.scantron_maxbubble'};
}	}

Line 5219 sub scantron_validate_missingbubbles {	Line 5693 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 5274 SCANTRONFORM	Line 5748 SCANTRONFORM
next;	next;
}	}
($uname,$udom)=split(/:/,$uname);	($uname,$udom)=split(/:/,$uname);
&Apache::lonnet::delenv('form.counter');
	&Apache::lonxml::clear_problem_counter();
&Apache::lonnet::appenv(%$scan_record);	&Apache::lonnet::appenv(%$scan_record);

	if (&scantron_clear_skip($scanlines,$scan_data,$i)) {
	&scantron_putfile($scanlines,$scan_data);
	}

my $i=0;	my $i=0;
foreach my $resource (@resources) {	foreach my $resource (@resources) {
Line 5286 SCANTRONFORM	Line 5765 SCANTRONFORM
'grade_domain' =>$udom,	'grade_domain' =>$udom,
'grade_courseid'=>$env{'request.course.id'},	'grade_courseid'=>$env{'request.course.id'},
'grade_symb' =>$resource->symb());	'grade_symb' =>$resource->symb());
if (exists($scan_record->{'scantron.CODE'}) &&	if (exists($scan_record->{'scantron.CODE'})
$scan_record->{'scantron.CODE'}) {	&&
	&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'})) {
$form{'CODE'}=$scan_record->{'scantron.CODE'};	$form{'CODE'}=$scan_record->{'scantron.CODE'};
} else {	} else {
$form{'CODE'}='';	$form{'CODE'}='';
Line 5302 SCANTRONFORM	Line 5782 SCANTRONFORM
$completedstudents{$uname}={'line'=>$line};	$completedstudents{$uname}={'line'=>$line};
if (&Apache::loncommon::connection_aborted($r)) { last; }	if (&Apache::loncommon::connection_aborted($r)) { last; }
} continue {	} continue {
&Apache::lonnet::delenv('form.counter');	&Apache::lonxml::clear_problem_counter();
&Apache::lonnet::delenv('scantron\.');	&Apache::lonnet::delenv('scantron\.');
}	}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
Line 5310 SCANTRONFORM	Line 5790 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 5322 sub scantron_upload_scantron_data {	Line 5802 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 5352 UPLOAD	Line 5832 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 5363 sub scantron_upload_scantron_data_save {	Line 5843 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 5388 sub scantron_upload_scantron_data_save {	Line 5868 sub scantron_upload_scantron_data_save {
my $uploadedfile=$fname;	my $uploadedfile=$fname;
$fname='scantron_orig_'.$fname;	$fname='scantron_orig_'.$fname;
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("<span class=\"LC_error\">Error:</span> 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'},'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("<span class=\"LC_success\">Success:</span> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
} else {	} else {
$r->print("<font color='red'>Error:</font> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>");	$r->print("<span class=\"LC_error\">Error:</span> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>");
}	}
}	}
if ($symb) {	if ($symb) {
Line 5408 sub scantron_upload_scantron_data_save {	Line 5888 sub scantron_upload_scantron_data_save {
sub valid_file {	sub valid_file {
my ($requested_file)=@_;	my ($requested_file)=@_;
foreach my $filename (sort(&scantron_filenames())) {	foreach my $filename (sort(&scantron_filenames())) {
&Apache::lonnet::logthis("$requested_file $filename");
if ($requested_file eq $filename) { return 1; }	if ($requested_file eq $filename) { return 1; }
}	}
return 0;	return 0;
Line 5416 sub valid_file {	Line 5895 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 5426 sub scantron_download_scantron_data {	Line 5905 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 5446 ERROR	Line 5925 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 5458 DOWNLOAD	Line 5937 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 5484 sub savedState {	Line 5962 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 5525 sub gradingmenu {	Line 6003 sub gradingmenu {
</script>	</script>
GRADINGMENUJS	GRADINGMENUJS
&commonJSfunctions($request);	&commonJSfunctions($request);
my $result='<h3> <font color="#339933">Manual Grading/View Submission</font></h3>';	my $result='<h3> <span class="LC_info">Manual Grading/View Submission</span></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 5537 GRADINGMENUJS	Line 6015 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 5545 GRADINGMENUJS	Line 6022 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)) {
foreach (sort (@$sections)) {	foreach (sort (@$sections)) {
$result.='<option value="'.$_.'" '.	$result.='<option value="'.$_.'" '.
($saveSec eq $_ ? 'selected="on"':'').'>'.$_.'</option>'."\n";	($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n";
}	}
}	}
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</option></select>   ';	$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';

$result.=&mt('Student Status').':</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);	$result.=&mt('Student Status').':'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);

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

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

$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
'<label><input type="radio" name="radioChoice" value="viewgrades" '.	'<label><input type="radio" name="radioChoice" value="viewgrades" '.
($saveCmd eq 'viewgrades' ? 'checked' : '').'> '.	($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
'<b>Current Resource:</b> For all students in selected section or course</label></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>'.
'<label><input type="radio" name="radioChoice" value="pickStudentPage" '.	'<label><input type="radio" name="radioChoice" value="pickStudentPage" '.
($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.	($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
'The <b>complete</b> set/page/sequence: For one student</label></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 />'.
Line 5596 GRADINGMENUJS	Line 6073 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";

	$result.='<tr bgcolor="#ffffe6"><td>'.
	'<input type="button" onClick="javascript:checkChoice(this.form,\'6\',\'processclicker\');" value="'.&mt('Process').'" />'.
	' '.&mt('clicker file').' </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:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.	'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";	'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
Line 5610 GRADINGMENUJS	Line 6091 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">'.
Line 5620 GRADINGMENUJS	Line 6101 GRADINGMENUJS
'<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'.	'<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";	'" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";

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

Line 5648 sub init_perm {	Line 6129 sub init_perm {
}	}
}	}

	sub gather_clicker_ids {
	my %clickerids=();

	my $classlist = &Apache::loncoursedata::get_classlist();

	# Set up a couple variables.
	my $usernameidx = &Apache::loncoursedata::CL_SNAME();
	my $domainidx = &Apache::loncoursedata::CL_SDOM();

	foreach my $student (keys %$classlist) {

	my $username = $classlist->{$student}->[$usernameidx];
	my $domain = $classlist->{$student}->[$domainidx];
	my $clickers =
	(&Apache::lonnet::userenvironment($domain,$username,'clickers'))[1];
	foreach my $id (split(/\,/,$clickers)) {
	if (exists($clickerids{$id})) {
	$clickerids{$id}.=','.$username.':'.$domain;
	} else {
	$clickerids{$id}=$username.':'.$domain;
	}
	}
	}
	return %clickerids;
	}

	sub gather_adv_clicker_ids {
	my %clickerids=();
	my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'};
	my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
	my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
	foreach my $element (sort keys %coursepersonnel) {
	foreach my $person (split(/\,/,$coursepersonnel{$element})) {
	my ($puname,$pudom)=split(/\:/,$person);
	my $clickers =
	(&Apache::lonnet::userenvironment($pudom,$puname,'clickers'))[1];
	foreach my $id (split(/\,/,$clickers)) {
	if (exists($clickerids{$id})) {
	$clickerids{$id}.=','.$puname.':'.$pudom;
	} else {
	$clickerids{$id}=$puname.':'.$pudom;
	}
	}
	}
	}
	return %clickerids;
	}

	sub process_clicker {
	my ($r)=@_;
	my ($symb)=&get_symb($r);
	if (!$symb) {return '';}
	my $result=&checkforfile_js();
	$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
	my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
	$result.=$table;
	$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
	$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
	$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource').
	'.</b></td></tr>'."\n";
	$result.='<tr bgcolor=#ffffe6><td>'."\n";
	my $upload=&mt("Upload File");
	my $type=&mt("Type");
	my $attendance=&mt("Award points just for participation");
	my $personnel=&mt("Correctness determined from response by course personnel");
	my $specific=&mt("Correctness determined from response with clicker ID");
	my $pcorrect=&mt("Percentage points for correct solution");
	my $pincorrect=&mt("Percentage points for incorrect solution");
	my $selectform=&Apache::loncommon::select_form('iclicker','upfiletype',
	('iclicker' => 'iClicker'));

	$result.=<<ENDUPFORM;
	<script type="text/javascript">
	function sanitycheck() {
	// Accept only integer percentages
	document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value);
	document.forms.gradesupload.pincorrect.value=Math.round(document.forms.gradesupload.pincorrect.value);
	// Find out grading choice
	for (i=0; i<document.forms.gradesupload.gradingmechanism.length; i++) {
	if (document.forms.gradesupload.gradingmechanism[i].checked) {
	gradingchoice=document.forms.gradesupload.gradingmechanism[i].value;
	}
	}
	// By default, new choice equals user selection
	newgradingchoice=gradingchoice;
	// Not good to give more points for false answers than correct ones
	if (Math.round(document.forms.gradesupload.pcorrect.value)<Math.round(document.forms.gradesupload.pincorrect.value)) {
	document.forms.gradesupload.pcorrect.value=document.forms.gradesupload.pincorrect.value;
	}
	// If new choice is attendance only, and old choice was correctness-based, restore defaults
	if ((gradingchoice=='attendance') && (document.forms.gradesupload.waschecked.value!='attendance')) {
	document.forms.gradesupload.pcorrect.value=100;
	document.forms.gradesupload.pincorrect.value=100;
	}
	// If the values are different, cannot be attendance only
	if ((Math.round(document.forms.gradesupload.pcorrect.value)!=Math.round(document.forms.gradesupload.pincorrect.value)) &&
	(gradingchoice=='attendance')) {
	newgradingchoice='personnel';
	}
	// Change grading choice to new one
	for (i=0; i<document.forms.gradesupload.gradingmechanism.length; i++) {
	if (document.forms.gradesupload.gradingmechanism[i].value==newgradingchoice) {
	document.forms.gradesupload.gradingmechanism[i].checked=true;
	} else {
	document.forms.gradesupload.gradingmechanism[i].checked=false;
	}
	}
	// Remember the old state
	document.forms.gradesupload.waschecked.value=newgradingchoice;
	}
	</script>
	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
	<input type="hidden" name="symb" value="$symb" />
	<input type="hidden" name="command" value="processclickerfile" />
	<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
	<input type="file" name="upfile" size="50" />
	<br /><label>$type: $selectform</label>
	<br /><label>$attendance: <input type="radio" name="gradingmechanism" value="attendance" checked="checked" onClick="sanitycheck()" /></label>
	<br /><label>$personnel: <input type="radio" name="gradingmechanism" value="personnel" onClick="sanitycheck()" /></label>
	<br /><label>$specific: <input type="radio" name="gradingmechanism" value="specific" onClick="sanitycheck()" /></label>
	<input type="text" name="specificid" size="15" />
	<input type="hidden" name="waschecked" value="attendance" />
	<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="100" onChange="sanitycheck()" /></label>
	<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="100" onChange="sanitycheck()" /></label>
	<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />
	</form>
	ENDUPFORM
	$result.='</td></tr></table>'."\n".
	'</td></tr></table><br /><br />'."\n";
	$result.=&show_grading_menu_form($symb);
	return $result;
	}

	sub process_clicker_file {
	my ($r)=@_;
	my ($symb)=&get_symb($r);
	if (!$symb) {return '';}
	my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
	if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) {
	$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>';
	return $result.&show_grading_menu_form($symb);
	}
	my %clickerids=&gather_clicker_ids();
	my %correctids=();
	if ($env{'form.gradingmechanism'} eq 'personnel') {
	%correctids=&gather_adv_clicker_ids();
	}
	if ($env{'form.gradingmechanism'} eq 'specific') {
	my $correctid=$env{'form.specificid'};
	$correctid=~tr/a-z/A-Z/;
	$correctid=~s/\s//gs;
	$correctids{$correctid}='specified';
	}
	if ($env{'form.gradingmechanism'} eq 'attendance') {
	$result.=&mt('Score based on attendance only');
	} else {
	my $number=0;
	$result.='<h3>'.&mt('Correctness determined by the following IDs').'</h3>';
	foreach my $id (sort(keys(%correctids))) {
	$result.='<tt>'.$id.'</tt> - ';
	if ($correctids{$id} eq 'specified') {
	$result.=&mt('specified');
	} else {
	my ($uname,$udom)=split(/\:/,$correctids{$id});
	$result.=&Apache::loncommon::plainname($uname,$udom);
	}
	$result.='<br />';
	$number++;
	}
	if ($number==0) {
	$result.='<span class="LC_error">'.&mt('No IDs found to determine correct answer').'</span>';
	return $result.&show_grading_menu_form($symb);
	}
	}
	return $result.&show_grading_menu_form($symb);
	}

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

Line 5660 sub handler {	Line 6319 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) {	$request->print(&Apache::loncommon::start_page('Grading'));
my ($temp1,$temp2);	if ($symb eq '' && $command eq '') {
($temp1,$temp2,$env{'form.url'})=&Apache::lonnet::decode_symb($symb);
$url = $env{'form.url'};
}
&send_header($request);
if ($url eq '' && $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 5721 sub handler {	Line 6374 sub handler {
$request->print(&editgrades($request));	$request->print(&editgrades($request));
} elsif ($command eq 'verify' && $perm{'vgr'}) {	} elsif ($command eq 'verify' && $perm{'vgr'}) {
$request->print(&verifyreceipt($request));	$request->print(&verifyreceipt($request));
	} elsif ($command eq 'processclicker' && $perm{'mgr'}) {
	$request->print(&process_clicker($request));
	} elsif ($command eq 'processclickerfile' && $perm{'mgr'}) {
	$request->print(&process_clicker_file($request));
} elsif ($command eq 'csvform' && $perm{'mgr'}) {	} elsif ($command eq 'csvform' && $perm{'mgr'}) {
$request->print(&upcsvScores_form($request));	$request->print(&upcsvScores_form($request));
} elsif ($command eq 'csvupload' && $perm{'mgr'}) {	} elsif ($command eq 'csvupload' && $perm{'mgr'}) {
Line 5763 sub handler {	Line 6420 sub handler {
$request->print("Access Denied ($command)");	$request->print("Access Denied ($command)");
}	}
}	}
&send_footer($request);	$request->print(&Apache::loncommon::end_page());
return '';	return '';
}	}

sub send_header {
my ($request)= @_;
$request->print(&Apache::lontexconvert::header());
# $request->print("
#<script>
#remotewindow=open('','homeworkremote');
#remotewindow.close();
#</script>");
$request->print(&Apache::loncommon::bodytag('Grading'));
$request->rflush();
}

sub send_footer {
my ($request)= @_;
$request->print('</body></html>');
}

1;	1;

__END__;	__END__;

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

Removed from v.1.302.2.1
changed lines
	Added in v.1.404