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.208 and 1.275

version 1.208, 2004/09/02 21:02:21	version 1.275, 2005/06/13 20:23:54
Line 25	Line 25
#	#
# http://www.lon-capa.org/	# http://www.lon-capa.org/
#	#
# 2/9,2/13 Guy Albertelli
# 6/8 Gerd Kortemeyer
# 7/26 H.K. Ng
# 8/20 Gerd Kortemeyer
# Year 2002
# June-August H.K. Ng
# Year 2003
# February, March H.K. Ng
# July, H. K. Ng
#

package Apache::grades;	package Apache::grades;
use strict;	use strict;
Line 90 sub getpartlist {	Line 80 sub getpartlist {
# --- Get the symbolic name of a problem and the url	# --- Get the symbolic name of a problem and the url
sub get_symb_and_url {	sub get_symb_and_url {
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)));
if ($symb eq '') {	if ($symb eq '') {
if (!$silent) {	if (!$silent) {
$request->print("Unable to handle ambiguous references:$url:.");	$request->print("Unable to handle ambiguous references:$url:.");
Line 101 sub get_symb_and_url {	Line 91 sub get_symb_and_url {
return ($symb,$url);	return ($symb,$url);
}	}

# --- Retrieve the fullname for a user. Return lastname, first middle ---
# --- Generation is attached next to the lastname if it exists. ---
sub get_fullname {
my ($uname,$udom) = @_;
my %name=&Apache::lonnet::get('environment', ['lastname','generation',
'firstname','middlename'],
$udom,$uname);
my $fullname;
my ($tmp) = keys(%name);
if ($tmp !~ /^(con_lost\|error\|no_such_host)/i) {
$fullname = &Apache::loncoursedata::ProcessFullName
(@name{qw/lastname generation firstname middlename/});
} else {
&Apache::lonnet::logthis('grades.pm: no name data for '.$uname.
'@'.$udom.':'.$tmp);
}
return $fullname;
}

#--- Format fullname, username:domain if different for display	#--- Format fullname, username:domain if different for display
#--- Use anywhere where the student names are listed	#--- Use anywhere where the student names are listed
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><font color="#999999">(Username)</font>';
} else {	} else {
return ' '.$fullname.'<font color="#999999"> ('.$uname.	return ' '.$fullname.'<font color="#999999"> ('.$uname.
($ENV{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';	($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
}	}
}	}

Line 136 sub nameUserString {	Line 107 sub nameUserString {
#--- 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 ($url,$symb) = shift;
$symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');	$symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
my $allkeys = &Apache::lonnet::metadata($url,'keys');	my $allkeys = &Apache::lonnet::metadata($url,'keys');
my %vPart;	my %vPart;
foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {	foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
Line 170 sub response_type {	Line 141 sub response_type {
sub get_display_part {	sub get_display_part {
my ($partID,$url,$symb)=@_;	my ($partID,$url,$symb)=@_;
if (!defined($symb) \|\| $symb eq '') {	if (!defined($symb) \|\| $symb eq '') {
$symb=$ENV{'form.symb'};	$symb=$env{'form.symb'};
if ($symb eq '') { $symb=&Apache::lonnet::symbread($url) }	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);
Line 181 sub get_display_part {	Line 152 sub get_display_part {
}	}
return $display;	return $display;
}	}

#--- Show resource title	#--- Show resource title
#--- and parts and response type	#--- and parts and response type
sub showResourceInfo {	sub showResourceInfo {
Line 228 sub get_order {	Line 200 sub get_order {
('grade_domain' => $udom),	('grade_domain' => $udom),
('grade_symb' => $symb),	('grade_symb' => $symb),
('grade_courseid' =>	('grade_courseid' =>
$ENV{'request.course.id'}),	$env{'request.course.id'}),
('grade_username' => $uname));	('grade_username' => $uname));
(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);	(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
my %analyze=&Apache::lonnet::str2hash($subresult);	my %analyze=&Apache::lonnet::str2hash($subresult);
Line 299 sub cleanRecord {	Line 271 sub cleanRecord {
'<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.	'<tr valign="top"><td>'.$grayFont.'Option ID</font></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})) {
my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',	my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},	$env{'course.'.$env{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});	$env{'course.'.$env{'request.course.id'}.'.num'});

my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};	my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
$ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';	$env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
$ENV{'form.kwclr'} = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';	$env{'form.kwclr'} = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
$ENV{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';	$env{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
$ENV{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';	$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
$ENV{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.	$env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
}	}
$answer =~ s-\n-<br />-g;	$answer =~ s-\n-<br />-g;
return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';	return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';
	} elsif ( $response eq 'organic') {
	my $result='Smile representation: "<tt>'.$answer.'</tt>"';
	my $jme=$record->{$version."resource.$partid.$respid.molecule"};
	$result.=&Apache::chemresponse::jme_img($jme,$answer,400);
	return $result;
}	}
return $answer;	return $answer;
}	}
Line 378 sub getclasslist {	Line 355 sub getclasslist {
my $status =	my $status =
$classlist->{$student}->[&Apache::loncoursedata::CL_STATUS()];	$classlist->{$student}->[&Apache::loncoursedata::CL_STATUS()];
# filter students according to status selected	# filter students according to status selected
if ($filterlist && $ENV{'form.Status'} ne 'Any') {	if ($filterlist && $env{'form.Status'} ne 'Any') {
if ($ENV{'form.Status'} ne $status) {	if ($env{'form.Status'} ne $status) {
delete ($classlist->{$student});	delete ($classlist->{$student});
next;	next;
}	}
Line 444 sub canview {	Line 421 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 ($url,$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) {
my ($status,undef) = split(/_/,$record{"resource.$_.solved"},2);	my ($status,undef) = split(/_/,$record{"resource.$_.solved"},2);
Line 471 sub jscriptNform {	Line 448 sub jscriptNform {
$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="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".
'<input type="hidden" name="command" value="submission" />'."\n".	'<input type="hidden" name="command" value="submission" />'."\n".
'<input type="hidden" name="student" value="" />'."\n".	'<input type="hidden" name="student" value="" />'."\n".
'<input type="hidden" name="userdom" value="" />'."\n".	'<input type="hidden" name="userdom" value="" />'."\n".
Line 534 sub most_similar {	Line 511 sub most_similar {
sub verifyreceipt {	sub verifyreceipt {
my $request = shift;	my $request = shift;

my $courseid = $ENV{'request.course.id'};	my $courseid = $env{'request.course.id'};
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 $url = $env{'form.url'};
my $symb = $ENV{'form.symb'};	my $symb = $env{'form.symb'};
unless ($symb) {	unless ($symb) {
$symb = &Apache::lonnet::symbread($url);	$symb = &Apache::lonnet::symbread($url);
}	}

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

my ($string,$contents,$matches) = ('','',0);	my ($string,$contents,$matches) = ('','',0);
my (undef,undef,$fullname) = &getclasslist('all','0');	my (undef,undef,$fullname) = &getclasslist('all','0');

my $receiptparts=0;	my $receiptparts=0;
if ($ENV{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }	if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
my $parts=['0'];	my $parts=['0'];
if ($receiptparts) { ($parts)=&response_type($url,$symb); }	if ($receiptparts) { ($parts)=&response_type($url,$symb); }
foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {	foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
Line 601 sub listStudents {	Line 578 sub listStudents {
my ($request) = shift;	my ($request) = shift;

my ($symb,$url) = &get_symb_and_url($request);	my ($symb,$url) = &get_symb_and_url($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 $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};	my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};

my $viewgrade = $ENV{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';	my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
$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><font color="#339933"> '.$viewgrade.
' Submissions for a Student or a Group of Students</font></h3>';	' Submissions for a Student or a Group of Students</font></h3>';

my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'},($ENV{'form.showgrading'} eq 'yes'));	my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$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 651 LISTJAVASCRIPT	Line 628 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' : '';
my $checklastsub = $checkhdgrade eq '' ? 'checked' : '';	my $checklastsub = $checkhdgrade eq '' ? '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><input type="radio" name="vProb" value="no" checked="on" /> no '."\n".	' <b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".
'<input type="radio" name="vProb" value="yes" /> one student '."\n".	'<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n".
'<input type="radio" name="vProb" value="all" /> all students <br />'."\n".	'<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n".
' <b>View Answer: </b><input type="radio" name="vAns" value="no" /> no '."\n".	' <b>View Answer: </b><label><input type="radio" name="vAns" value="no" /> no </label>'."\n".
'<input type="radio" name="vAns" value="yes" /> one student '."\n".	'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n".
'<input type="radio" name="vAns" value="all" checked="on" /> all students <br />'."\n".	'<label><input type="radio" name="vAns" value="all" checked="on" /> 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.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only'."\n";	$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n";
}	}

my $saveStatus = $ENV{'form.Status'} eq '' ? 'Active' : $ENV{'form.Status'};	my $saveStatus = $env{'form.Status'} eq '' ? 'Active' : $env{'form.Status'};
$ENV{'form.Status'} = $saveStatus;	$env{'form.Status'} = $saveStatus;

$gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only'."\n".	$gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
'<input type="radio" name="lastSub" value="last" /> last submission & parts info'."\n".	'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".
'<input type="radio" name="lastSub" value="datesub" /> by dates and submissions'."\n".	'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".
'<input type="radio" name="lastSub" value="all" /> all details'."\n".	'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n".
'<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="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";

if (exists($ENV{'form.gradingMenu'}) && exists($ENV{'form.Status'})) {	if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
$gradeTable.='<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n";	$gradeTable.='<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n";
} else {	} else {
$gradeTable.='<b>Student Status:</b> '.	$gradeTable.='<b>Student Status:</b> '.
&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';	&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
Line 693 LISTJAVASCRIPT	Line 670 LISTJAVASCRIPT
$gradeTable.='To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.	$gradeTable.='To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
'next to the student\'s name(s). Then click on the Next button.<br />'."\n".	'next to the student\'s name(s). Then click on the Next button.<br />'."\n".
'<input type="hidden" name="command" value="processGroup" />'."\n";	'<input type="hidden" name="command" value="processGroup" />'."\n";

	# checkall buttons
	$gradeTable.=&check_script('gradesub', 'stuinfo');
$gradeTable.='<input type="button" '."\n".	$gradeTable.='<input type="button" '."\n".
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
'value="Next->" />'."\n";	'value="Next->" /> <br />'."\n";
$gradeTable.='<input type="checkbox" name="checkPlag" checked="on">Check For Plagiarism</input>';	$gradeTable.=&check_buttons();
my (undef, undef, $fullname) = &getclasslist($getsec,'1');	$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="on" />Check For Plagiarism</label>';
	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">';
my $loop = 0;	my $loop = 0;
while ($loop < 2) {	while ($loop < 2) {
$gradeTable.='<td><b> No.</b> </td><td><b> Select </b></td>'.	$gradeTable.='<td><b> No.</b> </td><td><b> Select </b></td>'.
'<td>'.&nameUserString('header').'</td>';	'<td>'.&nameUserString('header').' Section/Group</td>';
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {	if ($env{'form.showgrading'} eq 'yes' && $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],$url,$symb);
$gradeTable.='<td><b> Part: '.$display_part.	$gradeTable.='<td><b> Part: '.$display_part.
Line 720 LISTJAVASCRIPT	Line 701 LISTJAVASCRIPT
foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {	foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);
my %status = ();	my %status = ();
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {	if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
(%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);	(%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
my $submitted = 0;	my $submitted = 0;
my $graded = 0;	my $graded = 0;
	my $incorrect = 0;
foreach (keys(%status)) {	foreach (keys(%status)) {
$submitted = 1 if ($status{$_} ne 'nothing');	$submitted = 1 if ($status{$_} ne 'nothing');
$graded = 1 if ($status{$_} !~ /^correct/);	$graded = 1 if ($status{$_} =~ /^ungraded/);
	$incorrect = 1 if ($status{$_} =~ /^incorrect/);

my ($foo,$partid,$foo1) = split(/\./,$_);	my ($foo,$partid,$foo1) = split(/\./,$_);
if ($status{'resource.'.$partid.'.submitted_by'} ne '') {	if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
$submitted = 0;	$submitted = 0;
Line 737 LISTJAVASCRIPT	Line 720 LISTJAVASCRIPT
$status{'resource.'.$partid.'.submitted_by'}.'" />';	$status{'resource.'.$partid.'.submitted_by'}.'" />';
}	}
}	}

next if (!$submitted && ($submitonly eq 'yes' \|\|	next if (!$submitted && ($submitonly eq 'yes' \|\|
$submitonly eq 'incorrect' \|\|	$submitonly eq 'incorrect' \|\|
$submitonly eq 'graded'));	$submitonly eq 'graded'));
next if (!$graded && ($submitonly eq 'graded' \|\|	next if (!$graded && ($submitonly eq 'graded'));
$submitonly eq 'incorrect'));	next if (!$incorrect && $submitonly eq 'incorrect');
}	}

$ctr++;	$ctr++;
	my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];

if ( $perm{'vgr'} eq 'F' ) {	if ( $perm{'vgr'} eq 'F' ) {
$gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);	$gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
$gradeTable.='<td align="right">'.$ctr.' </td>'.	$gradeTable.='<td align="right">'.$ctr.' </td>'.
'<td align="center"><input type=checkbox name="stuinfo" value="'.	'<td align="center"><label><input type=checkbox name="stuinfo" value="'.
$student.':'.$$fullname{$student}.' "></td>'."\n".	$student.':'.$$fullname{$student}.':::SECTION'.$section.
'<td>'.&nameUserString(undef,$$fullname{$student},$uname,$udom).'</td>'."\n";	') " />  </label></td>'."\n".'<td>'.
	&nameUserString(undef,$$fullname{$student},$uname,$udom).
	' '.$section.'</td>'."\n";

if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {	if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (sort keys(%status)) {	foreach (sort keys(%status)) {
next if (/^resource.*?submitted_by$/);	next if (/^resource.*?submitted_by$/);
$gradeTable.='<td align="middle"> '.$status{$_}.' </td>'."\n";	$gradeTable.='<td align="middle"> '.$status{$_}.' </td>'."\n";
Line 764 LISTJAVASCRIPT	Line 752 LISTJAVASCRIPT
}	}
if ($ctr%2 ==1) {	if ($ctr%2 ==1) {
$gradeTable.='<td> </td><td> </td><td> </td>';	$gradeTable.='<td> </td><td> </td><td> </td>';
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {	if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (@$partlist) {	foreach (@$partlist) {
$gradeTable.='<td> </td>';	$gradeTable.='<td> </td>';
}	}
Line 772 LISTJAVASCRIPT	Line 760 LISTJAVASCRIPT
$gradeTable.='</tr>';	$gradeTable.='</tr>';
}	}

$gradeTable.='</table></td></tr></table>'.	$gradeTable.='</table></td></tr></table>'."\n".
'<input type="button" '.	'<input type="button" '.
'onClick="javascript:checkSelect(this.form.stuinfo);" '.	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
'value="Next->" /></form>'."\n";	'value="Next->" /></form>'."\n";
Line 797 LISTJAVASCRIPT	Line 785 LISTJAVASCRIPT
}	}

#---- Called from the listStudents routine	#---- Called from the listStudents routine

	sub check_script {
	my ($form, $type)=@_;
	my $chkallscript='<script type="text/javascript">
	function checkall() {
	for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
	ele = document.forms.'.$form.'.elements[i];
	if (ele.name == "'.$type.'") {
	document.forms.'.$form.'.elements[i].checked=true;
	}
	}
	}

	function checksec() {
	for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
	ele = document.forms.'.$form.'.elements[i];
	string = document.forms.'.$form.'.chksec.value;
	if
	(ele.value.indexOf(":::SECTION"+string)>0) {
	document.forms.'.$form.'.elements[i].checked=true;
	}
	}
	}


	function uncheckall() {
	for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
	ele = document.forms.'.$form.'.elements[i];
	if (ele.name == "'.$type.'") {
	document.forms.'.$form.'.elements[i].checked=false;
	}
	}
	}

	</script>'."\n";
	return $chkallscript;
	}

	sub check_buttons {
	my $buttons.='<input type="button" onclick="checkall()" value="Check All" />';
	$buttons.='<input type="button" onclick="uncheckall()" value="Uncheck All" /> ';
	$buttons.='<input type="button" onclick="checksec()" value="Check Section/Group" />';
	$buttons.='<input type="text" size="5" name="chksec" /> ';
	return $buttons;
	}

# Displays the submissions for one student or a group of students	# Displays the submissions for one student or a group of students
sub processGroup {	sub processGroup {
my ($request) = shift;	my ($request) = shift;
Line 806 sub processGroup {	Line 840 sub processGroup {

foreach (@stuchecked) {	foreach (@stuchecked) {
my ($uname,$udom,$fullname) = split(/:/);	my ($uname,$udom,$fullname) = split(/:/);
$ENV{'form.student'} = $uname;	$env{'form.student'} = $uname;
$ENV{'form.userdom'} = $udom;	$env{'form.userdom'} = $udom;
$ENV{'form.fullname'} = $fullname;	$env{'form.fullname'} = $fullname;
&submission($request,$ctr,$total);	&submission($request,$ctr,$total);
$ctr++;	$ctr++;
}	}
Line 1001 sub sub_page_kw_js {	Line 1035 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 $docopen=&Apache::lonhtmlcommon::javascript_docopen();
	$docopen=~s/^document\.//;
$request->print(<<SUBJAVASCRIPT);	$request->print(<<SUBJAVASCRIPT);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">

Line 1113 sub sub_page_kw_js {	Line 1149 sub sub_page_kw_js {
pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);	pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
pWin.focus();	pWin.focus();
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.open('text/html','replace');	pDoc.$docopen;
pDoc.write("<html><head>");	pDoc.write("<html><head>");
pDoc.write("<title>Message Central</title>");	pDoc.write("<title>Message Central</title>");

Line 1244 sub sub_page_kw_js {	Line 1280 sub sub_page_kw_js {
hwdWin = window.open('', 'KeywordHighlightCentral', 'resizeable=yes,toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);	hwdWin = window.open('', 'KeywordHighlightCentral', 'resizeable=yes,toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);
hwdWin.focus();	hwdWin.focus();
var hDoc = hwdWin.document;	var hDoc = hwdWin.document;
hDoc.open('text/html','replace');	hDoc.$docopen;
hDoc.write("<html><head>");	hDoc.write("<html><head>");
hDoc.write("<title>Highlight Central</title>");	hDoc.write("<title>Highlight Central</title>");

Line 1316 sub gradeBox {	Line 1352 sub gradeBox {
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,undef,$symb);	my $display_part=&get_display_part($partid,undef,$symb);

	my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
	[$partid]);
	my $aggtries = $$record{'resource.'.$partid.'.tries'};
	if ($last_resets{$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";

Line 1354 sub gradeBox {	Line 1398 sub gradeBox {
$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="'.
$$record{'resource.'.$partid.'.solved'}.'" />'."\n";	$$record{'resource.'.$partid.'.solved'}.'" />'."\n".
	'<input type="hidden" name="totaltries'.$counter.'_'.$partid.'" value="'.
	$$record{'resource.'.$partid.'.tries'}.'" />'."\n".
	'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
	$aggtries.'" />'."\n";
$result.='</td></tr></table>'."\n";	$result.='</td></tr></table>'."\n";
return $result;	return $result;
}	}
Line 1364 sub show_problem {	Line 1412 sub show_problem {
my $rendered;	my $rendered;
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'});
}	}
if ($removeform) {	if ($removeform) {
$rendered=~s\|<form(.*?)>\|\|g;	$rendered=~s\|<form(.*?)>\|\|g;
Line 1374 sub show_problem {	Line 1422 sub show_problem {
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,	$companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
$ENV{'request.course.id'});	$env{'request.course.id'});
}	}
if ($removeform) {	if ($removeform) {
$companswer=~s\|<form(.*?)>\|\|g;	$companswer=~s\|<form(.*?)>\|\|g;
Line 1390 sub show_problem {	Line 1438 sub show_problem {
} else {	} else {
$result.='Correct answer: ';	$result.='Correct answer: ';
}	}
$result.=$ENV{'form.fullname'}.'</b></td></tr>';	$result.=$env{'form.fullname'}.'</b></td></tr>';
}	}
if ($mode eq 'both') {	if ($mode eq 'both') {
$result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';	$result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';
Line 1409 sub show_problem {	Line 1457 sub show_problem {
sub submission {	sub submission {
my ($request,$counter,$total) = @_;	my ($request,$counter,$total) = @_;

(my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;	(my $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'} = &get_fullname ($uname,$udom) 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=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }	if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }

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

if (!$ENV{'form.lastSub'}) { $ENV{'form.lastSub'} = 'datesub'; }	if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; }
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 src="'.$request->dir_config('lonIconsURL').
'/check.gif" height="16" border="0" />';	'/check.gif" height="16" border="0" />';

# header info	# header info
if ($counter == 0) {	if ($counter == 0) {
&sub_page_js($request);	&sub_page_js($request);
&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'};

$request->print('<h3> <font color="#339933">Submission Record</font></h3>'."\n".	$request->print('<h3> <font color="#339933">Submission Record</font></h3>'."\n".
'<font size=+1> <b>Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");	'<font size=+1> <b>Resource: </b>'.$env{'form.probTitle'}.'</font>'."\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 '.
$checkIcon.' symbol.'."\n";	$checkIcon.' symbol.'."\n";
$request->print($checkMark);	$request->print($checkMark);
Line 1450 sub submission {	Line 1499 sub submission {

# option to display problem, only once else it cause problems	# option to display problem, only once else it cause problems
# with the form later since the problem has a form.	# with the form later since the problem has a form.
if ($ENV{'form.vProb'} eq 'yes' or $ENV{'form.vAns'} eq 'yes') {	if ($env{'form.vProb'} eq 'yes' or $env{'form.vAns'} eq 'yes') {
my $mode;	my $mode;
if ($ENV{'form.vProb'} eq 'yes' && $ENV{'form.vAns'} eq 'yes') {	if ($env{'form.vProb'} eq 'yes' && $env{'form.vAns'} eq 'yes') {
$mode='both';	$mode='both';
} elsif ($ENV{'form.vProb'} eq 'yes') {	} elsif ($env{'form.vProb'} eq 'yes') {
$mode='text';	$mode='text';
} elsif ($ENV{'form.vAns'} eq 'yes') {	} elsif ($env{'form.vAns'} eq 'yes') {
$mode='answer';	$mode='answer';
}	}
$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));	$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
Line 1465 sub submission {	Line 1514 sub submission {
# kwclr is the only variable that is guaranteed to be non blank	# kwclr is the only variable that is guaranteed to be non blank
# if this subroutine has been called once.	# if this subroutine has been called once.
my %keyhash = ();	my %keyhash = ();
if ($ENV{'form.kwclr'} eq '' && $ENV{'form.handgrade'} eq 'yes') {	if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {
%keyhash = &Apache::lonnet::dump('nohist_handgrade',	%keyhash = &Apache::lonnet::dump('nohist_handgrade',
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},	$env{'course.'.$env{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});	$env{'course.'.$env{'request.course.id'}.'.num'});

my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};	my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
$ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';	$env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
$ENV{'form.kwclr'} = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';	$env{'form.kwclr'} = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
$ENV{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';	$env{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
$ENV{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';	$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
$ENV{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?	$env{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?
$keyhash{$symb.'_subject'} : $ENV{'form.probTitle'};	$keyhash{$symb.'_subject'} : $env{'form.probTitle'};
$ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';	$env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
}	}
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">'."\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".
'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".	'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\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="refresh" value="off" />'."\n".	'<input type="hidden" name="refresh" value="off" />'."\n".
'<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="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') {
$request->print('<input type="hidden" name="keywords" value="'.$ENV{'form.keywords'}.'" />'."\n".	$request->print('<input type="hidden" name="keywords" value="'.$env{'form.keywords'}.'" />'."\n".
'<input type="hidden" name="kwclr" value="'.$ENV{'form.kwclr'}.'" />'."\n".	'<input type="hidden" name="kwclr" value="'.$env{'form.kwclr'}.'" />'."\n".
'<input type="hidden" name="kwsize" value="'.$ENV{'form.kwsize'}.'" />'."\n".	'<input type="hidden" name="kwsize" value="'.$env{'form.kwsize'}.'" />'."\n".
'<input type="hidden" name="kwstyle" value="'.$ENV{'form.kwstyle'}.'" />'."\n".	'<input type="hidden" name="kwstyle" value="'.$env{'form.kwstyle'}.'" />'."\n".
'<input type="hidden" name="msgsub" value="'.$ENV{'form.msgsub'}.'" />'."\n".	'<input type="hidden" name="msgsub" value="'.$env{'form.msgsub'}.'" />'."\n".
'<input type="hidden" name="shownSub" value="0" />'."\n".	'<input type="hidden" name="shownSub" value="0" />'."\n".
'<input type="hidden" name="savemsgN" value="'.$ENV{'form.savemsgN'}.'" />'."\n");	'<input type="hidden" name="savemsgN" value="'.$env{'form.savemsgN'}.'" />'."\n");
foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {	foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
$request->print('<input type="hidden" name="vPart" value="'.$partid.'" />'."\n");	$request->print('<input type="hidden" name="vPart" value="'.$partid.'" />'."\n");
}	}
}	}

my ($cts,$prnmsg) = (1,'');	my ($cts,$prnmsg) = (1,'');
while ($cts <= $ENV{'form.savemsgN'}) {	while ($cts <= $env{'form.savemsgN'}) {
$prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.	$prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
(!exists($keyhash{$symb.'_savemsg'.$cts}) ?	(!exists($keyhash{$symb.'_savemsg'.$cts}) ?
&Apache::lonfeedback::clear_out_html($ENV{'form.savemsg'.$cts}) :	&Apache::lonfeedback::clear_out_html($env{'form.savemsg'.$cts}) :
&Apache::lonfeedback::clear_out_html($keyhash{$symb.'_savemsg'.$cts})).	&Apache::lonfeedback::clear_out_html($keyhash{$symb.'_savemsg'.$cts})).
'" />'."\n".	'" />'."\n".
'<input type="hidden" name="shownOnce'.$cts.'" value="0" />'."\n";	'<input type="hidden" name="shownOnce'.$cts.'" value="0" />'."\n";
Line 1526 sub submission {	Line 1575 sub submission {
}	}
$request->print($prnmsg);	$request->print($prnmsg);

if ($ENV{'form.handgrade'} eq 'yes' && $ENV{'form.showgrading'} eq 'yes') {	if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') {
#	#
# Print out the keyword options line	# Print out the keyword options line
#	#
Line 1548 KEYWORDS	Line 1597 KEYWORDS
}	}
}	}

if ($ENV{'form.vProb'} eq 'all' or $ENV{'form.vAns'} eq 'all') {	if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {
$request->print('<br /><br /><br />') if ($counter > 0);	$request->print('<br /><br /><br />') if ($counter > 0);
my $mode;	my $mode;
if ($ENV{'form.vProb'} eq 'all' && $ENV{'form.vAns'} eq 'all') {	if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {
$mode='both';	$mode='both';
} elsif ($ENV{'form.vProb'} eq 'all' ) {	} elsif ($env{'form.vProb'} eq 'all' ) {
$mode='text';	$mode='text';
} elsif ($ENV{'form.vAns'} eq 'all') {	} elsif ($env{'form.vAns'} eq 'all') {
$mode='answer';	$mode='answer';
}	}
$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($url,$symb);

# Display student info	# Display student info
Line 1570 KEYWORDS	Line 1618 KEYWORDS
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.
'" value="'.$ENV{'form.fullname'}.'" />'."\n";	'" value="'.$env{'form.fullname'}.'" />'."\n";

# If any part of the problem is an essay-response (handgraded), then check for collaborators	# If any part of the problem is an essay-response (handgraded), then check for collaborators
my @col_fullnames;	my @col_fullnames;
my ($classlist,$fullname);	my ($classlist,$fullname);
if ($ENV{'form.handgrade'} eq 'yes') {	if ($env{'form.handgrade'} eq 'yes') {
($classlist,undef,$fullname) = &getclasslist('all','0');	($classlist,undef,$fullname) = &getclasslist('all','0');
for (keys (%$handgrade)) {	for (keys (%$handgrade)) {
my $ncol = &Apache::lonnet::EXT('resource.'.$_.	my $ncol = &Apache::lonnet::EXT('resource.'.$_.
Line 1638 KEYWORDS	Line 1686 KEYWORDS
# (for multi-response type part)	# (for multi-response type part)
# (3) Last submission plus the parts info	# (3) Last submission plus the parts info
# (4) The whole record for this student	# (4) The whole record for this student
if ($ENV{'form.lastSub'} =~ /^(lastonly\|hdgrade)$/) {	if ($env{'form.lastSub'} =~ /^(lastonly\|hdgrade)$/) {
my ($string,$timestamp)= &get_last_submission(\%record);	my ($string,$timestamp)= &get_last_submission(\%record);
my $lastsubonly=''.	my $lastsubonly=''.
($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.	($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
Line 1650 KEYWORDS	Line 1698 KEYWORDS
for my $part (sort keys(%$handgrade)) {	for my $part (sort keys(%$handgrade)) {
my ($partid,$respid) = split(/_/,$part);	my ($partid,$respid) = split(/_/,$part);
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$url,$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;
my $submitby='<b>Part:</b> '.$display_part.	my $submitby='<b>Part:</b> '.$display_part.
' <b>Collaborative submission by:</b> '.	' <b>Collaborative submission by:</b> '.
'<a href="javascript:viewSubmitter(\''.	'<a href="javascript:viewSubmitter(\''.
$ENV{"form.$uname:$udom:$partid:submitted_by"}.	$env{"form.$uname:$udom:$partid:submitted_by"}.
'\')"; TARGET=_self>'.	'\')"; TARGET=_self>'.
$$fullname{$ENV{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';	$$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
$request->print($submitby);	$request->print($submitby);
next;	next;
}	}
Line 1676 KEYWORDS	Line 1724 KEYWORDS
my ($ressub,$subval) = split(/:/,$_,2);	my ($ressub,$subval) = split(/:/,$_,2);
# Similarity check	# Similarity check
my $similar='';	my $similar='';
if($ENV{'form.checkPlag'}){	if($env{'form.checkPlag'}){
my ($oname,$odom,$ocrsid,$oessay,$osim)=	my ($oname,$odom,$ocrsid,$oessay,$osim)=
&most_similar($uname,$udom,$subval);	&most_similar($uname,$udom,$subval);
if ($osim) {	if ($osim) {
Line 1690 KEYWORDS	Line 1738 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} eq 'yes')) {
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$url,$symb);
$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.	$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
$display_part.' <font color="#999999">( ID '.$respid.	$display_part.' <font color="#999999">( ID '.$respid.
' )</font>   ';	' )</font>   ';
	my @files;
	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);

	&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"}) {	if ($record{"resource.$partid.$respid.uploadedurl"}) {
&Apache::lonnet::allowuploaded('/adm/grades',	push(@files,$record{"resource.$partid.$respid.uploadedurl"});
$record{"resource.$partid.$respid.uploadedurl"});	}
$lastsubonly.='<a href="'.$record{"resource.$partid.$respid.uploadedurl"}.'" target="lonGRDs"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';	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);
	$lastsubonly.='<br /><a href="'.$file.'" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
	}
	$lastsubonly.='<br />';
}	}
$lastsubonly.='<b>Submitted Answer: </b>'.	$lastsubonly.='<b>Submitted Answer: </b>'.
&cleanRecord($subval,$responsetype,$symb,$partid,	&cleanRecord($subval,$responsetype,$symb,$partid,
Line 1712 KEYWORDS	Line 1776 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($url);
$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,
$ENV{'request.course.id'},	$env{'request.course.id'},
$last,'.submission',	$last,'.submission',
'Apache::grades::keywords_highlight'));	'Apache::grades::keywords_highlight'));
}	}
Line 1726 KEYWORDS	Line 1790 KEYWORDS
.$udom.'" />'."\n");	.$udom.'" />'."\n");

# return if view submission with no grading option	# return if view submission with no grading option
if ($ENV{'form.showgrading'} eq '' \|\| (!&canmodify($usec))) {	if ($env{'form.showgrading'} eq '' \|\| (!&canmodify($usec))) {
my $toGrade.='<input type="button" value="Grade Student" '.	my $toGrade.='<input type="button" value="Grade Student" '.
'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''	'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''
.$counter.'\');" TARGET=_self>  '."\n" if (&canmodify($usec));	.$counter.'\');" TARGET=_self>  '."\n" if (&canmodify($usec));
$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,$url)
}	}
$request->print($toGrade);	$request->print($toGrade);
Line 1742 KEYWORDS	Line 1806 KEYWORDS
}	}

# essay grading message center	# essay grading message center
if ($ENV{'form.handgrade'} eq 'yes') {	if ($env{'form.handgrade'} eq 'yes') {
my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});	my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
my $msgfor = $givenn.' '.$lastname;	my $msgfor = $givenn.' '.$lastname;
if (scalar(@col_fullnames) > 0) {	if (scalar(@col_fullnames) > 0) {
my $lastone = pop @col_fullnames;	my $lastone = pop @col_fullnames;
Line 1758 KEYWORDS	Line 1822 KEYWORDS
'<img src="'.$request->dir_config('lonIconsURL').	'<img src="'.$request->dir_config('lonIconsURL').
'/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".	'/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
'<br /> (Message will be sent when you click on Save & Next below.)'."\n"	'<br /> (Message will be sent when you click on Save & Next below.)'."\n"
if ($ENV{'form.handgrade'} eq 'yes');	if ($env{'form.handgrade'} eq 'yes');
$request->print($result);	$request->print($result);
}	}

Line 1769 KEYWORDS	Line 1833 KEYWORDS
my ($partid,$respid) = split(/_/);	my ($partid,$respid) = split(/_/);
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{$_} =~ /:no$/ && $env{'form.lastSub'} =~ /^(hdgrade)$/);
push @partlist,$partid;	push @partlist,$partid;
push @gradePartRespid,$partid.'.'.$respid;	push @gradePartRespid,$partid.'.'.$respid;

Line 1797 KEYWORDS	Line 1861 KEYWORDS
'<option>1</option><option>2</option>'.	'<option>1</option><option>2</option>'.
'<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="on">$nsel</;
$endform.=$ntstu.'student(s)   ';	$endform.=$ntstu.'student(s)   ';
$endform.='<input type="button" value="Previous" '.	$endform.='<input type="button" value="Previous" '.
Line 1841 sub get_last_submission {	Line 1905 sub get_last_submission {
#--- High light keywords, with style choosen by user.	#--- High light keywords, with style choosen by user.
sub keywords_highlight {	sub keywords_highlight {
my $string = shift;	my $string = shift;
my $size = $ENV{'form.kwsize'} eq '0' ? '' : 'size='.$ENV{'form.kwsize'};	my $size = $env{'form.kwsize'} eq '0' ? '' : 'size='.$env{'form.kwsize'};
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 (@keylist) {
$string =~ s/\b\Q$_\E(\b\|\.)/<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi;	$string =~ s/\b\Q$_\E(\b\|\.)/<font color\=$env{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi;
}	}
return $string;	return $string;
}	}
Line 1854 sub keywords_highlight {	Line 1918 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 $url = $env{'form.url'};
my $symb = $ENV{'form.symb'};	my $symb = $env{'form.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'};
if ($button eq 'Save & Next') {	if ($button eq 'Save & Next') {
my $ctr = 0;	my $ctr = 0;
while ($ctr < $ngrade) {	while ($ctr < $ngrade) {
my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});	my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);	my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
if ($errorflag eq 'no_score') {	if ($errorflag eq 'no_score') {
$ctr++;	$ctr++;
Line 1873 sub processHandGrade {	Line 1937 sub processHandGrade {
$ctr++;	$ctr++;
next;	next;
}	}
my $includemsg = $ENV{'form.includemsg'.$ctr};	my $includemsg = $env{'form.includemsg'.$ctr};
my ($subject,$message,$msgstatus) = ('','','');	my ($subject,$message,$msgstatus) = ('','','');
if ($includemsg =~ /savemsg\|newmsg\Q$ctr\E/) {	if ($includemsg =~ /savemsg\|newmsg\Q$ctr\E/) {
$subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/);	$subject = $env{'form.msgsub'} if ($includemsg =~ /^msgsub/);
my (@msgnum) = split(/,/,$includemsg);	my (@msgnum) = split(/,/,$includemsg);
foreach (@msgnum) {	foreach (@msgnum) {
$message.=$ENV{'form.'.$_} if ($_ =~ /savemsg\|newmsg/ && $_ ne '');	$message.=$env{'form.'.$_} if ($_ =~ /savemsg\|newmsg/ && $_ ne '');
}	}
$message =&Apache::lonfeedback::clear_out_html($message);	$message =&Apache::lonfeedback::clear_out_html($message);
$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;	$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
$message.=" for <a href=\"".	$message.=" for <a href=\"".
&Apache::lonnet::clutter($url).	&Apache::lonnet::clutter($url).
"?symb=$symb\">$ENV{'form.probTitle'}</a>";	"?symb=$symb\">$env{'form.probTitle'}</a>";
$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,	$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
$ENV{'form.msgsub'},$message);	$env{'form.msgsub'},$message);
}	}
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 (@collaborators) {
my ($errorflag,$pts,$wgt) =	my ($errorflag,$pts,$wgt) =
&saveHandGrade($request,$url,$symb,$_,$udom,$ctr,	&saveHandGrade($request,$url,$symb,$_,$udom,$ctr,
$ENV{'form.unamedom'.$ctr},$part);	$env{'form.unamedom'.$ctr},$part);
if ($errorflag eq 'not_allowed') {	if ($errorflag eq 'not_allowed') {
$request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");	$request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");
next;	next;
} else {	} else {
if ($message ne '') {	if ($message ne '') {
$msgstatus = &Apache::lonmsg::user_normal_msg($_,$udom,$ENV{'form.msgsub'},$message);	$msgstatus = &Apache::lonmsg::user_normal_msg($_,$udom,$env{'form.msgsub'},$message);
}	}

}	}
Line 1913 sub processHandGrade {	Line 1977 sub processHandGrade {
}	}
}	}

if ($ENV{'form.handgrade'} eq 'yes') {	if ($env{'form.handgrade'} eq 'yes') {
# Keywords sorted in alphabatical order	# Keywords sorted in alphabatical order
my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};	my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
my %keyhash = ();	my %keyhash = ();
$ENV{'form.keywords'} =~ s/,\s{0,}\|\s+/ /g;	$env{'form.keywords'} =~ s/,\s{0,}\|\s+/ /g;
$ENV{'form.keywords'} =~ s/^\s+\|\s+$//;	$env{'form.keywords'} =~ s/^\s+\|\s+$//;
my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'}));	my (@keywords) = sort(split(/\s+/,$env{'form.keywords'}));
$ENV{'form.keywords'} = join(' ',@keywords);	$env{'form.keywords'} = join(' ',@keywords);
$keyhash{$symb.'_keywords'} = $ENV{'form.keywords'};	$keyhash{$symb.'_keywords'} = $env{'form.keywords'};
$keyhash{$symb.'_subject'} = $ENV{'form.msgsub'};	$keyhash{$symb.'_subject'} = $env{'form.msgsub'};
$keyhash{$loginuser.'_kwclr'} = $ENV{'form.kwclr'};	$keyhash{$loginuser.'_kwclr'} = $env{'form.kwclr'};
$keyhash{$loginuser.'_kwsize'} = $ENV{'form.kwsize'};	$keyhash{$loginuser.'_kwsize'} = $env{'form.kwsize'};
$keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};	$keyhash{$loginuser.'_kwstyle'} = $env{'form.kwstyle'};

# message center - Order of message gets changed. Blank line is eliminated.	# message center - Order of message gets changed. Blank line is eliminated.
# New messages are saved in ENV for the next student.	# New messages are saved in env for the next student.
# All messages are saved in nohist_handgrade.db	# All messages are saved in nohist_handgrade.db
my ($ctr,$idx) = (1,1);	my ($ctr,$idx) = (1,1);
while ($ctr <= $ENV{'form.savemsgN'}) {	while ($ctr <= $env{'form.savemsgN'}) {
if ($ENV{'form.savemsg'.$ctr} ne '') {	if ($env{'form.savemsg'.$ctr} ne '') {
$keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};	$keyhash{$symb.'_savemsg'.$idx} = $env{'form.savemsg'.$ctr};
$idx++;	$idx++;
}	}
$ctr++;	$ctr++;
}	}
$ctr = 0;	$ctr = 0;
while ($ctr < $ngrade) {	while ($ctr < $ngrade) {
if ($ENV{'form.newmsg'.$ctr} ne '') {	if ($env{'form.newmsg'.$ctr} ne '') {
$keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};	$keyhash{$symb.'_savemsg'.$idx} = $env{'form.newmsg'.$ctr};
$ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};	$env{'form.savemsg'.$idx} = $env{'form.newmsg'.$ctr};
$idx++;	$idx++;
}	}
$ctr++;	$ctr++;
}	}
$ENV{'form.savemsgN'} = --$idx;	$env{'form.savemsgN'} = --$idx;
$keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};	$keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'};
my $putresult = &Apache::lonnet::put	my $putresult = &Apache::lonnet::put
('nohist_handgrade',\%keyhash,	('nohist_handgrade',\%keyhash,
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},	$env{'course.'.$env{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});	$env{'course.'.$env{'request.course.id'}.'.num'});
}	}
# Called by Save & Refresh from Highlight Attribute Window	# Called by Save & Refresh from Highlight Attribute Window
my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');	my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
if ($ENV{'form.refresh'} eq 'on') {	if ($env{'form.refresh'} eq 'on') {
my ($ctr,$total) = (0,0);	my ($ctr,$total) = (0,0);
while ($ctr < $ngrade) {	while ($ctr < $ngrade) {
$total++ if $ENV{'form.unamedom'.$ctr} ne '';	$total++ if $env{'form.unamedom'.$ctr} ne '';
$ctr++;	$ctr++;
}	}
$ENV{'form.NTSTU'}=$ngrade;	$env{'form.NTSTU'}=$ngrade;
$ctr = 0;	$ctr = 0;
while ($ctr < $total) {	while ($ctr < $total) {
my $processUser = $ENV{'form.unamedom'.$ctr};	my $processUser = $env{'form.unamedom'.$ctr};
($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};
&submission($request,$ctr,$total-1);	&submission($request,$ctr,$total-1);
$ctr++;	$ctr++;
}	}
Line 1976 sub processHandGrade {	Line 2040 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($url);
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};
&submission($request,0,0);	&submission($request,0,0);
return '';	return '';
}	}

# Get the next/previous one or group of students	# Get the next/previous one or group of students
my $firststu = $ENV{'form.unamedom0'};	my $firststu = $env{'form.unamedom0'};
my $laststu = $ENV{'form.unamedom'.($ngrade-1)};	my $laststu = $env{'form.unamedom'.($ngrade-1)};
my $ctr = 2;	my $ctr = 2;
while ($laststu eq '') {	while ($laststu eq '') {
$laststu = $ENV{'form.unamedom'.($ngrade-$ctr)};	$laststu = $env{'form.unamedom'.($ngrade-$ctr)};
$ctr++;	$ctr++;
$laststu = $firststu if ($ctr > $ngrade);	$laststu = $firststu if ($ctr > $ngrade);
}	}
Line 2010 sub processHandGrade {	Line 2074 sub processHandGrade {
@parsedlist = reverse @parsedlist if ($button eq 'Previous');	@parsedlist = reverse @parsedlist if ($button eq 'Previous');
my ($partlist) = &response_type($url);	my ($partlist) = &response_type($url);
foreach my $student (@parsedlist) {	foreach my $student (@parsedlist) {
my $submitonly=$ENV{'form.submitonly'};	my $submitonly=$env{'form.submitonly'};
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);
if ($submitonly =~ /^(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($url,$symb,$udom,$uname,$partlist);
my $submitted = 0;	my $submitted = 0;
my $graded = 1;	my $ungraded = 0;
	my $incorrect = 0;
foreach (keys(%status)) {	foreach (keys(%status)) {
$submitted = 1 if ($status{$_} ne 'nothing');	$submitted = 1 if ($status{$_} ne 'nothing');
$graded = 0 if ($status{$_} =~ /^correct/);	$ungraded = 1 if ($status{$_} =~ /^ungraded/);
	$incorrect = 1 if ($status{$_} =~ /^incorrect/);
my ($foo,$partid,$foo1) = split(/\./,$_);	my ($foo,$partid,$foo1) = split(/\./,$_);
if ($status{'resource.'.$partid.'.submitted_by'} ne '') {	if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
$submitted = 0;	$submitted = 0;
Line 2028 sub processHandGrade {	Line 2094 sub processHandGrade {
next if (!$submitted && ($submitonly eq 'yes' \|\|	next if (!$submitted && ($submitonly eq 'yes' \|\|
$submitonly eq 'incorrect' \|\|	$submitonly eq 'incorrect' \|\|
$submitonly eq 'graded'));	$submitonly eq 'graded'));
next if (!$graded && ($submitonly eq 'graded' \|\|	next if (!$ungraded && ($submitonly eq 'graded'));
$submitonly eq 'incorrect'));	next if (!$incorrect && $submitonly eq 'incorrect');
}	}
push @nextlist,$student if ($ctr < $ntstu);	push @nextlist,$student if ($ctr < $ntstu);
last if ($ctr == $ntstu);	last if ($ctr == $ntstu);
Line 2041 sub processHandGrade {	Line 2107 sub processHandGrade {

foreach (sort @nextlist) {	foreach (sort @nextlist) {
my ($uname,$udom,$submitter) = split(/:/);	my ($uname,$udom,$submitter) = split(/:/);
$ENV{'form.student'} = $uname;	$env{'form.student'} = $uname;
$ENV{'form.userdom'} = $udom;	$env{'form.userdom'} = $udom;
$ENV{'form.fullname'} = $$fullname{$_};	$env{'form.fullname'} = $$fullname{$_};
&submission($request,$ctr,$total);	&submission($request,$ctr,$total);
$ctr++;	$ctr++;
}	}
Line 2060 sub processHandGrade {	Line 2126 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,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
	my @v_flag;
my $usec = &Apache::lonnet::getsection($domain,$stuname,	my $usec = &Apache::lonnet::getsection($domain,$stuname,
$ENV{'request.course.id'});	$env{'request.course.id'});
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 %newrecord = ();	my %newrecord = ();
my ($pts,$wgt) = ('','');	my ($pts,$wgt) = ('','');
foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {	my %aggregate = ();
	my $aggregateflag = 0;
	foreach my $new_part (split(/:/,$env{'form.partlist'.$newflg})) {
#collaborator may vary for different parts	#collaborator may vary for different parts
if ($submitter && $_ ne $part) { next; }	if ($submitter && $new_part ne $part) { next; }
my $dropMenu = $ENV{'form.GD_SEL'.$newflg.'_'.$_};	my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part};
if ($dropMenu eq 'excused') {	if ($dropMenu eq 'excused') {
if ($record{'resource.'.$_.'.solved'} ne 'excused') {	if ($record{'resource.'.$new_part.'.solved'} ne 'excused') {
$newrecord{'resource.'.$_.'.solved'} = 'excused';	$newrecord{'resource.'.$new_part.'.solved'} = 'excused';
if (exists($record{'resource.'.$_.'.awarded'})) {	if (exists($record{'resource.'.$new_part.'.awarded'})) {
$newrecord{'resource.'.$_.'.awarded'} = '';	$newrecord{'resource.'.$new_part.'.awarded'} = '';
}	}
$newrecord{'resource.'.$_.'.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.'.$_.'.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
foreach my $key (keys (%record)) {	foreach my $key (keys (%record)) {
if ($key=~/^resource\.\Q$_\E\./) { $newrecord{$key} = ''; }	if ($key=~/^resource\.\Q$new_part\E\./) { $newrecord{$key} = ''; }
}	}
$newrecord{'resource.'.$_.'.regrader'}=	$newrecord{'resource.'.$new_part.'.regrader'}=
"$ENV{'user.name'}:$ENV{'user.domain'}";	"$env{'user.name'}:$env{'user.domain'}";
	my $totaltries = $record{'resource.'.$part.'.tries'};

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

	my $solvedstatus = $record{'resource.'.$new_part.'.solved'};
	if ($aggtries > 0) {
	&decrement($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);
	$aggregateflag = 1;
	}
} elsif ($dropMenu eq '') {	} elsif ($dropMenu eq '') {
$pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ?	$pts = ($env{'form.GD_BOX'.$newflg.'_'.$new_part} ne '' ?
$ENV{'form.GD_BOX'.$newflg.'_'.$_} :	$env{'form.GD_BOX'.$newflg.'_'.$new_part} :
$ENV{'form.RADVAL'.$newflg.'_'.$_});	$env{'form.RADVAL'.$newflg.'_'.$new_part});
if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '') {	if ($pts eq '' && $env{'form.GD_SEL'.$newflg.'_'.$new_part} eq '') {
next;	next;
}	}
$wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 :	$wgt = $env{'form.WGT'.$newflg.'_'.$new_part} eq '' ? 1 :
$ENV{'form.WGT'.$newflg.'_'.$_};	$env{'form.WGT'.$newflg.'_'.$new_part};
my $partial= $pts/$wgt;	my $partial= $pts/$wgt;
if ($partial eq $record{'resource.'.$_.'.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.
next;	next;
	} else {
	push @parts_graded, $new_part;
}	}
if ($record{'resource.'.$_.'.awarded'} ne $partial) {	if ($record{'resource.'.$new_part.'.awarded'} ne $partial) {
$newrecord{'resource.'.$_.'.awarded'} = $partial;	$newrecord{'resource.'.$new_part.'.awarded'} = $partial;
}	}
my $reckey = 'resource.'.$_.'.solved';	my $reckey = 'resource.'.$new_part.'.solved';
if ($partial == 0) {	if ($partial == 0) {
if ($record{$reckey} ne 'incorrect_by_override') {	if ($record{$reckey} ne 'incorrect_by_override') {
$newrecord{$reckey} = 'incorrect_by_override';	$newrecord{$reckey} = 'incorrect_by_override';
Line 2113 sub saveHandGrade {	Line 2200 sub saveHandGrade {
}	}
}	}
if ($submitter &&	if ($submitter &&
($record{'resource.'.$_.'.submitted_by'} ne $submitter)) {	($record{'resource.'.$new_part.'.submitted_by'} ne $submitter)) {
$newrecord{'resource.'.$_.'.submitted_by'} = $submitter;	$newrecord{'resource.'.$new_part.'.submitted_by'} = $submitter;
}	}
$newrecord{'resource.'.$_.'.regrader'}=	$newrecord{'resource.'.$new_part.'.regrader'}=
"$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 ($record{'resource.'.$new_part.'.solved'} =~ /^correct_/ \|\| $record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override') {
	push (@v_flag,$new_part);
}	}
}	}
if (scalar(keys(%newrecord)) > 0) {	if (scalar(keys(%newrecord)) > 0) {
	if (scalar(@v_flag)) {
	&version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@v_flag);
	}
&Apache::lonnet::cstore(\%newrecord,$symb,	&Apache::lonnet::cstore(\%newrecord,$symb,
$ENV{'request.course.id'},$domain,$stuname);	$env{'request.course.id'},$domain,$stuname);
	}
	if ($aggregateflag) {
	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
	$env{'course.'.$env{'request.course.id'}.'.domain'},
	$env{'course.'.$env{'request.course.id'}.'.num'});
}	}
return '',$pts,$wgt;	return '',$pts,$wgt;
}	}

	# ----------- Provides number of tries since last reset.
	sub get_num_tries {
	my ($record,$last_reset,$part) = @_;
	my $timestamp = '';
	my $num_tries = 0;
	if ($$record{'version'}) {
	for (my $version=$$record{'version'};$version>=1;$version--) {
	if (exists($$record{$version.':resource.'.$part.'.solved'})) {
	$timestamp = $$record{$version.':timestamp'};
	if ($timestamp > $last_reset) {
	$num_tries ++;
	} else {
	last;
	}
	}
	}
	}
	return $num_tries;
	}

	# ----------- Determine decrements required in aggregate totals
	sub decrement_aggs {
	my ($symb,$part,$aggregate,$aggtries,$totaltries,$solvedstatus) = @_;
	my %decrement = (
	attempts => 0,
	users => 0,
	correct => 0
	);
	$decrement{'attempts'} = $aggtries;
	if ($solvedstatus =~ /^correct/) {
	$decrement{'correct'} = 1;
	}
	if ($aggtries == $totaltries) {
	$decrement{'users'} = 1;
	}
	foreach my $type (keys (%decrement)) {
	$$aggregate{$symb."\0".$part."\0".$type} = -$decrement{$type};
	}
	return;
	}

	# ----------- Determine timestamps for last reset of aggregate totals for parts
	sub get_last_resets {
	my ($symb,$courseid,$partids) =@_;
	my %last_resets;
	my $cdom = $env{'course.'.$courseid.'.domain'};
	my $cname = $env{'course.'.$courseid.'.num'};
	my @keys;
	foreach my $part (@{$partids}) {
	push(@keys,"$symb\0$part\0resettime");
	}
	my %results=&Apache::lonnet::get('nohist_resourcetracker',\@keys,
	$cdom,$cname);
	foreach my $part (@{$partids}) {
	$last_resets{$part}=$results{"$symb\0$part\0resettime"};
	}
	return %last_resets;
	}

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

	}

#--------------------------------------------------------------------------------------	#--------------------------------------------------------------------------------------
#	#
#-------------------------- Next few routines handles grading by section or whole class	#-------------------------- Next few routines handles grading by section or whole class
Line 2192 sub viewgrades_js {	Line 2405 sub viewgrades_js {
function writeRadText(partid,weight) {	function writeRadText(partid,weight) {
var selval = document.classgrade["SELVAL_"+partid];	var selval = document.classgrade["SELVAL_"+partid];
var radioButton = document.classgrade["RADVAL_"+partid];	var radioButton = document.classgrade["RADVAL_"+partid];
	var override = document.classgrade["FORCE_"+partid].checked;
var textbox = document.classgrade["TEXTVAL_"+partid];	var textbox = document.classgrade["TEXTVAL_"+partid];
if (selval[1].selected \|\| selval[2].selected) {	if (selval[1].selected \|\| selval[2].selected) {
for (var i=0; i<radioButton.length; i++) {	for (var i=0; i<radioButton.length; i++) {
Line 2205 sub viewgrades_js {	Line 2419 sub viewgrades_js {
var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];	var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;	var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];	var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
if (saveval != "correct") {	if ((saveval != "correct") \|\| override) {
scorename.value = "";	scorename.value = "";
if (selval[1].selected) {	if (selval[1].selected) {
selname[1].selected = true;	selname[1].selected = true;
Line 2222 sub viewgrades_js {	Line 2436 sub viewgrades_js {
var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];	var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;	var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];	var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
if (saveval != "correct") {	if ((saveval != "correct") \|\| override) {
scorename.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;	scorename.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
selname[0].selected = true;	selname[0].selected = true;
}	}
Line 2259 sub viewgrades_js {	Line 2473 sub viewgrades_js {
if (selval[2].selected) {	if (selval[2].selected) {
document.classgrade["GD_"+user+'_'+partid+"_tries"].value = "0";	document.classgrade["GD_"+user+'_'+partid+"_tries"].value = "0";
}	}
}	}
}	}

function resetEntry(numpart) {	function resetEntry(numpart) {
Line 2301 sub viewgrades {	Line 2515 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,$url) = ($env{'form.symb'},$env{'form.url'});
#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(
$ENV{'course.'.$ENV{'request.course.id'}.'.num'},	$env{'course.'.$env{'request.course.id'}.'.num'},
$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><font color="#339933">'.&mt('Manual Grading').'</font></h3>';
$result.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";	$result.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n";

#view individual student submission form - called using Javascript viewOneStudent	#view individual student submission form - called using Javascript viewOneStudent
$result.=&jscriptNform($url,$symb);	$result.=&jscriptNform($url,$symb);
Line 2320 sub viewgrades {	Line 2534 sub viewgrades {
'<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="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".
'<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".	'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";

my $sectionClass;	my $sectionClass;
if ($ENV{'form.section'} eq 'all') {	if ($env{'form.section'} eq 'all') {
$sectionClass='Class </h3>';	$sectionClass='Class </h3>';
} elsif ($ENV{'form.section'} eq 'none') {	} elsif ($env{'form.section'} eq 'none') {
$sectionClass='Students in no Section </h3>';	$sectionClass='Students in no Section </h3>';
} else {	} else {
$sectionClass='Students in Section '.$ENV{'form.section'}.'</h3>';	$sectionClass='Students in Section '.$env{'form.section'}.'</h3>';
}	}
$result.='<h3>Assign Common Grade To '.$sectionClass;	$result.='<h3>Assign Common Grade To '.$sectionClass;
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".	$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
Line 2376 sub viewgrades {	Line 2590 sub viewgrades {
$weight{$partid}.')"> '.	$weight{$partid}.')"> '.
'<option selected="on"> </option>'.	'<option selected="on"> </option>'.
'<option>excused</option>'.	'<option>excused</option>'.
'<option>reset status</option></select></td></tr>'."\n";	'<option>reset status</option></select></td>'.
	'<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n";
$ctsparts++;	$ctsparts++;
}	}
$result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".	$result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
Line 2391 sub viewgrades {	Line 2606 sub viewgrades {
'<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($url,$symb));
	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');
$display =~ s\|^Number of Attempts\|Tries<br />\|; # makes the column narrower	$display =~ s\|^Number of Attempts\|Tries<br />\|; # makes the column narrower
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);
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$url,$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.
Line 2409 sub viewgrades {	Line 2626 sub viewgrades {
}	}
$result.='</tr>';	$result.='</tr>';

	my %last_resets =
	&get_last_resets($symb,$env{'request.course.id'},\@partids);

#get info for each student	#get info for each student
#list all the students - with points and grade status	#list all the students - with points and grade status
my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');	my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
my $ctr = 0;	my $ctr = 0;
foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {	foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
my $uname = $_;
$uname=~s/:/_/;
$result.='<input type="hidden" name="ctr'.$ctr.'" value="'.$uname.'" />'."\n";
$ctr++;	$ctr++;
$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},	$result.=&viewstudentgrade($url,$symb,$env{'request.course.id'},
$_,$$fullname{$_},\@parts,\%weight,$ctr);	$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
}	}
$result.='</table></td></tr></table>';	$result.='</table></td></tr></table>';
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";	$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
Line 2427 sub viewgrades {	Line 2644 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='<font color="red">There are no students in section "'.$env{'form.section'}.
'" with enrollment status "'.$ENV{'form.Status'}.'" to modify or grade.</font>';	'" with enrollment status "'.$env{'form.Status'}.'" to modify or grade.</font>';
}	}
$result.=&show_grading_menu_form($symb,$url);	$result.=&show_grading_menu_form($symb,$url);
return $result;	return $result;
Line 2436 sub viewgrades {	Line 2653 sub viewgrades {

#--- 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) = @_;	my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);
$student=~s/:/_/;	$student=~s/:/_/;
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);	my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
my $result='<tr bgcolor="#ffffdd"><td align="right">'.$ctr.' </td><td> '.	my %aggregates = ();
	my $result='<tr bgcolor="#ffffdd"><td align="right">'.
	'<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'.
	"\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";	'<font color="#999999">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
foreach my $apart (@$parts) {	foreach my $apart (@$parts) {
my ($part,$type) = &split_part_type($apart);	my ($part,$type) = &split_part_type($apart);
my $score=$record{"resource.$part.$type"};	my $score=$record{"resource.$part.$type"};
	$result.='<td align="middle">';
	my ($aggtries,$totaltries);
	unless (exists($aggregates{$part})) {
	$totaltries = $record{'resource.'.$part.'.tries'};

	$aggtries = $totaltries;
	if ($$last_resets{$part}) {
	$aggtries = &get_num_tries(\%record,$$last_resets{$part},
	$part);
	}
	$result.='<input type="hidden" name="'.
	'GD_'.$student.'_'.$part.'_aggtries" value="'.$aggtries.'" />'."\n";
	$result.='<input type="hidden" name="'.
	'GD_'.$student.'_'.$part.'_totaltries" value="'.$totaltries.'" />'."\n";
	$aggregates{$part} = 1;
	}
if ($type eq 'awarded') {	if ($type eq 'awarded') {
my $pts = $score eq '' ? '' : $score*$$weight{$part};	my $pts = $score eq '' ? '' : $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.='<td align="middle"><input type="text" name="'.	$result.='<input type="text" name="'.
'GD_'.$student.'_'.$part.'_awarded" '.	'GD_'.$student.'_'.$part.'_awarded" '.
'onChange="javascript:changeSelect(\''.$part.'\',\''.$student.	'onChange="javascript:changeSelect(\''.$part.'\',\''.$student.
'\')" value="'.$pts.'" size="4" /></td>'."\n";	'\')" value="'.$pts.'" size="4" /></td>'."\n";
Line 2460 sub viewstudentgrade {	Line 2696 sub viewstudentgrade {
$status = 'nothing' if ($status eq '');	$status = 'nothing' if ($status eq '');
$result.='<input type="hidden" name="'.'GD_'.$student.'_'.	$result.='<input type="hidden" name="'.'GD_'.$student.'_'.
$part.'_solved_s" value="'.$status.'" />'."\n";	$part.'_solved_s" value="'.$status.'" />'."\n";
$result.='<td align="middle"> <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="on">excused</option>'
Line 2471 sub viewstudentgrade {	Line 2707 sub viewstudentgrade {
$result.='<input type="hidden" name="'.	$result.='<input type="hidden" name="'.
'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.	'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
"\n";	"\n";
$result.='<td align="middle"><input type="text" name="'.	$result.='<input type="text" name="'.
'GD_'.$student.'_'.$part.'_'.$type.'" '.	'GD_'.$student.'_'.$part.'_'.$type.'" '.
'value="'.$score.'" size="4" /></td>'."\n";	'value="'.$score.'" size="4" /></td>'."\n";
}	}
Line 2485 sub viewstudentgrade {	Line 2721 sub viewstudentgrade {
sub editgrades {	sub editgrades {
my ($request) = @_;	my ($request) = @_;

my $symb=$ENV{'form.symb'};	my $symb=$env{'form.symb'};
my $url =$ENV{'form.url'};	my $url =$env{'form.url'};
my $title='<h3><font color="#339933">Current Grade Status</font></h3>';	my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
$title.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font><br />'."\n";	$title.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font><br />'."\n";
$title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n";	$title.='<font size=+1><b>Section: </b>'.$env{'form.section'}.'</font>'."\n";

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 2503 sub editgrades {	Line 2739 sub editgrades {
'ungraded' =>'ungraded_attempted',	'ungraded' =>'ungraded_attempted',
'nothing' => '',	'nothing' => '',
);	);
my ($classlist,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');	my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0');

my (@partid);	my (@partid);
my %weight = ();	my %weight = ();
Line 2512 sub editgrades {	Line 2748 sub editgrades {

my (@parts) = sort(&getpartlist($url,$symb));	my (@parts) = sort(&getpartlist($url,$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};
push @partid,$partid;	push @partid,$partid;
$weight{$partid} = $ENV{'form.weight_'.$partid};	$weight{$partid} = $env{'form.weight_'.$partid};
$ctr++;	$ctr++;
}	}
foreach my $partid (@partid) {	foreach my $partid (@partid) {
Line 2546 sub editgrades {	Line 2782 sub editgrades {
$result .= '</tr>'."\n";	$result .= '</tr>'."\n";
my $noupdate;	my $noupdate;
my ($updateCtr,$noupdateCtr) = (1,1);	my ($updateCtr,$noupdateCtr) = (1,1);
for ($i=0; $i<$ENV{'form.total'}; $i++) {	for ($i=0; $i<$env{'form.total'}; $i++) {
my $line;	my $line;
my $user = $ENV{'form.ctr'.$i};	my $user = $env{'form.ctr'.$i};
my $usercolon = $user;	my $usercolon = $user;
$usercolon =~s/_/:/;	$usercolon =~s/_/:/;
my ($uname,$udom)=split(/_/,$user);	my ($uname,$udom)=split(/_/,$user);
Line 2561 sub editgrades {	Line 2797 sub editgrades {
$noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";	$noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";
next;	next;
}	}
	my %aggregate = ();
	my $aggregateflag = 0;
foreach (@partid) {	foreach (@partid) {
my $old_aw = $ENV{'form.GD_'.$user.'_'.$_.'_awarded_s'};	my $old_aw = $env{'form.GD_'.$user.'_'.$_.'_awarded_s'};
my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1);	my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1);
my $old_part = $old_aw eq '' ? '' : $old_part_pcr;	my $old_part = $old_aw eq '' ? '' : $old_part_pcr;
my $old_score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_solved_s'}};	my $old_score = $scoreptr{$env{'form.GD_'.$user.'_'.$_.'_solved_s'}};
	my $awarded = $env{'form.GD_'.$user.'_'.$_.'_awarded'};
my $awarded = $ENV{'form.GD_'.$user.'_'.$_.'_awarded'};
my $pcr = $awarded/($weight{$_} ne '0' ? $weight{$_} : 1);	my $pcr = $awarded/($weight{$_} ne '0' ? $weight{$_} : 1);
my $partial = $awarded eq '' ? '' : $pcr;	my $partial = $awarded eq '' ? '' : $pcr;
my $score;	my $score;
if ($partial eq '') {	if ($partial eq '') {
$score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_solved_s'}};	$score = $scoreptr{$env{'form.GD_'.$user.'_'.$_.'_solved_s'}};
} elsif ($partial > 0) {	} elsif ($partial > 0) {
$score = 'correct_by_override';	$score = 'correct_by_override';
} elsif ($partial == 0) {	} elsif ($partial == 0) {
$score = 'incorrect_by_override';	$score = 'incorrect_by_override';
}	}
my $dropMenu = $ENV{'form.GD_'.$user.'_'.$_.'_solved'};	my $dropMenu = $env{'form.GD_'.$user.'_'.$_.'_solved'};
$score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));	$score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));

if ($dropMenu eq 'reset status' &&	if ($dropMenu eq 'reset status' &&
Line 2587 sub editgrades {	Line 2824 sub editgrades {
$newrecord{'resource.'.$_.'.solved'} = '';	$newrecord{'resource.'.$_.'.solved'} = '';
$newrecord{'resource.'.$_.'.award'} = '';	$newrecord{'resource.'.$_.'.award'} = '';
$newrecord{'resource.'.$_.'.awarded'} = 0;	$newrecord{'resource.'.$_.'.awarded'} = 0;
$newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";	$newrecord{'resource.'.$_.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
$updateflag = 1;	$updateflag = 1;
	if ($env{'form.GD_'.$user.'_'.$_.'_aggtries'} > 0) {
	my $aggtries = $env{'form.GD_'.$user.'_'.$_.'_aggtries'};
	my $totaltries = $env{'form.GD_'.$user.'_'.$_.'_totaltries'};
	my $solvedstatus = $env{'form.GD_'.$user.'_'.$_.'_solved_s'};
	&decrement_aggs($symb,$_,\%aggregate,$aggtries,$totaltries,$solvedstatus);
	$aggregateflag = 1;
	}
} elsif (!($old_part eq $partial && $old_score eq $score)) {	} elsif (!($old_part eq $partial && $old_score eq $score)) {
$updateflag = 1;	$updateflag = 1;
$newrecord{'resource.'.$_.'.awarded'} = $partial if $partial ne '';	$newrecord{'resource.'.$_.'.awarded'} = $partial if $partial ne '';
Line 2606 sub editgrades {	Line 2850 sub editgrades {
my ($part,$type) = &split_part_type($stores);	my ($part,$type) = &split_part_type($stores);
if ($part !~ m/^\Q$partid\E/) { next;}	if ($part !~ m/^\Q$partid\E/) { next;}
if ($type eq 'awarded' \|\| $type eq 'solved') { next; }	if ($type eq 'awarded' \|\| $type eq 'solved') { next; }
my $old_aw = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type.'_s'};	my $old_aw = $env{'form.GD_'.$user.'_'.$part.'_'.$type.'_s'};
my $awarded = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type};	my $awarded = $env{'form.GD_'.$user.'_'.$part.'_'.$type};
if ($awarded ne '' && $awarded ne $old_aw) {	if ($awarded ne '' && $awarded ne $old_aw) {
$newrecord{'resource.'.$part.'.'.$type}= $awarded;	$newrecord{'resource.'.$part.'.'.$type}= $awarded;
$newrecord{'resource.'.$part.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";	$newrecord{'resource.'.$part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
$updateflag=1;	$updateflag=1;
}	}
$line .= '<td align="center">'.$old_aw.' </td>'.	$line .= '<td align="center">'.$old_aw.' </td>'.
Line 2620 sub editgrades {	Line 2864 sub editgrades {
$line.='</tr>'."\n";	$line.='</tr>'."\n";
if ($updateflag) {	if ($updateflag) {
$count++;	$count++;
&Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},	&Apache::lonnet::cstore(\%newrecord,$symb,$env{'request.course.id'},
$udom,$uname);	$udom,$uname);
$result.='<tr bgcolor="#ffffde"><td align="right"> '.$updateCtr.' </td>'.$line;	$result.='<tr bgcolor="#ffffde"><td align="right"> '.$updateCtr.' </td>'.$line;
$updateCtr++;	$updateCtr++;
Line 2628 sub editgrades {	Line 2872 sub editgrades {
$noupdate.='<tr bgcolor="#ffffde"><td align="right"> '.$noupdateCtr.' </td>'.$line;	$noupdate.='<tr bgcolor="#ffffde"><td align="right"> '.$noupdateCtr.' </td>'.$line;
$noupdateCtr++;	$noupdateCtr++;
}	}
	if ($aggregateflag) {
	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
	$env{'course.'.$env{'request.course.id'}.'.domain'},
	$env{'course.'.$env{'request.course.id'}.'.num'});
	}
}	}
if ($noupdate) {	if ($noupdate) {
# my $numcols=(scalar(@partid)(scalar(@parts)-1)2)+3;	# my $numcols=(scalar(@partid)(scalar(@parts)-1)2)+3;
Line 2638 sub editgrades {	Line 2887 sub editgrades {
&show_grading_menu_form ($symb,$url);	&show_grading_menu_form ($symb,$url);
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 />';
return $title.$msg.$result;	return $title.$msg.$result;
}	}

Line 2661 sub split_part_type {	Line 2910 sub split_part_type {
#	#
#--- Javascript to handle csv upload	#--- Javascript to handle csv upload
sub csvupload_javascript_reverse_associate {	sub csvupload_javascript_reverse_associate {
	my $error1=&mt('You need to specify the username or ID');
	my $error2=&mt('You need to specify at least one grading field');
return(<<ENDPICK);	return(<<ENDPICK);
function verify(vf) {	function verify(vf) {
var foundsomething=0;	var foundsomething=0;
var founduname=0;	var founduname=0;
var founddomain=0;	var foundID=0;
for (i=0;i<=vf.nfields.value;i++) {	for (i=0;i<=vf.nfields.value;i++) {
tw=eval('vf.f'+i+'.selectedIndex');	tw=eval('vf.f'+i+'.selectedIndex');
if (i==0 && tw!=0) { founduname=1; }	if (i==0 && tw!=0) { foundID=1; }
if (i==1 && tw!=0) { founddomain=1; }	if (i==1 && tw!=0) { founduname=1; }
if (i!=0 && i!=1 && tw!=0) { foundsomething=1; }	if (i!=0 && i!=1 && i!=2 && tw!=0) { foundsomething=1; }
}	}
if (founduname==0 \|\| founddomain==0) {	if (founduname==0 && foundID==0) {
alert('You need to specify at both the username and domain');	alert('$error1');
return;	return;
}	}
if (foundsomething==0) {	if (foundsomething==0) {
alert('You need to specify at least one grading field');	alert('$error2');
return;	return;
}	}
vf.submit();	vf.submit();
}	}
Line 2699 ENDPICK	Line 2950 ENDPICK
}	}

sub csvupload_javascript_forward_associate {	sub csvupload_javascript_forward_associate {
	my $error1=&mt('You need to specify the username or ID');
	my $error2=&mt('You need to specify at least one grading field');
return(<<ENDPICK);	return(<<ENDPICK);
function verify(vf) {	function verify(vf) {
var foundsomething=0;	var foundsomething=0;
var founduname=0;	var founduname=0;
var founddomain=0;	var foundID=0;
for (i=0;i<=vf.nfields.value;i++) {	for (i=0;i<=vf.nfields.value;i++) {
tw=eval('vf.f'+i+'.selectedIndex');	tw=eval('vf.f'+i+'.selectedIndex');
if (tw==1) { founduname=1; }	if (tw==1) { foundID=1; }
if (tw==2) { founddomain=1; }	if (tw==2) { founduname=1; }
if (tw>2) { foundsomething=1; }	if (tw>3) { foundsomething=1; }
}	}
if (founduname==0 \|\| founddomain==0) {	if (founduname==0 && foundID==0) {
alert('You need to specify at both the username and domain');	alert('$error1');
return;	return;
}	}
if (foundsomething==0) {	if (foundsomething==0) {
alert('You need to specify at least one grading field');	alert('$error2');
return;	return;
}	}
vf.submit();	vf.submit();
}	}
Line 2736 ENDPICK	Line 2989 ENDPICK
sub csvuploadmap_header {	sub csvuploadmap_header {
my ($request,$symb,$url,$datatoken,$distotal)= @_;	my ($request,$symb,$url,$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();
} else {	} else {
$javascript=&csvupload_javascript_forward_associate();	$javascript=&csvupload_javascript_forward_associate();
}	}

my ($result) = &showResourceInfo($url,$ENV{'form.probTitle'});	my ($result) = &showResourceInfo($url,$env{'form.probTitle'});
	my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
	my $ignore=&mt('Ignore First Line');
$request->print(<<ENDPICK);	$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<h3><font color="#339933">Uploading Class Grades</font></h3>	<h3><font color="#339933">Uploading Class Grades</font></h3>
Line 2754 Total number of records found in file: $	Line 3008 Total number of records found in file: $
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
to this page if the data selected is insufficient to run your class.<hr />	to this page if the data selected is insufficient to run your class.<hr />
<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />	<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
	<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
<input type="hidden" name="associate" value="" />	<input type="hidden" name="associate" value="" />
<input type="hidden" name="phase" value="three" />	<input type="hidden" name="phase" value="three" />
<input type="hidden" name="datatoken" value="$datatoken" />	<input type="hidden" name="datatoken" value="$datatoken" />
<input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />	<input type="hidden" name="fileupload" value="$env{'form.fileupload'}" />
<input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" />	<input type="hidden" name="upfiletype" value="$env{'form.upfiletype'}" />
<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="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="csvuploadassign" />	<input type="hidden" name="command" value="csvuploadoptions" />
<hr />	<hr />
<script type="text/javascript" language="Javascript">	<script type="text/javascript" language="Javascript">
$javascript	$javascript
Line 2778 ENDPICK	Line 3033 ENDPICK
sub csvupload_fields {	sub csvupload_fields {
my ($url,$symb) = @_;	my ($url,$symb) = @_;
my (@parts) = &getpartlist($url,$symb);	my (@parts) = &getpartlist($url,$symb);
my @fields=(['username','Student Username'],['domain','Student Domain']);	my @fields=(['ID','Student ID'],
	['username','Student Username'],
	['domain','Student Domain']);
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');
my $name=$part;	my $name=$part;
if (!$display) { $display = $name; }	if (!$display) { $display = $name; }
@datum=($name,$display);	@datum=($name,$display);
	if ($name=~/^stores_(.*)_awarded/) {
	push(@fields,['stores_'.$1.'_points',"Points [Part: $1]"]);
	}
push(@fields,\@datum);	push(@fields,\@datum);
}	}
return (@fields);	return (@fields);
Line 2816 sub upcsvScores_form {	Line 3076 sub upcsvScores_form {
}	}
</script>	</script>
CSVFORMJS	CSVFORMJS
$ENV{'form.probTitle'} = &Apache::lonnet::gettitle($symb);	$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
my ($table) = &showResourceInfo($url,$ENV{'form.probTitle'});	my ($table) = &showResourceInfo($url,$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";
Line 2825 CSVFORMJS	Line 3085 CSVFORMJS
'.</b></td></tr>'."\n";	'.</b></td></tr>'."\n";
$result.='<tr bgcolor=#ffffe6><td>'."\n";	$result.='<tr bgcolor=#ffffe6><td>'."\n";
my $upfile_select=&Apache::loncommon::upfile_select_html();	my $upfile_select=&Apache::loncommon::upfile_select_html();
	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="url" value="$url" />
<input type="hidden" name="command" value="csvuploadmap" />	<input type="hidden" name="command" value="csvuploadmap" />
<input type="hidden" name="probTitle" value="$ENV{'form.probTitle'}" />	<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="saveState" value="$ENV{'form.saveState'}" />	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
$upfile_select	$upfile_select
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />	<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />
	<label><input type="checkbox" name="noFirstLine" />$ignore</lable>
</form>	</form>
ENDUPFORM	ENDUPFORM
$result.='</td></tr></table>'."\n";	$result.='</td></tr></table>'."\n";
Line 2850 sub csvuploadmap {	Line 3111 sub csvuploadmap {
if (!$symb) {return '';}	if (!$symb) {return '';}

my $datatoken;	my $datatoken;
if (!$ENV{'form.datatoken'}) {	if (!$env{'form.datatoken'}) {
$datatoken=&Apache::loncommon::upfile_store($request);	$datatoken=&Apache::loncommon::upfile_store($request);
} else {	} else {
$datatoken=$ENV{'form.datatoken'};	$datatoken=$env{'form.datatoken'};
&Apache::loncommon::load_tmp_file($request);	&Apache::loncommon::load_tmp_file($request);
}	}
my @records=&Apache::loncommon::upfile_record_sep();	my @records=&Apache::loncommon::upfile_record_sep();
	if ($env{'form.noFirstLine'}) { shift(@records); }
&csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);	&csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
my ($i,$keyfields);	my ($i,$keyfields);
if (@records) {	if (@records) {
my @fields=&csvupload_fields($url,$symb);	my @fields=&csvupload_fields($url,$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);
$i=&Apache::loncommon::csv_print_select_table($request,\@records,	$i=&Apache::loncommon::csv_print_select_table($request,\@records,
\@fields);	\@fields);
Line 2882 sub csvuploadmap {	Line 3144 sub csvuploadmap {
return '';	return '';
}	}

sub csvuploadassign {	sub csvuploadoptions {
my ($request)= @_;	my ($request)= @_;
my ($symb,$url)=&get_symb_and_url($request);	my ($symb,$url)=&get_symb_and_url($request);
if (!$symb) {return '';}	my $checked=(($env{'form.noFirstLine'})?'1':'0');
&Apache::loncommon::load_tmp_file($request);	my $ignore=&mt('Ignore First Line');
my @gradedata = &Apache::loncommon::upfile_record_sep();	$request->print(<<ENDPICK);
my @keyfields = split(/\,/,$ENV{'form.keyfields'});	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
my %fields=();	<h3><font color="#339933">Uploading Class Grade Options</font></h3>
for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {	<input type="hidden" name="command" value="csvuploadassign" />
if ($ENV{'form.upfile_associate'} eq 'reverse') {	<input type="submit" value="Assign Grades" /><br />
if ($ENV{'form.f'.$i} ne 'none') {	<p>
$fields{$keyfields[$i]}=$ENV{'form.f'.$i};	<label>
	<input type="checkbox" name="show_full_results" />
	Show a table of all changes
	</label>
	</p>
	<p>
	<label>
	<input type="checkbox" name="overwite_scores" checked="checked" />
	Overwrite any existing score
	</label>
	</p>
	ENDPICK
	my %fields=&get_fields();
	if (!defined($fields{'domain'})) {
	my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain');
	$request->print("\n<p> Users are in domain: ".$domform."</p>\n");
	}
	foreach my $key (sort(keys(%env))) {
	if ($key !~ /^form\.(.*)$/) { next; }
	my $cleankey=$1;
	if ($cleankey eq 'command') { next; }
	$request->print('<input type="hidden" name="'.$cleankey.
	'" value="'.$env{$key}.'" />'."\n");
	}
	# FIXME do a check for any duplicated user ids...
	# FIXME do a check for any invalid user ids?...
	$request->print("<hr /></form>\n");
	$request->print(&show_grading_menu_form($symb,$url));
	return '';
	}

	sub get_fields {
	my %fields;
	my @keyfields = split(/\,/,$env{'form.keyfields'});
	for (my $i=0; $i<=$env{'form.nfields'}; $i++) {
	if ($env{'form.upfile_associate'} eq 'reverse') {
	if ($env{'form.f'.$i} ne 'none') {
	$fields{$keyfields[$i]}=$env{'form.f'.$i};
}	}
} else {	} else {
if ($ENV{'form.f'.$i} ne 'none') {	if ($env{'form.f'.$i} ne 'none') {
$fields{$ENV{'form.f'.$i}}=$keyfields[$i];	$fields{$env{'form.f'.$i}}=$keyfields[$i];
}	}
}	}
}	}
	return %fields;
	}

	sub csvuploadassign {
	my ($request)= @_;
	my ($symb,$url)=&get_symb_and_url($request);
	if (!$symb) {return '';}
	&Apache::loncommon::load_tmp_file($request);
	my @gradedata = &Apache::loncommon::upfile_record_sep();
	if ($env{'form.noFirstLine'}) { shift(@gradedata); }
	my %fields=&get_fields();
$request->print('<h3>Assigning Grades</h3>');	$request->print('<h3>Assigning Grades</h3>');
my $courseid=$ENV{'request.course.id'};	my $courseid=$env{'request.course.id'};
my ($classlist) = &getclasslist('all',0);	my ($classlist) = &getclasslist('all',0);
my @notallowed;	my @notallowed;
my @skipped;	my @skipped;
my $countdone=0;	my $countdone=0;
foreach my $grade (@gradedata) {	foreach my $grade (@gradedata) {
my %entries=&Apache::loncommon::record_sep($grade);	my %entries=&Apache::loncommon::record_sep($grade);
	my $domain;
	if ($entries{$fields{'domain'}}) {
	$domain=$entries{$fields{'domain'}};
	} else {
	$domain=$env{'form.default_domain'};
	}
	$domain=~s/\s//g;
my $username=$entries{$fields{'username'}};	my $username=$entries{$fields{'username'}};
$username=~s/\s//g;	$username=~s/\s//g;
my $domain=$entries{$fields{'domain'}};	if (!$username) {
$domain=~s/\s//g;	my $id=$entries{$fields{'ID'}};
	$id=~s/\s//g;
	my %ids=&Apache::lonnet::idget($domain,$id);
	$username=$ids{$id};
	}
if (!exists($$classlist{"$username:$domain"})) {	if (!exists($$classlist{"$username:$domain"})) {
push(@skipped,"$username:$domain");	my $id=$entries{$fields{'ID'}};
	$id=~s/\s//g;
	if ($id) {
	push(@skipped,"$id:$domain");
	} else {
	push(@skipped,"$username:$domain");
	}
next;	next;
}	}
my $usec=$classlist->{"$username:$domain"}[5];	my $usec=$classlist->{"$username:$domain"}[5];
Line 2922 sub csvuploadassign {	Line 3249 sub csvuploadassign {
push(@notallowed,"$username:$domain");	push(@notallowed,"$username:$domain");
next;	next;
}	}
	my %points;
my %grades;	my %grades;
foreach my $dest (keys(%fields)) {	foreach my $dest (keys(%fields)) {
if ($dest eq 'username' \|\| $dest eq 'domain') { next; }	if ($dest eq 'ID' \|\| $dest eq 'username' \|\|
if ($entries{$fields{$dest}} eq '') { next; }	$dest eq 'domain') { next; }
my $store_key=$dest;	if ($entries{$fields{$dest}} =~ /^\s*$/) { next; }
$store_key=~s/^stores/resource/;	if ($dest=~/stores_(.*)_points/) {
$store_key=~s/_/\./g;	my $part=$1;
$grades{$store_key}=$entries{$fields{$dest}};	my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',
	$symb,$domain,$username);
	$entries{$fields{$dest}}=~s/\s//g;
	my $pcr=$entries{$fields{$dest}} / $wgt;
	my $award='correct_by_override';
	$grades{"resource.$part.awarded"}=$pcr;
	$grades{"resource.$part.solved"}=$award;
	$points{$part}=1;
	} else {
	if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} }
	if ($dest=~/stores_(.*)_solved/) { if ($points{$1}) {next;} }
	my $store_key=$dest;
	$store_key=~s/^stores/resource/;
	$store_key=~s/_/\./g;
	$grades{$store_key}=$entries{$fields{$dest}};
	}
}	}
$grades{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";	if (! %grades) { push(@skipped,"$username:$domain no data to store"); }
&Apache::lonnet::cstore(\%grades,$symb,$ENV{'request.course.id'},	$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
	# &Apache::lonnet::logthis(" storing ".(join('-',%grades)));
	&Apache::lonnet::cstore(\%grades,$symb,$env{'request.course.id'},
$domain,$username);	$domain,$username);
$request->print('.');	$request->print('.');
$request->rflush();	$request->rflush();
Line 2979 function checkPickOne(formname) {	Line 3324 function checkPickOne(formname) {
LISTJAVASCRIPT	LISTJAVASCRIPT
&commonJSfunctions($request);	&commonJSfunctions($request);
my ($symb,$url) = &get_symb_and_url($request);	my ($symb,$url) = &get_symb_and_url($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><font color="#339933"> '.
'Manual Grading by Page or Sequence</font></h3>';	'Manual Grading by Page or Sequence</font></h3>';
Line 3020 LISTJAVASCRIPT	Line 3365 LISTJAVASCRIPT
'<input type="radio" name="lastSub" value="all" /> all details'."\n";	'<input type="radio" name="lastSub" value="all" /> all details'."\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="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.=' <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";
Line 3070 sub getSymbMap {	Line 3415 sub getSymbMap {
my $minder = 0;	my $minder = 0;

# Gather every sequence that has problems.	# Gather every sequence that has problems.
my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); }, 1);	my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); },
	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.'.'.$sequence->compTitle();
Line 3079 sub getSymbMap {	Line 3425 sub getSymbMap {
$minder++;	$minder++;
}	}
}	}

$navmap->untieHashes();
return \@titles,\%symbx;	return \@titles,\%symbx;
}	}

Line 3090 sub displayPage {	Line 3434 sub displayPage {
my ($request) = shift;	my ($request) = shift;

my ($symb,$url) = &get_symb_and_url($request);	my ($symb,$url) = &get_symb_and_url($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 $pageTitle = $ENV{'form.page'};	my $pageTitle = $env{'form.page'};
my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');	my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
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];

#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(
$ENV{'course.'.$ENV{'request.course.id'}.'.num'},	$env{'course.'.$env{'request.course.id'}.'.num'},
$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();

if (!&canview($usec)) {	if (!&canview($usec)) {
$request->print('<font color="red">Unable to view requested student.('.$ENV{'form.student'}.')</font>');	$request->print('<font color="red">Unable to view requested student.('.$env{'form.student'}.')</font>');
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb,$url));
return;	return;
}	}
my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>';	my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></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";
&sub_page_js($request);	&sub_page_js($request);
$request->print($result);	$request->print($result);

my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($ENV{'form.page'});	my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps

my $iterator = $navmap->getIterator($map->map_start(),	my $iterator = $navmap->getIterator($map->map_start(),
Line 3125 sub displayPage {	Line 3469 sub displayPage {

my $studentTable='<form action="/adm/grades" method="post" name="gradePage">'."\n".	my $studentTable='<form action="/adm/grades" method="post" name="gradePage">'."\n".
'<input type="hidden" name="command" value="gradeByPage" />'."\n".	'<input type="hidden" name="command" value="gradeByPage" />'."\n".
'<input type="hidden" name="fullname" value="'.$$fullname{$ENV{'form.student'}}.'" />'."\n".	'<input type="hidden" name="fullname" value="'.$$fullname{$env{'form.student'}}.'" />'."\n".
'<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="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').	my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
'/check.gif" height="16" border="0" />';	'/check.gif" height="16" border="0" />';
Line 3142 sub displayPage {	Line 3486 sub displayPage {
'<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="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>';

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
Line 3151 sub displayPage {	Line 3495 sub displayPage {
if($curRes == $iterator->BEGIN_MAP) { $depth++; }	if($curRes == $iterator->BEGIN_MAP) { $depth++; }
if($curRes == $iterator->END_MAP) { $depth--; }	if($curRes == $iterator->END_MAP) { $depth--; }

if (ref($curRes) && $curRes->is_problem()) {	if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
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">';
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');
} 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'});
$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>
Line 3173 sub displayPage {	Line 3517 sub displayPage {
$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 /> <font color="red">No recorded submission for this problem</font><br />';
} else {	} else {
Line 3192 sub displayPage {	Line 3536 sub displayPage {
$studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);	$studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);

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

}	}
Line 3213 sub displayPage {	Line 3557 sub displayPage {
$curRes = $iterator->next();	$curRes = $iterator->next();
}	}

$navmap->untieHashes();

$studentTable.='</td></tr></table></td></tr></table>'."\n".	$studentTable.='</td></tr></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.');" TARGET=_self />'.
Line 3227 sub displayPage {	Line 3569 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;
	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">'.
'<td><b>Date/Time</b></td>'.	'<td><b>Date/Time</b></td>'.
	($isCODE?'<td><b>CODE</b></td>':'').
'<td><b>Submission</b></td>'.	'<td><b>Submission</b></td>'.
'<td><b>Status </b></td></tr>';	'<td><b>Status </b></td></tr>';
my ($version);	my ($version);
Line 3242 sub displaySubByDates {	Line 3587 sub displaySubByDates {
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'}));
$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';	$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
	if ($isCODE) {
	$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
	}
my @versionKeys = split(/\:/,$$record{$version.':keys'});	my @versionKeys = split(/\:/,$$record{$version.':keys'});
my @displaySub = ();	my @displaySub = ();
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
Line 3300 sub displaySubByDates {	Line 3648 sub displaySubByDates {
sub updateGradeByPage {	sub updateGradeByPage {
my ($request) = shift;	my ($request) = shift;

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 $pageTitle = $ENV{'form.page'};	my $pageTitle = $env{'form.page'};
my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');	my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
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('<font color="red">Unable to modify requested student.('.$env{'form.student'}.'</font>');
$request->print(&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'}));	$request->print(&show_grading_menu_form($env{'form.symb'},$env{'form.url'}));
return;	return;
}	}
my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>';	my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></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";

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

my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $ENV{'form.page'});	my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps

my $iterator = $navmap->getIterator($map->map_start(),	my $iterator = $navmap->getIterator($map->map_start(),
Line 3349 sub updateGradeByPage {	Line 3697 sub updateGradeByPage {

my %newrecord=();	my %newrecord=();
my @displayPts=();	my @displayPts=();
	my %aggregate = ();
	my $aggregateflag = 0;
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
my $newpts = $ENV{'form.GD_BOX'.$question.'_'.$partid};	my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid};
my $oldpts = $ENV{'form.oldpts'.$question.'_'.$partid};	my $oldpts = $env{'form.oldpts'.$question.'_'.$partid};

my $wgt = $ENV{'form.WGT'.$question.'_'.$partid} != 0 ?	my $wgt = $env{'form.WGT'.$question.'_'.$partid} != 0 ?
$ENV{'form.WGT'.$question.'_'.$partid} : 1;	$env{'form.WGT'.$question.'_'.$partid} : 1;
my $partial = $newpts/$wgt;	my $partial = $newpts/$wgt;
my $score;	my $score;
if ($partial > 0) {	if ($partial > 0) {
Line 3362 sub updateGradeByPage {	Line 3712 sub updateGradeByPage {
} elsif ($newpts ne '') { #empty is taken as 0	} elsif ($newpts ne '') { #empty is taken as 0
$score = 'incorrect_by_override';	$score = 'incorrect_by_override';
}	}
my $dropMenu = $ENV{'form.GD_SEL'.$question.'_'.$partid};	my $dropMenu = $env{'form.GD_SEL'.$question.'_'.$partid};
if ($dropMenu eq 'excused') {	if ($dropMenu eq 'excused') {
$partial = '';	$partial = '';
$score = 'excused';	$score = 'excused';
} elsif ($dropMenu eq 'reset status'	} elsif ($dropMenu eq 'reset status'
&& $ENV{'form.solved'.$question.'_'.$partid} ne '') { #update only if previous record exists	&& $env{'form.solved'.$question.'_'.$partid} ne '') { #update only if previous record exists
$newrecord{'resource.'.$partid.'.tries'} = 0;	$newrecord{'resource.'.$partid.'.tries'} = 0;
$newrecord{'resource.'.$partid.'.solved'} = '';	$newrecord{'resource.'.$partid.'.solved'} = '';
$newrecord{'resource.'.$partid.'.award'} = '';	$newrecord{'resource.'.$partid.'.award'} = '';
$newrecord{'resource.'.$partid.'.awarded'} = 0;	$newrecord{'resource.'.$partid.'.awarded'} = 0;
$newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}";	$newrecord{'resource.'.$partid.'.regrader'} = "$env{'user.name'}:$env{'user.domain'}";
$changeflag++;	$changeflag++;
$newpts = '';	$newpts = '';

	my $aggtries = $env{'form.aggtries'.$question.'_'.$partid};
	my $totaltries = $env{'form.totaltries'.$question.'_'.$partid};
	my $solvedstatus = $env{'form.solved'.$question.'_'.$partid};
	if ($aggtries > 0) {
	&decrement_aggs($symbx,$partid,\%aggregate,$aggtries,$totaltries,$solvedstatus);
	$aggregateflag = 1;
	}
}	}
my $display_part=&get_display_part($partid,undef,	my $display_part=&get_display_part($partid,undef,
$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>';
Line 3391 sub updateGradeByPage {	Line 3749 sub updateGradeByPage {

$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 '';
$newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}"	$newrecord{'resource.'.$partid.'.regrader'} = "$env{'user.name'}:$env{'user.domain'}"
if (scalar(keys(%newrecord)) > 0);	if (scalar(keys(%newrecord)) > 0);

$changeflag++;	$changeflag++;
}	}
if (scalar(keys(%newrecord)) > 0) {	if (scalar(keys(%newrecord)) > 0) {
&Apache::lonnet::cstore(\%newrecord,$symbx,$ENV{'request.course.id'},	&Apache::lonnet::cstore(\%newrecord,$symbx,$env{'request.course.id'},
$udom,$uname);	$udom,$uname);
}	}
	if ($aggregateflag) {
	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
	$env{'course.'.$env{'request.course.id'}.'.domain'},
	$env{'course.'.$env{'request.course.id'}.'.num'});
	}

$studentTable.='<td valign="top">'.$displayPts[0].'</td>'.	$studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
'<td valign="top">'.$displayPts[1].'</td>'.	'<td valign="top">'.$displayPts[1].'</td>'.
Line 3410 sub updateGradeByPage {	Line 3773 sub updateGradeByPage {
$curRes = $iterator->next();	$curRes = $iterator->next();
}	}

$navmap->untieHashes();

$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'},$env{'form.url'});
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 3435 sub defaultFormData {	Line 3796 sub defaultFormData {
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="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";
}	}

sub getSequenceDropDown {	sub getSequenceDropDown {
Line 3457 sub getSequenceDropDown {	Line 3818 sub getSequenceDropDown {
}	}

sub scantron_filenames {	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));	&Apache::loncommon::propath($cdom,$cname));
my @possiblenames;	my @possiblenames;
Line 3472 sub scantron_filenames {	Line 3833 sub scantron_filenames {
}	}

sub scantron_uploads {	sub scantron_uploads {
	my ($file2grade) = @_;
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</option>\n";	$result.="<option".($filename eq $file2grade ? ' selected="on"':'').">$filename</option>\n";
}	}
$result.="</select>";	$result.="</select>";
return $result;	return $result;
Line 3496 sub scantron_scantab {	Line 3858 sub scantron_scantab {
}	}

sub scantron_CODElist {	sub scantron_CODElist {
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 @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);	my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
my $namechoice='<option></option>';	my $namechoice='<option></option>';
foreach my $name (sort(@names)) {	foreach my $name (sort {uc($a) cmp uc($b)} @names) {
if ($name =~ /^error: 2 /) { next; }	if ($name =~ /^error: 2 /) { next; }
$namechoice.='<option value="'.$name.'">'.$name.'</option>';	$namechoice.='<option value="'.$name.'">'.$name.'</option>';
}	}
Line 3510 sub scantron_CODElist {	Line 3872 sub scantron_CODElist {

sub scantron_CODEunique {	sub scantron_CODEunique {
my $result='<nobr>	my $result='<nobr>
<input type="radio" name="scantron_CODEunique"	<label><input type="radio" name="scantron_CODEunique"
value="Yes" checked="on" /> Yes	value="Yes" checked="on" /> Yes </label>
</nobr>	</nobr>
<nobr>	<nobr>
<input type="radio" name="scantron_CODEunique"	<label><input type="radio" name="scantron_CODEunique"
value="No" /> No	value="No" /> No </label>
</nobr>';	</nobr>';
return $result;	return $result;
}	}

sub scantron_selectphase {	sub scantron_selectphase {
my ($r) = @_;	my ($r,$file2grade) = @_;
my ($symb,$url)=&get_symb_and_url($r);	my ($symb,$url)=&get_symb_and_url($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,$url);
my $grading_menu_button=&show_grading_menu_form($symb,$url);	my $grading_menu_button=&show_grading_menu_form($symb,$url);
my $file_selector=&scantron_uploads();	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();
my $CODE_unique=&scantron_CODEunique();	my $CODE_unique=&scantron_CODEunique();
Line 3537 sub scantron_selectphase {	Line 3899 sub scantron_selectphase {
$result.= <<SCANTRONFORM;	$result.= <<SCANTRONFORM;
<table width="100%" border="0">	<table width="100%" border="0">
<tr>	<tr>
	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
<td bgcolor="#777777">	<td bgcolor="#777777">
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
<input type="hidden" name="command" value="scantron_warning" />	<input type="hidden" name="command" value="scantron_warning" />
$default_form_data	$default_form_data
<table width="100%" border="0">	<table width="100%" border="0">
Line 3565 sub scantron_selectphase {	Line 3927 sub scantron_selectphase {
<tr bgcolor="#ffffe6">	<tr bgcolor="#ffffe6">
<td> Options: </td>	<td> Options: </td>
<td>	<td>
<input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records <br />	<label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />
<input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections	<label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections</label>
</td>	</td>
</tr>	</tr>
<tr bgcolor="#ffffe6">	<tr bgcolor="#ffffe6">
<td colspan="2">	<td colspan="2">
<input type="submit" value="Validate Scantron Records" />	<input type="submit" value="Grading: Validate Scantron Records" />
</td>	</td>
</tr>	</tr>
</table>	</table>
</form>	</td>
</td>	</form>
</tr>	</tr>
SCANTRONFORM	SCANTRONFORM

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

if (&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'}) \|\|	if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) \|\|
&Apache::lonnet::allowed('usc',$ENV{'request.course.id'})) {	&Apache::lonnet::allowed('usc',$env{'request.course.id'})) {

$r->print(<<SCANTRONFORM);	$r->print(<<SCANTRONFORM);
<tr>	<tr>
Line 3598 SCANTRONFORM	Line 3960 SCANTRONFORM
<td>	<td>
SCANTRONFORM	SCANTRONFORM
my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));	my $default_form_data=&defaultFormData(&get_symb_and_url($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);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function checkUpload(formname) {	function checkUpload(formname) {
Line 3632 SCANTRONFORM	Line 3994 SCANTRONFORM
}	}
$r->print(<<SCANTRONFORM);	$r->print(<<SCANTRONFORM);
<tr>	<tr>
<td bgcolor="#777777">	<form action='/adm/grades' name='scantron_download'>
<form action='/adm/grades' name='scantron_download'>	<td bgcolor="#777777">
<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 3650 SCANTRONFORM	Line 4012 SCANTRONFORM
</td>	</td>
</tr>	</tr>
</table>	</table>
</form>	</td>
</td>	</form>
</tr>	</tr>
SCANTRONFORM	SCANTRONFORM

$r->print(<<SCANTRONFORM);	$r->print(<<SCANTRONFORM);
</table>	</table>
</form>
$grading_menu_button	$grading_menu_button
SCANTRONFORM	SCANTRONFORM

Line 3746 sub scantron_fixup_scanline {	Line 4107 sub scantron_fixup_scanline {
&scan_data($scan_data,	&scan_data($scan_data,
"$whichline.no_bubble.".$args->{'question'},'1');	"$whichline.no_bubble.".$args->{'question'},'1');
} else {	} else {
substr($answer,$args->{'response'},1)=$on;	if ($on eq 'letter') {
	my @alphabet=('A'..'Z');
	$answer=$alphabet[$args->{'response'}];
	} elsif ($on eq 'number') {
	$answer=$args->{'response'}+1;
	} else {
	substr($answer,$args->{'response'},1)=$on;
	}
&scan_data($scan_data,	&scan_data($scan_data,
"$whichline.no_bubble.".$args->{'question'},undef,'1');	"$whichline.no_bubble.".$args->{'question'},undef,'1');
}	}
Line 3758 sub scantron_fixup_scanline {	Line 4126 sub scantron_fixup_scanline {

sub scan_data {	sub scan_data {
my ($scan_data,$key,$value,$delete)=@_;	my ($scan_data,$key,$value,$delete)=@_;
my $filename=$ENV{'form.scantron_selectfile'};	my $filename=$env{'form.scantron_selectfile'};
if (defined($value)) {	if (defined($value)) {
$scan_data->{$filename.'_'.$key} = $value;	$scan_data->{$filename.'_'.$key} = $value;
}	}
Line 3806 sub scantron_parse_scanline {	Line 4174 sub scantron_parse_scanline {
my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});	my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});
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; }
my @array=split($$scantron_config{'Qon'},$currentquest,-1);	if ($$scantron_config{'Qon'} eq 'letter') {
if (length($array[0]) eq $$scantron_config{'Qlength'}) {	if ($currentquest eq '?') {
$record{"scantron.$questnum.answer"}='';	push(@{$record{'scantron.doubleerror'}},$questnum);
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {	$record{"scantron.$questnum.answer"}='';
push(@{$record{"scantron.missingerror"}},$questnum);	} elsif (!$currentquest
}	\|\| $currentquest eq $$scantron_config{'Qoff'}
	\|\| $currentquest !~ /^[A-Z]$/) {
	$record{"scantron.$questnum.answer"}='';
	if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
	push(@{$record{"scantron.missingerror"}},$questnum);
	}
	} else {
	$record{"scantron.$questnum.answer"}=$currentquest;
	}
	} elsif ($$scantron_config{'Qon'} eq 'number') {
	if ($currentquest eq '?') {
	push(@{$record{'scantron.doubleerror'}},$questnum);
	$record{"scantron.$questnum.answer"}='';
	} elsif (!$currentquest
	\|\| $currentquest eq $$scantron_config{'Qoff'}
	\|\| $currentquest !~ /^\d$/) {
	$record{"scantron.$questnum.answer"}='';
	if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
	push(@{$record{"scantron.missingerror"}},$questnum);
	}
	} else {
	$record{"scantron.$questnum.answer"}=
	$alphabet[$currentquest-1];
	}
} else {	} else {
$record{"scantron.$questnum.answer"}=$alphabet[length($array[0])];	my @array=split($$scantron_config{'Qon'},$currentquest,-1);
	if (length($array[0]) eq $$scantron_config{'Qlength'}) {
	$record{"scantron.$questnum.answer"}='';
	if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
	push(@{$record{"scantron.missingerror"}},$questnum);
	}
	} else {
	$record{"scantron.$questnum.answer"}=
	$alphabet[length($array[0])];
	}
	if (scalar(@array) gt 2) {
	push(@{$record{'scantron.doubleerror'}},$questnum);
	my @ans=@array;
	my $i=length($ans[0]);shift(@ans);
	while ($#ans) {
	$i+=length($ans[0])+1;
	$record{"scantron.$questnum.answer"}.=$alphabet[$i];
	shift(@ans);
	}
	}
}	}
if (scalar(@array) gt 2) {
push(@{$record{'scantron.doubleerror'}},$questnum);
my @ans=@array;
my $i=length($ans[0]);shift(@ans);
while ($#ans) {
$i+=length($ans[0])+1;
$record{"scantron.$questnum.answer"}.=$alphabet[$i];
shift(@ans);
}
}
}	}
$record{'scantron.maxquest'}=$questnum;	$record{'scantron.maxquest'}=$questnum;
return \%record;	return \%record;
Line 3854 sub scantron_find_student {	Line 4254 sub scantron_find_student {

sub scantron_filter {	sub scantron_filter {
my ($curres)=@_;	my ($curres)=@_;
if (ref($curres) && $curres->is_problem() && !$curres->randomout) {	# randomout is dysfunctional at best for this purpose
	if (ref($curres) && $curres->is_problem()) { #&& !$curres->randomout) {
return 1;	return 1;
}	}
return 0;	return 0;
Line 3862 sub scantron_filter {	Line 4263 sub scantron_filter {

sub scantron_process_corrections {	sub scantron_process_corrections {
my ($r) = @_;	my ($r) = @_;
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
my $which=$ENV{'form.scantron_line'};	my $which=$env{'form.scantron_line'};
my $line=&scantron_get_line($scanlines,$scan_data,$which);	my $line=&scantron_get_line($scanlines,$scan_data,$which);
my ($skip,$err,$errmsg);	my ($skip,$err,$errmsg);
if ($ENV{'form.scantron_skip_record'}) {	if ($env{'form.scantron_skip_record'}) {
$skip=1;	$skip=1;
} elsif ($ENV{'form.scantron_corrections'} =~ /^(duplicate\|incorrect)ID$/) {	} elsif ($env{'form.scantron_corrections'} =~ /^(duplicate\|incorrect)ID$/) {
my $newstudent=$ENV{'form.scantron_username'}.':'.	my $newstudent=$env{'form.scantron_username'}.':'.
$ENV{'form.scantron_domain'};	$env{'form.scantron_domain'};
my $newid=$classlist->{$newstudent}->[&Apache::loncoursedata::CL_ID];	my $newid=$classlist->{$newstudent}->[&Apache::loncoursedata::CL_ID];
($line,$err,$errmsg)=	($line,$err,$errmsg)=
&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which,	&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which,
'ID',{'newid'=>$newid,	'ID',{'newid'=>$newid,
'username'=>$ENV{'form.scantron_username'},	'username'=>$env{'form.scantron_username'},
'domain'=>$ENV{'form.scantron_domain'}});	'domain'=>$env{'form.scantron_domain'}});
} elsif ($ENV{'form.scantron_corrections'} =~ /^(duplicate\|incorrect)CODE$/) {	} elsif ($env{'form.scantron_corrections'} =~ /^(duplicate\|incorrect)CODE$/) {
my $resolution=$ENV{'form.scantron_CODE_resolution'};	my $resolution=$env{'form.scantron_CODE_resolution'};
my $newCODE;	my $newCODE;
my %args;	my %args;
if ($resolution eq 'use_unfound') {	if ($resolution eq 'use_unfound') {
$newCODE='use_unfound';	$newCODE='use_unfound';
} elsif ($resolution eq 'use_found') {	} elsif ($resolution eq 'use_found') {
$newCODE=$ENV{'form.scantron_CODE_selectedvalue'};	$newCODE=$env{'form.scantron_CODE_selectedvalue'};
} elsif ($resolution eq 'use_typed') {	} elsif ($resolution eq 'use_typed') {
$newCODE=$ENV{'form.scantron_CODE_newvalue'};	$newCODE=$env{'form.scantron_CODE_newvalue'};
} elsif ($resolution =~ /^use_closest_(\d+)/) {	} elsif ($resolution =~ /^use_closest_(\d+)/) {
$newCODE=$ENV{"form.scantron_CODE_closest_$1"};	$newCODE=$env{"form.scantron_CODE_closest_$1"};
}	}
if ($ENV{'form.scantron_corrections'} eq 'duplicateCODE') {	if ($env{'form.scantron_corrections'} eq 'duplicateCODE') {
$args{'CODE_ignore_dup'}=1;	$args{'CODE_ignore_dup'}=1;
}	}
$args{'CODE'}=$newCODE;	$args{'CODE'}=$newCODE;
($line,$err,$errmsg)=	($line,$err,$errmsg)=
&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which,	&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which,
'CODE',\%args);	'CODE',\%args);
} elsif ($ENV{'form.scantron_corrections'} =~ /^(missing\|double)bubble$/) {	} elsif ($env{'form.scantron_corrections'} =~ /^(missing\|double)bubble$/) {
foreach my $question (split(',',$ENV{'form.scantron_questions'})) {	foreach my $question (split(',',$env{'form.scantron_questions'})) {
($line,$err,$errmsg)=	($line,$err,$errmsg)=
&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,	&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,
$which,'answer',	$which,'answer',
{ 'question'=>$question,	{ 'question'=>$question,
'response'=>$ENV{"form.scantron_correct_Q_$question"}});	'response'=>$env{"form.scantron_correct_Q_$question"}});
if ($err) { last; }	if ($err) { last; }
}	}
}	}
Line 3932 sub allow_skipping {	Line 4333 sub allow_skipping {

sub should_be_skipped {	sub should_be_skipped {
my ($scan_data,$i)=@_;	my ($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
return 0;	return 0;
}	}
Line 3963 sub check_for_error {	Line 4364 sub check_for_error {

sub scantron_warning_screen {	sub scantron_warning_screen {
my ($button_text)=@_;	my ($button_text)=@_;
my $title=&Apache::lonnet::gettitle($ENV{'form.selectpage'});	my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
return (<<STUFF);	return (<<STUFF);
<p>	<p>
<font color="red">Please double check the information	<font color="red">Please double check the information
Line 3971 sub scantron_warning_screen {	Line 4372 sub scantron_warning_screen {
</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>
</table>	</table>
</font>	</font>
<br />	<br />
Line 3988 sub scantron_do_warning {	Line 4389 sub scantron_do_warning {
if (!$symb) {return '';}	if (!$symb) {return '';}
my $default_form_data=&defaultFormData($symb,$url);	my $default_form_data=&defaultFormData($symb,$url);
$r->print(&scantron_form_start().$default_form_data);	$r->print(&scantron_form_start().$default_form_data);
my $warning=&scantron_warning_screen('Validate Records');	if ( $env{'form.selectpage'} eq '' \|\|
$r->print(<<STUFF);	$env{'form.scantron_selectfile'} eq '' \|\|
	$env{'form.scantron_format'} eq '' ) {
	$r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>");
	if ( $env{'form.selectpage'} eq '') {
	$r->print('<p><font color="red">You have not selected a Sequence to grade</font></p>');
	}
	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>');
	}
	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>');
	}
	} else {
	my $warning=&scantron_warning_screen('Grading: Validate Records');
	$r->print(<<STUFF);
$warning	$warning
<input type="submit" name="submit" value="Validate Records" />	<input type="submit" name="submit" value="Grading: Validate Records" />
<input type="hidden" name="command" value="scantron_validate" />	<input type="hidden" name="command" value="scantron_validate" />
</form>
STUFF	STUFF
$r->print("<br />".&show_grading_menu_form($symb,$url)."</body></html>");	}
	$r->print("</form><br />".&show_grading_menu_form($symb,$url)."</body></html>");
return '';	return '';
}	}

Line 4003 sub scantron_form_start {	Line 4418 sub scantron_form_start {
my ($max_bubble)=@_;	my ($max_bubble)=@_;
my $result= <<SCANTRONFORM;	my $result= <<SCANTRONFORM;
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
<input type="hidden" name="selectpage" value="$ENV{'form.selectpage'}" />	<input type="hidden" name="selectpage" value="$env{'form.selectpage'}" />
<input type="hidden" name="scantron_format" value="$ENV{'form.scantron_format'}" />	<input type="hidden" name="scantron_format" value="$env{'form.scantron_format'}" />
<input type="hidden" name="scantron_selectfile" value="$ENV{'form.scantron_selectfile'}" />	<input type="hidden" name="scantron_selectfile" value="$env{'form.scantron_selectfile'}" />
<input type="hidden" name="scantron_maxbubble" value="$max_bubble'" />	<input type="hidden" name="scantron_maxbubble" value="$max_bubble" />
<input type="hidden" name="scantron_CODElist" value="$ENV{'form.scantron_CODElist'}" />	<input type="hidden" name="scantron_CODElist" value="$env{'form.scantron_CODElist'}" />
<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'}" />
SCANTRONFORM	SCANTRONFORM
return $result;	return $result;
}	}
Line 4023 sub scantron_validate_file {	Line 4438 sub scantron_validate_file {

# 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
if ($ENV{'form.scantron_options_redo'} ne 'redo_skipped_ready') {	if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') {
&reset_skipping_status();	&reset_skipping_status();
}	}
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');	&scantron_remove_file('skipped');
$ENV{'form.scantron_options_redo'}='redo_skipped_ready';	$env{'form.scantron_options_redo'}='redo_skipped_ready';
}	}

if ($ENV{'form.scantron_options_ignore'} eq 'ignore_corrections') {	if ($env{'form.scantron_options_ignore'} eq 'ignore_corrections') {
&check_for_error($r,&scantron_remove_file('corrected'));	&check_for_error($r,&scantron_remove_file('corrected'));
&check_for_error($r,&scantron_remove_file('skipped'));	&check_for_error($r,&scantron_remove_file('skipped'));
&check_for_error($r,&scantron_remove_scan_data());	&check_for_error($r,&scantron_remove_scan_data());
$ENV{'form.scantron_options_ignore'}='done';	$env{'form.scantron_options_ignore'}='done';
}	}

if ($ENV{'form.scantron_corrections'}) {	if ($env{'form.scantron_corrections'}) {
&scantron_process_corrections($r);	&scantron_process_corrections($r);
}	}
$r->print("<p>Gathering neccessary info.</p>");$r->rflush();	$r->print("<p>Gathering neccessary info.</p>");$r->rflush();
Line 4053 sub scantron_validate_file {	Line 4468 sub scantron_validate_file {
'CODE',	'CODE',
'doublebubble',	'doublebubble',
'missingbubbles');	'missingbubbles');
if (!$ENV{'form.validatepass'}) {	if (!$env{'form.validatepass'}) {
$ENV{'form.validatepass'} = 0;	$env{'form.validatepass'} = 0;
}	}
my $currentphase=$ENV{'form.validatepass'};	my $currentphase=$env{'form.validatepass'};

my $stop=0;	my $stop=0;
while (!$stop && $currentphase < scalar(@validate_phases)) {	while (!$stop && $currentphase < scalar(@validate_phases)) {
Line 4094 STUFF	Line 4509 STUFF

sub scantron_remove_file {	sub scantron_remove_file {
my ($which)=@_;	my ($which)=@_;
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='scantron_';	my $file='scantron_';
if ($which eq 'corrected' \|\| $which eq 'skipped') {	if ($which eq 'corrected' \|\| $which eq 'skipped') {
$file.=$which.'_';	$file.=$which.'_';
} else {	} else {
return 'refused';	return 'refused';
}	}
$file.=$ENV{'form.scantron_selectfile'};	$file.=$env{'form.scantron_selectfile'};
return &Apache::lonnet::removeuserfile($cname,$cdom,$file);	return &Apache::lonnet::removeuserfile($cname,$cdom,$file);
}	}

sub scantron_remove_scan_data {	sub scantron_remove_scan_data {
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 @keys=&Apache::lonnet::getkeys('nohist_scantrondata',$cdom,$cname);	my @keys=&Apache::lonnet::getkeys('nohist_scantrondata',$cdom,$cname);
my @todelete;	my @todelete;
my $filename=$ENV{'form.scantron_selectfile'};	my $filename=$env{'form.scantron_selectfile'};
foreach my $key (@keys) {	foreach my $key (@keys) {
if ($key=~/^\Q$filename\E_/) {	if ($key=~/^\Q$filename\E_/) {
if ($ENV{'form.scantron_options_redo'} eq 'redo_skipped_ready' &&	if ($env{'form.scantron_options_redo'} eq 'redo_skipped_ready' &&
$key=~/remember_skipping/) {	$key=~/remember_skipping/) {
next;	next;
}	}
Line 4130 sub scantron_remove_scan_data {	Line 4545 sub scantron_remove_scan_data {

sub scantron_getfile {	sub scantron_getfile {
#FIXME really would prefer a scantron directory	#FIXME really would prefer a scantron directory
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 $lines;	my $lines;
$lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.	$lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
'scantron_orig_'.$ENV{'form.scantron_selectfile'});	'scantron_orig_'.$env{'form.scantron_selectfile'});
my %scanlines;	my %scanlines;
$scanlines{'orig'}=[(split("\n",$lines,-1))];	$scanlines{'orig'}=[(split("\n",$lines,-1))];
my $temp=$scanlines{'orig'};	my $temp=$scanlines{'orig'};
$scanlines{'count'}=$#$temp;	$scanlines{'count'}=$#$temp;

$lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.	$lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
'scantron_corrected_'.$ENV{'form.scantron_selectfile'});	'scantron_corrected_'.$env{'form.scantron_selectfile'});
if ($lines eq '-1') {	if ($lines eq '-1') {
$scanlines{'corrected'}=[];	$scanlines{'corrected'}=[];
} else {	} else {
$scanlines{'corrected'}=[(split("\n",$lines,-1))];	$scanlines{'corrected'}=[(split("\n",$lines,-1))];
}	}
$lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.	$lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
'scantron_skipped_'.$ENV{'form.scantron_selectfile'});	'scantron_skipped_'.$env{'form.scantron_selectfile'});
if ($lines eq '-1') {	if ($lines eq '-1') {
$scanlines{'skipped'}=[];	$scanlines{'skipped'}=[];
} else {	} else {
Line 4162 sub scantron_getfile {	Line 4577 sub scantron_getfile {

sub lonnet_putfile {	sub lonnet_putfile {
my ($contents,$filename)=@_;	my ($contents,$filename)=@_;
my $docuname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};	my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
my $docudom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};	my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $docuhome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};	$env{'form.sillywaytopassafilearound'}=$contents;
$ENV{'form.sillywaytopassafilearound'}=$contents;	&Apache::lonnet::finishuserfileupload($docuname,$docudom,'sillywaytopassafilearound',$filename);
&Apache::lonnet::finishuserfileupload($docuname,$docudom,$docuhome,'sillywaytopassafilearound',$filename);

}	}

sub scantron_putfile {	sub scantron_putfile {
my ($scanlines,$scan_data) = @_;	my ($scanlines,$scan_data) = @_;
#FIXME really would prefer a scantron directory	#FIXME really would prefer a scantron directory
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'};
if ($scanlines) {	if ($scanlines) {
my $prefix='scantron_';	my $prefix='scantron_';
# no need to update orig, shouldn't change	# no need to update orig, shouldn't change
# &lonnet_putfile(join("\n",@{$scanlines->{'orig'}}),$prefix.'orig_'.	# &lonnet_putfile(join("\n",@{$scanlines->{'orig'}}),$prefix.'orig_'.
# $ENV{'form.scantron_selectfile'});	# $env{'form.scantron_selectfile'});
&lonnet_putfile(join("\n",@{$scanlines->{'corrected'}}),	&lonnet_putfile(join("\n",@{$scanlines->{'corrected'}}),
$prefix.'corrected_'.	$prefix.'corrected_'.
$ENV{'form.scantron_selectfile'});	$env{'form.scantron_selectfile'});
&lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),	&lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),
$prefix.'skipped_'.	$prefix.'skipped_'.
$ENV{'form.scantron_selectfile'});	$env{'form.scantron_selectfile'});
}	}
&Apache::lonnet::put('nohist_scantrondata',$scan_data,$cdom,$cname);	&Apache::lonnet::put('nohist_scantrondata',$scan_data,$cdom,$cname);
}	}
Line 4227 sub scantron_validate_ID {	Line 4641 sub scantron_validate_ID {
my %idmap=&username_to_idmap($classlist);	my %idmap=&username_to_idmap($classlist);

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

my %found=('ids'=>{},'usernames'=>{});	my %found=('ids'=>{},'usernames'=>{});
Line 4296 sub scantron_get_correction {	Line 4710 sub scantron_get_correction {
$r->print(" in scanline $i <pre>".	$r->print(" in scanline $i <pre>".
$line."</pre> \n");	$line."</pre> \n");
}	}
	my $message="<p>The ID on the form is <tt>".
	$$scan_record{'scantron.ID'}."</tt><br />\n".
	"The name on the paper is ".
	$$scan_record{'scantron.LastName'}.",".
	$$scan_record{'scantron.FirstName'}."</p>";

$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");	$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");	$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");
if ($error =~ /ID$/) {	if ($error =~ /ID$/) {
Line 4304 sub scantron_get_correction {	Line 4724 sub scantron_get_correction {
} elsif ($error eq 'duplicateID') {	} elsif ($error eq 'duplicateID') {
$r->print("The encoded ID has also been used by a previous paper $arg</p>\n");	$r->print("The encoded ID has also been used by a previous paper $arg</p>\n");
}	}
$r->print("<p>The ID on the form is <tt>".	$r->print($message);
$$scan_record{'scantron.ID'}."</tt><br />\n");
$r->print("The name on the paper is ".
$$scan_record{'scantron.LastName'}.",".
$$scan_record{'scantron.FirstName'}."</p>");
$r->print("<p>How should I handle this? <br /> \n");	$r->print("<p>How should I handle this? <br /> \n");
$r->print("\n<ul><li> ");	$r->print("\n<ul><li> ");
#FIXME it would be nice if this sent back the user ID and	#FIXME it would be nice if this sent back the user ID and
Line 4317 sub scantron_get_correction {	Line 4733 sub scantron_get_correction {
'scantron_username','scantron_domain'));	'scantron_username','scantron_domain'));
$r->print(": <input type='text' name='scantron_username' value='' />");	$r->print(": <input type='text' name='scantron_username' value='' />");
$r->print("\n@".	$r->print("\n@".
&Apache::loncommon::select_dom_form($ENV{'request.role.domain'},'scantron_domain'));	&Apache::loncommon::select_dom_form($env{'request.role.domain'},'scantron_domain'));

$r->print('</li>');	$r->print('</li>');
} elsif ($error =~ /CODE$/) {	} elsif ($error =~ /CODE$/) {
Line 4326 sub scantron_get_correction {	Line 4742 sub scantron_get_correction {
} elsif ($error eq 'duplicateCODE') {	} elsif ($error eq 'duplicateCODE') {
$r->print("</p><p>The encoded CODE has also been used by a previous paper ".join(', ',@{$arg}).", and CODEs are supposed to be unique</p>\n");	$r->print("</p><p>The encoded CODE has also been used by a previous paper ".join(', ',@{$arg}).", and CODEs are supposed to be unique</p>\n");
}	}
$r->print("<p>The CODE on the form is <tt>".	$r->print("<p>The CODE on the form is <tt>'".
$$scan_record{'scantron.CODE'}."</tt><br />\n");	$$scan_record{'scantron.CODE'}."'</tt><br />\n");
$r->print("<p>The ID on the form is <tt>".	$r->print($message);
$$scan_record{'scantron.ID'}."</tt><br />\n");
$r->print("The name on the paper is ".
$$scan_record{'scantron.LastName'}.",".
$$scan_record{'scantron.FirstName'}."</p>");
$r->print("<p>How should I handle this? <br /> \n");	$r->print("<p>How should I handle this? <br /> \n");
$r->print("\n<br /> ");	$r->print("\n<br /> ");
my $i=0;	my $i=0;
if ($error eq 'incorrectCODE') {	if ($error eq 'incorrectCODE'
	&& $$scan_record{'scantron.CODE'}=~/\S/ ) {
my ($max,$closest)=&scantron_get_closely_matching_CODEs($arg,$$scan_record{'scantron.CODE'});	my ($max,$closest)=&scantron_get_closely_matching_CODEs($arg,$$scan_record{'scantron.CODE'});
foreach my $testcode (@{$closest}) {	foreach my $testcode (@{$closest}) {
my $checked='';	my $checked='';
if (!$i) { $checked=' checked="on" '; }	if (!$i) { $checked=' checked="on" '; }
$r->print("<input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.<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++;
}	}
}	}
my $checked; if (!$i) { $checked=' checked="on" '; }	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
$r->print("<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.");	my $checked; if (!$i) { $checked=' checked="on" '; }
$r->print("\n<br />");	$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(<<ENDSCRIPT);	$r->print(<<ENDSCRIPT);
<script type="text/javascript">	<script type="text/javascript">
Line 4363 function change_radio(field) {	Line 4778 function change_radio(field) {
ENDSCRIPT	ENDSCRIPT
my $href="/adm/pickcode?".	my $href="/adm/pickcode?".
"form=".&Apache::lonnet::escape("scantronupload").	"form=".&Apache::lonnet::escape("scantronupload").
"&scantron_format=".&Apache::lonnet::escape($ENV{'form.scantron_format'}).	"&scantron_format=".&Apache::lonnet::escape($env{'form.scantron_format'}).
"&scantron_CODElist=".&Apache::lonnet::escape($ENV{'form.scantron_CODElist'}).	"&scantron_CODElist=".&Apache::lonnet::escape($env{'form.scantron_CODElist'}).
"&curCODE=".&Apache::lonnet::escape($$scan_record{'scantron.CODE'}).	"&curCODE=".&Apache::lonnet::escape($$scan_record{'scantron.CODE'}).
"&scantron_selectfile=".&Apache::lonnet::escape($ENV{'form.scantron_selectfile'});	"&scantron_selectfile=".&Apache::lonnet::escape($env{'form.scantron_selectfile'});
$r->print("<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. 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("<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("\n<br />");
$r->print("<input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use <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') {
$r->print("<p>There have been multiple bubbles scanned for a some question(s)</p>\n");	$r->print("<p>There have been multiple bubbles scanned for a some question(s)</p>\n");
$r->print('<input type="hidden" name="scantron_questions" value="'.	$r->print('<input type="hidden" name="scantron_questions" value="'.
join(',',@{$arg}).'" />');	join(',',@{$arg}).'" />');
	$r->print($message);
$r->print("<p>Please indicate which bubble should be used for grading</p>");	$r->print("<p>Please indicate which bubble should be used for grading</p>");
foreach my $question (@{$arg}) {	foreach my $question (@{$arg}) {
my $selected=$$scan_record{"scantron.$question.answer"};	my $selected=$$scan_record{"scantron.$question.answer"};
Line 4382 ENDSCRIPT	Line 4798 ENDSCRIPT
}	}
} elsif ($error eq 'missingbubble') {	} elsif ($error eq 'missingbubble') {
$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");	$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
	$r->print($message);
$r->print("<p>Please indicate which bubble should be used for grading</p>");	$r->print("<p>Please indicate which bubble should be used for grading</p>");
$r->print("Some questions have no scanned bubbles\n");	$r->print("Some questions have no scanned bubbles\n");
$r->print('<input type="hidden" name="scantron_questions" value="'.	$r->print('<input type="hidden" name="scantron_questions" value="'.
Line 4400 ENDSCRIPT	Line 4817 ENDSCRIPT
sub scantron_bubble_selector {	sub scantron_bubble_selector {
my ($r,$scan_config,$quest,@selected)=@_;	my ($r,$scan_config,$quest,@selected)=@_;
my $max=$$scan_config{'Qlength'};	my $max=$$scan_config{'Qlength'};

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

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

Line 4440 sub scantron_get_closely_matching_CODEs	Line 4862 sub scantron_get_closely_matching_CODEs
}	}

sub get_codes {	sub get_codes {
my $old_name=$ENV{'form.scantron_CODElist'};	my $old_name=$env{'form.scantron_CODElist'};
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 %result=&Apache::lonnet::get('CODEs',[$old_name],$cdom,$cnum);	my %result=&Apache::lonnet::get('CODEs',[$old_name],$cdom,$cnum);
my %allcodes=map {(&Apache::lonprintout::num_to_letters($_),1)} split(',',$result{$old_name});	my %allcodes=map {(&Apache::lonprintout::num_to_letters($_),1)} split(',',$result{$old_name});
return %allcodes;	return %allcodes;
Line 4450 sub get_codes {	Line 4872 sub get_codes {

sub scantron_validate_CODE {	sub scantron_validate_CODE {
my ($r,$currentphase) = @_;	my ($r,$currentphase) = @_;
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
if ($scantron_config{'CODElocation'} &&	if ($scantron_config{'CODElocation'} &&
$scantron_config{'CODEstart'} &&	$scantron_config{'CODEstart'} &&
$scantron_config{'CODElength'}) {	$scantron_config{'CODElength'}) {
if (!defined($ENV{'form.scantron_CODElist'})) {	if (!defined($env{'form.scantron_CODElist'})) {
&FIXME_blow_up()	&FIXME_blow_up()
}	}
} else {	} else {
Line 4473 sub scantron_validate_CODE {	Line 4895 sub scantron_validate_CODE {
$scan_data);	$scan_data);
my $CODE=$$scan_record{'scantron.CODE'};	my $CODE=$$scan_record{'scantron.CODE'};
my $error=0;	my $error=0;
if (!exists($allcodes{$CODE}) && !$$scan_record{'scantron.useCODE'}) {	if (!&Apache::lonnet::validCODE($CODE)) {
&scantron_get_correction($r,$i,$scan_record,	&scantron_get_correction($r,$i,$scan_record,
\%scantron_config,	\%scantron_config,
$line,'incorrectCODE',\%allcodes);	$line,'incorrectCODE',\%allcodes);
return(1,$currentphase);	return(1,$currentphase);
}	}
if (exists($usedCODEs{$CODE}) && $ENV{'form.scantron_CODEunique'}	if (%allcodes && !exists($allcodes{$CODE})
	&& !$$scan_record{'scantron.useCODE'}) {
	&scantron_get_correction($r,$i,$scan_record,
	\%scantron_config,
	$line,'incorrectCODE',\%allcodes);
	return(1,$currentphase);
	}
	if (exists($usedCODEs{$CODE})
	&& $env{'form.scantron_CODEunique'} eq 'yes'
&& !$$scan_record{'scantron.CODE_ignore_dup'}) {	&& !$$scan_record{'scantron.CODE_ignore_dup'}) {
&scantron_get_correction($r,$i,$scan_record,	&scantron_get_correction($r,$i,$scan_record,
\%scantron_config,	\%scantron_config,
Line 4498 sub scantron_validate_doublebubble {	Line 4928 sub scantron_validate_doublebubble {
my %idmap=&username_to_idmap($classlist);	my %idmap=&username_to_idmap($classlist);

#get scantron line setup	#get scantron line setup
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$scan_data,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
Line 4516 sub scantron_validate_doublebubble {	Line 4946 sub scantron_validate_doublebubble {

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

sub scantron_validate_missingbubbles {	sub scantron_validate_missingbubbles {
Line 4546 sub scantron_validate_missingbubbles {	Line 4976 sub scantron_validate_missingbubbles {
my %idmap=&username_to_idmap($classlist);	my %idmap=&username_to_idmap($classlist);

#get scantron line setup	#get scantron line setup
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
my $max_bubble=&scantron_get_maxbubble();	my $max_bubble=&scantron_get_maxbubble();
if (!$max_bubble) { $max_bubble=2**31; }	if (!$max_bubble) { $max_bubble=2**31; }
Line 4573 sub scantron_validate_missingbubbles {	Line 5003 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,$url)=&get_symb_and_url($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $default_form_data=&defaultFormData($symb,$url);	my $default_form_data=&defaultFormData($symb,$url);

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();
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&username_to_idmap($classlist);	my %idmap=&username_to_idmap($classlist);
Line 4639 SCANTRONFORM	Line 5069 SCANTRONFORM
'grade_target' =>'grade',	'grade_target' =>'grade',
'grade_username'=>$uname,	'grade_username'=>$uname,
'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'}) {	$scan_record->{'scantron.CODE'}) {
$form{'CODE'}=$scan_record->{'scantron.CODE'};	$form{'CODE'}=$scan_record->{'scantron.CODE'};
	} else {
	$form{'CODE'}='';
}	}
my $result=&Apache::lonnet::ssi($resource->src(),%form);	my $result=&Apache::lonnet::ssi($resource->src(),%form);
	if ($result ne '') {
	&Apache::lonnet::logthis("scantron grading error -> $result");
	&Apache::lonnet::logthis("scantron grading error info name $uname domain $udom course $env{'request.course.id'} url ".$resource->src());
	}
	if (&Apache::loncommon::connection_aborted($r)) { last; }
}	}
$completedstudents{$uname}={'line'=>$line};	$completedstudents{$uname}={'line'=>$line};
	if (&Apache::loncommon::connection_aborted($r)) { last; }
} continue {	} continue {
&Apache::lonnet::delenv('form.counter');	&Apache::lonnet::delenv('form.counter');
&Apache::lonnet::delenv('scantron\.');	&Apache::lonnet::delenv('scantron\.');
Line 4657 SCANTRONFORM	Line 5094 SCANTRONFORM
# my $lasttime = &Time::HiRes::time()-$start;	# my $lasttime = &Time::HiRes::time()-$start;
# $r->print("<p>took $lasttime</p>");	# $r->print("<p>took $lasttime</p>");

$navmap->untieHashes();
$r->print("</form>");	$r->print("</form>");
$r->print(&show_grading_menu_form($symb,$url));	$r->print(&show_grading_menu_form($symb,$url));
return '';	return '';
Line 4665 SCANTRONFORM	Line 5101 SCANTRONFORM

sub scantron_upload_scantron_data {	sub scantron_upload_scantron_data {
my ($r)=@_;	my ($r)=@_;
$r->print(&Apache::loncommon::coursebrowser_javascript($ENV{'request.role.domain'}));	$r->print(&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}));
my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',	my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
'domainid',	'domainid',
'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_and_url($r,1));
$r->print(<<UPLOAD);	$r->print(<<UPLOAD);
Line 4707 sub scantron_upload_scantron_data_save {	Line 5143 sub scantron_upload_scantron_data_save {
'<input type="hidden" name="command" value="scantronupload" />'."\n".	'<input type="hidden" name="command" value="scantronupload" />'."\n".
'<input type="submit" name="submit" value="Do Another Upload" />'."\n".	'<input type="submit" name="submit" value="Do Another Upload" />'."\n".
'</form>'."\n";	'</form>'."\n";
if (!&Apache::lonnet::allowed('usc',$ENV{'form.domainid'}) &&	if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&
!&Apache::lonnet::allowed('usc',	!&Apache::lonnet::allowed('usc',
$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,$url));
Line 4718 sub scantron_upload_scantron_data_save {	Line 5154 sub scantron_upload_scantron_data_save {
}	}
return '';	return '';
}	}
$r->print("Doing upload to ".$ENV{'form.courseid'}." <br />");	my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
my $home=&Apache::lonnet::homeserver($ENV{'form.courseid'},	$r->print("Doing upload to ".$coursedata{'description'}." <br />");
$ENV{'form.domainid'});	my $fname=$env{'form.upfile.filename'};
my $fname=$ENV{'form.upfile.filename'};
#FIXME	#FIXME
#copied from lonnet::userfileupload()	#copied from lonnet::userfileupload()
#make that function able to target a specified course	#make that function able to target a specified course
Line 4735 sub scantron_upload_scantron_data_save {	Line 5170 sub scantron_upload_scantron_data_save {
$fname=~s/[^\w\.\-]//g;	$fname=~s/[^\w\.\-]//g;
# See if there is anything left	# See if there is anything left
unless ($fname) { return 'error: no uploaded file'; }	unless ($fname) { return 'error: no uploaded file'; }
	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("<font color='red'>Error:</font> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");
} else {	} else {
my $result=&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'},$ENV{'form.domainid'},$home,'upfile',$fname);	my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);
if ($result =~ m\|^/uploaded/\|) {	if ($result =~ m\|^/uploaded/\|) {
$r->print("<font color='green'>Success:</font> Successfully uploaded ".(length($ENV{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");	$r->print("<font color='green'>Success:</font> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
} else {	} else {
$r->print("<font color='red'>Error:</font> An error (".$result.") occured when attempting to upload the file, <tt>".&HTML::Entities::encode($ENV{'form.upfile.filename'},'<>&"')."</tt>");	$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>");
}	}
}	}
if ($symb) {	if ($symb) {
$r->print(&show_grading_menu_form($symb,$url));	$r->print(&scantron_selectphase($r,$uploadedfile));
} else {	} else {
$r->print($doanotherupload);	$r->print($doanotherupload);
}	}
Line 4766 sub valid_file {	Line 5202 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_and_url($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'};
if (! &valid_file($file)) {	if (! &valid_file($file)) {
$r->print(<<ERROR);	$r->print(<<ERROR);
<p>	<p>
Line 4803 DOWNLOAD	Line 5239 DOWNLOAD
#	#
#-------------------------------------------------------------------	#-------------------------------------------------------------------


#-------------------------- Menu interface -------------------------	#-------------------------- Menu interface -------------------------
#	#
#--- Show a Grading Menu button - Calls the next routine ---	#--- Show a Grading Menu button - Calls the next routine ---
Line 4812 sub show_grading_menu_form {	Line 5247 sub show_grading_menu_form {
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="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".
'</form>'."\n";	'</form>'."\n";
Line 4822 sub show_grading_menu_form {	Line 5257 sub show_grading_menu_form {
# -- Retrieve choices for grading form	# -- Retrieve choices for grading form
sub savedState {	sub savedState {
my %savedState = ();	my %savedState = ();
if ($ENV{'form.saveState'}) {	if ($env{'form.saveState'}) {
foreach (split(/:/,$ENV{'form.saveState'})) {	foreach (split(/:/,$env{'form.saveState'})) {
my ($key,$value) = split(/=/,$_,2);	my ($key,$value) = split(/=/,$_,2);
$savedState{$key} = $value;	$savedState{$key} = $value;
}	}
Line 4856 sub gradingmenu {	Line 5291 sub gradingmenu {
if (!checkReceiptNo(formname,'notOK')) { return false;}	if (!checkReceiptNo(formname,'notOK')) { return false;}
formname.submit();	formname.submit();
}	}
	if (val < 7) formname.submit();
}	}

function checkReceiptNo(formname,nospace) {	function checkReceiptNo(formname,nospace) {
Line 4908 GRADINGMENUJS	Line 5344 GRADINGMENUJS
($saveSec eq $_ ? 'selected="on"':'').'>'.$_.'</option>'."\n";	($saveSec eq $_ ? 'selected="on"':'').'>'.$_.'</option>'."\n";
}	}
}	}
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select>   ';	$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</option></select>   ';

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

Line 4952 GRADINGMENUJS	Line 5388 GRADINGMENUJS
'<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";

if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)) {	if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {
$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
'<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">'.
	'<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
	'" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";

$result.='</form></td></tr></table>'."\n".	$result.='</form></td></tr></table>'."\n".
'</td></tr></table>'."\n".	'</td></tr></table>'."\n".
Line 4971 sub handler {	Line 5410 sub handler {
my $request=$_[0];	my $request=$_[0];

undef(%perm);	undef(%perm);
if ($ENV{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($request,'text/xml');	&Apache::loncommon::content_type($request,'text/xml');
} else {	} else {
&Apache::loncommon::content_type($request,'text/html');	&Apache::loncommon::content_type($request,'text/html');
Line 4979 sub handler {	Line 5418 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 $url=$env{'form.url'};
my $symb=$ENV{'form.symb'};	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) {
Line 4988 sub handler {	Line 5427 sub handler {
}	}
if (!$url) {	if (!$url) {
my ($temp1,$temp2);	my ($temp1,$temp2);
($temp1,$temp2,$ENV{'form.url'})=&Apache::lonnet::decode_symb($symb);	($temp1,$temp2,$env{'form.url'})=&Apache::lonnet::decode_symb($symb);
$url = $ENV{'form.url'};	$url = $env{'form.url'};
}	}
&send_header($request);	&send_header($request);
if ($url eq '' && $symb eq '' && $command eq '') {	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'})) {
my $token=$ENV{'form.codeone'}.''.$ENV{'form.codetwo'}.''.	my $token=$env{'form.codeone'}.''.$env{'form.codetwo'}.''.
$ENV{'form.codethree'};	$env{'form.codethree'};
my ($tsymb,$tuname,$tudom,$tcrsid)=	my ($tsymb,$tuname,$tudom,$tcrsid)=
&Apache::lonnet::checkin($token);	&Apache::lonnet::checkin($token);
if ($tsymb) {	if ($tsymb) {
Line 5019 sub handler {	Line 5458 sub handler {
}	}
}	}
} else {	} else {
if (!($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}))) {	if (!($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
if ($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {	if ($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
$perm{'vgr_section'}=$ENV{'request.course.sec'};	$perm{'vgr_section'}=$env{'request.course.sec'};
} else {	} else {
delete($perm{'vgr'});	delete($perm{'vgr'});
}	}
}	}
if (!($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) {	if (!($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$env{'request.course.id'}))) {
if ($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {	if ($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
$perm{'mgr_section'}=$ENV{'request.course.sec'};	$perm{'mgr_section'}=$env{'request.course.sec'};
} else {	} else {
delete($perm{'mgr'});	delete($perm{'mgr'});
}	}
}	}
if ($command eq 'submission' && $perm{'vgr'}) {	if ($command eq 'submission' && $perm{'vgr'}) {
($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));	($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
&pickStudentPage($request);	&pickStudentPage($request);
} elsif ($command eq 'displayPage' && $perm{'vgr'}) {	} elsif ($command eq 'displayPage' && $perm{'vgr'}) {
Line 5059 sub handler {	Line 5498 sub handler {
$request->print(&csvupload($request));	$request->print(&csvupload($request));
} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {	} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
$request->print(&csvuploadmap($request));	$request->print(&csvuploadmap($request));
} elsif ($command eq 'csvuploadassign' && $perm{'mgr'}) {	} elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {
if ($ENV{'form.associate'} ne 'Reverse Association') {	if ($env{'form.associate'} ne 'Reverse Association') {
$request->print(&csvuploadassign($request));	$request->print(&csvuploadoptions($request));
} else {	} else {
if ( $ENV{'form.upfile_associate'} ne 'reverse' ) {	if ( $env{'form.upfile_associate'} ne 'reverse' ) {
$ENV{'form.upfile_associate'} = 'reverse';	$env{'form.upfile_associate'} = 'reverse';
} else {	} else {
$ENV{'form.upfile_associate'} = 'forward';	$env{'form.upfile_associate'} = 'forward';
}	}
$request->print(&csvuploadmap($request));	$request->print(&csvuploadmap($request));
}	}
	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
	$request->print(&csvuploadassign($request));
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
$request->print(&scantron_selectphase($request));	$request->print(&scantron_selectphase($request));
} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
Line 5079 sub handler {	Line 5520 sub handler {
} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
$request->print(&scantron_process_students($request));	$request->print(&scantron_process_students($request));
} elsif ($command eq 'scantronupload' &&	} elsif ($command eq 'scantronupload' &&
(&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})\|\|	(&Apache::lonnet::allowed('usc',$env{'request.role.domain'})\|\|
&Apache::lonnet::allowed('usc',$ENV{'request.course.id'}))) {	&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
$request->print(&scantron_upload_scantron_data($request));	$request->print(&scantron_upload_scantron_data($request));
} elsif ($command eq 'scantronupload_save' &&	} elsif ($command eq 'scantronupload_save' &&
(&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})\|\|	(&Apache::lonnet::allowed('usc',$env{'request.role.domain'})\|\|
&Apache::lonnet::allowed('usc',$ENV{'request.course.id'}))) {	&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
$request->print(&scantron_upload_scantron_data_save($request));	$request->print(&scantron_upload_scantron_data_save($request));
} elsif ($command eq 'scantron_download' &&	} elsif ($command eq 'scantron_download' &&
&Apache::lonnet::allowed('usc',$ENV{'request.course.id'})) {	&Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
$request->print(&scantron_download_scantron_data($request));	$request->print(&scantron_download_scantron_data($request));
} elsif ($command) {	} elsif ($command) {
$request->print("Access Denied ($command)");	$request->print("Access Denied ($command)");
Line 5111 sub send_header {	Line 5552 sub send_header {

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

1;	1;

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

Removed from v.1.208
changed lines
	Added in v.1.275