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.448 and 1.485

version 1.448, 2007/10/09 10:31:21	version 1.485, 2007/11/08 01:48:18
Line 35 use Apache::loncommon;	Line 35 use Apache::loncommon;
use Apache::lonhtmlcommon;	use Apache::lonhtmlcommon;
use Apache::lonnavmaps;	use Apache::lonnavmaps;
use Apache::lonhomework;	use Apache::lonhomework;
	use Apache::lonpickcode;
use Apache::loncoursedata;	use Apache::loncoursedata;
use Apache::lonmsg();	use Apache::lonmsg();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
Line 56 my %first_bubble_line = (); # First bubb	Line 57 my %first_bubble_line = (); # First bubb


sub save_bubble_lines {	sub save_bubble_lines {
&Apache::lonnet::logthis("Saving bubble_lines...");
foreach my $line (keys(%bubble_lines_per_response)) {	foreach my $line (keys(%bubble_lines_per_response)) {
&Apache::lonnet::logthis("Saving form.scantron.bubblelines.$line value: $bubble_lines_per_response{$line}");
$env{"form.scantron.bubblelines.$line"} = $bubble_lines_per_response{$line};	$env{"form.scantron.bubblelines.$line"} = $bubble_lines_per_response{$line};
$env{"form.scantron.first_bubble_line.$line"} =	$env{"form.scantron.first_bubble_line.$line"} =
$first_bubble_line{$line};	$first_bubble_line{$line};
Line 71 sub restore_bubble_lines {	Line 70 sub restore_bubble_lines {
%bubble_lines_per_response = ();	%bubble_lines_per_response = ();
while ($env{"form.scantron.bubblelines.$line"}) {	while ($env{"form.scantron.bubblelines.$line"}) {
my $value = $env{"form.scantron.bubblelines.$line"};	my $value = $env{"form.scantron.bubblelines.$line"};
&Apache::lonnet::logthis("Restoring form.scantron.bubblelines.$line value: $value");
$bubble_lines_per_response{$line} = $value;	$bubble_lines_per_response{$line} = $value;
$first_bubble_line{$line} =	$first_bubble_line{$line} =
$env{"form.scantron.first_bubble_line.$line"};	$env{"form.scantron.first_bubble_line.$line"};
Line 86 sub restore_bubble_lines {	Line 84 sub restore_bubble_lines {
sub get_response_bubbles {	sub get_response_bubbles {
my ($parsed_line, $response) = @_;	my ($parsed_line, $response) = @_;

my $bubble_line = $first_bubble_line{$response};
my $bubble_lines= $bubble_lines_per_response{$response};	my $bubble_line = $first_bubble_line{$response-1} +1;
	my $bubble_lines= $bubble_lines_per_response{$response-1};

my $selected = "";	my $selected = "";

for (my $bline = 0; $bline < $bubble_lines; $bline++) {	for (my $bline = 0; $bline < $bubble_lines; $bline++) {
$selected .= $$parsed_line{"scantron.$bubble_line.answer"};	$selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":";
$bubble_line++;	$bubble_line++;
}	}
return $selected;	return $selected;
Line 171 sub get_symb {	Line 171 sub get_symb {
sub nameUserString {	sub nameUserString {
my ($type,$fullname,$uname,$udom) = @_;	my ($type,$fullname,$uname,$udom) = @_;
if ($type eq 'header') {	if ($type eq 'header') {
return '<b> Fullname </b><span class="LC_internal_info">(Username)</span>';	return '<b> '.&mt('Fullname').' </b><span class="LC_internal_info">('.&mt('Username').')</span>';
} else {	} else {
return ' '.$fullname.'<span class="LC_internal_info"> ('.$uname.	return ' '.$fullname.'<span class="LC_internal_info"> ('.$uname.
($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>';	($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>';
Line 254 sub showResourceInfo {	Line 254 sub showResourceInfo {
$partsseen{$partID}=1;	$partsseen{$partID}=1;
}	}
my $display_part=&get_display_part($partID,$symb);	my $display_part=&get_display_part($partID,$symb);
$result.='<td><b>Part: </b>'.$display_part.' <span class="LC_internal_info">'.	$result.='<td>'.&mt('<b>Part: </b>[_1]',$display_part).' <span class="LC_internal_info">'.
$resID.'</span></td>'.	$resID.'</span></td>'.
'<td><b>Type: </b>'.$responsetype.'</td></tr>';	'<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>';
# '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';	# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';
}	}
}	}
$result.='</table>'."\n";	$result.='</table>'."\n";
Line 332 sub cleanRecord {	Line 332 sub cleanRecord {
$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';	$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';
}	}
return '<blockquote><table border="1">'.	return '<blockquote><table border="1">'.
'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.	'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.	'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';	$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'match') {	} elsif ($response eq 'match') {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
Line 352 sub cleanRecord {	Line 352 sub cleanRecord {
$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';	$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';
}	}
return '<blockquote><table border="1">'.	return '<blockquote><table border="1">'.
'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.	'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.'Item ID</span></td>'.	'<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'.
$middlerow.'</tr>'.	$middlerow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.	'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$bottomrow.'</tr>'.'</table></blockquote>';	$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'radiobutton') {	} elsif ($response eq 'radiobutton') {
my %answer=&Apache::lonnet::str2hash($answer);	my %answer=&Apache::lonnet::str2hash($answer);
Line 365 sub cleanRecord {	Line 365 sub cleanRecord {
foreach my $foil (@$order) {	foreach my $foil (@$order) {
if (exists($answer{$foil})) {	if (exists($answer{$foil})) {
if ($foil eq $correct) {	if ($foil eq $correct) {
$toprow.='<td><b>true</b></td>';	$toprow.='<td><b>'.&mt('true').'</b></td>';
} else {	} else {
$toprow.='<td><i>true</i></td>';	$toprow.='<td><i>'.&mt('true').'</i></td>';
}	}
} else {	} else {
$toprow.='<td>false</td>';	$toprow.='<td>'.&mt('false').'</td>';
}	}
$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';	$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';
}	}
return '<blockquote><table border="1">'.	return '<blockquote><table border="1">'.
'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.	'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.	'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';	$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'essay') {	} elsif ($response eq 'essay') {
if (! exists ($env{'form.'.$symb})) {	if (! exists ($env{'form.'.$symb})) {
Line 475 COMMONJSFUNCTIONS	Line 475 COMMONJSFUNCTIONS
#--- Dumps the class list with usernames,list of sections,	#--- Dumps the class list with usernames,list of sections,
#--- section, ids and fullnames for each user.	#--- section, ids and fullnames for each user.
sub getclasslist {	sub getclasslist {
my ($getsec,$filterlist) = @_;	my ($getsec,$filterlist,$getgroup) = @_;
my @getsec;	my @getsec;
	my @getgroup;
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
if (!ref($getsec)) {	if (!ref($getsec)) {
if ($getsec ne '' && $getsec ne 'all') {	if ($getsec ne '' && $getsec ne 'all') {
Line 486 sub getclasslist {	Line 487 sub getclasslist {
@getsec=@{$getsec};	@getsec=@{$getsec};
}	}
if (grep(/^all$/,@getsec)) { undef(@getsec); }	if (grep(/^all$/,@getsec)) { undef(@getsec); }
	if (!ref($getgroup)) {
	if ($getgroup ne '' && $getgroup ne 'all') {
	@getgroup=($getgroup);
	}
	} else {
	@getgroup=@{$getgroup};
	}
	if (grep(/^all$/,@getgroup)) { undef(@getgroup); }

my $classlist=&Apache::loncoursedata::get_classlist();	my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
# Bail out if we were unable to get the classlist	# Bail out if we were unable to get the classlist
return if (! defined($classlist));	return if (! defined($classlist));
	&Apache::loncoursedata::get_group_memberships($classlist,$keylist);
#	#
my %sections;	my %sections;
my %fullnames;	my %fullnames;
Line 506 sub getclasslist {	Line 516 sub getclasslist {
$classlist->{$student}->[&Apache::loncoursedata::CL_FULLNAME()];	$classlist->{$student}->[&Apache::loncoursedata::CL_FULLNAME()];
my $status =	my $status =
$classlist->{$student}->[&Apache::loncoursedata::CL_STATUS()];	$classlist->{$student}->[&Apache::loncoursedata::CL_STATUS()];
	my $group =
	$classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
# filter students according to status selected	# filter students according to status selected
if ($filterlist && (!($stu_status =~ /Any/))) {	if ($filterlist && (!($stu_status =~ /Any/))) {
if (!($stu_status =~ $status)) {	if (!($stu_status =~ $status)) {
delete ($classlist->{$student});	delete($classlist->{$student});
next;	next;
}	}
}	}
	# filter students according to groups selected
	my @stu_groups = split(/,/,$group);
	if (@getgroup) {
	my $exclude = 1;
	foreach my $grp (@getgroup) {
	foreach my $stu_group (@stu_groups) {
	if ($stu_group eq $grp) {
	$exclude = 0;
	}
	}
	if (($grp eq 'none') && !$group) {
	$exclude = 0;
	}
	}
	if ($exclude) {
	delete($classlist->{$student});
	}
	}
$section = ($section ne '' ? $section : 'none');	$section = ($section ne '' ? $section : 'none');
if (&canview($section)) {	if (&canview($section)) {
if (!@getsec \|\| grep(/^\Q$section\E$/,@getsec)) {	if (!@getsec \|\| grep(/^\Q$section\E$/,@getsec)) {
$sections{$section}++;	$sections{$section}++;
$fullnames{$student}=$fullname;	if ($classlist->{$student}) {
	$fullnames{$student}=$fullname;
	}
} else {	} else {
delete($classlist->{$student});	delete($classlist->{$student});
}	}
Line 768 sub listStudents {	Line 800 sub listStudents {
my $cdom = $env{"course.$env{'request.course.id'}.domain"};	my $cdom = $env{"course.$env{'request.course.id'}.domain"};
my $cnum = $env{"course.$env{'request.course.id'}.num"};	my $cnum = $env{"course.$env{'request.course.id'}.num"};
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};	my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
	my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};	my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};

my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';	my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?	$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};

my $result='<h3><span class="LC_info"> '.$viewgrade.	my $result='<h3><span class="LC_info"> '.
' Submissions for a Student or a Group of Students</span></h3>';	&mt($viewgrade.' Submissions for a Student or a Group of Students')
	.'</span></h3>';

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

	my %lt = ( 'multiple' =>
	"Please select a student or group of students before clicking on the Next button.",
	'single' =>
	"Please select the student before clicking on the Next button.",
	);
	%lt = &Apache::lonlocal::texthash(%lt);
$request->print(<<LISTJAVASCRIPT);	$request->print(<<LISTJAVASCRIPT);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function checkSelect(checkBox) {	function checkSelect(checkBox) {
Line 790 sub listStudents {	Line 829 sub listStudents {
ctr++;	ctr++;
}	}
}	}
sense = "a student or group of students";	sense = '$lt{'multiple'}';
} else {	} else {
if (checkBox.checked) {	if (checkBox.checked) {
ctr = 1;	ctr = 1;
}	}
sense = "the student";	sense = '$lt{'single'}';
}	}
if (ctr == 0) {	if (ctr == 0) {
alert("Please select "+sense+" before clicking on the Next button.");	alert(sense);
return false;	return false;
}	}
document.gradesub.submit();	document.gradesub.submit();
Line 818 LISTJAVASCRIPT	Line 857 LISTJAVASCRIPT
my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : '';	my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : '';
my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : '';	my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : '';
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.	my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
"\n".$table.	"\n".$table;
' <b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
'<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n".	$gradeTable .=
'<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n".	' '.
' <b>View Answer: </b><label><input type="radio" name="vAns" value="no" /> no </label>'."\n".	&mt('<b>View Problem Text: </b>[_1]',
'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n".	'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
'<label><input type="radio" name="vAns" value="all" checked="checked" /> all students </label><br />'."\n".	'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n".
' <b>Submissions: </b>'."\n";	'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label>').'<br />'."\n";
	$gradeTable .=
	' '.
	&mt('<b>View Answer: </b>[_1]',
	'<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n".
	'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n".
	'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label>').'<br />'."\n";

	my $submission_options;
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {	if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n";	$submission_options.=
	'<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> '.&mt('essay part only').' </label>'."\n";
}	}
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;	my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
$env{'form.Status'} = $saveStatus;	$env{'form.Status'} = $saveStatus;
$gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".	$submission_options.=
'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".	'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.&mt('last submission only').' </label>'."\n".
'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".	'<label><input type="radio" name="lastSub" value="last" /> '.&mt('last submission & parts info').' </label>'."\n".
'<label><input type="radio" name="lastSub" value="all" /> all details</label><br />'."\n".	'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n".
' <b>Grading Increments:</b> <select name="increment">'.	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>';
'<option value="1">Whole Points</option>'.	$gradeTable .=
'<option value=".5">Half Points</option>'.	' '.
'<option value=".25">Quarter Points</option>'.	&mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n";
'<option value=".1">Tenths of a Point</option>'.
'</select>'.	$gradeTable .=
	' '.
	&mt('<b>Grading Increments:</b> [_1]',
	'<select name="increment">'.
	'<option value="1">'.&mt('Whole Points').'</option>'.
	'<option value=".5">'.&mt('Half Points').'</option>'.
	'<option value=".25">'.&mt('Quarter Points').'</option>'.
	'<option value=".1">'.&mt('Tenths of a Point').'</option>'.
	'</select>');

	$gradeTable .=
&build_section_inputs().	&build_section_inputs().
'<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".
Line 854 LISTJAVASCRIPT	Line 912 LISTJAVASCRIPT
if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {	if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
$gradeTable.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";	$gradeTable.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";
} else {	} else {
$gradeTable.='<b>Student Status:</b> '.	$gradeTable.=&mt('<b>Student Status:</b> [_1]',
&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';	&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />';
}	}

$gradeTable.='To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.	$gradeTable.=&mt('To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
'next to the student\'s name(s). Then click on the Next button.<br />'."\n".	'next to the student\'s name(s). Then click on the Next button.').'<br />'."\n".
'<input type="hidden" name="command" value="processGroup" />'."\n";	'<input type="hidden" name="command" value="processGroup" />'."\n";

# checkall buttons	# checkall buttons
$gradeTable.=&check_script('gradesub', 'stuinfo');	$gradeTable.=&check_script('gradesub', 'stuinfo');
$gradeTable.='<input type="button" '."\n".	$gradeTable.='<input type="button" '."\n".
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
'value="Next->" /> <br />'."\n";	'value="'.&mt('Next->').'" /> <br />'."\n";
$gradeTable.=&check_buttons();	$gradeTable.=&check_buttons();
$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />Check For Plagiarism</label>';	$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />'.&mt('Check For Plagiarism').'</label>';
my ($classlist, undef, $fullname) = &getclasslist($getsec,'1');	my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);
$gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.	$gradeTable.= &Apache::loncommon::start_data_table().
'<table border="0"><tr bgcolor="#e6ffff">';	&Apache::loncommon::start_data_table_header_row();
my $loop = 0;	my $loop = 0;
while ($loop < 2) {	while ($loop < 2) {
$gradeTable.='<td><b> No.</b> </td><td><b> Select </b></td>'.	$gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'.
'<td>'.&nameUserString('header').' Section/Group</td>';	'<th>'.&nameUserString('header').' '.&mt('Section/Group').'</th>';
if ($env{'form.showgrading'} eq 'yes'	if ($env{'form.showgrading'} eq 'yes'
&& $submitonly ne 'queued'	&& $submitonly ne 'queued'
&& $submitonly ne 'all') {	&& $submitonly ne 'all') {
foreach (sort(@$partlist)) {	foreach my $part (sort(@$partlist)) {
my $display_part=&get_display_part((split(/_/))[0],$symb);	my $display_part=
$gradeTable.='<td><b> Part: '.$display_part.	&get_display_part((split(/_/,$part))[0],$symb);
' Status </b></td>';	$gradeTable.=
	'<th>'.&mt('Part: [_1] Status',$display_part).'</th>';
}	}
} elsif ($submitonly eq 'queued') {	} elsif ($submitonly eq 'queued') {
$gradeTable.='<td><b> '.&mt('Queue Status').' </b></td>';	$gradeTable.='<th>'.&mt('Queue Status').' </th>';
}	}
$loop++;	$loop++;
# $gradeTable.='<td></td>' if ($loop%2 ==1);	# $gradeTable.='<td></td>' if ($loop%2 ==1);
}	}
$gradeTable.='</tr>'."\n";	$gradeTable.=&Apache::loncommon::end_data_table_header_row()."\n";

my $ctr = 0;	my $ctr = 0;
foreach my $student (sort	foreach my $student (sort
Line 944 LISTJAVASCRIPT	Line 1003 LISTJAVASCRIPT

$ctr++;	$ctr++;
my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];	my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];
	my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
if ( $perm{'vgr'} eq 'F' ) {	if ( $perm{'vgr'} eq 'F' ) {
$gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);	if ($ctr%2 ==1) {
	$gradeTable.= &Apache::loncommon::start_data_table_row();
	}
$gradeTable.='<td align="right">'.$ctr.' </td>'.	$gradeTable.='<td align="right">'.$ctr.' </td>'.
'<td align="center"><label><input type=checkbox name="stuinfo" value="'.	'<td align="center"><label><input type=checkbox name="stuinfo" value="'.
$student.':'.$$fullname{$student}.':::SECTION'.$section.	$student.':'.$$fullname{$student}.':::SECTION'.$section.
') " />  </label></td>'."\n".'<td>'.	') " />  </label></td>'."\n".'<td>'.
&nameUserString(undef,$$fullname{$student},$uname,$udom).	&nameUserString(undef,$$fullname{$student},$uname,$udom).
' '.$section.'</td>'."\n";	' '.$section.($group ne '' ?'/'.$group:'').'</td>'."\n";

if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {	if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (sort keys(%status)) {	foreach (sort keys(%status)) {
next if (/^resource.*?submitted_by$/);	next if ($_ =~ /^resource.*?submitted_by$/);
$gradeTable.='<td align="center"> '.$status{$_}.' </td>'."\n";	$gradeTable.='<td align="center"> '.&mt($status{$_}).' </td>'."\n";
}	}
}	}
# $gradeTable.='<td></td>' if ($ctr%2 ==1);	# $gradeTable.='<td></td>' if ($ctr%2 ==1);
$gradeTable.='</tr>'."\n" if ($ctr%2 ==0);	if ($ctr%2 ==0) {
	$gradeTable.=&Apache::loncommon::end_data_table_row()."\n";
	}
}	}
}	}
if ($ctr%2 ==1) {	if ($ctr%2 ==1) {
Line 975 LISTJAVASCRIPT	Line 1038 LISTJAVASCRIPT
} elsif ($submitonly eq 'queued') {	} elsif ($submitonly eq 'queued') {
$gradeTable.='<td> </td>';	$gradeTable.='<td> </td>';
}	}
$gradeTable.='</tr>';	$gradeTable.=&Apache::loncommon::end_data_table_row();
}	}

$gradeTable.='</table></td></tr></table>'."\n".	$gradeTable.=&Apache::loncommon::end_data_table()."\n".
'<input type="button" '.	'<input type="button" '.
'onClick="javascript:checkSelect(this.form.stuinfo);" '.	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
'value="Next->" /></form>'."\n";	'value="'.&mt('Next->').'" /></form>'."\n";
if ($ctr == 0) {	if ($ctr == 0) {
my $num_students=(scalar(keys(%$fullname)));	my $num_students=(scalar(keys(%$fullname)));
if ($num_students eq 0) {	if ($num_students eq 0) {
$gradeTable='<br /> <span class="LC_warning">There are no students currently enrolled.</span>';	$gradeTable='<br /> <span class="LC_warning">'.&mt('There are no students currently enrolled.').'</span>';
} else {	} else {
my $submissions='submissions';	my $submissions='submissions';
if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }	if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }
if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; }	if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; }
if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; }	if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; }
$gradeTable='<br /> <span class="LC_warning">'.	$gradeTable='<br /> <span class="LC_warning">'.
'No '.$submissions.' found for this resource for any students. ('.$num_students.	&mt('No '.$submissions.' found for this resource for any students. ([_1] students checked for '.$submissions.')',
' students checked for '.$submissions.')</span><br />';	$num_students).
	'</span><br />';
}	}
} elsif ($ctr == 1) {	} elsif ($ctr == 1) {
$gradeTable =~ s/type=checkbox/type=checkbox checked/;	$gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/;
}	}
$gradeTable.=&show_grading_menu_form($symb);	$gradeTable.=&show_grading_menu_form($symb);
$request->print($gradeTable);	$request->print($gradeTable);
Line 1043 sub check_script {	Line 1107 sub check_script {
}	}

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

pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");	pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");	pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
pDoc.write("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"</span></h3><br /><br />");	pDoc.write("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />");

pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");	pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");	pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
pDoc.write("<td><b>Type</b></td><td><b>Include</b></td><td><b>Message</td></tr>");	pDoc.write("<td><b>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>");
}	}
function displaySubject(msg,shwsel) {	function displaySubject(msg,shwsel) {
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.write("<tr bgcolor=\\"#ffffdd\\">");	pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
pDoc.write("<td>Subject</td>");	pDoc.write("<td>Subject<\\/td>");
pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"></td>");	pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"></td></tr>");	pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>");
}	}

function displaySavedMsg(ctr,msg,shwsel) {	function displaySavedMsg(ctr,msg,shwsel) {
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.write("<tr bgcolor=\\"#ffffdd\\">");	pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
pDoc.write("<td align=\\"center\\">"+ctr+"</td>");	pDoc.write("<td align=\\"center\\">"+ctr+"<\\/td>");
pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"></td>");	pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"</textarea></td></tr>");	pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"<\\/textarea><\\/td><\\/tr>");
}	}

function newMsg(newmsg,shwsel) {	function newMsg(newmsg,shwsel) {
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.write("<tr bgcolor=\\"#ffffdd\\">");	pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
pDoc.write("<td align=\\"center\\">New</td>");	pDoc.write("<td align=\\"center\\">New<\\/td>");
pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"></td>");	pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"</textarea></td></tr>");	pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>");
}	}

function msgTail() {	function msgTail() {
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.write("</table>");	pDoc.write("<\\/table>");
pDoc.write("</td></tr></table> ");	pDoc.write("<\\/td><\\/tr><\\/table> ");
pDoc.write("<input type=\\"button\\" value=\\"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('$end_page_msg_central');	pDoc.write('$end_page_msg_central');
pDoc.close();	pDoc.close();
}	}
Line 1533 INNERJS	Line 1597 INNERJS
hDoc.$docopen;	hDoc.$docopen;
hDoc.write('$start_page_highlight_central');	hDoc.write('$start_page_highlight_central');
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");	hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
hDoc.write("<h3><span class=\\"LC_info\\"> Keyword Highlight Options</span></h3><br /><br />");	hDoc.write("<h3><span class=\\"LC_info\\"> Keyword Highlight Options<\\/span><\\/h3><br /><br />");

hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");	hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");	hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
hDoc.write("<td><b>Text Color</b></td><td><b>Font Size</b></td><td><b>Font Style</td></tr>");	hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>");
}	}

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

function highlightend() {	function highlightend() {
var hDoc = hwdWin.document;	var hDoc = hwdWin.document;
hDoc.write("</table>");	hDoc.write("<\\/table>");
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('$end_page_highlight_central');	hDoc.write('$end_page_highlight_central');
hDoc.close();	hDoc.close();
}	}
Line 1580 sub get_increment {	Line 1644 sub get_increment {
sub gradeBox {	sub gradeBox {
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;	my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
my $checkIcon = '<img alt="'.&mt('Check Mark').	my $checkIcon = '<img alt="'.&mt('Check Mark').
'" src="'.$request->dir_config('lonIconsURL').	'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';
'/check.gif" height="16" border="0" />';
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
my $wgtmsg = ($wgt > 0 ? '(problem weight)' :	my $wgtmsg = ($wgt > 0) ? &mt('(problem weight)')
'<span class="LC_info">problem weight assigned by computer</span>');	: '<span class="LC_info">'.&mt('problem weight assigned by computer').'</span>';
$wgt = ($wgt > 0 ? $wgt : '1');	$wgt = ($wgt > 0 ? $wgt : '1');
my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ?	my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
'' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));	'' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));
my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";	my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
my $display_part=&get_display_part($partid,$symb);	my $display_part= &get_display_part($partid,$symb);
my %last_resets = &get_last_resets($symb,$env{'request.course.id'},	my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
[$partid]);	[$partid]);
my $aggtries = $$record{'resource.'.$partid.'.tries'};	my $aggtries = $$record{'resource.'.$partid.'.tries'};
if ($last_resets{$partid}) {	if ($last_resets{$partid}) {
$aggtries = &get_num_tries($record,$last_resets{$partid},$partid);	$aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
}	}
$result.='<table border="0"><tr><td>'.	$result.='<table border="0"><tr>';
'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
my $ctr = 0;	my $ctr = 0;
my $thisweight = 0;	my $thisweight = 0;
my $increment = &get_increment();	my $increment = &get_increment();
$result.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across
	my $radio.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across
while ($thisweight<=$wgt) {	while ($thisweight<=$wgt) {
$result.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.	$radio.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.	'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
$thisweight.')" value="'.$thisweight.'" '.	$thisweight.')" value="'.$thisweight.'" '.
($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";	($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');	$radio.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
$thisweight += $increment;	$thisweight += $increment;
$ctr++;	$ctr++;
}	}
$result.='</tr></table>';	$radio.='</tr></table>';
$result.='</td><td> <b>or</b> </td>'."\n";
$result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.	my $line.='<input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
($score ne ''? ' value = "'.$score.'"':'').' size="4" '.	($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
'onChange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','.	'onChange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','.
$wgt.')" /></td>'."\n";	$wgt.')" /></td>'."\n";
$result.='<td>/'.$wgt.' '.$wgtmsg.	$line.='<td>/'.$wgt.' '.$wgtmsg.
($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : '').	($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : '').
' </td><td>'."\n";	' </td><td>'."\n";
$result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.	$line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {	if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
$result.='<option></option>'.	$line.='<option></option>'.
'<option selected="selected">excused</option>';	'<option value="excused" selected="selected">'.&mt('excused').'</option>';
} else {	} else {
$result.='<option selected="selected"></option>'.	$line.='<option selected="selected"></option>'.
'<option>excused</option>';	'<option value="excused" >'.&mt('excused').'</option>';
}	}
$result.='<option>reset status</option></select>'."\n";	$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";
$result.="  \n";

	$result .=
	&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);


	$result.='</tr></table>'."\n";
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".	$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.	'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
Line 1639 sub gradeBox {	Line 1708 sub gradeBox {
$$record{'resource.'.$partid.'.tries'}.'" />'."\n".	$$record{'resource.'.$partid.'.tries'}.'" />'."\n".
'<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.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);	$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);
return $result;	return $result;
}	}
Line 1671 sub handback_box {	Line 1739 sub handback_box {
'<span class="LC_filename">'.$file_disp.'</span>');	'<span class="LC_filename">'.$file_disp.'</span>');
$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";	$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
$result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';	$result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
$result.='(File will be uploaded when you click on Save & Next below.)<br />';	$result.='('.&mt('File will be uploaded when you click on Save & Next below.').')<br />';
$file_counter++;	$file_counter++;
}	}
}	}
Line 1707 sub show_problem {	Line 1775 sub show_problem {
$companswer=~s\|</form>\|\|g;	$companswer=~s\|</form>\|\|g;
$companswer=~s\|name="submit"\|name="would_have_been_submit"\|g;	$companswer=~s\|name="submit"\|name="would_have_been_submit"\|g;
}	}
my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';	$rendered=
$result.='<table border="0" width="100%">';	'<div class="LC_grade_show_problem_header">'.
if ($viewon) {	&mt('View of the problem').
$result.='<tr><td bgcolor="#e6ffff"><b> ';	'</div><div class="LC_grade_show_problem_problem">'.
if ($mode eq 'both' or $mode eq 'text') {	$rendered.
$result.='View of the problem - ';	'</div>';
} else {	$companswer=
$result.='Correct answer: ';	'<div class="LC_grade_show_problem_header">'.
}	&mt('Correct answer').
$result.=$env{'form.fullname'}.'</b></td></tr>';	'</div><div class="LC_grade_show_problem_problem">'.
}	$companswer.
	'</div>';
	my $result;
if ($mode eq 'both') {	if ($mode eq 'both') {
$result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';	$result=$rendered.$companswer;
$result.='<b>Correct answer:</b><br />'.$companswer;
} elsif ($mode eq 'text') {	} elsif ($mode eq 'text') {
$result.='<tr><td bgcolor="#ffffff">'.$rendered;	$result=$rendered;
} elsif ($mode eq 'answer') {	} elsif ($mode eq 'answer') {
$result.='<tr><td bgcolor="#ffffff">'.$companswer;	$result=$companswer;
}	}
$result.='</td></tr></table>';	$result='<div class="LC_grade_show_problem">'.$result.'</div>';
$result.='</td></tr></table><br />';
return $result;	return $result;
}	}

Line 1784 sub build_section_inputs {	Line 1852 sub build_section_inputs {
# --------------------------- show submissions of a student, option to grade	# --------------------------- show submissions of a student, option to grade
sub submission {	sub submission {
my ($request,$counter,$total) = @_;	my ($request,$counter,$total) = @_;

my ($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'});
Line 1818 sub submission {	Line 1885 sub submission {
if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) {	if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) {
&download_all_link($request, $symb);	&download_all_link($request, $symb);
}	}
$request->print('<h3> <span class="LC_info">Submission Record</span></h3>'."\n".	$request->print('<h3> <span class="LC_info">'.&mt('Submission Record').'</span></h3>'."\n".
'<h4> <b>Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n");	'<h4> '.&mt('<b>Resource: </b> [_1]',$env{'form.probTitle'}).'</h4>'."\n");

if ($env{'form.handgrade'} eq 'no') {
my $checkMark='<br /><br /> <b>Note:</b> Part(s) graded correct by the computer is marked with a '.
$checkIcon.' symbol.'."\n";
$request->print($checkMark);
}

# option to display problem, only once else it cause problems	# option to display problem, only once else it cause problems
# with the form later since the problem has a form.	# with the form later since the problem has a form.
Line 1928 KEYWORDS	Line 1989 KEYWORDS
}	}

# This is where output for one specific student would start	# This is where output for one specific student would start
my $bgcolor='#DDEEDD';	my $add_class = ($counter%2) ? 'LC_grade_show_user_odd_row' : '';
if (int($counter/2) eq $counter) { $bgcolor='#DDDDEE'; }
$request->print("\n\n".	$request->print("\n\n".
'<p><table border="2"><tr><th bgcolor="'.$bgcolor.'">'.$env{'form.fullname'}.'</th></tr><tr><td bgcolor="'.$bgcolor.'">');	'<div class="LC_grade_show_user '.$add_class.'">'.
	'<div class="LC_grade_user_name">'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'</div>'.
	'<div class="LC_grade_show_user_body">'."\n");

if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {	if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {
my $mode;	my $mode;
Line 1943 KEYWORDS	Line 2005 KEYWORDS
$mode='answer';	$mode='answer';
}	}
&Apache::lonxml::clear_problem_counter();	&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,{'request.prefix' => 'ctr'.$counter}));
}	}

my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
Line 1951 KEYWORDS	Line 2013 KEYWORDS

# 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='<div class="LC_grade_submissions">';
'<table border="0" width="100%"><tr bgcolor="#edffff"><td>'."\n";
	$result.='<div class="LC_grade_submissions_header">';
$result.='<b>Fullname: </b>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'<br />'."\n";	$result.= &mt('Submissions');
$result.='<input type="hidden" name="name'.$counter.	$result.='<input type="hidden" name="name'.$counter.
'" value="'.$env{'form.fullname'}.'" />'."\n";	'" value="'.$env{'form.fullname'}.'" />'."\n";
	if ($env{'form.handgrade'} eq 'no') {
	$result.='<span class="LC_grade_check_note">'.
	&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)."</span>\n";

	}



# If any part of the problem is an essay-response (handgraded), then check for collaborators	# If any part of the problem is an essay-response (handgraded), then check for collaborators
my @col_fullnames;	my $fullname;
my ($classlist,$fullname);	my $col_fullnames = [];
if ($env{'form.handgrade'} eq 'yes') {	if ($env{'form.handgrade'} eq 'yes') {
($classlist,undef,$fullname) = &getclasslist('all','0');	(my $sub_result,$fullname,$col_fullnames)=
for (keys (%$handgrade)) {	&check_collaborators($symb,$uname,$udom,\%record,$handgrade,
my $ncol = &Apache::lonnet::EXT('resource.'.$_.	$counter);
'.maxcollaborators',	$result.=$sub_result;
$symb,$udom,$uname);
next if ($ncol <= 0);
s/\_/\./g;
next if ($record{'resource.'.$_.'.collaborators'} eq '');
my @goodcollaborators = ();
my @badcollaborators = ();
foreach (split(/,?\s+/,$record{'resource.'.$_.'.collaborators'})) {
$_ =~ s/[\$\^]//g;
next if ($_ eq '');
my ($co_name,$co_dom) = split /\@\|:/,$_;
$co_dom = $udom if (! defined($co_dom) \|\| $co_dom =~ /^domain$/i);
next if ($co_name eq $uname && $co_dom eq $udom);
# Doing this grep allows 'fuzzy' specification
my @Matches = grep /^$co_name:$co_dom$/i,keys %$classlist;
if (! scalar(@Matches)) {
push @badcollaborators,$_;
} else {
push @goodcollaborators, @Matches;
}
}
if (scalar(@goodcollaborators) != 0) {
$result.='<b>Collaborators: </b>';
foreach (@goodcollaborators) {
my ($lastname,$givenn) = split(/,/,$$fullname{$_});
push @col_fullnames, $givenn.' '.$lastname;
$result.=$$fullname{$_}.'     ';
}
$result.='<br />'."\n";
my ($part)=split(/\./,$_);
$result.='<input type="hidden" name="collaborator'.$counter.
'" value="'.$part.':'.(join ':',@goodcollaborators).'" />'.
"\n";
}
if (scalar(@badcollaborators) > 0) {
$result.='<table border="0"><tr bgcolor="#ffbbbb"><td>';
$result.='This student has submitted ';
$result.=(scalar(@badcollaborators) == 1) ? 'an invalid collaborator' : 'invalid collaborators';
$result .= ': '.join(', ',@badcollaborators);
$result .= '</td></tr></table>';
}
if (scalar(@badcollaborators > $ncol)) {
$result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>';
$result .= 'This student has submitted too many '.
'collaborators. Maximum is '.$ncol.'.';
$result .= '</td></tr></table>';
}
}
}	}
$request->print($result."\n");	$request->print($result."\n");
	$request->print('</div>'."\n");
# print student answer/submission	# print student answer/submission
# Options are (1) Handgaded submission only	# Options are (1) Handgaded submission only
# (2) Last submission, includes submission that is not handgraded	# (2) Last submission, includes submission that is not handgraded
Line 2024 KEYWORDS	Line 2046 KEYWORDS
# (4) The whole record for this student	# (4) The whole record for this student
if ($env{'form.lastSub'} =~ /^(lastonly\|hdgrade)$/) {	if ($env{'form.lastSub'} =~ /^(lastonly\|hdgrade)$/) {
my ($string,$timestamp)= &get_last_submission(\%record);	my ($string,$timestamp)= &get_last_submission(\%record);
my $lastsubonly=''.
($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.	my $lastsubonly;
$$timestamp)."</td></tr>\n";
if ($$timestamp eq '') {	if ($$timestamp eq '') {
$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0];	$lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>';
} else {	} else {
	$lastsubonly = '<div class="LC_grade_submissions_body"> <b>Date Submitted:</b> '.$$timestamp."\n";

my %seenparts;	my %seenparts;
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
foreach my $part (@part_response_id) {	foreach my $part (@part_response_id) {
Line 2052 KEYWORDS	Line 2076 KEYWORDS
}	}
my $responsetype = $responseType->{$partid}->{$respid};	my $responsetype = $responseType->{$partid}->{$respid};
if (!exists($record{"resource.$partid.$respid.submission"})) {	if (!exists($record{"resource.$partid.$respid.submission"})) {
$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.	$lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '.
$display_part.' <span class="LC_internal_info">( ID '.$respid.	$display_part.' <span class="LC_internal_info">( ID '.$respid.
' )</span>   '.	' )</span>   '.
'<span class="LC_warning">Nothing submitted - no attempts</span><br /><br />';	'<span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br /><br /></div>';
next;	next;
}	}
foreach (@$string) {	foreach my $submission (@$string) {
my ($partid,$respid) = /^resource\.([^\.])\.([^\.])\.submission/;	my ($partid,$respid) = ($submission =~ /^resource\.([^\.])\.([^\.])\.submission/);
if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }	if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
my ($ressub,$subval) = split(/:/,$_,2);	my ($ressub,$subval) = split(/:/,$submission,2);
# Similarity check	# Similarity check
my $similar='';	my $similar='';
if($env{'form.checkPlag'}){	if($env{'form.checkPlag'}){
Line 2091 KEYWORDS	Line 2115 KEYWORDS
($env{'form.lastSub'} eq 'hdgrade' &&	($env{'form.lastSub'} eq 'hdgrade' &&
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {	$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
my $display_part=&get_display_part($partid,$symb);	my $display_part=&get_display_part($partid,$symb);
$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.	$lastsubonly.='<div class="LC_grade_submission_part"><b>Part:</b> '.
$display_part.' <span class="LC_internal_info">( ID '.$respid.	$display_part.' <span class="LC_internal_info">( ID '.$respid.
' )</span>   ';	' )</span>   ';
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);	my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
if (@$files) {	if (@$files) {
$lastsubonly.='<br /><span class="LC_warning">Like all files provided by users, this file may contain virusses</span><br />';	$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain virusses').'</span><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.'?rawmode=1" 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 />';
}	}
$lastsubonly.='<b>Submitted Answer: </b>'.	$lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.
&cleanRecord($subval,$responsetype,$symb,$partid,	&cleanRecord($subval,$responsetype,$symb,$partid,
$respid,\%record,$order);	$respid,\%record,$order);
if ($similar) {$lastsubonly.="<br /><br />$similar\n";}	if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
	$lastsubonly.='</div>';
}	}
}	}
}	}
	$lastsubonly.='</div>'."\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($symb);	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)$/) {
Line 2127 KEYWORDS	Line 2152 KEYWORDS

$request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'	$request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
.$udom.'" />'."\n");	.$udom.'" />'."\n");

# return if view submission with no grading option	# return if view submission with no grading option
if ($env{'form.showgrading'} eq '' \|\| (!&canmodify($usec))) {	if ($env{'form.showgrading'} eq '' \|\| (!&canmodify($usec))) {
my $toGrade.='<input type="button" value="Grade Student" '.	my $toGrade.='<input type="button" value="Grade Student" '.
'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''	'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''
.$counter.'\');" target="_self" />  '."\n" if (&canmodify($usec));	.$counter.'\');" target="_self" />  '."\n" if (&canmodify($usec));
$toGrade.='</td></tr></table></td></tr></table>'."\n";	$toGrade.='</div>'."\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);	$toGrade.='</form>'.&show_grading_menu_form($symb);
Line 2141 KEYWORDS	Line 2165 KEYWORDS
$request->print($toGrade);	$request->print($toGrade);
return;	return;
} else {	} else {
$request->print('</td></tr></table></td></tr></table>'."\n");	$request->print('</div>'."\n");
}	}

# essay grading message center	# essay grading message center
if ($env{'form.handgrade'} eq 'yes') {	if ($env{'form.handgrade'} eq 'yes') {
	my $result='<div class="LC_grade_message_center">';

	$result.='<div class="LC_grade_message_center_header">'.
	&mt('Send Message').'</div><div class="LC_grade_message_center_body">';
my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});	my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
my $msgfor = $givenn.' '.$lastname;	my $msgfor = $givenn.' '.$lastname;
if (scalar(@col_fullnames) > 0) {	if (scalar(@$col_fullnames) > 0) {
my $lastone = pop @col_fullnames;	my $lastone = pop(@$col_fullnames);
$msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';	$msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.';
}	}
$msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript	$msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
$result='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".	$result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
'<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><label> ('.	&mt('Compose message to student').(scalar(@$col_fullnames) >= 1 ? 's' : '').'</a><label> ('.
&mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.	&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 /> ('.
&mt('Message will be sent when you click on Save & Next below.').")\n";	&mt('Message will be sent when you click on Save & Next below.').")\n";
	$result.='</div></div>';
$request->print($result);	$request->print($result);
}	}
if ($perm{'vgr'}) {
$request->print('<br />'.
&Apache::loncommon::track_student_link(&mt('View recent activity'),
$uname,$udom,'check'));
}
if ($perm{'opa'}) {
$request->print('<br />'.
&Apache::loncommon::pprmlink(&mt('Set/Change parameters'),
$uname,$udom,$symb,'check'));
}

my %seen = ();	my %seen = ();
my @partlist;	my @partlist;
my @gradePartRespid;	my @gradePartRespid;
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
	$request->print('<div class="LC_grade_assign">'.

	'<div class="LC_grade_assign_header">'.
	&mt('Assign Grades').'</div>'.
	'<div class="LC_grade_assign_body">');
foreach my $part_response_id (@part_response_id) {	foreach my $part_response_id (@part_response_id) {
my ($partid,$respid) = @{ $part_response_id };	my ($partid,$respid) = @{ $part_response_id };
my $part_resp = join('_',@{ $part_response_id });	my $part_resp = join('_',@{ $part_response_id });
Line 2191 KEYWORDS	Line 2215 KEYWORDS
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));
}	}
	$request->print('</div></div>');

	$request->print('<div class="LC_grade_info_links">');
	if ($perm{'vgr'}) {
	$request->print(
	&Apache::loncommon::track_student_link(&mt('View recent activity'),
	$uname,$udom,'check'));
	}
	if ($perm{'opa'}) {
	$request->print(
	&Apache::loncommon::pprmlink(&mt('Set/Change parameters'),
	$uname,$udom,$symb,'check'));
	}
	$request->print('</div>');

$result='<input type="hidden" name="partlist'.$counter.	$result='<input type="hidden" name="partlist'.$counter.
'" value="'.(join ":",@partlist).'" />'."\n";	'" value="'.(join ":",@partlist).'" />'."\n";
$result.='<input type="hidden" name="gradePartRespid'.	$result.='<input type="hidden" name="gradePartRespid'.
Line 2201 KEYWORDS	Line 2240 KEYWORDS
$partlist[$ctr].'" />'."\n";	$partlist[$ctr].'" />'."\n";
$ctr++;	$ctr++;
}	}
$request->print($result.'</td></tr></table></td></tr></table>'."\n");	$request->print($result.''."\n");

# Done with printing info for one student	# Done with printing info for one student

$request->print('</td></tr></table></p>');	$request->print('</div>');#LC_grade_show_user_body
	$request->print('</div>');#LC_grade_show_user


# print end of form	# print end of form
if ($counter == $total) {	if ($counter == $total) {
my $endform='<table border="0"><tr><td>'."\n";	my $endform='<table border="0"><tr><td>'."\n";
$endform.='<input type="button" value="Save & Next" '.	$endform.='<input type="button" value="'.&mt('Save & Next').'" '.
'onClick="javascript:checksubmit(this.form,\'Save & Next\','.	'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
$total.','.scalar(@partlist).');" target="_self" />  '."\n";	$total.','.scalar(@partlist).');" target="_self" />  '."\n";
my $ntstu ='<select name="NTSTU">'.	my $ntstu ='<select name="NTSTU">'.
Line 2220 KEYWORDS	Line 2260 KEYWORDS
'<option>7</option><option>10</option></select>'."\n";	'<option>7</option><option>10</option></select>'."\n";
my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
$endform.=$ntstu.'student(s)   ';	$endform.=&mt('[_1]student(s)',$ntstu);
$endform.='<input type="button" value="Previous" '.	$endform.='  <input type="button" value="'.&mt('Previous').'" '.
'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" />  '."\n".	'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" />  '."\n".
'<input type="button" value="Next" '.	'<input type="button" value="'.&mt('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.=&mt('(Next and Previous (student) do not save the scores.)')."\n" ;
$endform.="<input type='hidden' value='".&get_increment().	$endform.="<input type='hidden' value='".&get_increment().
"' name='increment' />";	"' name='increment' />";
$endform.='</td><tr></table></form>';	$endform.='</td></tr></table></form>';
$endform.=&show_grading_menu_form($symb);	$endform.=&show_grading_menu_form($symb);
$request->print($endform);	$request->print($endform);
}	}
return '';	return '';
}	}

	sub check_collaborators {
	my ($symb,$uname,$udom,$record,$handgrade,$counter) = @_;
	my ($result,@col_fullnames);
	my ($classlist,undef,$fullname) = &getclasslist('all','0');
	foreach my $part (keys(%$handgrade)) {
	my $ncol = &Apache::lonnet::EXT('resource.'.$part.
	'.maxcollaborators',
	$symb,$udom,$uname);
	next if ($ncol <= 0);
	$part =~ s/\_/\./g;
	next if ($record->{'resource.'.$part.'.collaborators'} eq '');
	my (@good_collaborators, @bad_collaborators);
	foreach my $possible_collaborator
	(split(/,?\s+/,$record->{'resource.'.$part.'.collaborators'})) {
	$possible_collaborator =~ s/[\$\^]//g;
	next if ($possible_collaborator eq '');
	my ($co_name,$co_dom) = split(/\@\|:/,$possible_collaborator);
	$co_dom = $udom if (! defined($co_dom) \|\| $co_dom =~ /^domain$/i);
	next if ($co_name eq $uname && $co_dom eq $udom);
	# Doing this grep allows 'fuzzy' specification
	my @matches = grep(/^\Q$co_name\E:\Q$co_dom\E$/i,
	keys(%$classlist));
	if (! scalar(@matches)) {
	push(@bad_collaborators, $possible_collaborator);
	} else {
	push(@good_collaborators, @matches);
	}
	}
	if (scalar(@good_collaborators) != 0) {
	$result.='<br />'.&mt('Collaborators: ');
	foreach my $name (@good_collaborators) {
	my ($lastname,$givenn) = split(/,/,$$fullname{$name});
	push(@col_fullnames, $givenn.' '.$lastname);
	$result.=$fullname->{$name}.'     ';
	}
	$result.='<br />'."\n";
	my ($part)=split(/\./,$part);
	$result.='<input type="hidden" name="collaborator'.$counter.
	'" value="'.$part.':'.(join ':',@good_collaborators).'" />'.
	"\n";
	}
	if (scalar(@bad_collaborators) > 0) {
	$result.='<div class="LC_warning">';
	$result.=&mt('This student has submitted [quant,_1,invalid collaborator]: [_2]',scalar(@bad_collaborators),join(', ',@bad_collaborators));
	$result .= '</div>';
	}
	if (scalar(@bad_collaborators > $ncol)) {
	$result .= '<div class="LC_warning">';
	$result .= &mt('This student has submitted too many '.
	'collaborators. Maximum is [_1].',$ncol);
	$result .= '</div>';
	}
	}
	return ($result,$fullname,\@col_fullnames);
	}

#--- Retrieve the last submission for all the parts	#--- Retrieve the last submission for all the parts
sub get_last_submission {	sub get_last_submission {
my ($returnhash)=@_;	my ($returnhash)=@_;
Line 2511 sub processHandGrade {	Line 2607 sub processHandGrade {
$ctr++;	$ctr++;
}	}
if ($total < 0) {	if ($total < 0) {
my $the_end = '<h3><span class="LC_info">LON-CAPA User Message</span></h3><br />'."\n";	my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n";
$the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";	$the_end.=&mt('<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.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n";
$the_end.=&show_grading_menu_form($symb);	$the_end.=&show_grading_menu_form($symb);
$request->print($the_end);	$request->print($the_end);
}	}
Line 3084 sub viewgrades {	Line 3180 sub viewgrades {
&Apache::lonnet::clear_EXT_cache_status();	&Apache::lonnet::clear_EXT_cache_status();

my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';	my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';
$result.='<h4><b>Current Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n";	$result.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";

#view individual student submission form - called using Javascript viewOneStudent	#view individual student submission form - called using Javascript viewOneStudent
$result.=&jscriptNform($symb);	$result.=&jscriptNform($symb);
Line 3102 sub viewgrades {	Line 3198 sub viewgrades {
my $sectionClass;	my $sectionClass;
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
if ($env{'form.section'} eq 'all') {	if ($env{'form.section'} eq 'all') {
$sectionClass='Class </h3>';	$sectionClass='Class';
} elsif ($env{'form.section'} eq 'none') {	} elsif ($env{'form.section'} eq 'none') {
$sectionClass=&mt('Students in no Section').'</h3>';	$sectionClass='Students in no Section';
} else {	} else {
$sectionClass=&mt('Students in Section(s) [_1]',$section_display).'</h3>';	$sectionClass='Students in Section(s) [_1]';
}	}
$result.='<h3>'.&mt('Assign Common Grade To [_1]',$sectionClass);	$result.=
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".	'<h3>'.
'<table border=0><tr bgcolor="#ffffdd"><td>';	&mt("Assign Common Grade To $sectionClass",$section_display).'</h3>';
	$result.= &Apache::loncommon::start_data_table();
#radio buttons/text box for assigning points for a section or class.	#radio buttons/text box for assigning points for a section or class.
#handles different parts of a problem	#handles different parts of a problem
my ($partlist,$handgrade,$responseType) = &response_type($symb);	my ($partlist,$handgrade,$responseType) = &response_type($symb);
my %weight = ();	my %weight = ();
my $ctsparts = 0;	my $ctsparts = 0;
$result.='<table border="0">';
my %seen = ();	my %seen = ();
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
foreach my $part_response_id (@part_response_id) {	foreach my $part_response_id (@part_response_id) {
Line 3128 sub viewgrades {	Line 3224 sub viewgrades {
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
$weight{$partid} = $wgt eq '' ? '1' : $wgt;	$weight{$partid} = $wgt eq '' ? '1' : $wgt;

$result.='<input type="hidden" name="partid_'.
$ctsparts.'" value="'.$partid.'" />'."\n";
$result.='<input type="hidden" name="weight_'.
$partid.'" value="'.$weight{$partid}.'" />'."\n";
my $display_part=&get_display_part($partid,$symb);	my $display_part=&get_display_part($partid,$symb);
$result.='<tr><td><b>Part:</b> '.$display_part.'   <b>Point:</b> </td><td>';	my $radio.='<table border="0"><tr>';
$result.='<table border="0"><tr>';
my $ctr = 0;	my $ctr = 0;
while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across	while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across
$result.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '.	$radio.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '.
'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}.	'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}.
','.$ctr.')" />'.$ctr."</label></td>\n";	','.$ctr.')" />'.$ctr."</label></td>\n";
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
$ctr++;	$ctr++;
}	}
$result.='</tr></table>';	$radio.='</tr></table>';
$result.= '</td><td><b> or </b><input type="text" name="TEXTVAL_'.	my $line = '<input type="text" name="TEXTVAL_'.
$partid.'" size="4" '.'onChange="javascript:writePoint(\''.	$partid.'" size="4" '.'onChange="javascript:writePoint(\''.
$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.	$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
$weight{$partid}.' (problem weight)</td>'."\n";	$weight{$partid}.' (problem weight)</td>'."\n";
$result.= '</td><td><select name="SELVAL_'.$partid.'"'.	$line.= '<td><select name="SELVAL_'.$partid.'"'.
'onChange="javascript:writeRadText(\''.$partid.'\','.	'onChange="javascript:writeRadText(\''.$partid.'\','.
$weight{$partid}.')"> '.	$weight{$partid}.')"> '.
'<option selected="selected"> </option>'.	'<option selected="selected"> </option>'.
'<option>excused</option>'.	'<option value="excused">'.&mt('excused').'</option>'.
'<option>reset status</option></select></td>'.	'<option value="reset status">'.&mt('reset status').'</option>'.
'<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n";	'</select></td>'.
	'<td><label><input type="checkbox" name="FORCE_'.$partid.'" />'.&mt('Override "Correct"').'</label>';
	$line.='<input type="hidden" name="partid_'.
	$ctsparts.'" value="'.$partid.'" />'."\n";
	$line.='<input type="hidden" name="weight_'.
	$partid.'" value="'.$weight{$partid}.'" />'."\n";

	$result.=
	&Apache::loncommon::start_data_table_row()."\n".
	&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line).
	&Apache::loncommon::end_data_table_row()."\n";
$ctsparts++;	$ctsparts++;
}	}
$result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".	$result.=&Apache::loncommon::end_data_table()."\n".
'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
$result.='<input type="button" value="Revert to Default" '.	$result.='<input type="button" value="'.&mt('Revert to Default').'" '.
'onClick="javascript:resetEntry('.$ctsparts.');" target="_self" />';	'onClick="javascript:resetEntry('.$ctsparts.');" />';

#table listing all the students in a section/class	#table listing all the students in a section/class
#header of table	#header of table
$result.= '<h3>Assign Grade to Specific Students in '.$sectionClass;	$result.= '<h3>'.&mt('Assign Grade to Specific Students in '.$sectionClass,
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".	$section_display).'</h3>';
'<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'.	$result.= &Apache::loncommon::start_data_table().
'<td>'.&nameUserString('header')."</td>\n";	&Apache::loncommon::start_data_table_header_row().
	'<th>'.&mt('No.').'</th>'.
	'<th>'.&nameUserString('header')."</th>\n";
my (@parts) = sort(&getpartlist($symb));	my (@parts) = sort(&getpartlist($symb));
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);	my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
my @partids = ();	my @partids = ();
Line 3179 sub viewgrades {	Line 3282 sub viewgrades {
push(@partids, $partid);	push(@partids, $partid);
my $display_part=&get_display_part($partid,$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.='<th>'.
' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n";	&mt('Score Part: [_1]<br /> (weight = [_2])',
	$display_part,$weight{$partid}).'</th>'."\n";
next;	next;

} else {	} else {
$display =~s/\[Part: \Q$partid\E\]/Part:<\/b> $display_part/;	if ($display =~ /Problem Status/) {
	my $grade_status_mt = &mt('Grade Status');
	$display =~ s{Problem Status}{$grade_status_mt<br />};
	}
	my $part_mt = &mt('Part:');
	$display =~s{\[Part: \Q$partid\E\]}{$part_mt $display_part};
}	}
$display =~ s\|Problem Status\|Grade Status<br />\|;
$result.='<td><b>'.$display.'</td>'."\n";	$result.='<th>'.$display.'</th>'."\n";
}	}
$result.='</tr>';	$result.=&Apache::loncommon::end_data_table_header_row();

my %last_resets =	my %last_resets =
&get_last_resets($symb,$env{'request.course.id'},\@partids);	&get_last_resets($symb,$env{'request.course.id'},\@partids);
Line 3208 sub viewgrades {	Line 3318 sub viewgrades {
$result.=&viewstudentgrade($symb,$env{'request.course.id'},	$result.=&viewstudentgrade($symb,$env{'request.course.id'},
$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);	$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
}	}
$result.='</table></td></tr></table>';	$result.=&Apache::loncommon::end_data_table();
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";	$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
$result.='<input type="button" value="Save" '.	$result.='<input type="button" value="'.&mt('Save').'" '.
'onClick="javascript:submit();" target="_self" /></form>'."\n";	'onClick="javascript:submit();" target="_self" /></form>'."\n";
if (scalar(%$fullname) eq 0) {	if (scalar(%$fullname) eq 0) {
my $colspan=3+scalar(@parts);	my $colspan=3+scalar(@parts);
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
$result='<span class="LC_warning">'.	$result='<span class="LC_warning">'.
&mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade',	&mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
$section_display, $stu_status).	$section_display, $stu_status).
'</span>';	'</span>';
}	}
Line 3231 sub viewstudentgrade {	Line 3341 sub viewstudentgrade {
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 = ();
my $result='<tr bgcolor="#ffffdd"><td align="right">'.	my $result=&Apache::loncommon::start_data_table_row().'<td align="right">'.
'<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'.	'<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'.
"\n".$ctr.' </td><td> '.	"\n".$ctr.' </td><td> '.
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
Line 3273 sub viewstudentgrade {	Line 3383 sub viewstudentgrade {
$result.=' <select name="'.	$result.=' <select name="'.
'GD_'.$student.'_'.$part.'_solved" '.	'GD_'.$student.'_'.$part.'_solved" '.
'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";	'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
$result.= (($status eq 'excused') ? '<option> </option><option selected="selected">excused</option>'	$result.= (($status eq 'excused') ? '<option> </option><option selected="selected" value="excused">'.&mt('excused').'</option>'
: '<option selected="selected"> </option><option>excused</option>')."\n";	: '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n";
$result.='<option>reset status</option>';	$result.='<option value="reset status">'.&mt('reset status').'</option>';
$result.="</select> </td>\n";	$result.="</select> </td>\n";
} else {	} else {
$result.='<input type="hidden" name="'.	$result.='<input type="hidden" name="'.
Line 3286 sub viewstudentgrade {	Line 3396 sub viewstudentgrade {
'value="'.$score.'" size="4" /></td>'."\n";	'value="'.$score.'" size="4" /></td>'."\n";
}	}
}	}
$result.='</tr>';	$result.=&Apache::loncommon::end_data_table_row();
return $result;	return $result;
}	}

Line 3297 sub editgrades {	Line 3407 sub editgrades {

my $symb=&get_symb($request);	my $symb=&get_symb($request);
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
my $title='<h3><span class="LC_info">'.&mt('Current Grade Status').'</span></h3>';	my $title='<h2>'.&mt('Current Grade Status').'</h2>';
$title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4><br />'."\n";	$title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";
$title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n";	$title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n";

my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";	my $result= &Apache::loncommon::start_data_table().
$result.= '<table border="0"><tr bgcolor="#deffff">'.	&Apache::loncommon::start_data_table_header_row().
'<td rowspan=2 valign="center"> <b>No.</b> </td>'.	'<th rowspan="2" valign="middle">'.&mt('No.').'</th>'.
'<td rowspan=2 valign="center">'.&nameUserString('header')."</td>\n";	'<th rowspan="2" valign="middle">'.&nameUserString('header')."</th>\n";

my %scoreptr = (	my %scoreptr = (
'correct' =>'correct_by_override',	'correct' =>'correct_by_override',
'incorrect'=>'incorrect_by_override',	'incorrect'=>'incorrect_by_override',
Line 3330 sub editgrades {	Line 3439 sub editgrades {
}	}
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);	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 .= '<th align="center">'.&mt('Old Score').'</th>'.
'<td align="center"> <b>New Score</b> </td>';	'<th align="center">'.&mt('New Score').'</th>';
$columns{$partid}=2;	$columns{$partid}=2;
foreach my $stores (@parts) {	foreach my $stores (@parts) {
my ($part,$type) = &split_part_type($stores);	my ($part,$type) = &split_part_type($stores);
Line 3340 sub editgrades {	Line 3449 sub editgrades {
my $display=&Apache::lonnet::metadata($url,$stores.'.display');	my $display=&Apache::lonnet::metadata($url,$stores.'.display');
$display =~ s/\[Part: (\w)+\]//;	$display =~ s/\[Part: (\w)+\]//;
$display =~ s/Number of Attempts/Tries/;	$display =~ s/Number of Attempts/Tries/;
$header .= '<td align="center"> <b>Old '.$display.'</b> </td>'.	$header .= '<th align="center">'.&mt('Old '.$display).'</th>'.
'<td align="center"> <b>New '.$display.'</b> </td>';	'<th align="center">'.&mt('New '.$display).'</th>';
$columns{$partid}+=2;	$columns{$partid}+=2;
}	}
}	}
foreach my $partid (@partid) {	foreach my $partid (@partid) {
my $display_part=&get_display_part($partid,$symb);	my $display_part=&get_display_part($partid,$symb);
$result .= '<td colspan="'.$columns{$partid}.	$result .= '<th colspan="'.$columns{$partid}.'" align="center">'.
'" align="center"><b>Part:</b> '.$display_part.	&mt('Part: [_1] (Weight = [_2])',$display_part,$weight{$partid}).
' (Weight = '.$weight{$partid}.')</td>';	'</th>';

}	}
$result .= '</tr><tr bgcolor="#deffff">';	$result .= &Apache::loncommon::end_data_table_header_row().
$result .= $header;	&Apache::loncommon::start_data_table_header_row().
$result .= '</tr>'."\n";	$header.
my $noupdate;	&Apache::loncommon::end_data_table_header_row();
	my @noupdate;
my ($updateCtr,$noupdateCtr) = (1,1);	my ($updateCtr,$noupdateCtr) = (1,1);
for ($i=0; $i<$env{'form.total'}; $i++) {	for ($i=0; $i<$env{'form.total'}; $i++) {
my $line;	my $line;
Line 3367 sub editgrades {	Line 3477 sub editgrades {
my $usec=$classlist->{"$uname:$udom"}[5];	my $usec=$classlist->{"$uname:$udom"}[5];
if (!&canmodify($usec)) {	if (!&canmodify($usec)) {
my $numcols=scalar(@partid)*4+2;	my $numcols=scalar(@partid)*4+2;
$noupdate.=$line."<td colspan=\"$numcols\"><span class=\"LC_warning\">Not allowed to modify student</span></td></tr>";	push(@noupdate,
	$line."<td colspan=\"$numcols\"><span class=\"LC_warning\">".
	&mt('Not allowed to modify student')."</span></td></tr>");
next;	next;
}	}
my %aggregate = ();	my %aggregate = ();
Line 3436 sub editgrades {	Line 3548 sub editgrades {
'<td align="center">'.$awarded.' </td>';	'<td align="center">'.$awarded.' </td>';
}	}
}	}
$line.='</tr>'."\n";	$line.="\n";

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'};
Line 3469 sub editgrades {	Line 3581 sub editgrades {
}	}
}	}

$result.='<tr bgcolor="#ffffde"><td align="right"> '.$updateCtr.' </td>'.$line;	$result.=&Apache::loncommon::start_data_table_row().
	'<td align="right"> '.$updateCtr.' </td>'.$line.
	&Apache::loncommon::end_data_table_row();
$updateCtr++;	$updateCtr++;
} else {	} else {
$noupdate.='<tr bgcolor="#ffffde"><td align="right"> '.$noupdateCtr.' </td>'.$line;	push(@noupdate,
	'<td align="right"> '.$noupdateCtr.' </td>'.$line);
$noupdateCtr++;	$noupdateCtr++;
}	}
if ($aggregateflag) {	if ($aggregateflag) {
Line 3480 sub editgrades {	Line 3595 sub editgrades {
$cdom,$cnum);	$cdom,$cnum);
}	}
}	}
if ($noupdate) {	if (@noupdate) {
# my $numcols=(scalar(@partid)(scalar(@parts)-1)2)+3;	# my $numcols=(scalar(@partid)(scalar(@parts)-1)2)+3;
my $numcols=scalar(@partid)*4+2;	my $numcols=scalar(@partid)*4+2;
$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr><tr bgcolor="#ffffde">'.$noupdate;	$result .= &Apache::loncommon::start_data_table_row('LC_empty_row').
}	'<td align="center" colspan="'.$numcols.'">'.
$result .= '</table></td></tr></table>'."\n".	&mt('No Changes Occurred For the Students Below').
&show_grading_menu_form ($symb);	'</td>'.
my $msg = '<br /><b>Number of records updated = '.$rec_update.	&Apache::loncommon::end_data_table_row();
' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'.	foreach my $line (@noupdate) {
'<b>Total number of students = '.$env{'form.total'}.'</b><br />';	$result.=
	&Apache::loncommon::start_data_table_row().
	$line.
	&Apache::loncommon::end_data_table_row();
	}
	}
	$result .= &Apache::loncommon::end_data_table().
	&show_grading_menu_form($symb);
	my $msg = '<p><b>'.
	&mt('Number of records updated = [_1] for [quant,_2,student].',
	$rec_update,$count).'</b><br />'.
	'<b>'.&mt('Total number of students = [_1]',$env{'form.total'}).
	'</b></p>';
return $title.$msg.$result;	return $title.$msg.$result;
}	}

Line 3881 sub csvuploadassign {	Line 4008 sub csvuploadassign {
if ($wgt) {	if ($wgt) {
$entries{$fields{$dest}}=~s/\s//g;	$entries{$fields{$dest}}=~s/\s//g;
my $pcr=$entries{$fields{$dest}} / $wgt;	my $pcr=$entries{$fields{$dest}} / $wgt;
my $award='correct_by_override';	my $award=($pcr == 0) ? 'incorrect_by_override'
	: 'correct_by_override';
$grades{"resource.$part.awarded"}=$pcr;	$grades{"resource.$part.awarded"}=$pcr;
$grades{"resource.$part.solved"}=$award;	$grades{"resource.$part.solved"}=$award;
$points{$part}=1;	$points{$part}=1;
Line 3965 LISTJAVASCRIPT	Line 4093 LISTJAVASCRIPT
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};	my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};

my $result='<h3><span class="LC_info"> '.	my $result='<h3><span class="LC_info"> '.
'Manual Grading by Page or Sequence</span></h3>';	&mt('Manual Grading by Page or Sequence').'</span></h3>';

$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";	$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
$result.=' <b>Problems from:</b> <select name="selectpage">'."\n";
my ($titles,$symbx) = &getSymbMap();	my ($titles,$symbx) = &getSymbMap();
my ($curpage) =&Apache::lonnet::decode_symb($symb);	my ($curpage) =&Apache::lonnet::decode_symb($symb);
# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);	# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);
# my $type=($curpage =~ /\.(page\|sequence)/);	# my $type=($curpage =~ /\.(page\|sequence)/);
	my $select = '<select name="selectpage">'."\n";
my $ctr=0;	my $ctr=0;
foreach (@$titles) {	foreach (@$titles) {
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
$result.='<option value="'.$ctr.'" '.	$select.='<option value="'.$ctr.'" '.
($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').	($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
'>'.$showtitle.'</option>'."\n";	'>'.$showtitle.'</option>'."\n";
$ctr++;	$ctr++;
}	}
$result.= '</select>'."<br />\n";	$select.= '</select>';
	$result.=&mt(' <b>Problems from:</b> [_1]',$select)."<br />\n";

$ctr=0;	$ctr=0;
foreach (@$titles) {	foreach (@$titles) {
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
Line 3992 LISTJAVASCRIPT	Line 4122 LISTJAVASCRIPT
$result.='<input type="hidden" name="page" />'."\n".	$result.='<input type="hidden" name="page" />'."\n".
'<input type="hidden" name="title" />'."\n";	'<input type="hidden" name="title" />'."\n";

$result.=' <b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".	my $options =
'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n";	'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
	'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n";
$result.=' <b>Submission Details: </b>'.	$result.=' '.&mt('<b>View Problems Text: </b> [_1]',$options);
'<label><input type="radio" name="lastSub" value="none" /> none</label>'."\n".
'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> by dates and submissions</label>'."\n".	$options =
'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n";	'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n".
	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n".
	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n";
	$result.=' '.&mt('<b>Submission Details: </b>[_1]',$options);

$result.=&build_section_inputs();	$result.=&build_section_inputs();
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
Line 4007 LISTJAVASCRIPT	Line 4140 LISTJAVASCRIPT
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";

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

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

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

my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</b><br />'.	my $studentTable.=' <b>'.&mt('Select a student you wish to grade and then click on the Next button.').'</b><br />'.
'<table border="0"><tr><td bgcolor="#777777">'.	&Apache::loncommon::start_data_table().
'<table border="0"><tr bgcolor="#e6ffff">'.	&Apache::loncommon::start_data_table_header_row().
'<td align="right"> <b>No.</b></td>'.	'<th align="right"> '.&mt('No.').'</th>'.
'<td>'.&nameUserString('header').'</td>'.	'<th>'.&nameUserString('header').'</th>'.
'<td align="right"> <b>No.</b></td>'.	'<th align="right"> '.&mt('No.').'</th>'.
'<td>'.&nameUserString('header').'</td></tr>';	'<th>'.&nameUserString('header').'</th>'.
	&Apache::loncommon::end_data_table_header_row();

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

$studentTable.=&show_grading_menu_form($symb);	$studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);	$request->print($studentTable);
Line 4095 sub displayPage {	Line 4236 sub displayPage {
&Apache::lonnet::clear_EXT_cache_status();	&Apache::lonnet::clear_EXT_cache_status();

if (!&canview($usec)) {	if (!&canview($usec)) {
$request->print('<span class="LC_warning">Unable to view requested student.('.$env{'form.student'}.')</span>');	$request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>');
$request->print(&show_grading_menu_form($symb));	$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>';	my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>';
$result.='<h3> Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).	$result.='<h3> '.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)).
'</h3>'."\n";	'</h3>'."\n";
if (&Apache::lonnet::validCODE($env{'form.CODE'})) {	if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
$result.='<h3> CODE: '.$env{'form.CODE'}.'</h3>'."\n";	$result.='<h3> '.&mt('CODE: [_1]',$env{'form.CODE'}).'</h3>'."\n";
} else {	} else {
delete($env{'form.CODE'});	delete($env{'form.CODE'});
}	}
Line 4114 sub displayPage {	Line 4255 sub displayPage {
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});	my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {	if (!$map) {
$request->print('<span class="LC_warning">Unable to view requested sequence. ('.$resUrl.')</span>');	$request->print('<span class="LC_warning">'.&mt('Unable to view requested sequence. ([_1])',$resUrl).'</span>');
$request->print(&show_grading_menu_form($symb));	$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
Line 4136 sub displayPage {	Line 4277 sub displayPage {
'<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n";	'<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n";
}	}
my $checkIcon = '<img alt="'.&mt('Check Mark').	my $checkIcon = '<img alt="'.&mt('Check Mark').
'" src="'.$request->dir_config('lonIconsURL').	'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';
'/check.gif" height="16" border="0" />';

$studentTable.=' <b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.	$studentTable.=' '.&mt('<b>Note:</b> Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon)."\n".
' symbol.'."\n".	&Apache::loncommon::start_data_table().
'<table border="0"><tr><td bgcolor="#777777">'.	&Apache::loncommon::start_data_table_header_row().
'<table border="0"><tr bgcolor="#e6ffff">'.	'<th align="center"> Prob. </th>'.
'<td align="center"><b> Prob. </b></td>'.	'<th> '.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'.
'<td><b> '.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';	&Apache::loncommon::end_data_table_header_row();

&Apache::lonxml::clear_problem_counter();	&Apache::lonxml::clear_problem_counter();
my ($depth,$question,$prob) = (1,1,1);	my ($depth,$question,$prob) = (1,1,1);
Line 4158 sub displayPage {	Line 4298 sub displayPage {
my $parts = $curRes->parts();	my $parts = $curRes->parts();
my $title = $curRes->compTitle();	my $title = $curRes->compTitle();
my $symbx = $curRes->symb();	my $symbx = $curRes->symb();
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.	$studentTable.=
(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';	&Apache::loncommon::start_data_table_row().
	'<td align="center" valign="top" >'.$prob.
	(scalar(@{$parts}) == 1 ? ''
	: '<br />('.&mt('[_1] parts)',
	scalar(@{$parts}))
	).
	'</td>';
$studentTable.='<td valign="top">';	$studentTable.='<td valign="top">';
my %form = ('CODE' => $env{'form.CODE'},);	my %form = ('CODE' => $env{'form.CODE'},);
if ($env{'form.vProb'} eq 'yes' ) {	if ($env{'form.vProb'} eq 'yes' ) {
Line 4174 sub displayPage {	Line 4320 sub displayPage {
# $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 /> '.&mt('<b>Correct answer:</b><br />[_1]',$companswer);
}	}

my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);	my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);

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

$studentTable.='</table></td></tr></table>'."\n".	$studentTable.='</table>'."\n".
'<input type="button" value="Save" '.	'<input type="button" value="'.&mt('Save').'" '.
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'.	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
'</form>'."\n";	'</form>'."\n";
$studentTable.=&show_grading_menu_form($symb);	$studentTable.=&show_grading_menu_form($symb);
Line 4232 sub displaySubByDates {	Line 4378 sub displaySubByDates {
my $isCODE=0;	my $isCODE=0;
my $isTask = ($symb =~/\.task$/);	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=&Apache::loncommon::start_data_table().
'<table border="0" width="100%"><tr bgcolor="#e6ffff">'.	&Apache::loncommon::start_data_table_header_row().
'<td><b>Date/Time</b></td>'.	'<th>'.&mt('Date/Time').'</th>'.
($isCODE?'<td><b>CODE</b></td>':'').	($isCODE?'<th>'.&mt('CODE').'</th>':'').
'<td><b>Submission</b></td>'.	'<th>'.&mt('Submission').'</th>'.
'<td><b>Status </b></td></tr>';	'<th>'.&mt('Status').'</th>'.
	&Apache::loncommon::end_data_table_header_row();
my ($version);	my ($version);
my %mark;	my %mark;
my %orders;	my %orders;
$mark{'correct_by_student'} = $checkIcon;	$mark{'correct_by_student'} = $checkIcon;
if (!exists($$record{'1:timestamp'})) {	if (!exists($$record{'1:timestamp'})) {
return '<br /> <span class="LC_warning">Nothing submitted - no attempts</span><br />';	return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br />';
}	}

my $interaction;	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 =
	&Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});
if (exists($$record{$version.':resource.0.version'})) {	if (exists($$record{$version.':resource.0.version'})) {
$interaction = $$record{$version.':resource.0.version'};	$interaction = $$record{$version.':resource.0.version'};
}	}

my $where = ($isTask ? "$version:resource.$interaction"	my $where = ($isTask ? "$version:resource.$interaction"
: "$version:resource");	: "$version:resource");
$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';	$studentTable.=&Apache::loncommon::start_data_table_row().
	'<td>'.$timestamp.'</td>';
if ($isCODE) {	if ($isCODE) {
$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';	$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
}	}
Line 4274 sub displaySubByDates {	Line 4423 sub displaySubByDates {

my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)	my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));	: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
$displaySub[0].='<b>Part:</b> '.$display_part.' ';	$displaySub[0].='<b>'.&mt('Part:').'</b> '.$display_part.' ';
$displaySub[0].='<span class="LC_internal_info">(ID '.	$displaySub[0].='<span class="LC_internal_info">('.&mt('ID').' '.
$responseId.')</span> <b>';	$responseId.')</span> <b>';
if ($$record{"$where.$partid.tries"} eq '') {	if ($$record{"$where.$partid.tries"} eq '') {
$displaySub[0].='Trial not counted';	$displaySub[0].=&mt('Trial not counted');
} else {	} else {
$displaySub[0].='Trial '.	$displaySub[0].=&mt('Trial [_1]',
$$record{"$where.$partid.tries"};	$$record{"$where.$partid.tries"});
}	}
my $responseType=($isTask ? 'Task'	my $responseType=($isTask ? 'Task'
: $responseType->{$partid}->{$responseId});	: $responseType->{$partid}->{$responseId});
Line 4295 sub displaySubByDates {	Line 4444 sub displaySubByDates {
}	}
}	}
if (exists($$record{"$where.$partid.checkedin"})) {	if (exists($$record{"$where.$partid.checkedin"})) {
$displaySub[1].='Checked in by '.	$displaySub[1].=&mt('Checked in by [_1] into slot [_2]',
$$record{"$where.$partid.checkedin"}.' into slot '.	$$record{"$where.$partid.checkedin"},
$$record{"$where.$partid.checkedin.slot"}.	$$record{"$where.$partid.checkedin.slot"}).
'<br />';	'<br />';
}	}
if (exists $$record{"$where.$partid.award"}) {	if (exists $$record{"$where.$partid.award"}) {
$displaySub[1].='<b>Part:</b> '.$display_part.'  '.	$displaySub[1].='<b>'.&mt('Part:').'</b> '.$display_part.'  '.
lc($$record{"$where.$partid.award"}).' '.	lc($$record{"$where.$partid.award"}).' '.
$mark{$$record{"$where.$partid.solved"}}.	$mark{$$record{"$where.$partid.solved"}}.
'<br />';	'<br />';
Line 4321 sub displaySubByDates {	Line 4470 sub displaySubByDates {
}	}
$studentTable.='<td>'.$displaySub[0].' </td><td>'.$displaySub[1];	$studentTable.='<td>'.$displaySub[0].' </td><td>'.$displaySub[1];
if ($displaySub[2]) {	if ($displaySub[2]) {
$studentTable.='Manually graded by '.$displaySub[2];	$studentTable.=&mt('Manually graded by [_1]',$displaySub[2]);
}	}
$studentTable.=' </td></tr>';	$studentTable.=' </td>'.
	&Apache::loncommon::end_data_table_row();
}	}
$studentTable.='</table></td></tr></table>';	$studentTable.=&Apache::loncommon::end_data_table();
return $studentTable;	return $studentTable;
}	}

Line 4363 sub updateGradeByPage {	Line 4512 sub updateGradeByPage {
my $iterator = $navmap->getIterator($map->map_start(),	my $iterator = $navmap->getIterator($map->map_start(),
$map->map_finish());	$map->map_finish());

my $studentTable='<table border="0"><tr><td bgcolor="#777777">'.	my $studentTable=
'<table border="0"><tr bgcolor="#e6ffff">'.	&Apache::loncommon::start_data_table().
'<td align="center"><b> Prob. </b></td>'.	&Apache::loncommon::start_data_table_header_row().
'<td><b> Title </b></td>'.	'<th align="center"> '.&mt('Prob.').' </th>'.
'<td><b> Previous Score </b></td>'.	'<th> '.&mt('Title').' </th>'.
'<td><b> New Score </b></td></tr>';	'<th> '.&mt('Previous Score').' </th>'.
	'<th> '.&mt('New Score').' </th>'.
	&Apache::loncommon::end_data_table_header_row();

$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 4381 sub updateGradeByPage {	Line 4532 sub updateGradeByPage {
my $parts = $curRes->parts();	my $parts = $curRes->parts();
my $title = $curRes->compTitle();	my $title = $curRes->compTitle();
my $symbx = $curRes->symb();	my $symbx = $curRes->symb();
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.	$studentTable.=
(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';	&Apache::loncommon::start_data_table_row().
	'<td align="center" valign="top" >'.$prob.
	(scalar(@{$parts}) == 1 ? ''
	: '<br />('.&mt('[quant,_1, parts]',scalar(@{$parts}))
	).')</td>';
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';	$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';

my %newrecord=();	my %newrecord=();
Line 4469 sub updateGradeByPage {	Line 4624 sub updateGradeByPage {

$studentTable.='<td valign="top">'.$displayPts[0].'</td>'.	$studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
'<td valign="top">'.$displayPts[1].'</td>'.	'<td valign="top">'.$displayPts[1].'</td>'.
'</tr>';	&Apache::loncommon::end_data_table_row();

$prob++;	$prob++;
}	}
$curRes = $iterator->next();	$curRes = $iterator->next();
}	}

$studentTable.='</td></tr></table></td></tr></table>';	$studentTable.=&Apache::loncommon::end_data_table();
$studentTable.=&show_grading_menu_form($env{'form.symb'});	$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 '.
Line 4862 SCANTRONFORM	Line 5017 SCANTRONFORM
</tr>	</tr>
SCANTRONFORM	SCANTRONFORM

$r->print(<<SCANTRONFORM);	$r->print('<tr><td bgcolor="#777777">');
</table>	&Apache::lonpickcode::code_list($r,2);
$grading_menu_button	$r->print('</td></tr></table>');
SCANTRONFORM	$r->print($grading_menu_button);

return	return
}	}

Line 5031 sub username_to_idmap {	Line 5185 sub username_to_idmap {

sub scantron_fixup_scanline {	sub scantron_fixup_scanline {
my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;	my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;


if ($field eq 'ID') {	if ($field eq 'ID') {
if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {	if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {
return ($line,1,'New value too large');	return ($line,1,'New value too large');
Line 5062 sub scantron_fixup_scanline {	Line 5217 sub scantron_fixup_scanline {
$$scantron_config{'CODElength'})=$args->{'CODE'};	$$scantron_config{'CODElength'})=$args->{'CODE'};
}	}
} elsif ($field eq 'answer') {	} elsif ($field eq 'answer') {
my $length=$scantron_config->{'Qlength'};	&scantron_get_maxbubble(); # Need the bubble counter info.
	my $length =$scantron_config->{'Qlength'};
my $off=$scantron_config->{'Qoff'};	my $off=$scantron_config->{'Qoff'};
my $on=$scantron_config->{'Qon'};	my $on=$scantron_config->{'Qon'};
my $answer=${off}x$length;	my $question_number = $args->{'question'} -1;
if ($args->{'response'} eq 'none') {	my $first_position = $first_bubble_line{$question_number};
&scan_data($scan_data,	my $bubble_count = $bubble_lines_per_response{$question_number};
"$whichline.no_bubble.".$args->{'question'},'1');	my $bubbles_per_line= $$scantron_config{'Qlength'};
} else {	my $answer=${off}x($bubbles_per_line*$bubble_count);
if ($on eq 'letter') {	my $final_answer;
my @alphabet=('A'..'Z');	if ($$scantron_config{'Qon'} eq 'letter' \|\|
$answer=$alphabet[$args->{'response'}];	$$scantron_config{'Qon'} eq 'number') {
} elsif ($on eq 'number') {	$bubbles_per_line = 10;
$answer=$args->{'response'}+1;	}
if ($answer == 10) { $answer = '0'; }	if (defined $args->{'response'}) {

	if ($args->{'response'} eq 'none') {
	&scan_data($scan_data,
	"$whichline.no_bubble.".$args->{'question'},'1');
} else {	} else {
substr($answer,$args->{'response'},1)=$on;	my ($bubble_line, $bubble_number) = split(/:/,$args->{'response'});
	if ($on eq 'letter') {
	my @alphabet=('A'..'Z');
	$answer=$alphabet[$bubble_number];
	} elsif ($on eq 'number') {
	$answer= $bubble_number+1;
	if ($answer == 10) { $answer = '0'; }
	} else {
	substr($answer,$bubble_number+$bubble_line*$bubbles_per_line,1)=$on;
	$final_answer = $answer;
	}
	&scan_data($scan_data,
	"$whichline.no_bubble.".$args->{'question'},undef,'1');

	# Positional notation already has the right final answer length..

	if (($on eq 'letter') \|\| ($on eq 'number')) {
	for (my $l = 0; $l < $bubble_count; $l++) {
	if ($l eq $bubble_line) {
	$final_answer .= $answer;
	} else {
	$final_answer .= ' ';
	}
	}
	}
}	}
&scan_data($scan_data,	# $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
"$whichline.no_bubble.".$args->{'question'},undef,'1');	#substr($line,$where-1,$length)=$answer;
	substr($line,
	$scantron_config->{'Qstart'}+$first_position-1,
	$bubbles_per_line*$length) = $final_answer;
}	}
my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
substr($line,$where-1,$length)=$answer;
}	}
return $line;	return $line;
}	}
Line 5176 sub scan_data {	Line 5361 sub scan_data {

sub scantron_parse_scanline {	sub scantron_parse_scanline {
my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_;	my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_;

my %record;	my %record;
my $questions=substr($line,$$scantron_config{'Qstart'}-1); # Answers	my $questions=substr($line,$$scantron_config{'Qstart'}-1); # Answers
my $data=substr($line,0,$$scantron_config{'Qstart'}-1); # earlier stuff	my $data=substr($line,0,$$scantron_config{'Qstart'}-1); # earlier stuff
Line 5214 sub scantron_parse_scanline {	Line 5400 sub scantron_parse_scanline {
my $questnum=0;	my $questnum=0;
my $ansnum =1; # Multiple 'answer lines'/question.	my $ansnum =1; # Multiple 'answer lines'/question.

while ($questions) {	chomp($questions); # Get rid of any trailing \n.
	$questions =~ s/\r$//; # Get rid of trailing \r too (MAC or Win uploads).
	while (length($questions)) {
my $answers_needed = $bubble_lines_per_response{$questnum};	my $answers_needed = $bubble_lines_per_response{$questnum};
my $answer_length = $$scantron_config{'Qlength'} * $answers_needed;	my $answer_length = $$scantron_config{'Qlength'} * $answers_needed;

Line 5238 sub scantron_parse_scanline {	Line 5426 sub scantron_parse_scanline {
\|\| (&occurence_count($currentquest, "[A-Z]") > 1)) {	\|\| (&occurence_count($currentquest, "[A-Z]") > 1)) {
push(@{$record{'scantron.doubleerror'}},$questnum);	push(@{$record{'scantron.doubleerror'}},$questnum);
for (my $ans = 0; $ans < $answers_needed; $ans++) {	for (my $ans = 0; $ans < $answers_needed; $ans++) {
$record{"scantron.$ansnum.answer"}='';	my $bubble = substr($currentquest, $ans, 1);
	if ($bubble =~ /[A-Z]/ ) {
	$record{"scantron.$ansnum.answer"} = $bubble;
	} else {
	$record{"scantron.$ansnum.answer"}='';
	}
$ansnum++;	$ansnum++;
}	}

Line 5252 sub scantron_parse_scanline {	Line 5445 sub scantron_parse_scanline {
}	}
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {	if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);	push(@{$record{"scantron.missingerror"}},$questnum);
$ansnum += $answers_needed;	# $ansnum += $answers_needed;
}	}

} else {	} else {
for (my $ans = 0; $ans < $answers_needed; $ans++) {	for (my $ans = 0; $ans < $answers_needed; $ans++) {
$record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);	$record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
Line 5273 sub scantron_parse_scanline {	Line 5465 sub scantron_parse_scanline {
\|\| (&occurence_count($currentquest, '\d') > 1)) {	\|\| (&occurence_count($currentquest, '\d') > 1)) {
push(@{$record{'scantron.doubleerror'}},$questnum);	push(@{$record{'scantron.doubleerror'}},$questnum);
for (my $ans = 0; $ans < $answers_needed; $ans++) {	for (my $ans = 0; $ans < $answers_needed; $ans++) {
$record{"scantron.$ansnum.answer"}='';	my $bubble = substr($currentquest, $ans, 1);
	if ($bubble =~ /\d/) {
	$record{"scantron.$ansnum.answer"} = $alphabet[$bubble];
	} else {
	$record{"scantron.$ansnum.answer"}=' ';
	}
$ansnum++;	$ansnum++;
}	}

Line 5318 sub scantron_parse_scanline {	Line 5515 sub scantron_parse_scanline {
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {	if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);	push(@{$record{"scantron.missingerror"}},$questnum);
}	}
} elsif (scalar(@array) lt 2) {
	# If the bubble is not the last position, there will be
	# 2 elements. If it is the last position, there will be 1 element.

	} elsif (scalar(@array) le 2) {

my $location = [length($array[0])];	my $location = length($array[0]);
my $line_num = $location / $$scantron_config{'Qlength'};	my $line_num = int($location / $$scantron_config{'Qlength'});
my $bubble = $alphabet[$location % $$scantron_config{'Qlength'}];	my $bubble = $alphabet[$location % $$scantron_config{'Qlength'}];


for (my $ans = 0; $ans < $answers_needed; $ans++) {	for (my $ans = 0; $ans < $answers_needed; $ans++) {
if ($ans eq $line_num) {	if ($ans eq $line_num) {
Line 5343 sub scantron_parse_scanline {	Line 5545 sub scantron_parse_scanline {

my $first_answer = $ansnum;	my $first_answer = $ansnum;
for (my $ans =0; $ans < $answers_needed; $ans++) {	for (my $ans =0; $ans < $answers_needed; $ans++) {
$record{"scantron.$ansnum.answer"} = '';	my $item = $first_answer+$ans;
$ans++;	$record{"scantron.$item.answer"} = '';
}	}

my @ans=@array;	my @ans=@array;
my $i=length($ans[0]);shift(@ans);	my $i=0;
	my $increment = 0;
while ($#ans) {	while ($#ans) {
$i+=length($ans[0])+1;	$i+=length($ans[0]) + $increment;
my $line = $i/$$scantron_config{'Qlength'} + $first_answer;	my $line = int($i/$$scantron_config{'Qlength'} + $first_answer);
my $bubble = $i%$$scantron_config{'Qlength'};	my $bubble = $i%$$scantron_config{'Qlength'};

$record{"scantron.$line.answer"}.=$alphabet[$bubble];	$record{"scantron.$line.answer"}.=$alphabet[$bubble];
shift(@ans);	shift(@ans);
	$increment = 1;
}	}
	$ansnum += $answers_needed;
}	}
}	}
}	}
Line 5716 SCANTRONFORM	Line 5920 SCANTRONFORM

my $line = 0;	my $line = 0;
while (defined($env{"form.scantron.bubblelines.$line"})) {	while (defined($env{"form.scantron.bubblelines.$line"})) {
&Apache::lonnet::logthis("Saving chunk for $line");
my $chunk =	my $chunk =
'<input type="hidden" name="scantron.bubblelines.'.$line.'" value="'.$env{"form.scantron.bubblelines.$line"}.'" />'."\n";	'<input type="hidden" name="scantron.bubblelines.'.$line.'" value="'.$env{"form.scantron.bubblelines.$line"}.'" />'."\n";
$chunk .=	$chunk .=
Line 5782 sub scantron_validate_file {	Line 5985 sub scantron_validate_file {
}	}
my $currentphase=$env{'form.validatepass'};	my $currentphase=$env{'form.validatepass'};

&Apache::lonnet::logthis("Phase: $currentphase");

my $stop=0;	my $stop=0;
while (!$stop && $currentphase < scalar(@validate_phases)) {	while (!$stop && $currentphase < scalar(@validate_phases)) {
Line 6294 sub scantron_validate_ID {	Line 6496 sub scantron_validate_ID {
sub scantron_get_correction {	sub scantron_get_correction {
my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;	my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;

#FIXME in the case of a duplicated ID the previous line, probaly need	#FIXME in the case of a duplicated ID the previous line, probably need
#to show both the current line and the previous one and allow skipping	#to show both the current line and the previous one and allow skipping
#the previous one or the current one	#the previous one or the current one

Line 6393 ENDSCRIPT	Line 6595 ENDSCRIPT
$r->print($message);	$r->print($message);
$r->print("<p>Please indicate which bubble should be used for grading</p>");	$r->print("<p>Please indicate which bubble should be used for grading</p>");
foreach my $question (@{$arg}) {	foreach my $question (@{$arg}) {

my $selected = &get_response_bubbles($scan_record, $question);	my $selected = &get_response_bubbles($scan_record, $question);
	my @select_array = split(/:/,$selected);
&scantron_bubble_selector($r,$scan_config,$question,	&scantron_bubble_selector($r,$scan_config,$question,
split('',$selected));	@select_array);
}	}
} elsif ($error eq 'missingbubble') {	} elsif ($error eq 'missingbubble') {
$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");	$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
Line 6407 ENDSCRIPT	Line 6609 ENDSCRIPT
join(',',@{$arg}).'" />');	join(',',@{$arg}).'" />');
foreach my $question (@{$arg}) {	foreach my $question (@{$arg}) {
my $selected = &get_response_bubbles($scan_record, $question);	my $selected = &get_response_bubbles($scan_record, $question);
&scantron_bubble_selector($r,$scan_config,$question);	my @select_array = split(/:/,$selected); # ought to be an array of empties.
	&scantron_bubble_selector($r,$scan_config,$question, @select_array);
}	}
} else {	} else {
$r->print("\n<ul>");	$r->print("\n<ul>");
Line 6427 ENDSCRIPT	Line 6630 ENDSCRIPT
$r - Apache request object	$r - Apache request object
$scan_config - hash from &get_scantron_config()	$scan_config - hash from &get_scantron_config()
$quest - number of the bubble line to make a corrector for	$quest - number of the bubble line to make a corrector for
$selected - array of letters of previously selected bubbles	@lines - array of answer lines.

=cut	=cut

sub scantron_bubble_selector {	sub scantron_bubble_selector {
my ($r,$scan_config,$quest,@selected)=@_;	my ($r,$scan_config,$quest,@lines)=@_;
my $max=$$scan_config{'Qlength'};	my $max=$$scan_config{'Qlength'};


my $scmode=$$scan_config{'Qon'};	my $scmode=$$scan_config{'Qon'};

	my $bubble_length = scalar(@lines);


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

my $response = $quest-1;	my $response = $quest-1;
my $lines = $bubble_lines_per_response{$response};	my $lines = $bubble_lines_per_response{$response};
&Apache::lonnet::logthis("Question $quest, lines: $lines");

my $total_lines = $lines*2;	my $total_lines = $lines*2;
my @alphabet=('A'..'Z');	my @alphabet=('A'..'Z');

$r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");	$r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");

for (my $l = 0; $l < $lines; $l++) {	for (my $l = 0; $l < $lines; $l++) {
if ($l != 0) {	if ($l != 0) {
$r->print('<tr>');	$r->print('<tr>');
}	}
	my @selected = split(//,$lines[$l]);
# FIXME: This loop probably has to be considerably more clever for
# multiline bubbles: User can multibubble by having bubbles in
# several lines. User can skip lines legitimately etc. etc.

for (my $i=0;$i<$max;$i++) {	for (my $i=0;$i<$max;$i++) {
$r->print("\n".'<td align="center">');	$r->print("\n".'<td align="center">');
if ($selected[0] eq $alphabet[$i]) {	if ($selected[0] eq $alphabet[$i]) {
Line 6483 sub scantron_bubble_selector {	Line 6685 sub scantron_bubble_selector {
# multiline questions (different values e.g..).	# multiline questions (different values e.g..).

for (my $i=0;$i<$max;$i++) {	for (my $i=0;$i<$max;$i++) {
	my $value = "$l:$i"; # Relative bubble line #: Bubble in line.
$r->print("\n".	$r->print("\n".
'<td><label><input type="radio" name="scantron_correct_Q_'.	'<td><label><input type="radio" name="scantron_correct_Q_'.
$quest.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");	$quest.'" value="'.$value.'" />'.$alphabet[$i]."</label></td>");
}	}
$r->print('</tr>');	$r->print('</tr>');

Line 6706 sub scantron_validate_doublebubble {	Line 6909 sub scantron_validate_doublebubble {
=cut	=cut

sub scantron_get_maxbubble {	sub scantron_get_maxbubble {
&Apache::lonnet::logthis("get_max_bubble");
if (defined($env{'form.scantron_maxbubble'}) &&	if (defined($env{'form.scantron_maxbubble'}) &&
$env{'form.scantron_maxbubble'}) {	$env{'form.scantron_maxbubble'}) {
&Apache::lonnet::logthis("cached");
&restore_bubble_lines();	&restore_bubble_lines();
return $env{'form.scantron_maxbubble'};	return $env{'form.scantron_maxbubble'};
}	}
&Apache::lonnet::logthis("computing");

my (undef, undef, $sequence) =	my (undef, undef, $sequence) =
&Apache::lonnet::decode_symb($env{'form.selectpage'});	&Apache::lonnet::decode_symb($env{'form.selectpage'});
Line 6751 sub scantron_get_maxbubble {	Line 6951 sub scantron_get_maxbubble {


foreach my $part_id (@{$analysis{'parts'}}) {	foreach my $part_id (@{$analysis{'parts'}}) {
my ($trash, $part) = split(/\./, $part_id);

my $lines = $analysis{"$part_id.bubble_lines"}[0];
	my $lines = $analysis{"$part_id.bubble_lines"};;

# TODO - make this a persistent hash not an array.	# TODO - make this a persistent hash not an array.

Line 6803 sub scantron_validate_missingbubbles {	Line 7003 sub scantron_validate_missingbubbles {
$scan_data);	$scan_data);
if (!defined($$scan_record{'scantron.missingerror'})) { next; }	if (!defined($$scan_record{'scantron.missingerror'})) { next; }
my @to_correct;	my @to_correct;

	# Probably here's where the error is...

foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {	foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
if ($missing > $max_bubble) { next; }	if ($missing > $max_bubble) { next; }
push(@to_correct,$missing);	push(@to_correct,$missing);
Line 7135 sub show_grading_menu_form {	Line 7338 sub show_grading_menu_form {
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\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="'.&mt('Grading Menu').'" />'."\n".
'</form>'."\n";	'</form>'."\n";
return $result;	return $result;
}	}
Line 7159 sub grading_menu {	Line 7362 sub grading_menu {
my $probTitle = &Apache::lonnet::gettitle($symb);	my $probTitle = &Apache::lonnet::gettitle($symb);
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);	my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);

#
# Define menu data
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
$request->print($table);	$request->print($table);
my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),	my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
'handgrade'=>$hdgrade,	'handgrade'=>$hdgrade,
Line 7192 sub grading_menu {	Line 7391 sub grading_menu {
$fields{'command'} = 'scantron_selectphase';	$fields{'command'} = 'scantron_selectphase';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push (@menu, { url => $url,	push (@menu, { url => $url,
name => &mt('Grade Scantron Forms'),	name => &mt('Grade/Manage Scantron Forms'),
short_description =>	short_description =>
&mt('')});	&mt('')});
$fields{'command'} = 'verify';	$fields{'command'} = 'verify';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push (@menu, { url => "",	push (@menu, { url => "",
jscript => ' onClick="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" ',
name => &mt('Verify Receipt'),	name => &mt('Verify Receipt'),
short_description =>	short_description =>
&mt('')});	&mt('')});
$fields{'command'} = 'manage';
$url = &Apache::lonhtmlcommon::build_url('/adm/helper/resettimes.helper',\%fields);
push (@menu, { url => $url,
name => &mt('Manage Access Times'),
short_description =>
&mt('')});
$fields{'command'} = 'view';
$url = &Apache::lonhtmlcommon::build_url('/adm/pickcode',\%fields);
push (@menu, { url => $url,
name => &mt('View Saved CODEs'),
short_description =>
&mt('')});

#	#
# Create the menu	# Create the menu
my $Str;	my $Str;
Line 7223 sub grading_menu {	Line 7408 sub grading_menu {
$Str .= '<input type="hidden" name="command" value="" />'.	$Str .= '<input type="hidden" name="command" value="" />'.
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".	'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$probTitle.'" ue="" />'."\n".	'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".
'<input type="hidden" name="saveState" value="" />'."\n".	'<input type="hidden" name="saveState" value="" />'."\n".
'<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";
Line 7236 sub grading_menu {	Line 7421 sub grading_menu {
$menudata->{'url'}.'" >'.	$menudata->{'url'}.'" >'.
$menudata->{'name'}."</a></h3>\n";	$menudata->{'name'}."</a></h3>\n";
} else {	} else {
$Str .=' <h3><a '.	$Str .=' <h3><input type="button" value="'.&mt('Verify Receipt').'" '.
$menudata->{'jscript'}.	$menudata->{'jscript'}.
' href="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" >'.	' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
$menudata->{'name'}."</a></h3>\n";	' /></h3>';
$Str .= (' 'x8).	$Str .= (' 'x8).
' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}).	&mt(' receipt: [_1]',
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';	&Apache::lonnet::recprefix($env{'request.course.id'}).
	'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />');
}	}
$Str .= ' '.(' 'x8).$menudata->{'short_description'}.	$Str .= ' '.(' 'x8).$menudata->{'short_description'}.
"\n";	"\n";
}	}
$Str .="</dl>\n";
$Str .="</form>\n";	$Str .="</form>\n";
$request->print(<<GRADINGMENUJS);	$request->print(<<GRADINGMENUJS);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
Line 7260 sub grading_menu {	Line 7445 sub grading_menu {
cmdsave = 'submission';	cmdsave = 'submission';
}	}
formname.command.value = cmd;	formname.command.value = cmd;
formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
if (val < 5) formname.submit();	if (val < 5) formname.submit();
if (val == 5) {	if (val == 5) {
if (!checkReceiptNo(formname,'notOK')) { return false;}	if (!checkReceiptNo(formname,'notOK')) {
formname.submit();	return false;
}	} else {
if (val < 7) formname.submit();	formname.submit();
}	}
function checkChoice2(formname,val,cmdx) {
if (val <= 2) {
var cmd = radioSelection(formname.radioChoice);
var cmdsave = cmd;
} else {
cmd = cmdx;
cmdsave = 'submission';
}
formname.command.value = cmd;
if (val < 5) formname.submit();
if (val == 5) {
if (!checkReceiptNo(formname,'notOK')) { return false;}
formname.submit();
}	}
if (val < 7) formname.submit();
}	}

function checkReceiptNo(formname,nospace) {	function checkReceiptNo(formname,nospace) {
Line 7302 sub grading_menu {	Line 7471 sub grading_menu {
</script>	</script>
GRADINGMENUJS	GRADINGMENUJS
&commonJSfunctions($request);	&commonJSfunctions($request);
my $result='<h3> <span class="LC_info">Manual Grading/View Submission</span></h3>';
$result.=$table;
my (undef,$sections) = &getclasslist('all','0');
my $savedState = &savedState();
my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});

$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$probTitle.'" ue="" />'."\n".
'<input type="hidden" name="saveState" value="" />'."\n".
'<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";

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

$result.='<table width="100%" border="0">';
$result.='<tr bgcolor="#ffffe6" valign="top">'."\n";
$result.='<td><b>'.&mt('Sections').'</b></td>';
# $result.='<td>Groups</td>';
$result.='<td><b>'.&mt('Access Status').'</td>'."\n";
$result.='</tr>';
$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
' <select name="section" multiple="multiple" size="3">'."\n";
if (ref($sections)) {
foreach (sort (@$sections)) {
$result.='<option value="'.$_.'" '.
($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n";
}
}
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';
return $Str;	return $Str;
}	}

Line 7387 sub submit_options {	Line 7519 sub submit_options {
</script>	</script>
GRADINGMENUJS	GRADINGMENUJS
&commonJSfunctions($request);	&commonJSfunctions($request);
my $result='<h3> <span class="LC_info">Manual Grading/View Submission</span></h3>';
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);	my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
$result.=$table;	my $result;
my (undef,$sections) = &getclasslist('all','0');	my (undef,$sections) = &getclasslist('all','0');
my $savedState = &savedState();	my $savedState = &savedState();
my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});	my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
Line 7406 GRADINGMENUJS	Line 7537 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 border="0"><tr><td bgcolor=#777777>'."\n".	$result.='
'<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n".	<div class="LC_grade_select_mode">
' <b>Select a Grading/Viewing Option</b></td></tr>'."\n".	<div class="LC_grade_select_mode_current">
'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";	<h2>
	'.&mt('Grade Current Resource').'
$result.='<table width="100%" border="0">';	</h2>
$result.='<tr bgcolor="#ffffe6" valign="top">'."\n";	<div class="LC_grade_select_mode_body">
$result.='<td><b>'.&mt('Sections').'</b></td>';	<div class="LC_grades_resource_info">
$result.='<td><b>'.&mt('Groups').'</b></td>';	'.$table.'
$result.='<td><b>'.&mt('Access Status').'</td>'."\n";	</div>
$result.='</tr>';	<div class="LC_grade_select_mode_selector">
$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".	<div class="LC_grade_select_mode_selector_header">
' <select name="section" multiple="multiple" size="3">'."\n";	'.&mt('Sections').'
	</div>
	<div class="LC_grade_select_mode_selector_body">
	<select name="section" multiple="multiple" size="5">'."\n";
if (ref($sections)) {	if (ref($sections)) {
foreach (sort (@$sections)) {	foreach my $section (sort (@$sections)) {
$result.='<option value="'.$_.'" '.	$result.='<option value="'.$section.'" '.
($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n";	($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
}	}
}	}
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';	$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';
$result.= '</td><td>'."\n";	$result.='
$result.= &Apache::lonstatistics::GroupSelect('group','multiple',3);	</div>
$result.='</td><td>'."\n";	</div>
$result.=&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,3,undef,'mult');	<div class="LC_grade_select_mode_selector">
	<div class="LC_grade_select_mode_selector_header">
$result.='</td></tr>';	'.&mt('Groups').'
	</div>
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3"><label>'.	<div class="LC_grade_select_mode_selector_body">
'<input type="radio" name="radioChoice" value="submission" '.	'.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').	</div>
'</label> <select name="submitonly">'.	</div>
'<option value="yes" '.	<div class="LC_grade_select_mode_selector">
($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>'.	<div class="LC_grade_select_mode_selector_header">
'<option value="queued" '.	'.&mt('Access Status').'
($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>'.	</div>
'<option value="graded" '.	<div class="LC_grade_select_mode_selector_body">
($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>'.	'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
'<option value="incorrect" '.	</div>
($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>'.	</div>
'<option value="all" '.	<div class="LC_grade_select_mode_selector">
($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option></select></td></tr>'."\n";	<div class="LC_grade_select_mode_selector_header">
	'.&mt('Submission Status').'
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.	</div>
'<label><input type="radio" name="radioChoice" value="viewgrades" '.	<div class="LC_grade_select_mode_selector_body">
($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.	<select name="submitonly" size="5">
'<b>Current Resource:</b> For all students in selected section or course</label></td></tr>'."\n";	<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
	<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
$result.='<tr bgcolor="#ffffe6" valign="top"><td colspan="2">'.	<option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
'<label><input type="radio" name="radioChoice" value="pickStudentPage" '.	<option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>
($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.	<option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>
'The <b>complete</b> set/page/sequence: For one student</label></td></tr>'."\n";	</select>
	</div>
$result.='<tr bgcolor="#ffffe6"><td colspan="2"><br />'.	</div>
'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.	<div class="LC_grade_select_mode_type_body">
'</td></tr></table>'."\n";	<div class="LC_grade_select_mode_type">
	<label>
$result.='</td>'; #<td valign="top">';	<input type="radio" name="radioChoice" value="submission" '.
	($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.
# $result.='<table width="100%" border="0">';	&mt('Select individual students to grade and view submissions.').'
# $result.='<tr bgcolor="#ffffe6"><td>'.	</label>
# '<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.	</div>
# ' '.&mt('scores from file').' </td></tr>'."\n";	<div class="LC_grade_select_mode_type">
#	<label>
# $result.='<tr bgcolor="#ffffe6"><td>'.	<input type="radio" name="radioChoice" value="viewgrades" '.
# '<input type="button" onClick="javascript:checkChoice(this.form,\'6\',\'processclicker\');" value="'.&mt('Process').'" />'.	($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
# ' '.&mt('clicker file').' </td></tr>'."\n";	&mt('Grade all selected students in a grading table.').'
#	</label>
# $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.	</div>
# '<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.	<div class="LC_grade_select_mode_type">
# '" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";	<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" />
#	</div>
# if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {	</div>
# $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.	</div>
# '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.	</div>
# ' '.&mt('receipt').': '.	<div class="LC_grade_select_mode_page">
# &Apache::lonnet::recprefix($env{'request.course.id'}).	<h2>
# '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'.	'.&mt('Grade Complete Folder for One Student').'
# '</td></tr>'."\n";	</h2>
# }	<div class="LC_grades_select_mode_body">
# $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.	<div class="LC_grade_select_mode_type_body">
# '<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.	<div class="LC_grade_select_mode_type">
# '" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";	<label>
# $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.	<input type="radio" name="radioChoice" value="pickStudentPage" '.
# '<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'.	($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
# '" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";	&mt('The <b>complete</b> page/sequence/folder: For one student').'
#	</label>
# $result.='</table>'."\n".'</td>';	</div>
$result.= '</tr></table>'."\n".	<div class="LC_grade_select_mode_type">
'</td></tr></table></form>'."\n";	<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" />
	</div>
	</div>
	</div>
	</div>
	</div>
	</form>';
return $result;	return $result;
}	}

Line 7668 function sanitycheck() {	Line 7808 function sanitycheck() {
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
<input type="file" name="upfile" size="50" />	<input type="file" name="upfile" size="50" />
<br /><label>$type: $selectform</label>	<br /><label>$type: $selectform</label>
<br /><label>$attendance: <input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" /></label>	<br /><label><input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" />$attendance </label>
<br /><label>$personnel: <input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" /></label>	<br /><label><input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" />$personnel</label>
<br /><label>$specific: <input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" /></label>	<br /><label><input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" />$specific </label>
<input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />	<input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />
<input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />	<input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onChange="sanitycheck()" /></label>	<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onChange="sanitycheck()" /></label>
Line 8005 ENDHEADER	Line 8145 ENDHEADER

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

&reset_caches();	&reset_caches();
if ($env{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($request,'text/xml');	&Apache::loncommon::content_type($request,'text/xml');
Line 8101 sub handler {	Line 8240 sub handler {
} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
$request->print(&csvuploadassign($request));	$request->print(&csvuploadassign($request));
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
&Apache::lonnet::logthis("Selecting pyhase");
$request->print(&scantron_selectphase($request));	$request->print(&scantron_selectphase($request));
} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
$request->print(&scantron_do_warning($request));	$request->print(&scantron_do_warning($request));

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

Removed from v.1.448
changed lines
	Added in v.1.485