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.313 and 1.368

version 1.313, 2006/02/14 15:11:09	version 1.368, 2006/07/02 00:51:25
Line 36 use Apache::lonhtmlcommon;	Line 36 use Apache::lonhtmlcommon;
use Apache::lonnavmaps;	use Apache::lonnavmaps;
use Apache::lonhomework;	use Apache::lonhomework;
use Apache::loncoursedata;	use Apache::loncoursedata;
use Apache::lonmsg qw(:user_normal_msg);	use Apache::lonmsg();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
use Apache::lonlocal;	use Apache::lonlocal;
use String::Similarity;	use String::Similarity;
	use lib '/home/httpd/lib/perl';
	use LONCAPA;

	use POSIX qw(floor);

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

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

#--- Format fullname, username:domain if different for display	#--- Format fullname, username:domain if different for display
Line 106 sub nameUserString {	Line 111 sub nameUserString {
#--- Get the partlist and the response type for a given problem. ---	#--- Get the partlist and the response type for a given problem. ---
#--- Indicate if a response type is coded handgraded or not. ---	#--- Indicate if a response type is coded handgraded or not. ---
sub response_type {	sub response_type {
my ($url,$symb) = shift;	my ($symb) = shift;
$symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');	my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
my $allkeys = &Apache::lonnet::metadata($url,'keys');	my $allkeys = &Apache::lonnet::metadata($url,'keys');
my %vPart;	my %vPart;
foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {	foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
Line 116 sub response_type {	Line 121 sub response_type {
my %seen = ();	my %seen = ();
my (@partlist,%handgrade,%responseType);	my (@partlist,%handgrade,%responseType);
foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {	foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
if (/^\w+response_.*/) {	if (/^\w+response_.*/ \|\| /^Task_/) {
my ($responsetype,$part) = split(/_/,$_,2);	my ($responsetype,$part) = split(/_/,$_,2);
my ($partid,$respid) = split(/_/,$part);	my ($partid,$respid) = split(/_/,$part);
	if ($responsetype eq 'Task') { $respid='0'; }
if (&Apache::loncommon::check_if_partid_hidden($partid,$symb)) {	if (&Apache::loncommon::check_if_partid_hidden($partid,$symb)) {
next;	next;
}	}
Line 135 sub response_type {	Line 141 sub response_type {
push @partlist,$partid;	push @partlist,$partid;
}	}
}	}
return \@partlist,\%handgrade,\%responseType;	return (\@partlist,\%handgrade,\%responseType);
}	}

sub get_display_part {	sub get_display_part {
my ($partID,$url,$symb)=@_;	my ($partID,$symb)=@_;
if (!defined($symb) \|\| $symb eq '') {
$symb=$env{'form.symb'};
if ($symb eq '') { $symb=&Apache::lonnet::symbread($url) }
}
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);	my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
if (defined($display) and $display ne '') {	if (defined($display) and $display ne '') {
$display.= " (<font color=\"#999900\">id $partID</font>)";	$display.= " (<font color=\"#999900\">id $partID</font>)";
Line 156 sub get_display_part {	Line 158 sub get_display_part {
#--- Show resource title	#--- Show resource title
#--- and parts and response type	#--- and parts and response type
sub showResourceInfo {	sub showResourceInfo {
my ($url,$probTitle,$checkboxes) = @_;	my ($symb,$probTitle,$checkboxes) = @_;
my $col=3;	my $col=3;
if ($checkboxes) { $col=4; }	if ($checkboxes) { $col=4; }
my $result ='<table border="0">'.	my $result ='<table border="0">'.
'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'.	'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'.
$probTitle.'</font></td></tr>'."\n";	$probTitle.'</font></td></tr>'."\n";
my ($partlist,$handgrade,$responseType) = &response_type($url);	my ($partlist,$handgrade,$responseType) = &response_type($symb);
my %resptype = ();	my %resptype = ();
my $hdgrade='no';	my $hdgrade='no';
my %partsseen;	my %partsseen;
Line 180 sub showResourceInfo {	Line 182 sub showResourceInfo {
}	}
$partsseen{$partID}=1;	$partsseen{$partID}=1;
}	}
my $display_part=&get_display_part($partID,$url);	my $display_part=&get_display_part($partID,$symb);
$result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.	$result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.
$resID.'</font></td>'.	$resID.'</font></td>'.
'<td><b>Type: </b>'.$responsetype.'</td></tr>';	'<td><b>Type: </b>'.$responsetype.'</td></tr>';
Line 207 sub get_order {	Line 209 sub get_order {
return ($analyze{"$partid.$respid.shown"});	return ($analyze{"$partid.$respid.shown"});
}	}
#--- Clean response type for display	#--- Clean response type for display
#--- Currently filters option/rank/radiobutton/match/essay response types only.	#--- Currently filters option/rank/radiobutton/match/essay/Task
	# response types only.
sub cleanRecord {	sub cleanRecord {
my ($answer,$response,$symb,$partid,$respid,$record,$order,$version) = @_;	my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,
	$uname,$udom) = @_;
my $grayFont = '<font color="#999999">';	my $grayFont = '<font color="#999999">';
if ($response =~ /^(option\|rank)$/) {	if ($response =~ /^(option\|rank)$/) {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
Line 290 sub cleanRecord {	Line 294 sub cleanRecord {
my $jme=$record->{$version."resource.$partid.$respid.molecule"};	my $jme=$record->{$version."resource.$partid.$respid.molecule"};
$result.=&Apache::chemresponse::jme_img($jme,$answer,400);	$result.=&Apache::chemresponse::jme_img($jme,$answer,400);
return $result;	return $result;
	} elsif ( $response eq 'Task') {
	if ( $answer eq 'SUBMITTED') {
	my $files = $record->{$version."resource.$respid.$partid.bridgetask.portfiles"};
	my $result = &Apache::bridgetask::file_list($files,$uname,$udom);
	return $result;
	} elsif ( grep(/^\Q$version\E.*?\.instance$/, keys(%{$record})) ) {
	my @matches = grep(/^\Q$version\E.*?\.instance$/,
	keys(%{$record}));
	return join('<br />',($version,@matches));


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

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

}	}
return $answer;	return $answer;
}	}
Line 429 sub canview {	Line 464 sub canview {

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

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

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

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

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

	return $points;
	}

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

#	#
Line 528 sub verifyreceipt {	Line 589 sub verifyreceipt {
my $receipt = &Apache::lonnet::recprefix($courseid).'-'.	my $receipt = &Apache::lonnet::recprefix($courseid).'-'.
$env{'form.receipt'};	$env{'form.receipt'};
$receipt =~ s/[^\-\d]//g;	$receipt =~ s/[^\-\d]//g;
my $url = $env{'form.url'};	my $symb = &Apache::lonnet::symbread();
my $symb = $env{'form.symb'};
unless ($symb) {
$symb = &Apache::lonnet::symbread($url);
}

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

my ($string,$contents,$matches) = ('','',0);	my ($string,$contents,$matches) = ('','',0);
my (undef,undef,$fullname) = &getclasslist('all','0');	my (undef,undef,$fullname) = &getclasslist('all','0');
Line 544 sub verifyreceipt {	Line 601 sub verifyreceipt {
my $receiptparts=0;	my $receiptparts=0;
if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }	if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
my $parts=['0'];	my $parts=['0'];
if ($receiptparts) { ($parts)=&response_type($url,$symb); }	if ($receiptparts) { ($parts)=&response_type($symb); }
foreach (sort	foreach (sort
{	{
if (lc($$fullname{$a}) ne lc($$fullname{$b})) {	if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
Line 572 sub verifyreceipt {	Line 629 sub verifyreceipt {
if ($matches == 0) {	if ($matches == 0) {
$string = $title.'No match found for the above receipt.';	$string = $title.'No match found for the above receipt.';
} else {	} else {
$string = &jscriptNform($url,$symb).$title.	$string = &jscriptNform($symb).$title.
'The above receipt matches the following student'.	'The above receipt matches the following student'.
($matches <= 1 ? '.' : 's.')."\n".	($matches <= 1 ? '.' : 's.')."\n".
'<table border="0"><tr><td bgcolor="#777777">'."\n".	'<table border="0"><tr><td bgcolor="#777777">'."\n".
Line 586 sub verifyreceipt {	Line 643 sub verifyreceipt {
$string.='</tr>'."\n".$contents.	$string.='</tr>'."\n".$contents.
'</table></td></tr></table>'."\n";	'</table></td></tr></table>'."\n";
}	}
return $string.&show_grading_menu_form($symb,$url);	return $string.&show_grading_menu_form($symb);
}	}

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

my ($symb,$url) = &get_symb_and_url($request);	my ($symb) = &get_symb($request);
my $cdom = $env{"course.$env{'request.course.id'}.domain"};	my $cdom = $env{"course.$env{'request.course.id'}.domain"};
my $cnum = $env{"course.$env{'request.course.id'}.num"};	my $cnum = $env{"course.$env{'request.course.id'}.num"};
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};	my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
Line 609 sub listStudents {	Line 666 sub listStudents {
my $result='<h3><font color="#339933"> '.$viewgrade.	my $result='<h3><font color="#339933"> '.$viewgrade.
' Submissions for a Student or a Group of Students</font></h3>';	' Submissions for a Student or a Group of Students</font></h3>';

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

$request->print(<<LISTJAVASCRIPT);	$request->print(<<LISTJAVASCRIPT);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
Line 668 LISTJAVASCRIPT	Line 725 LISTJAVASCRIPT
$gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".	$gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".	'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".
'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".	'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".
'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n".	'<label><input type="radio" name="lastSub" value="all" /> all details</label><br />'."\n".
	' <b>Grading Increments:</b> <select name="increment">'.
	'<option value="1">Whole Points</option>'.
	'<option value=".5">Half Points</option>'.
	'<option value=".25">Quarter Points</option>'.
	'<option value=".1">Tenths of a Point</option>'.
	'</select>'.

'<input type="hidden" name="section" value="'.$getsec.'" />'."\n".	'<input type="hidden" name="section" value="'.$getsec.'" />'."\n".
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".	'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n".	'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n".
'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\n".	'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";

Line 708 LISTJAVASCRIPT	Line 771 LISTJAVASCRIPT
&& $submitonly ne 'queued'	&& $submitonly ne 'queued'
&& $submitonly ne 'all') {	&& $submitonly ne 'all') {
foreach (sort(@$partlist)) {	foreach (sort(@$partlist)) {
my $display_part=&get_display_part((split(/_/))[0],$url,$symb);	my $display_part=&get_display_part((split(/_/))[0],$symb);
$gradeTable.='<td><b> Part: '.$display_part.	$gradeTable.='<td><b> Part: '.$display_part.
' Status </b></td>';	' Status </b></td>';
}	}
Line 744 LISTJAVASCRIPT	Line 807 LISTJAVASCRIPT
if ($env{'form.showgrading'} eq 'yes'	if ($env{'form.showgrading'} eq 'yes'
&& $submitonly ne 'queued'	&& $submitonly ne 'queued'
&& $submitonly ne 'all') {	&& $submitonly ne 'all') {
(%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);	(%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);
my $submitted = 0;	my $submitted = 0;
my $graded = 0;	my $graded = 0;
my $incorrect = 0;	my $incorrect = 0;
Line 826 LISTJAVASCRIPT	Line 889 LISTJAVASCRIPT
} elsif ($ctr == 1) {	} elsif ($ctr == 1) {
$gradeTable =~ s/type=checkbox/type=checkbox checked/;	$gradeTable =~ s/type=checkbox/type=checkbox checked/;
}	}
$gradeTable.=&show_grading_menu_form($symb,$url);	$gradeTable.=&show_grading_menu_form($symb);
$request->print($gradeTable);	$request->print($gradeTable);
return '';	return '';
}	}
Line 1082 sub sub_page_kw_js {	Line 1145 sub sub_page_kw_js {
my $request = shift;	my $request = shift;
my $iconpath = $request->dir_config('lonIconsURL');	my $iconpath = $request->dir_config('lonIconsURL');
&commonJSfunctions($request);	&commonJSfunctions($request);

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

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

	self.close()

	}
	</script>
	INNERJS

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

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


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

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

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

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

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

pDoc.write("}");

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

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

pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");	pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");	pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
pDoc.write("<font color=\\"green\\" size=+1> Compose Message for \"+fullname+\"</font><br><br>");	pDoc.write("<font color=\\"green\\" size=+1> Compose Message for \"+fullname+\"</font><br /><br />");

pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");	pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");	pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
Line 1280 sub sub_page_kw_js {	Line 1374 sub sub_page_kw_js {
pDoc.write("</table>");	pDoc.write("</table>");
pDoc.write("</td></tr></table> ");	pDoc.write("</td></tr></table> ");
pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\">  ");	pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\">  ");
pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");	pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
pDoc.write("</form>");	pDoc.write("</form>");
pDoc.write("</body></html>");	pDoc.write('$end_page_msg_central');
pDoc.close();	pDoc.close();
}	}

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

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

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

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

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

hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");	hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");	hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
Line 1373 sub sub_page_kw_js {	Line 1448 sub sub_page_kw_js {
hDoc.write("</table>");	hDoc.write("</table>");
hDoc.write("</td></tr></table> ");	hDoc.write("</td></tr></table> ");
hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\">  ");	hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\">  ");
hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");	hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
hDoc.write("</form>");	hDoc.write("</form>");
hDoc.write("</body></html>");	hDoc.write('$end_page_highlight_central');
hDoc.close();	hDoc.close();
}	}

Line 1383 sub sub_page_kw_js {	Line 1458 sub sub_page_kw_js {
SUBJAVASCRIPT	SUBJAVASCRIPT
}	}

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

#--- displays the grading box, used in essay type problem and grading by page/sequence	#--- displays the grading box, used in essay type problem and grading by page/sequence
sub gradeBox {	sub gradeBox {
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;	my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
Line 1393 sub gradeBox {	Line 1477 sub gradeBox {
'<font color="red">problem weight assigned by computer</font>');	'<font color="red">problem weight assigned by computer</font>');
$wgt = ($wgt > 0 ? $wgt : '1');	$wgt = ($wgt > 0 ? $wgt : '1');
my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ?	my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
'' : $$record{'resource.'.$partid.'.awarded'}*$wgt);	'' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));
my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";	my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
my $display_part=&get_display_part($partid,undef,$symb);	my $display_part=&get_display_part($partid,$symb);
my %last_resets = &get_last_resets($symb,$env{'request.course.id'},	my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
[$partid]);	[$partid]);
my $aggtries = $$record{'resource.'.$partid.'.tries'};	my $aggtries = $$record{'resource.'.$partid.'.tries'};
Line 1405 sub gradeBox {	Line 1489 sub gradeBox {
$result.='<table border="0"><tr><td>'.	$result.='<table border="0"><tr><td>'.
'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";	'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
my $ctr = 0;	my $ctr = 0;
	my $thisweight = 0;
	my $increment = &get_increment();
$result.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across	$result.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across
while ($ctr<=$wgt) {	while ($thisweight<=$wgt) {
$result.= '<td><nobr><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.	$result.= '<td><nobr><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.	'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
$ctr.')" value="'.$ctr.'" '.	$thisweight.')" value="'.$thisweight.'" '.
($score eq $ctr ? 'checked':'').' /> '.$ctr."</label></nobr></td>\n";	($score eq $thisweight ? 'checked':'').' /> '.$thisweight."</label></nobr></td>\n";
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
	$thisweight += $increment;
$ctr++;	$ctr++;
}	}
$result.='</tr></table>';	$result.='</tr></table>';
Line 1443 sub gradeBox {	Line 1530 sub gradeBox {
'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.	'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
$aggtries.'" />'."\n";	$aggtries.'" />'."\n";
$result.='</td></tr></table>'."\n";	$result.='</td></tr></table>'."\n";
my $files=&get_submitted_files($udom,$uname,$partid,$counter,$record);	$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);
if (@$files) {	return $result;
my $file_counter = 0;	}
foreach my $file (@$files) {
$result.=' Return commented document to student. <input type="file" name="part'.$partid.'_returndoc';	sub handback_box {
$result.=$file_counter.'" />'."\n";	my ($symb,$uname,$udom,$counter,$partid,$record) = @_;
$result.='<input type="hidden" name="respid" value="'.$counter.'" />';	my ($partlist,$handgrade,$responseType) = &response_type($symb);
$result.='<input type="hidden" name="returndocorig'.$file_counter.'" value="'.$file.'" />';	my (@respids);
	foreach my $part_resp (sort(keys(%$handgrade))) {
	my ($part,$resp) = split(/_/,$part_resp);
	if ($part eq $partid) {
	push @respids,$resp;
}	}
}	}
	my $result;
	foreach my $respid (@respids) {
return $result;	my $prefix = $counter.'_'.$partid.'_'.$respid.'_';
	my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record);
	next if (!@$files);
	my $file_counter = 1;
	foreach my $file (@$files) {
	if ($file =~ /\/portfolio\//) {
	my ($file_path, $file_disp) = ($file =~ m\|(.+/)(.+)$\|);
	my ($name,$version,$ext) = &file_name_version_ext($file_disp);
	$file_disp = "$name.$ext";
	$file = $file_path.$file_disp;
	$result.=&mt('Return commented version of [_1] to student.',
	'<span class="LC_filename">'.$file_disp.'</span>');
	$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
	$result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
	$file_counter++;
	}
	}
	}
	return $result;
}	}

sub show_problem {	sub show_problem {
my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode) = @_;	my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode) = @_;
my $rendered;	my $rendered;
	&Apache::lonxml::remember_problem_counter();
if ($mode eq 'both' or $mode eq 'text') {	if ($mode eq 'both' or $mode eq 'text') {
$rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,	$rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
$env{'request.course.id'});	$env{'request.course.id'});
Line 1472 sub show_problem {	Line 1582 sub show_problem {
}	}
my $companswer;	my $companswer;
if ($mode eq 'both' or $mode eq 'answer') {	if ($mode eq 'both' or $mode eq 'answer') {
	&Apache::lonxml::restore_problem_counter();
$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'});
}	}
Line 1508 sub show_problem {	Line 1619 sub show_problem {
sub submission {	sub submission {
my ($request,$counter,$total) = @_;	my ($request,$counter,$total) = @_;

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

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

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

Line 1559 sub submission {	Line 1669 sub submission {
} elsif ($env{'form.vAns'} eq 'yes') {	} elsif ($env{'form.vAns'} eq 'yes') {
$mode='answer';	$mode='answer';
}	}
	&Apache::lonxml::clear_problem_counter();
$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));	$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
}	}

Line 1591 sub submission {	Line 1702 sub submission {
'<input type="hidden" name="studentNo" value="" />'."\n".	'<input type="hidden" name="studentNo" value="" />'."\n".
'<input type="hidden" name="gradeOpt" value="" />'."\n".	'<input type="hidden" name="gradeOpt" value="" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" />'."\n".	'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" />'."\n".
'<input type="hidden" name="vProb" value="'.$env{'form.vProb'}.'" />'."\n".	'<input type="hidden" name="vProb" value="'.$env{'form.vProb'}.'" />'."\n".
'<input type="hidden" name="vAns" value="'.$env{'form.vAns'}.'" />'."\n".	'<input type="hidden" name="vAns" value="'.$env{'form.vAns'}.'" />'."\n".
'<input type="hidden" name="lastSub" value="'.$env{'form.lastSub'}.'" />'."\n".	'<input type="hidden" name="lastSub" value="'.$env{'form.lastSub'}.'" />'."\n".
'<input type="hidden" name="section" value="'.$env{'form.section'}.'">'."\n".	'<input type="hidden" name="section" value="'.$env{'form.section'}.'" />'."\n".
'<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'">'."\n".	'<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'">'."\n".	'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" />'."\n".
'<input type="hidden" name="NCT"'.	'<input type="hidden" name="NCT"'.
' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");	' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");
if ($env{'form.handgrade'} eq 'yes') {	if ($env{'form.handgrade'} eq 'yes') {
Line 1640 KEYWORDS	Line 1750 KEYWORDS
#	#
# Load the other essays for similarity check	# Load the other essays for similarity check
#	#
my $essayurl=&Apache::lonnet::declutter($url);	my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
my ($adom,$aname,$apath)=($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);	my ($adom,$aname,$apath)=($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
$apath=&Apache::lonnet::escape($apath);	$apath=&escape($apath);
$apath=~s/\W/\_/gs;	$apath=~s/\W/\_/gs;
%oldessays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);	%oldessays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
}	}
Line 1658 KEYWORDS	Line 1768 KEYWORDS
} elsif ($env{'form.vAns'} eq 'all') {	} elsif ($env{'form.vAns'} eq 'all') {
$mode='answer';	$mode='answer';
}	}
	&Apache::lonxml::clear_problem_counter();
$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode));	$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode));
}	}

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

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

$result.='<b>Fullname: </b>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'<br />'."\n";	$result.='<b>Fullname: </b>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'<br />'."\n";
$result.='<input type="hidden" name="name'.$counter.	$result.='<input type="hidden" name="name'.$counter.
Line 1748 KEYWORDS	Line 1859 KEYWORDS
my %seenparts;	my %seenparts;
for my $part (sort keys(%$handgrade)) {	for my $part (sort keys(%$handgrade)) {
my ($partid,$respid) = split(/_/,$part);	my ($partid,$respid) = split(/_/,$part);
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$symb);
if ($env{"form.$uname:$udom:$partid:submitted_by"}) {	if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
if (exists($seenparts{$partid})) { next; }	if (exists($seenparts{$partid})) { next; }
$seenparts{$partid}=1;	$seenparts{$partid}=1;
Line 1792 KEYWORDS	Line 1903 KEYWORDS
if ($env{'form.lastSub'} eq 'lastonly' \|\|	if ($env{'form.lastSub'} eq 'lastonly' \|\|
($env{'form.lastSub'} eq 'hdgrade' &&	($env{'form.lastSub'} eq 'hdgrade' &&
$$handgrade{$part} eq 'yes')) {	$$handgrade{$part} eq 'yes')) {
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$symb);
$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.	$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
$display_part.' <font color="#999999">( ID '.$respid.	$display_part.' <font color="#999999">( ID '.$respid.
' )</font>   ';	' )</font>   ';
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);	my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
# if ($record{"resource.$partid.$respid.portfiles"}) {
# my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
# foreach my $file (split(',',$record{"resource.$partid.$respid.portfiles"})) {
# push(@files,$file_url.$file);
# }
# }
# if ($record{"resource.$partid.$respid.uploadedurl"}) {
# push(@files,$record{"resource.$partid.$respid.uploadedurl"});
# }
if (@$files) {	if (@$files) {
$lastsubonly.='<br /><font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';	$lastsubonly.='<br /><font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
my $file_counter = 0;	my $file_counter = 0;
foreach my $file (@$files) {	foreach my $file (@$files) {
$file_counter ++;	$file_counter ++;
&Apache::lonnet::allowuploaded('/adm/grades',$file);	&Apache::lonnet::allowuploaded('/adm/grades',$file);
$lastsubonly.='<br /><a href="'.$file.'" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';	$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
}	}
$lastsubonly.='<br />';	$lastsubonly.='<br />';
}	}
Line 1827 KEYWORDS	Line 1929 KEYWORDS
$lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";	$lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
$request->print($lastsubonly);	$request->print($lastsubonly);
} elsif ($env{'form.lastSub'} eq 'datesub') {	} elsif ($env{'form.lastSub'} eq 'datesub') {
my (undef,$responseType,undef,$parts) = &showResourceInfo($url);	my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);
$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
} elsif ($env{'form.lastSub'} =~ /^(last\|all)$/) {	} elsif ($env{'form.lastSub'} =~ /^(last\|all)$/) {
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
Line 1847 KEYWORDS	Line 1949 KEYWORDS
$toGrade.='</td></tr></table></td></tr></table>'."\n";	$toGrade.='</td></tr></table></td></tr></table>'."\n";
if (($env{'form.command'} eq 'submission') \|\|	if (($env{'form.command'} eq 'submission') \|\|
($env{'form.command'} eq 'processGroup' && $counter == $total)) {	($env{'form.command'} eq 'processGroup' && $counter == $total)) {
$toGrade.='</form>'.&show_grading_menu_form($symb,$url)	$toGrade.='</form>'.&show_grading_menu_form($symb);
}	}
$request->print($toGrade);	$request->print($toGrade);
return;	return;
Line 1868 KEYWORDS	Line 1970 KEYWORDS
'<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";	'<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
$result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter.	$result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter.
',\''.$msgfor.'\')"; TARGET=_self>'.	',\''.$msgfor.'\')"; TARGET=_self>'.
&mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> ('.	&mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a><label> ('.
&mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" />)'.	&mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.
'<img src="'.$request->dir_config('lonIconsURL').	'<img src="'.$request->dir_config('lonIconsURL').
'/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".	'/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
'<br /> ('.	'<br /> ('.
Line 1890 KEYWORDS	Line 1992 KEYWORDS
my %seen = ();	my %seen = ();
my @partlist;	my @partlist;
my @gradePartRespid;	my @gradePartRespid;
for (sort keys(%$handgrade)) {	for my $part_resp (sort(keys(%$handgrade))) {
my ($partid,$respid) = split(/_/);	my ($partid,$respid) = split(/_/, $part_resp);
next if ($seen{$partid} > 0);	next if ($seen{$partid} > 0);
$seen{$partid}++;	$seen{$partid}++;
next if ($$handgrade{$_} =~ /:no$/ && $env{'form.lastSub'} =~ /^(hdgrade)$/);	next if ($$handgrade{$part_resp} =~ /:no$/ && $env{'form.lastSub'} =~ /^(hdgrade)$/);
push @partlist,$partid;	push @partlist,$partid;
push @gradePartRespid,$partid.'.'.$respid;	push @gradePartRespid,$partid.'.'.$respid;

$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
}	}
$result='<input type="hidden" name="partlist'.$counter.	$result='<input type="hidden" name="partlist'.$counter.
Line 1930 KEYWORDS	Line 2031 KEYWORDS
'<input type="button" value="Next" '.	'<input type="button" value="Next" '.
'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self>  ';	'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self>  ';
$endform.='(Next and Previous (student) do not save the scores.)'."\n" ;	$endform.='(Next and Previous (student) do not save the scores.)'."\n" ;
	$endform.="<input type='hidden' value='".&get_increment().
	"' name='increment' />";
$endform.='</td><tr></table></form>';	$endform.='</td><tr></table></form>';
$endform.=&show_grading_menu_form($symb,$url);	$endform.=&show_grading_menu_form($symb);
$request->print($endform);	$request->print($endform);
}	}
return '';	return '';
Line 1979 sub keywords_highlight {	Line 2082 sub keywords_highlight {
#--- Called from submission routine	#--- Called from submission routine
sub processHandGrade {	sub processHandGrade {
my ($request) = shift;	my ($request) = shift;
my $url = $env{'form.url'};	my $symb = &get_symb($request);
my $symb = $env{'form.symb'};	my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
my $button = $env{'form.gradeOpt'};	my $button = $env{'form.gradeOpt'};
my $ngrade = $env{'form.NCT'};	my $ngrade = $env{'form.NCT'};
my $ntstu = $env{'form.NTSTU'};	my $ntstu = $env{'form.NTSTU'};
Line 1991 sub processHandGrade {	Line 2094 sub processHandGrade {
my $ctr = 0;	my $ctr = 0;
while ($ctr < $ngrade) {	while ($ctr < $ngrade) {
my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});	my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);	my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$symb,$uname,$udom,$ctr);
if ($errorflag eq 'no_score') {	if ($errorflag eq 'no_score') {
$ctr++;	$ctr++;
next;	next;
Line 2006 sub processHandGrade {	Line 2109 sub processHandGrade {
if ($includemsg =~ /savemsg\|newmsg\Q$ctr\E/) {	if ($includemsg =~ /savemsg\|newmsg\Q$ctr\E/) {
$subject = $env{'form.msgsub'} if ($includemsg =~ /msgsub/);	$subject = $env{'form.msgsub'} if ($includemsg =~ /msgsub/);
unless ($subject=~/\w/) { $subject=&mt('Grading Feedback'); }	unless ($subject=~/\w/) { $subject=&mt('Grading Feedback'); }
	$subject.=' ['.&Apache::lonnet::declutter($url).']';
my (@msgnum) = split(/,/,$includemsg);	my (@msgnum) = split(/,/,$includemsg);
foreach (@msgnum) {	foreach (@msgnum) {
$message.=$env{'form.'.$_} if ($_ =~ /savemsg\|newmsg/ && $_ ne '');	$message.=$env{'form.'.$_} if ($_ =~ /savemsg\|newmsg/ && $_ ne '');
Line 2017 sub processHandGrade {	Line 2121 sub processHandGrade {
&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,
$subject.' ['.	$subject,
&Apache::lonnet::declutter($url).']',$message);	$message);
$request->print('<br />'.&mt('Sending message to [_1]@[_2]',$uname,$udom).': '.	$request->print('<br />'.&mt('Sending message to [_1]@[_2]',$uname,$udom).': '.
$msgstatus);	$msgstatus);
}	}
Line 2029 sub processHandGrade {	Line 2133 sub processHandGrade {
my ($part,@collaborators) = split(/:/,$collabstr);	my ($part,@collaborators) = split(/:/,$collabstr);
foreach my $collaborator (@collaborators) {	foreach my $collaborator (@collaborators) {
my ($errorflag,$pts,$wgt) =	my ($errorflag,$pts,$wgt) =
&saveHandGrade($request,$url,$symb,$collaborator,$udom,$ctr,	&saveHandGrade($request,$symb,$collaborator,$udom,$ctr,
$env{'form.unamedom'.$ctr},$part);	$env{'form.unamedom'.$ctr},$part);
if ($errorflag eq 'not_allowed') {	if ($errorflag eq 'not_allowed') {
$request->print("<font color=\"red\">Not allowed to modify grades for $collaborator:$udom</font>");	$request->print("<span class=\"LC_error\">".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom")."</span>");
next;	next;
} else {	} else {
if ($message ne '') {	if ($message ne '') {
$msgstatus = &Apache::lonmsg::user_normal_msg($collaborator,$udom,$env{'form.msgsub'},$message);	$msgstatus = &Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message);
}	}
}	}
}	}
Line 2107 sub processHandGrade {	Line 2211 sub processHandGrade {

# Go directly to grade student - from submission or link from chart page	# Go directly to grade student - from submission or link from chart page
if ($button eq 'Grade Student') {	if ($button eq 'Grade Student') {
(undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($url);	(undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb);
my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};	my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};
($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);	($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
$env{'form.fullname'} = $$fullname{$processUser};	$env{'form.fullname'} = $$fullname{$processUser};
Line 2145 sub processHandGrade {	Line 2249 sub processHandGrade {
}	}
$ctr = 0;	$ctr = 0;
@parsedlist = reverse @parsedlist if ($button eq 'Previous');	@parsedlist = reverse @parsedlist if ($button eq 'Previous');
my ($partlist) = &response_type($url);	my ($partlist) = &response_type($symb);
foreach my $student (@parsedlist) {	foreach my $student (@parsedlist) {
my $submitonly=$env{'form.submitonly'};	my $submitonly=$env{'form.submitonly'};
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);
Line 2159 sub processHandGrade {	Line 2263 sub processHandGrade {

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

#---- Save the score and award for each student, if changed	#---- Save the score and award for each student, if changed
sub saveHandGrade {	sub saveHandGrade {
my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;	my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
my @v_flag;	my @version_parts;
my $usec = &Apache::lonnet::getsection($domain,$stuname,	my $usec = &Apache::lonnet::getsection($domain,$stuname,
$env{'request.course.id'});	$env{'request.course.id'});
if (!&canmodify($usec)) { return('not_allowed'); }	if (!&canmodify($usec)) { return('not_allowed'); }
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
my @parts_graded;	my @parts_graded;
my %newrecord = ();	my %newrecord = ();
my ($pts,$wgt) = ('','');	my ($pts,$wgt) = ('','');
my %aggregate = ();	my %aggregate = ();
my $aggregateflag = 0;	my $aggregateflag = 0;

my @parts = split(/:/,$env{'form.partlist'.$newflg});	my @parts = split(/:/,$env{'form.partlist'.$newflg});
foreach my $new_part (@parts) {	foreach my $new_part (@parts) {
#collaborator may vary for different parts	#collaborator ($submi may vary for different parts
if ($submitter && $new_part ne $part) { next; }	if ($submitter && $new_part ne $part) { next; }
my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part};	my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part};
if ($dropMenu eq 'excused') {	if ($dropMenu eq 'excused') {
Line 2229 sub saveHandGrade {	Line 2332 sub saveHandGrade {
if (exists($record{'resource.'.$new_part.'.awarded'})) {	if (exists($record{'resource.'.$new_part.'.awarded'})) {
$newrecord{'resource.'.$new_part.'.awarded'} = '';	$newrecord{'resource.'.$new_part.'.awarded'} = '';
}	}
$newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";	$newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
}	}
} elsif ($dropMenu eq 'reset status'	} elsif ($dropMenu eq 'reset status'
&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts	&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts
Line 2250 sub saveHandGrade {	Line 2353 sub saveHandGrade {

my $solvedstatus = $record{'resource.'.$new_part.'.solved'};	my $solvedstatus = $record{'resource.'.$new_part.'.solved'};
if ($aggtries > 0) {	if ($aggtries > 0) {
&decrement($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);	&decrement_aggs($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);
$aggregateflag = 1;	$aggregateflag = 1;
}	}
} elsif ($dropMenu eq '') {	} elsif ($dropMenu eq '') {
Line 2265 sub saveHandGrade {	Line 2368 sub saveHandGrade {
my $partial= $pts/$wgt;	my $partial= $pts/$wgt;
if ($partial eq $record{'resource.'.$new_part.'.awarded'}) {	if ($partial eq $record{'resource.'.$new_part.'.awarded'}) {
#do not update score for part if not changed.	#do not update score for part if not changed.
	&handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord);
next;	next;
} else {	} else {
push @parts_graded, $new_part;	push @parts_graded, $new_part;
Line 2289 sub saveHandGrade {	Line 2393 sub saveHandGrade {
$newrecord{'resource.'.$new_part.'.regrader'}=	$newrecord{'resource.'.$new_part.'.regrader'}=
"$env{'user.name'}:$env{'user.domain'}";	"$env{'user.name'}:$env{'user.domain'}";
}	}
if ($env{'form.part'.$new_part.'_returndoc1'}) {
# if multiple files are uploaded names will be 'returndoc2','returndoc3'

my $portfolio_root = &Apache::loncommon::propath($domain,
$stuname).
'/userfiles/portfolio';
$request->print('<br>'.$portfolio_root.'<br>');

# my $result=&Apache::lonnet::userfileupload('uploaddoc','',
# 'portfolio'.$env{'form.currentpath'});

my $file_counter = 1;
my $respid = $env{'form.respid'};
while ($env{'form.part'.$new_part.'_returndoc'.$file_counter}) {
my $fname=$env{'form.returndoc'.$file_counter.'.filename'};
$newrecord{"resource.$new_part.$respid.handback"} = $env{'form.returndocorig'.$file_counter};
$request->print("<br />".$fname." will be the uploaded file name");
$request->print("<font color=\"red\">Will upload document</font>".$env{'form.returndocorig'.$file_counter});
$file_counter++;
}
}

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

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

my @ungraded_parts;	my @ungraded_parts;
foreach my $part (@parts) {	foreach my $part (@parts) {
if ( !defined($record{'resource.'.$part.'.awarded'})	if ( !defined($record{'resource.'.$part.'.awarded'})
Line 2347 sub saveHandGrade {	Line 2434 sub saveHandGrade {
}	}
return ('',$pts,$wgt);	return ('',$pts,$wgt);
}	}

	sub handback_files {
	my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;
	my $portfolio_root = &propath($domain,$stuname).'/userfiles/portfolio';
	my ($partlist,$handgrade,$responseType) = &response_type($symb);
	foreach my $part_resp (sort(keys(%$handgrade))) {
	my ($part_id, $resp_id) = split(/_/,$part_resp);
	if (($env{'form.'.$newflg.'_'.$part_resp.'_returndoc1'}) && ($new_part == $part_id)) {
	# if multiple files are uploaded names will be 'returndoc2','returndoc3'
	my $file_counter = 1;
	my $file_msg;
	while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) {
	my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'};
	my ($directory,$answer_file) =
	($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter} =~ /^(.?)([^\/])$/);
	my ($answer_name,$answer_ver,$answer_ext) =
	&file_name_version_ext($answer_file);
	my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
	my @dir_list = &Apache::lonnet::dirlist($portfolio_path,$domain,$stuname,$portfolio_root);
	my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
	# fix file name
	my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
	my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,
	$newflg.'_'.$part_resp.'_returndoc'.$file_counter,
	$save_file_name);
	if ($result !~ m\|^/uploaded/\|) {
	$request->print('<font color="red"> An errror occured ('.$result.
	') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</font><br />');
	} else {
	# mark the file as read only
	my @files = ($save_file_name);
	my @what = ($symb,'handback');
	&Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what);
	if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) {
	$$newrecord{"resource.$new_part.$resp_id.handback"}.=',';
	}
	$$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name;
	$file_msg.= "\n".'<br /><span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span><br />";

	}
	$request->print("<br />".$fname." will be the uploaded file name");
	$request->print(" ".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
	$file_counter++;
	}
	my $subject = "File Handed Back by Instructor ";
	my $message = "A file has been returned that was originally submitted in reponse to: <br />";
	$message .= "<strong>".&Apache::lonnet::gettitle($symb)."</strong><br />";
	$message .= ' The returned file(s) are named: '. $file_msg;
	$message .= " and can be found in your portfolio space.";
	my $url = (&Apache::lonnet::decode_symb($symb))[2];
	$url = &Apache::lonnet::declutter($url);
	my $msgstatus = &Apache::lonmsg::user_normal_msg($stuname,$domain,
	$subject.' (File Returned) ['.$url.']',$message);

	}
	}
	return;
	}

sub get_submitted_files {	sub get_submitted_files {
my ($udom,$uname,$partid,$respid,$record) = @_;	my ($udom,$uname,$partid,$respid,$record) = @_;
my @files;	my @files;
Line 2361 sub get_submitted_files {	Line 2507 sub get_submitted_files {
}	}
return (\@files);	return (\@files);
}	}

# ----------- Provides number of tries since last reset.	# ----------- Provides number of tries since last reset.
sub get_num_tries {	sub get_num_tries {
my ($record,$last_reset,$part) = @_;	my ($record,$last_reset,$part) = @_;
Line 2424 sub get_last_resets {	Line 2571 sub get_last_resets {
sub version_portfiles {	sub version_portfiles {
my ($record, $parts_graded, $courseid, $symb, $domain, $stu_name, $v_flag) = @_;	my ($record, $parts_graded, $courseid, $symb, $domain, $stu_name, $v_flag) = @_;
my $version_parts = join('\|',@$v_flag);	my $version_parts = join('\|',@$v_flag);
	my @returned_keys;
my $parts = join('\|', @$parts_graded);	my $parts = join('\|', @$parts_graded);
my $portfolio_root = &Apache::loncommon::propath($domain,	my $portfolio_root = &propath($domain,$stu_name).
$stu_name).	'/userfiles/portfolio';
'/userfiles/portfolio';
foreach my $key (keys(%$record)) {	foreach my $key (keys(%$record)) {
my $new_portfiles;	my $new_portfiles;
if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {	if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
my @v_portfiles;	my @versioned_portfiles;
my @portfiles = split(/,/,$$record{$key});	my @portfiles = split(/\s,\s/,$$record{$key});
foreach my $file (@portfiles) {	foreach my $file (@portfiles) {
&Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);	&Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);
my ($directory,$answer_file) =($file =~ /^(.?)([^\/])$/);	my ($directory,$answer_file) =($file =~ /^(.?)([^\/])$/);
my $version = 0;
my ($answer_name,$answer_ver,$answer_ext) =	my ($answer_name,$answer_ver,$answer_ext) =
&file_name_version_ext($answer_file);	&file_name_version_ext($answer_file);
my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stu_name,$portfolio_root);	my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stu_name,$portfolio_root);
$version = &get_next_version($answer_name, $answer_ext, \@dir_list);	my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);	my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
if ($new_answer ne 'problem getting file') {	if ($new_answer ne 'problem getting file') {
push(@v_portfiles, $directory.$new_answer);	push(@versioned_portfiles, $directory.$new_answer);
&Apache::lonnet::mark_as_readonly($domain,$stu_name,	&Apache::lonnet::mark_as_readonly($domain,$stu_name,
['/portfolio'.$directory.$new_answer],	[$directory.$new_answer],
[$symb,$env{'request.course.id'},'graded']);	[$symb,$env{'request.course.id'},'graded']);
}	}

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

sub get_next_version {	sub get_next_version {
my ($answer_name, $answer_ext, $dir_list);	my ($answer_name, $answer_ext, $dir_list) = @_;
my $version;	my $version;
foreach my $row (@$dir_list) {	foreach my $row (@$dir_list) {
my ($file) = split(/\&/,$row,2);	my ($file) = split(/\&/,$row,2);
Line 2691 sub viewgrades {	Line 2837 sub viewgrades {
my ($request) = shift;	my ($request) = shift;
&viewgrades_js($request);	&viewgrades_js($request);

my ($symb,$url) = ($env{'form.symb'},$env{'form.url'});	my ($symb) = &get_symb($request);
#need to make sure we have the correct data for later EXT calls,	#need to make sure we have the correct data for later EXT calls,
#thus invalidate the cache	#thus invalidate the cache
&Apache::lonnet::devalidatecourseresdata(	&Apache::lonnet::devalidatecourseresdata(
Line 2703 sub viewgrades {	Line 2849 sub viewgrades {
$result.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n";	$result.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n";

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

#beginning of class grading form	#beginning of class grading form
$result.= '<form action="/adm/grades" method="post" name="classgrade">'."\n".	$result.= '<form action="/adm/grades" method="post" name="classgrade">'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="command" value="editgrades" />'."\n".	'<input type="hidden" name="command" value="editgrades" />'."\n".
'<input type="hidden" name="section" value="'.$env{'form.section'}.'" />'."\n".	'<input type="hidden" name="section" value="'.$env{'form.section'}.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
Line 2728 sub viewgrades {	Line 2873 sub viewgrades {
'<table border=0><tr bgcolor="#ffffdd"><td>';	'<table border=0><tr bgcolor="#ffffdd"><td>';
#radio buttons/text box for assigning points for a section or class.	#radio buttons/text box for assigning points for a section or class.
#handles different parts of a problem	#handles different parts of a problem
my ($partlist,$handgrade) = &response_type($url,$symb);	my ($partlist,$handgrade) = &response_type($symb);
my %weight = ();	my %weight = ();
my $ctsparts = 0;	my $ctsparts = 0;
$result.='<table border="0">';	$result.='<table border="0">';
Line 2745 sub viewgrades {	Line 2890 sub viewgrades {
$ctsparts.'" value="'.$partid.'" />'."\n";	$ctsparts.'" value="'.$partid.'" />'."\n";
$result.='<input type="hidden" name="weight_'.	$result.='<input type="hidden" name="weight_'.
$partid.'" value="'.$weight{$partid}.'" />'."\n";	$partid.'" value="'.$weight{$partid}.'" />'."\n";
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$symb);
$result.='<tr><td><b>Part:</b> '.$display_part.'   <b>Point:</b> </td><td>';	$result.='<tr><td><b>Part:</b> '.$display_part.'   <b>Point:</b> </td><td>';
$result.='<table border="0"><tr>';	$result.='<table border="0"><tr>';
my $ctr = 0;	my $ctr = 0;
Line 2781 sub viewgrades {	Line 2926 sub viewgrades {
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".	$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
'<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'.	'<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'.
'<td>'.&nameUserString('header')."</td>\n";	'<td>'.&nameUserString('header')."</td>\n";
my (@parts) = sort(&getpartlist($url,$symb));	my (@parts) = sort(&getpartlist($symb));
	my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
my @partids = ();	my @partids = ();
foreach my $part (@parts) {	foreach my $part (@parts) {
my $display=&Apache::lonnet::metadata($url,$part.'.display');	my $display=&Apache::lonnet::metadata($url,$part.'.display');
Line 2789 sub viewgrades {	Line 2935 sub viewgrades {
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }	if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
my ($partid) = &split_part_type($part);	my ($partid) = &split_part_type($part);
push(@partids, $partid);	push(@partids, $partid);
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$symb);
if ($display =~ /^Partial Credit Factor/) {	if ($display =~ /^Partial Credit Factor/) {
$result.='<td><b>Score Part:</b> '.$display_part.	$result.='<td><b>Score Part:</b> '.$display_part.
' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n";	' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n";
Line 2817 sub viewgrades {	Line 2963 sub viewgrades {
return $a cmp $b;	return $a cmp $b;
} (keys(%$fullname))) {	} (keys(%$fullname))) {
$ctr++;	$ctr++;
$result.=&viewstudentgrade($url,$symb,$env{'request.course.id'},	$result.=&viewstudentgrade($symb,$env{'request.course.id'},
$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);	$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
}	}
$result.='</table></td></tr></table>';	$result.='</table></td></tr></table>';
Line 2829 sub viewgrades {	Line 2975 sub viewgrades {
$result='<font color="red">There are no students in section "'.$env{'form.section'}.	$result='<font color="red">There are no students in section "'.$env{'form.section'}.
'" with enrollment status "'.$env{'form.Status'}.'" to modify or grade.</font>';	'" with enrollment status "'.$env{'form.Status'}.'" to modify or grade.</font>';
}	}
$result.=&show_grading_menu_form($symb,$url);	$result.=&show_grading_menu_form($symb);
return $result;	return $result;
}	}

#--- call by previous routine to display each student	#--- call by previous routine to display each student
sub viewstudentgrade {	sub viewstudentgrade {
my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;	my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);	my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
my %aggregates = ();	my %aggregates = ();
Line 2866 sub viewstudentgrade {	Line 3012 sub viewstudentgrade {
$aggregates{$part} = 1;	$aggregates{$part} = 1;
}	}
if ($type eq 'awarded') {	if ($type eq 'awarded') {
my $pts = $score eq '' ? '' : $score*$$weight{$part};	my $pts = $score eq '' ? '' : &compute_points($score,$$weight{$part});
$result.='<input type="hidden" name="'.	$result.='<input type="hidden" name="'.
'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";	'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
$result.='<input type="text" name="'.	$result.='<input type="text" name="'.
Line 2903 sub viewstudentgrade {	Line 3049 sub viewstudentgrade {
sub editgrades {	sub editgrades {
my ($request) = @_;	my ($request) = @_;

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

my (@parts) = sort(&getpartlist($url,$symb));	my (@parts) = sort(&getpartlist($symb));
my $header;	my $header;
while ($ctr < $env{'form.totalparts'}) {	while ($ctr < $env{'form.totalparts'}) {
my $partid = $env{'form.partid_'.$ctr};	my $partid = $env{'form.partid_'.$ctr};
Line 2936 sub editgrades {	Line 3081 sub editgrades {
$weight{$partid} = $env{'form.weight_'.$partid};	$weight{$partid} = $env{'form.weight_'.$partid};
$ctr++;	$ctr++;
}	}
	my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
foreach my $partid (@partid) {	foreach my $partid (@partid) {
$header .= '<td align="center"> <b>Old Score</b> </td>'.	$header .= '<td align="center"> <b>Old Score</b> </td>'.
'<td align="center"> <b>New Score</b> </td>';	'<td align="center"> <b>New Score</b> </td>';
Line 2953 sub editgrades {	Line 3099 sub editgrades {
}	}
}	}
foreach my $partid (@partid) {	foreach my $partid (@partid) {
my $display_part=&get_display_part($partid,$url,$symb);	my $display_part=&get_display_part($partid,$symb);
$result .= '<td colspan="'.$columns{$partid}.	$result .= '<td colspan="'.$columns{$partid}.
'" align="center"><b>Part:</b> '.$display_part.	'" align="center"><b>Part:</b> '.$display_part.
' (Weight = '.$weight{$partid}.')</td>';	' (Weight = '.$weight{$partid}.')</td>';
Line 3093 sub editgrades {	Line 3239 sub editgrades {
$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr><tr bgcolor="#ffffde">'.$noupdate;	$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr><tr bgcolor="#ffffde">'.$noupdate;
}	}
$result .= '</table></td></tr></table>'."\n".	$result .= '</table></td></tr></table>'."\n".
&show_grading_menu_form ($symb,$url);	&show_grading_menu_form ($symb);
my $msg = '<br /><b>Number of records updated = '.$rec_update.	my $msg = '<br /><b>Number of records updated = '.$rec_update.
' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'.	' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'.
'<b>Total number of students = '.$env{'form.total'}.'</b><br />';	'<b>Total number of students = '.$env{'form.total'}.'</b><br />';
Line 3196 ENDPICK	Line 3342 ENDPICK
}	}

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

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

sub csvupload_fields {	sub csvupload_fields {
my ($url,$symb) = @_;	my ($symb) = @_;
my (@parts) = &getpartlist($url,$symb);	my (@parts) = &getpartlist($symb);
my @fields=(['ID','Student ID'],	my @fields=(['ID','Student ID'],
['username','Student Username'],	['username','Student Username'],
['domain','Student Domain']);	['domain','Student Domain']);
	my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
foreach my $part (sort(@parts)) {	foreach my $part (sort(@parts)) {
my @datum;	my @datum;
my $display=&Apache::lonnet::metadata($url,$part.'.display');	my $display=&Apache::lonnet::metadata($url,$part.'.display');
Line 3287 CSVFORMJS	Line 3433 CSVFORMJS

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


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

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

if ($env{'form.upfile_associate'} eq 'reverse') {	if ($env{'form.upfile_associate'} eq 'reverse') {
&Apache::loncommon::csv_print_samples($request,\@records);	&Apache::loncommon::csv_print_samples($request,\@records);
Line 3358 sub csvuploadmap {	Line 3503 sub csvuploadmap {
}	}
}	}
&csvuploadmap_footer($request,$i,$keyfields);	&csvuploadmap_footer($request,$i,$keyfields);
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));

return '';	return '';
}	}

sub csvuploadoptions {	sub csvuploadoptions {
my ($request)= @_;	my ($request)= @_;
my ($symb,$url)=&get_symb_and_url($request);	my ($symb)=&get_symb($request);
my $checked=(($env{'form.noFirstLine'})?'1':'0');	my $checked=(($env{'form.noFirstLine'})?'1':'0');
my $ignore=&mt('Ignore First Line');	my $ignore=&mt('Ignore First Line');
$request->print(<<ENDPICK);	$request->print(<<ENDPICK);
Line 3403 ENDPICK	Line 3548 ENDPICK
# FIXME do a check for any invalid user ids?...	# FIXME do a check for any invalid user ids?...
$request->print('<input type="submit" value="Assign Grades" /><br />	$request->print('<input type="submit" value="Assign Grades" /><br />
<hr /></form>'."\n");	<hr /></form>'."\n");
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));
return '';	return '';
}	}

Line 3426 sub get_fields {	Line 3571 sub get_fields {

sub csvuploadassign {	sub csvuploadassign {
my ($request)= @_;	my ($request)= @_;
my ($symb,$url)=&get_symb_and_url($request);	my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
	my $error_msg = '';
&Apache::loncommon::load_tmp_file($request);	&Apache::loncommon::load_tmp_file($request);
my @gradedata = &Apache::loncommon::upfile_record_sep();	my @gradedata = &Apache::loncommon::upfile_record_sep();
if ($env{'form.noFirstLine'}) { shift(@gradedata); }	if ($env{'form.noFirstLine'}) { shift(@gradedata); }
Line 3480 sub csvuploadassign {	Line 3626 sub csvuploadassign {
my $part=$1;	my $part=$1;
my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',	my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',
$symb,$domain,$username);	$symb,$domain,$username);
$entries{$fields{$dest}}=~s/\s//g;	if ($wgt) {
my $pcr=$entries{$fields{$dest}} / $wgt;	$entries{$fields{$dest}}=~s/\s//g;
my $award='correct_by_override';	my $pcr=$entries{$fields{$dest}} / $wgt;
$grades{"resource.$part.awarded"}=$pcr;	my $award='correct_by_override';
$grades{"resource.$part.solved"}=$award;	$grades{"resource.$part.awarded"}=$pcr;
$points{$part}=1;	$grades{"resource.$part.solved"}=$award;
	$points{$part}=1;
	} else {
	$error_msg = "<br />" .
	&mt("Some point values were assigned"
	." for problems with a weight "
	."of zero. These values were "
	."ignored.");
	}
} else {	} else {
if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} }	if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} }
if ($dest=~/stores_(.*)_solved/) { if ($points{$1}) {next;} }	if ($dest=~/stores_(.*)_solved/) { if ($points{$1}) {next;} }
Line 3516 sub csvuploadassign {	Line 3670 sub csvuploadassign {
}	}
$request->print("<br />Stored $countdone students\n");	$request->print("<br />Stored $countdone students\n");
if (@skipped) {	if (@skipped) {
$request->print('<p<font size="+1"><b>Skipped Students</b></font></p>');	$request->print('<p><font size="+1"><b>Skipped Students</b></font></p>');
foreach my $student (@skipped) { $request->print("$student<br />\n"); }	foreach my $student (@skipped) { $request->print("$student<br />\n"); }
}	}
if (@notallowed) {	if (@notallowed) {
Line 3524 sub csvuploadassign {	Line 3678 sub csvuploadassign {
foreach my $student (@notallowed) { $request->print("$student<br />\n"); }	foreach my $student (@notallowed) { $request->print("$student<br />\n"); }
}	}
$request->print("<br />\n");	$request->print("<br />\n");
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));
return '';	return $error_msg;
}	}
#------------- end of section for handling csv file upload ---------	#------------- end of section for handling csv file upload ---------
#	#
Line 3554 function checkPickOne(formname) {	Line 3708 function checkPickOne(formname) {
</script>	</script>
LISTJAVASCRIPT	LISTJAVASCRIPT
&commonJSfunctions($request);	&commonJSfunctions($request);
my ($symb,$url) = &get_symb_and_url($request);	my ($symb) = &get_symb($request);
my $cdom = $env{"course.$env{'request.course.id'}.domain"};	my $cdom = $env{"course.$env{'request.course.id'}.domain"};
my $cnum = $env{"course.$env{'request.course.id'}.num"};	my $cnum = $env{"course.$env{'request.course.id'}.num"};
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};	my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
Line 3576 LISTJAVASCRIPT	Line 3730 LISTJAVASCRIPT
'>'.$showtitle.'</option>'."\n";	'>'.$showtitle.'</option>'."\n";
$ctr++;	$ctr++;
}	}
$result.= '</select>'."<br>\n";	$result.= '</select>'."<br />\n";
$ctr=0;	$ctr=0;
foreach (@$titles) {	foreach (@$titles) {
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
Line 3598 LISTJAVASCRIPT	Line 3752 LISTJAVASCRIPT
$result.='<input type="hidden" name="section" value="'.$getsec.'" />'."\n".	$result.='<input type="hidden" name="section" value="'.$getsec.'" />'."\n".
'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".	'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".
'<input type="hidden" name="command" value="displayPage" />'."\n".	'<input type="hidden" name="command" value="displayPage" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";

Line 3607 LISTJAVASCRIPT	Line 3760 LISTJAVASCRIPT

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

my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</b><br>'.	my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</b><br />'.
'<table border="0"><tr><td bgcolor="#777777">'.	'<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">'.	'<table border="0"><tr bgcolor="#e6ffff">'.
'<td align="right"> <b>No.</b></td>'.	'<td align="right"> <b>No.</b></td>'.
Line 3637 LISTJAVASCRIPT	Line 3790 LISTJAVASCRIPT
$studentTable.='<input type="button" '.	$studentTable.='<input type="button" '.
'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";	'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";

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

return '';	return '';
Line 3670 sub getSymbMap {	Line 3823 sub getSymbMap {
sub displayPage {	sub displayPage {
my ($request) = shift;	my ($request) = shift;

my ($symb,$url) = &get_symb_and_url($request);	my ($symb) = &get_symb($request);
my $cdom = $env{"course.$env{'request.course.id'}.domain"};	my $cdom = $env{"course.$env{'request.course.id'}.domain"};
my $cnum = $env{"course.$env{'request.course.id'}.num"};	my $cnum = $env{"course.$env{'request.course.id'}.num"};
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};	my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
Line 3688 sub displayPage {	Line 3841 sub displayPage {

if (!&canview($usec)) {	if (!&canview($usec)) {
$request->print('<font color="red">Unable to view requested student.('.$env{'form.student'}.')</font>');	$request->print('<font color="red">Unable to view requested student.('.$env{'form.student'}.')</font>');
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>';	my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>';
Line 3702 sub displayPage {	Line 3855 sub displayPage {
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {	if (!$map) {
$request->print('<font color="red">Unable to view requested sequence. ('.$resUrl.')</font>');	$request->print('<font color="red">Unable to view requested sequence. ('.$resUrl.')</font>');
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
my $iterator = $navmap->getIterator($map->map_start(),	my $iterator = $navmap->getIterator($map->map_start(),
Line 3714 sub displayPage {	Line 3867 sub displayPage {
'<input type="hidden" name="student" value="'.$env{'form.student'}.'" />'."\n".	'<input type="hidden" name="student" value="'.$env{'form.student'}.'" />'."\n".
'<input type="hidden" name="page" value="'.$pageTitle.'" />'."\n".	'<input type="hidden" name="page" value="'.$pageTitle.'" />'."\n".
'<input type="hidden" name="title" value="'.$env{'form.title'}.'" />'."\n".	'<input type="hidden" name="title" value="'.$env{'form.title'}.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="overRideScore" value="no" />'."\n".	'<input type="hidden" name="overRideScore" value="no" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";
Line 3729 sub displayPage {	Line 3881 sub displayPage {
'<td align="center"><b> Prob. </b></td>'.	'<td align="center"><b> Prob. </b></td>'.
'<td><b> '.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';	'<td><b> '.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';

	&Apache::lonxml::clear_problem_counter();
my ($depth,$question,$prob) = (1,1,1);	my ($depth,$question,$prob) = (1,1,1);
$iterator->next(); # skip the first BEGIN_MAP	$iterator->next(); # skip the first BEGIN_MAP
my $curRes = $iterator->next(); # for "current resource"	my $curRes = $iterator->next(); # for "current resource"
Line 3741 sub displayPage {	Line 3894 sub displayPage {
my $title = $curRes->compTitle();	my $title = $curRes->compTitle();
my $symbx = $curRes->symb();	my $symbx = $curRes->symb();
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.	$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).' parts)').'</td>';	(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';
$studentTable.='<td valign="top">';	$studentTable.='<td valign="top">';
if ($env{'form.vProb'} eq 'yes' ) {	if ($env{'form.vProb'} eq 'yes' ) {
$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,	$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
Line 3752 sub displayPage {	Line 3905 sub displayPage {
$companswer =~ s\|</form>\|\|g;	$companswer =~ s\|</form>\|\|g;
# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>	# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
# $companswer =~ s/$1/ /ms;	# $companswer =~ s/$1/ /ms;
# $request->print('match='.$1."<br>\n");	# $request->print('match='.$1."<br />\n");
# }	# }
# $companswer =~ s\|<table border=\"1\">\|<table border=\"0\">\|g;	# $companswer =~ s\|<table border=\"1\">\|<table border=\"0\">\|g;
$studentTable.=' <b>'.$title.'</b> <br> <b>Correct answer:</b><br>'.$companswer;	$studentTable.=' <b>'.$title.'</b> <br /> <b>Correct answer:</b><br />'.$companswer;
}	}

my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);	my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
Line 3802 sub displayPage {	Line 3955 sub displayPage {
'<input type="button" value="Save" '.	'<input type="button" value="Save" '.
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
'</form>'."\n";	'</form>'."\n";
$studentTable.=&show_grading_menu_form($symb,$url);	$studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);	$request->print($studentTable);

return '';	return '';
Line 3811 sub displayPage {	Line 3964 sub displayPage {
sub displaySubByDates {	sub displaySubByDates {
my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;	my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
my $isCODE=0;	my $isCODE=0;
	my $isTask = ($symb =~/\.task$/);
if (exists($record->{'resource.CODE'})) { $isCODE=1; }	if (exists($record->{'resource.CODE'})) { $isCODE=1; }
my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.	my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
'<table border="0" width="100%"><tr bgcolor="#e6ffff">'.	'<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
Line 3825 sub displaySubByDates {	Line 3979 sub displaySubByDates {
if (!exists($$record{'1:timestamp'})) {	if (!exists($$record{'1:timestamp'})) {
return '<br /> <font color="red">Nothing submitted - no attempts</font><br />';	return '<br /> <font color="red">Nothing submitted - no attempts</font><br />';
}	}

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

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


# next if ($$record{"$version:resource.$partid.solved"} eq '');	# next if ($$record{"$version:resource.$partid.solved"} eq '');
my $display_part=&get_display_part($partid,undef,$symb);	my $display_part=&get_display_part($partid,$symb);
foreach my $matchKey (@matchKey) {	foreach my $matchKey (@matchKey) {
if (exists($$record{$version.':'.$matchKey}) &&	if (exists($$record{$version.':'.$matchKey}) &&
$$record{$version.':'.$matchKey} ne '') {	$$record{$version.':'.$matchKey} ne '') {
my ($responseId)=($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/);
	my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
	: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
	#&Apache::lonnet::logthis("match $matchKey $responseId (".$$record{$version.':'.$matchKey});
$displaySub[0].='<b>Part:</b> '.$display_part.' ';	$displaySub[0].='<b>Part:</b> '.$display_part.' ';
$displaySub[0].='<font color="#999999">(ID '.	$displaySub[0].='<font color="#999999">(ID '.
$responseId.')</font> <b>';	$responseId.')</font> <b>';
if ($$record{"$version:resource.$partid.tries"} eq '') {	if ($$record{"$where.$partid.tries"} eq '') {
$displaySub[0].='Trial not counted';	$displaySub[0].='Trial not counted';
} else {	} else {
$displaySub[0].='Trial '.	$displaySub[0].='Trial '.
$$record{"$version:resource.$partid.tries"};	$$record{"$where.$partid.tries"};
}	}
my $responseType=$responseType->{$partid}->{$responseId};	my $responseType=($isTask ? 'Task'
	: $responseType->{$partid}->{$responseId});
if (!exists($orders{$partid})) { $orders{$partid}={}; }	if (!exists($orders{$partid})) { $orders{$partid}={}; }
if (!exists($orders{$partid}->{$responseId})) {	if (!exists($orders{$partid}->{$responseId})) {
$orders{$partid}->{$responseId}=	$orders{$partid}->{$responseId}=
&get_order($partid,$responseId,$symb,$uname,$udom);	&get_order($partid,$responseId,$symb,$uname,$udom);
}	}
$displaySub[0].='</b>  '.	$displaySub[0].='</b>  '.
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:").'<br />';	&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
}	}
}	}
if (exists $$record{"$version:resource.$partid.award"}) {	if (exists($$record{"$where.$partid.checkedin"})) {
	$displaySub[1].='Checked in by '.
	$$record{"$where.$partid.checkedin"}.' into slot '.
	$$record{"$where.$partid.checkedin.slot"}.
	'<br />';
	}
	if (exists $$record{"$where.$partid.award"}) {
$displaySub[1].='<b>Part:</b> '.$display_part.'  '.	$displaySub[1].='<b>Part:</b> '.$display_part.'  '.
lc($$record{"$version:resource.$partid.award"}).' '.	lc($$record{"$where.$partid.award"}).' '.
$mark{$$record{"$version:resource.$partid.solved"}}.	$mark{$$record{"$where.$partid.solved"}}.
'<br />';	'<br />';
}	}
if (exists $$record{"$version:resource.$partid.regrader"}) {	if (exists $$record{"$where.$partid.regrader"}) {
$displaySub[2].=$$record{"$version:resource.$partid.regrader"}.	$displaySub[2].=$$record{"$where.$partid.regrader"}.
	' (<b>'.&mt('Part').':</b> '.$display_part.')';
	} elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) {
	$displaySub[2].=
	$$record{"$version:resource.$partid.regrader"}.
' (<b>'.&mt('Part').':</b> '.$display_part.')';	' (<b>'.&mt('Part').':</b> '.$display_part.')';
}	}
}	}
Line 3898 sub updateGradeByPage {	Line 4078 sub updateGradeByPage {
my $usec=$classlist->{$env{'form.student'}}[5];	my $usec=$classlist->{$env{'form.student'}}[5];
if (!&canmodify($usec)) {	if (!&canmodify($usec)) {
$request->print('<font color="red">Unable to modify requested student.('.$env{'form.student'}.'</font>');	$request->print('<font color="red">Unable to modify requested student.('.$env{'form.student'}.'</font>');
$request->print(&show_grading_menu_form($env{'form.symb'},$env{'form.url'}));	$request->print(&show_grading_menu_form($env{'form.symb'}));
return;	return;
}	}
my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>';	my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>';
Line 3912 sub updateGradeByPage {	Line 4092 sub updateGradeByPage {
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {	if (!$map) {
$request->print('<font color="red">Unable to grade requested sequence. ('.$resUrl.')</font>');	$request->print('<font color="red">Unable to grade requested sequence. ('.$resUrl.')</font>');
my ($symb,$url)=&get_symb_and_url($request);	my ($symb)=&get_symb($request);
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
my $iterator = $navmap->getIterator($map->map_start(),	my $iterator = $navmap->getIterator($map->map_start(),
Line 3938 sub updateGradeByPage {	Line 4118 sub updateGradeByPage {
my $title = $curRes->compTitle();	my $title = $curRes->compTitle();
my $symbx = $curRes->symb();	my $symbx = $curRes->symb();
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.	$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).' parts)').'</td>';	(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';	$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';

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

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

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

sub defaultFormData {	sub defaultFormData {
my ($symb,$url)=@_;	my ($symb)=@_;
return '	return '
<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
}	}
Line 4067 sub scantron_filenames {	Line 4245 sub scantron_filenames {
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};	my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,	my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
&Apache::loncommon::propath($cdom,$cname));	&propath($cdom,$cname));
my @possiblenames;	my @possiblenames;
foreach my $filename (sort(@files)) {	foreach my $filename (sort(@files)) {
($filename)=split(/&/,$filename);	($filename)=split(/&/,$filename);
Line 4131 sub scantron_CODEunique {	Line 4309 sub scantron_CODEunique {

sub scantron_selectphase {	sub scantron_selectphase {
my ($r,$file2grade) = @_;	my ($r,$file2grade) = @_;
my ($symb,$url)=&get_symb_and_url($r);	my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $sequence_selector=&getSequenceDropDown($r,$symb);	my $sequence_selector=&getSequenceDropDown($r,$symb);
my $default_form_data=&defaultFormData($symb,$url);	my $default_form_data=&defaultFormData($symb);
my $grading_menu_button=&show_grading_menu_form($symb,$url);	my $grading_menu_button=&show_grading_menu_form($symb);
my $file_selector=&scantron_uploads($file2grade);	my $file_selector=&scantron_uploads($file2grade);
my $format_selector=&scantron_scantab();	my $format_selector=&scantron_scantab();
my $CODE_selector=&scantron_CODElist();	my $CODE_selector=&scantron_CODElist();
Line 4175 sub scantron_selectphase {	Line 4353 sub scantron_selectphase {
<td> Options: </td>	<td> Options: </td>
<td>	<td>
<label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />	<label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />
<label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections</label>	<label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections</label> <br />
	<label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> Skip hidden resources when grading</label>
</td>	</td>
</tr>	</tr>
<tr bgcolor="#ffffe6">	<tr bgcolor="#ffffe6">
Line 4206 SCANTRONFORM	Line 4385 SCANTRONFORM
<tr bgcolor="#ffffe6">	<tr bgcolor="#ffffe6">
<td>	<td>
SCANTRONFORM	SCANTRONFORM
my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));	my $default_form_data=&defaultFormData(&get_symb($r,1));
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};	my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
$r->print(<<UPLOAD);	$r->print(<<UPLOAD);
Line 4504 sub scantron_find_student {	Line 4683 sub scantron_find_student {

sub scantron_filter {	sub scantron_filter {
my ($curres)=@_;	my ($curres)=@_;
# randomout is dysfunctional at best for this purpose
if (ref($curres) && $curres->is_problem()) { #&& !$curres->randomout) {	if (ref($curres) && $curres->is_problem()) {
	# if the user has asked to not have either hidden
	# or 'randomout' controlled resources to be graded
	# don't include them
	if ($env{'form.scantron_options_hidden'} eq 'ignore_hidden'
	&& $curres->randomout) {
	return 0;
	}
return 1;	return 1;
}	}
return 0;	return 0;
Line 4600 sub remember_current_skipped {	Line 4786 sub remember_current_skipped {
$to_remember{$i}=1;	$to_remember{$i}=1;
}	}
}	}
&Apache::lonnet::logthis('remembering '.join(':',%to_remember));
&scan_data($scan_data,'remember_skipping',join(':',%to_remember));	&scan_data($scan_data,'remember_skipping',join(':',%to_remember));
&scantron_putfile(undef,$scan_data);	&scantron_putfile(undef,$scan_data);
}	}
Line 4647 STUFF	Line 4832 STUFF

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

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

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

# do the detection of only doing skipped records first befroe we delete	# do the detection of only doing skipped records first befroe we delete
# them when doing the corrections reset	# them when doing the corrections reset
Line 4722 sub scantron_validate_file {	Line 4908 sub scantron_validate_file {
$r->print("<p>Gathering neccessary info.</p>");$r->rflush();	$r->print("<p>Gathering neccessary info.</p>");$r->rflush();
#get the student pick code ready	#get the student pick code ready
$r->print(&Apache::loncommon::studentbrowser_javascript());	$r->print(&Apache::loncommon::studentbrowser_javascript());
my $max_bubble=&scantron_get_maxbubble($r);	my $max_bubble=&scantron_get_maxbubble();
my $result=&scantron_form_start($max_bubble).$default_form_data;	my $result=&scantron_form_start($max_bubble).$default_form_data;
$r->print($result);	$r->print($result);

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

Line 4895 sub scantron_put_line {	Line 5088 sub scantron_put_line {
$scanlines->{'corrected'}[$i]=$newline;	$scanlines->{'corrected'}[$i]=$newline;
}	}

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

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

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

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

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

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

	return (0,$currentphase+1);
	}

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

Line 4965 sub scantron_get_correction {	Line 5197 sub scantron_get_correction {
#the previous one or the current one	#the previous one or the current one

$r->print("<p><b>An error was detected ($error)</b>");	$r->print("<p><b>An error was detected ($error)</b>");
if ( defined($$scan_record{'scantron.PaperID'}) ) {	if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {
$r->print(" for PaperID <tt>".	$r->print(" for PaperID <tt>".
$$scan_record{'scantron.PaperID'}."</tt> \n");	$$scan_record{'scantron.PaperID'}."</tt> \n");
} else {	} else {
Line 5041 function change_radio(field) {	Line 5273 function change_radio(field) {
</script>	</script>
ENDSCRIPT	ENDSCRIPT
my $href="/adm/pickcode?".	my $href="/adm/pickcode?".
"form=".&Apache::lonnet::escape("scantronupload").	"form=".&escape("scantronupload").
"&scantron_format=".&Apache::lonnet::escape($env{'form.scantron_format'}).	"&scantron_format=".&escape($env{'form.scantron_format'}).
"&scantron_CODElist=".&Apache::lonnet::escape($env{'form.scantron_CODElist'}).	"&scantron_CODElist=".&escape($env{'form.scantron_CODElist'}).
"&curCODE=".&Apache::lonnet::escape($$scan_record{'scantron.CODE'}).	"&curCODE=".&escape($$scan_record{'scantron.CODE'}).
"&scantron_selectfile=".&Apache::lonnet::escape($env{'form.scantron_selectfile'});	"&scantron_selectfile=".&escape($env{'form.scantron_selectfile'});
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");	if ($env{'form.scantron_CODElist'} =~ /\S/) {
$r->print("\n<br />");	$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");
	$r->print("\n<br />");
	}
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use </label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" /> as the CODE.");	$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use </label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" /> as the CODE.");
$r->print("\n<br /><br />");	$r->print("\n<br /><br />");
} elsif ($error eq 'doublebubble') {	} elsif ($error eq 'doublebubble') {
Line 5221 sub scantron_validate_doublebubble {	Line 5455 sub scantron_validate_doublebubble {
return (0,$currentphase+1);	return (0,$currentphase+1);
}	}

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

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

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

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

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

my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
Line 5336 SCANTRONFORM	Line 5571 SCANTRONFORM
next;	next;
}	}
($uname,$udom)=split(/:/,$uname);	($uname,$udom)=split(/:/,$uname);
&Apache::lonnet::delenv('form.counter');
	&Apache::lonxml::clear_problem_counter();
&Apache::lonnet::appenv(%$scan_record);	&Apache::lonnet::appenv(%$scan_record);

my $i=0;	my $i=0;
Line 5364 SCANTRONFORM	Line 5600 SCANTRONFORM
$completedstudents{$uname}={'line'=>$line};	$completedstudents{$uname}={'line'=>$line};
if (&Apache::loncommon::connection_aborted($r)) { last; }	if (&Apache::loncommon::connection_aborted($r)) { last; }
} continue {	} continue {
&Apache::lonnet::delenv('form.counter');	&Apache::lonxml::clear_problem_counter();
&Apache::lonnet::delenv('scantron\.');	&Apache::lonnet::delenv('scantron\.');
}	}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
Line 5372 SCANTRONFORM	Line 5608 SCANTRONFORM
# $r->print("<p>took $lasttime</p>");	# $r->print("<p>took $lasttime</p>");

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

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

sub scantron_upload_scantron_data_save {	sub scantron_upload_scantron_data_save {
my($r)=@_;	my($r)=@_;
my ($symb,$url)=&get_symb_and_url($r,1);	my ($symb)=&get_symb($r,1);
my $doanotherupload=	my $doanotherupload=
'<br /><form action="/adm/grades" method="post">'."\n".	'<br /><form action="/adm/grades" method="post">'."\n".
'<input type="hidden" name="command" value="scantronupload" />'."\n".	'<input type="hidden" name="command" value="scantronupload" />'."\n".
Line 5425 sub scantron_upload_scantron_data_save {	Line 5661 sub scantron_upload_scantron_data_save {
$env{'form.domainid'}.'_'.$env{'form.courseid'})) {	$env{'form.domainid'}.'_'.$env{'form.courseid'})) {
$r->print("You are not allowed to upload Scantron data to the requested course.<br />");	$r->print("You are not allowed to upload Scantron data to the requested course.<br />");
if ($symb) {	if ($symb) {
$r->print(&show_grading_menu_form($symb,$url));	$r->print(&show_grading_menu_form($symb));
} else {	} else {
$r->print($doanotherupload);	$r->print($doanotherupload);
}	}
Line 5470 sub scantron_upload_scantron_data_save {	Line 5706 sub scantron_upload_scantron_data_save {
sub valid_file {	sub valid_file {
my ($requested_file)=@_;	my ($requested_file)=@_;
foreach my $filename (sort(&scantron_filenames())) {	foreach my $filename (sort(&scantron_filenames())) {
&Apache::lonnet::logthis("$requested_file $filename");
if ($requested_file eq $filename) { return 1; }	if ($requested_file eq $filename) { return 1; }
}	}
return 0;	return 0;
Line 5478 sub valid_file {	Line 5713 sub valid_file {

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

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

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

$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".	$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".	'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".	'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".
'<input type="hidden" name="command" value="" />'."\n".	'<input type="hidden" name="command" value="" />'."\n".
Line 5607 GRADINGMENUJS	Line 5840 GRADINGMENUJS
'<input type="hidden" name="gradingMenu" value="1" />'."\n".	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";	'<input type="hidden" name="showgrading" value="yes" />'."\n";

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

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

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

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

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

$result.='<tr bgcolor="#ffffe6"><td><br />'.	$result.='<tr bgcolor="#ffffe6"><td><br />'.
Line 5658 GRADINGMENUJS	Line 5891 GRADINGMENUJS

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

$result.='<table width="100%" border=0>';	$result.='<table width="100%" border="0">';
$result.='<tr bgcolor="#ffffe6"><td>'.	$result.='<tr bgcolor="#ffffe6"><td>'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
' '.&mt('scores from file').' </td></tr>'."\n";	' '.&mt('scores from file').' </td></tr>'."\n";
Line 5672 GRADINGMENUJS	Line 5905 GRADINGMENUJS
'<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.	'<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
' '.&mt('receipt').': '.	' '.&mt('receipt').': '.
&Apache::lonnet::recprefix($env{'request.course.id'}).	&Apache::lonnet::recprefix($env{'request.course.id'}).
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')">'.	'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'.
'</td></tr>'."\n";	'</td></tr>'."\n";
}	}
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.	$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
Line 5722 sub handler {	Line 5955 sub handler {
$request->send_http_header;	$request->send_http_header;
return '' if $request->header_only;	return '' if $request->header_only;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
my $url=$env{'form.url'};	my $symb=&get_symb($request,1);
my $symb=$env{'form.symb'};
my @commands=&Apache::loncommon::get_env_multiple('form.command');	my @commands=&Apache::loncommon::get_env_multiple('form.command');
my $command=$commands[0];	my $command=$commands[0];
if ($#commands > 0) {	if ($#commands > 0) {
&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));	&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
}	}
if (!$url) {	$request->print(&Apache::loncommon::start_page('Grading'));
my ($temp1,$temp2);	if ($symb eq '' && $command eq '') {
($temp1,$temp2,$env{'form.url'})=&Apache::lonnet::decode_symb($symb);
$url = $env{'form.url'};
}
&send_header($request);
if ($url eq '' && $symb eq '' && $command eq '') {
if ($env{'user.adv'}) {	if ($env{'user.adv'}) {
if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&	if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
($env{'form.codethree'})) {	($env{'form.codethree'})) {
Line 5825 sub handler {	Line 6052 sub handler {
$request->print("Access Denied ($command)");	$request->print("Access Denied ($command)");
}	}
}	}
&send_footer($request);	$request->print(&Apache::loncommon::end_page());
return '';	return '';
}	}

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

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

1;	1;

__END__;	__END__;

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

Removed from v.1.313
changed lines
	Added in v.1.368