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.584 and 1.605

version 1.584, 2009/12/15 18:26:18	version 1.605, 2010/04/06 14:56:37
Line 96 sub ssi_print_error {	Line 96 sub ssi_print_error {

#	#
# --- Retrieve the parts from the metadata file.---	# --- Retrieve the parts from the metadata file.---
	# Returns an array of everything that the resources stores away
	#

sub getpartlist {	sub getpartlist {
my ($symb,$errorref) = @_;	my ($symb,$errorref) = @_;

Line 121 sub getpartlist {	Line 124 sub getpartlist {
}	}

# --- Get the symbolic name of a problem and the url	# --- Get the symbolic name of a problem and the url
	# Generate an error message if symb could not be found unless silent flag is set
	# Takes $env{'form.symb'} by default; if not present, takes $env{'form.url'} and tries to get symb from that
	#

sub get_symb {	sub get_symb {
my ($request,$silent) = @_;	my ($request,$silent) = @_;
(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;	(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;
my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));	my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
if ($symb eq '') {	if ($symb eq '') {
if (!$silent) {	if (!$silent) {
$request->print("Unable to handle ambiguous references:$url:.");	$request->print(&mt("Unable to handle ambiguous references: [_1].",$url));
return ();	return ();
}	}
}	}
Line 160 sub response_type {	Line 167 sub response_type {
return;	return;
}	}
my $res = $navmap->getBySymb($symb);	my $res = $navmap->getBySymb($symb);
	unless (ref($res)) {
	$$response_error = 1;
	return;
	}
my $partlist = $res->parts();	my $partlist = $res->parts();
my %vPart =	my %vPart =
map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));	map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));
Line 203 sub get_display_part {	Line 214 sub get_display_part {
return $display;	return $display;
}	}

#--- Show resource title
#--- and parts and response type
sub showResourceInfo {
my ($symb,$probTitle,$checkboxes,$res_error) = @_;
my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";
my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
if (ref($res_error)) {
if ($$res_error) {
return;
}
}
$result.=&Apache::loncommon::start_data_table()
.&Apache::loncommon::start_data_table_header_row();
if ($checkboxes) {
$result.='<th> </th>';
}
$result.='<th>'.&mt('Problem Part').'</th>'
.'<th>'.&mt('Res. ID').'</th>'
.'<th>'.&mt('Type').'</th>'
.&Apache::loncommon::end_data_table_header_row();
my %resptype = ();
my $hdgrade='no';
my %partsseen;
foreach my $partID (sort(keys(%$responseType))) {
foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {
my $handgrade=$$handgrade{$partID.'_'.$resID};
my $responsetype = $responseType->{$partID}->{$resID};
$hdgrade = $handgrade if ($handgrade eq 'yes');
$result.=&Apache::loncommon::start_data_table_row();
if ($checkboxes) {
if (exists($partsseen{$partID})) {
$result.="<td> </td>";
} else {
$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>";
}
$partsseen{$partID}=1;
}
my $display_part=&get_display_part($partID,$symb);
$result.='<td>'.$display_part.'</td>'
.'<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>'
.'<td>'.&mt($responsetype).'</td>'
# .'<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td>'
.&Apache::loncommon::end_data_table_row();
}
}
$result.=&Apache::loncommon::end_data_table();
return $result,$responseType,$hdgrade,$partlist,$handgrade;
}

sub reset_caches {	sub reset_caches {
&reset_analyze_cache();	&reset_analyze_cache();
&reset_perm();	&reset_perm();
Line 421 sub cleanRecord {	Line 383 sub cleanRecord {
return '<blockquote><table border="1">'.	return '<blockquote><table border="1">'.
'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.	'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.	'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';	$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'essay') {	} elsif ($response eq 'essay') {
if (! exists ($env{'form.'.$symb})) {	if (! exists ($env{'form.'.$symb})) {
my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',	my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
Line 483 sub cleanRecord {	Line 445 sub cleanRecord {
#-- A couple of common js functions	#-- A couple of common js functions
sub commonJSfunctions {	sub commonJSfunctions {
my $request = shift;	my $request = shift;
$request->print(<<COMMONJSFUNCTIONS);	$request->print(&Apache::lonhtmlcommon::scripttag(<<COMMONJSFUNCTIONS));
<script type="text/javascript" language="javascript">
function radioSelection(radioButton) {	function radioSelection(radioButton) {
var selection=null;	var selection=null;
if (radioButton.length > 1) {	if (radioButton.length > 1) {
Line 512 sub commonJSfunctions {	Line 473 sub commonJSfunctions {
return selectOne.value;	return selectOne.value;
}	}
}	}
</script>
COMMONJSFUNCTIONS	COMMONJSFUNCTIONS
}	}

Line 667 sub student_gradeStatus {	Line 627 sub student_gradeStatus {
sub jscriptNform {	sub jscriptNform {
my ($symb) = @_;	my ($symb) = @_;
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
my $jscript='<script type="text/javascript" language="javascript">'."\n".	my $jscript= &Apache::lonhtmlcommon::scripttag(
' function viewOneStudent(user,domain) {'."\n".	' function viewOneStudent(user,domain) {'."\n".
' document.onestudent.student.value = user;'."\n".	' document.onestudent.student.value = user;'."\n".
' document.onestudent.userdom.value = domain;'."\n".	' document.onestudent.userdom.value = domain;'."\n".
' document.onestudent.submit();'."\n".	' document.onestudent.submit();'."\n".
' }'."\n".	' }'."\n".
'</script>'."\n";	"\n");
$jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".	$jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".
'<input type="hidden" name="symb" value="'.&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="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n".	'<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n".
'<input type="hidden" name="command" value="submission" />'."\n".	'<input type="hidden" name="command" value="submission" />'."\n".
'<input type="hidden" name="student" value="" />'."\n".	'<input type="hidden" name="student" value="" />'."\n".
Line 730 sub most_similar {	Line 689 sub most_similar {

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

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

# these will be returned. Do not care if not at least 50 percent similar	# these will be returned. Do not care if not at least 50 percent similar
my $limit=0.6;	my $limit=0.6;
Line 767 sub most_similar {	Line 726 sub most_similar {

#------------------------------------ Receipt Verification Routines	#------------------------------------ Receipt Verification Routines
#	#

	sub initialverifyreceipt {
	my $request = shift;
	&commonJSfunctions($request);
	my ($symb) = &get_symb($request);
	return '<form name="gradingMenu"><input type="submit" value="'.&mt('Verify Receipt Number.').'" />'.
	&Apache::lonnet::recprefix($env{'request.course.id'}).
	'-<input type="text" name="receipt" size="4" />'.
	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
	'<input type="hidden" name="command" value="verify" />'.
	"</form>\n";
	}

#--- Check whether a receipt number is valid.---	#--- Check whether a receipt number is valid.---
sub verifyreceipt {	sub verifyreceipt {
my $request = shift;	my $request = shift;
Line 779 sub verifyreceipt {	Line 751 sub verifyreceipt {

my $title.=	my $title.=
'<h3><span class="LC_info">'.	'<h3><span class="LC_info">'.
&mt('Verifying Receipt No. [_1]',$receipt).	&mt('Verifying Receipt Number [_1]',$receipt).
'</span></h3>'."\n".	'</span></h3>'."\n";
'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
'</h4>'."\n";

my ($string,$contents,$matches) = ('','',0);	my ($string,$contents,$matches) = ('','',0);
my (undef,undef,$fullname) = &getclasslist('all','0');	my (undef,undef,$fullname) = &getclasslist('all','0');
Line 869 sub listStudents {	Line 839 sub listStudents {
my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};	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 '' ?
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};

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

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

my %lt = &Apache::lonlocal::texthash (	my %lt = &Apache::lonlocal::texthash (
'multiple' => 'Please select a student or group of students before clicking on the Next button.',	'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.',	'single' => 'Please select the student before clicking on the Next button.',
);	);
$request->print(<<LISTJAVASCRIPT);	$request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
<script type="text/javascript" language="javascript">
function checkSelect(checkBox) {	function checkSelect(checkBox) {
var ctr=0;	var ctr=0;
var sense="";	var sense="";
Line 912 sub listStudents {	Line 881 sub listStudents {
formname.command.value = 'submission';	formname.command.value = 'submission';
formname.submit();	formname.submit();
}	}
</script>
LISTJAVASCRIPT	LISTJAVASCRIPT

&commonJSfunctions($request);	&commonJSfunctions($request);
Line 921 LISTJAVASCRIPT	Line 889 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";

$gradeTable .= &Apache::lonhtmlcommon::start_pick_box();	$gradeTable .= &Apache::lonhtmlcommon::start_pick_box();
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))	$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))
Line 944 LISTJAVASCRIPT	Line 912 LISTJAVASCRIPT
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;	my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
$env{'form.Status'} = $saveStatus;	$env{'form.Status'} = $saveStatus;
$submission_options.=	$submission_options.=
'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.&mt('last submission only').' </label>'."\n".	'<span class="LC_nobreak">'.
'<label><input type="radio" name="lastSub" value="last" /> '.&mt('last submission & parts info').' </label>'."\n".	'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.
'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n".	&mt('last submission only').' </label></span>'."\n".
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>';	'<span class="LC_nobreak">'.
	'<label><input type="radio" name="lastSub" value="last" /> '.
	&mt('last submission & parts info').' </label></span>'."\n".
	'<span class="LC_nobreak">'.
	'<label><input type="radio" name="lastSub" value="datesub" /> '.
	&mt('by dates and submissions').'</label></span>'."\n".
	'<span class="LC_nobreak">'.
	'<label><input type="radio" name="lastSub" value="all" /> '.
	&mt('all details').'</label></span>';
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))	$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))
.$submission_options	.$submission_options
.&Apache::lonhtmlcommon::row_closure();	.&Apache::lonhtmlcommon::row_closure();
Line 967 LISTJAVASCRIPT	Line 943 LISTJAVASCRIPT
'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n".	'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n".
'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\n".	'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";

Line 993 LISTJAVASCRIPT	Line 968 LISTJAVASCRIPT
# 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="'.&mt('Next').' →" /> <br />'."\n";	'value="'.&mt('Next').' →" /> <br />'."\n";
$gradeTable.=&check_buttons();	$gradeTable.=&check_buttons();
my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);	my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);
$gradeTable.= &Apache::loncommon::start_data_table().	$gradeTable.= &Apache::loncommon::start_data_table().
Line 1111 LISTJAVASCRIPT	Line 1086 LISTJAVASCRIPT
}	}

$gradeTable.=&Apache::loncommon::end_data_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="'.&mt('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) {
Line 1140 LISTJAVASCRIPT	Line 1115 LISTJAVASCRIPT

sub check_script {	sub check_script {
my ($form, $type)=@_;	my ($form, $type)=@_;
my $chkallscript='<script type="text/javascript">	my $chkallscript= &Apache::lonhtmlcommon::scripttag('
function checkall() {	function checkall() {
for (i=0; i<document.forms.'.$form.'.elements.length; i++) {	for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
ele = document.forms.'.$form.'.elements[i];	ele = document.forms.'.$form.'.elements[i];
Line 1171 sub check_script {	Line 1146 sub check_script {
}	}
}	}

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

Line 1210 sub processGroup {	Line 1185 sub processGroup {
sub sub_page_js {	sub sub_page_js {
my $request = shift;	my $request = shift;
my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');	my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
$request->print(<<SUBJAVASCRIPT);	$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
<script type="text/javascript" language="javascript">
function updateRadio(formname,id,weight) {	function updateRadio(formname,id,weight) {
var gradeBox = formname["GD_BOX"+id];	var gradeBox = formname["GD_BOX"+id];
var radioButton = formname["RADVAL"+id];	var radioButton = formname["RADVAL"+id];
Line 1379 sub sub_page_js {	Line 1353 sub sub_page_js {

formname.submit();	formname.submit();
}	}
</script>
SUBJAVASCRIPT	SUBJAVASCRIPT
}	}

Line 1389 sub sub_page_kw_js {	Line 1362 sub sub_page_kw_js {
my $iconpath = $request->dir_config('lonIconsURL');	my $iconpath = $request->dir_config('lonIconsURL');
&commonJSfunctions($request);	&commonJSfunctions($request);

my $inner_js_msg_central=<<INNERJS;	my $inner_js_msg_central= &Apache::lonhtmlcommon::scripttag(<<INNERJS);
<script text="text/javascript">
function checkInput() {	function checkInput() {
opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);	opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);
var nmsg = opener.document.SCORE.savemsgN.value;	var nmsg = opener.document.SCORE.savemsgN.value;
Line 1427 sub sub_page_kw_js {	Line 1399 sub sub_page_kw_js {
self.close()	self.close()

}	}
</script>
INNERJS	INNERJS

my $inner_js_highlight_central=<<INNERJS;	my $inner_js_highlight_central= &Apache::lonhtmlcommon::scripttag(<<INNERJS);
<script type="text/javascript">
function updateChoice(flag) {	function updateChoice(flag) {
opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);	opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);	opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
Line 1442 INNERJS	Line 1412 INNERJS
}	}
self.close()	self.close()
}	}
</script>
INNERJS	INNERJS

my $start_page_msg_central =	my $start_page_msg_central =
Line 1466 INNERJS	Line 1435 INNERJS
my $docopen=&Apache::lonhtmlcommon::javascript_docopen();	my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
$docopen=~s/^document\.//;	$docopen=~s/^document\.//;
my $alertmsg = &mt('Please select a word or group of words from document and then click this link.');	my $alertmsg = &mt('Please select a word or group of words from document and then click this link.');
$request->print(<<SUBJAVASCRIPT);	$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
<script type="text/javascript" language="javascript">

//===================== Show list of keywords ====================	//===================== Show list of keywords ====================
function keywords(formname) {	function keywords(formname) {
Line 1617 INNERJS	Line 1585 INNERJS
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 1691 INNERJS	Line 1659 INNERJS
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();
}	}

</script>
SUBJAVASCRIPT	SUBJAVASCRIPT
}	}

Line 1711 sub get_increment {	Line 1678 sub get_increment {
return $increment;	return $increment;
}	}

	sub gradeBox_start {
	return (
	&Apache::loncommon::start_data_table()
	.&Apache::loncommon::start_data_table_header_row()
	.'<th>'.&mt('Part').'</th>'
	.'<th>'.&mt('Points').'</th>'
	.'<th> </th>'
	.'<th>'.&mt('Assign Grade').'</th>'
	.'<th>'.&mt('Weight').'</th>'
	.'<th>'.&mt('Grade Status').'</th>'
	.&Apache::loncommon::end_data_table_header_row()
	);
	}

	sub gradeBox_end {
	return (
	&Apache::loncommon::end_data_table()
	);
	}
#--- displays the grading box, used in essay type problem and grading by page/sequence	#--- displays the grading box, used in essay type problem and grading by page/sequence
sub gradeBox {	sub gradeBox {
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;	my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
Line 1730 sub gradeBox {	Line 1716 sub gradeBox {
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>';	$result.=&Apache::loncommon::start_data_table_row();
my $ctr = 0;	my $ctr = 0;
my $thisweight = 0;	my $thisweight = 0;
my $increment = &get_increment();	my $increment = &get_increment();
Line 1738 sub gradeBox {	Line 1724 sub gradeBox {
my $radio.='<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) {
$radio.= '<td><span class="LC_nobreak"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.	$radio.= '<td><span class="LC_nobreak"><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";
$radio.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');	$radio.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
Line 1749 sub gradeBox {	Line 1735 sub gradeBox {

my $line.='<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";
$line.='<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><b>'.&mt('Grade Status').':</b>'."\n";	' </td>'."\n";
$line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.	$line.='<td><select name="GD_SEL'.$counter.'_'.$partid.'" '.
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";	'onchange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {	if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
$line.='<option></option>'.	$line.='<option></option>'.
'<option value="excused" selected="selected">'.&mt('excused').'</option>';	'<option value="excused" selected="selected">'.&mt('excused').'</option>';
Line 1766 sub gradeBox {	Line 1752 sub gradeBox {
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";	$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\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);
$result .=	$result .=
'<td><b>'.&mt('Part:').'</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points:').'</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';	'<td>'.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';
$result.='</tr></table>'."\n";	$result.=&Apache::loncommon::end_data_table_row();
$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 1850 sub show_problem {	Line 1835 sub show_problem {
$companswer=~s\|name="submit"\|name="would_have_been_submit"\|g;	$companswer=~s\|name="submit"\|name="would_have_been_submit"\|g;
}	}
$rendered=	$rendered=
'<div class="LC_grade_show_problem_header">'.	'<div class="LC_Box">'
&mt('View of the problem').	.'<h3 class="LC_hcell">'.&mt('View of the problem').'</h3>'
'</div><div class="LC_grade_show_problem_problem">'.	.$rendered
$rendered.	.'</div>';
'</div>';
$companswer=	$companswer=
'<div class="LC_grade_show_problem_header">'.	'<div class="LC_Box">'
&mt('Correct answer').	.'<h3 class="LC_hcell">'.&mt('Correct answer').'</h3>'
'</div><div class="LC_grade_show_problem_problem">'.	.$companswer
$companswer.	.'</div>';
'</div>';
my $result;	my $result;
if ($mode eq 'both') {	if ($mode eq 'both') {
$result=$rendered.$companswer;	$result=$rendered.$companswer;
} elsif ($mode eq 'text') {	} elsif ($mode eq 'text') {
$result=$rendered;	$result=$rendered;
} elsif ($mode eq 'answer') {	} elsif ($mode eq 'answer') {
$result=$companswer;	$result=$companswer;
}	}
$result='<div class="LC_grade_show_problem">'.$result.'</div>';
return $result;	return $result;
}	}

Line 1930 sub submission {	Line 1912 sub submission {
$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?	$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});	my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';	$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
my $symb = &get_symb($request);	my $symb = &get_symb($request);
	my $probtitle=&Apache::lonnet::gettitle($symb);
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }	if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }

if (!&canview($usec)) {	if (!&canview($usec)) {
Line 1954 sub submission {	Line 1937 sub submission {
if ($counter == 0) {	if ($counter == 0) {
&sub_page_js($request);	&sub_page_js($request);
&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');	&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
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">'.&mt('Submission Record').'</span></h3>'."\n".	$request->print('<h3> <span class="LC_info">'.&mt('Submission Record').'</span></h3>');
'<h4> '.&mt('<b>Resource: </b> [_1]',$env{'form.probTitle'}).'</h4>'."\n");

# 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 1991 sub submission {	Line 1971 sub submission {
$env{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';	$env{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';	$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
$env{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?	$env{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?
$keyhash{$symb.'_subject'} : $env{'form.probTitle'};	$keyhash{$symb.'_subject'} : $probtitle;
$env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';	$env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
}	}
my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};	my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};
Line 2001 sub submission {	Line 1981 sub submission {
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n".	'<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n".
'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".	'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="refresh" value="off" />'."\n".	'<input type="hidden" name="refresh" value="off" />'."\n".
'<input type="hidden" name="studentNo" value="" />'."\n".	'<input type="hidden" name="studentNo" value="" />'."\n".
'<input type="hidden" name="gradeOpt" value="" />'."\n".	'<input type="hidden" name="gradeOpt" value="" />'."\n".
Line 2047 sub submission {	Line 2026 sub submission {
$request->print(<<KEYWORDS);	$request->print(<<KEYWORDS);
<b>Keyword Options:</b>	<b>Keyword Options:</b>
<a href="javascript:keywords(document.SCORE);" target="_self">List</a>	<a href="javascript:keywords(document.SCORE);" target="_self">List</a>
<a href="#" onMouseDown="javascript:getSel(); return false"	<a href="#" onmousedown="javascript:getSel(); return false"
CLASS="page">Paste Selection to List</a>	CLASS="page">Paste Selection to List</a>
<a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br />	<a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br />
KEYWORDS	KEYWORDS
Line 2063 KEYWORDS	Line 2042 KEYWORDS
}	}

# This is where output for one specific student would start	# This is where output for one specific student would start
my $add_class = ($counter%2) ? 'LC_grade_show_user_odd_row' : '';	my $add_class = ($counter%2) ? ' LC_grade_show_user_odd_row' : '';
$request->print("\n\n".	$request->print(
'<div class="LC_grade_show_user '.$add_class.'">'.	"\n\n"
'<div class="LC_grade_user_name">'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'</div>'.	.'<div class="LC_grade_show_user'.$add_class.'">'
'<div class="LC_grade_show_user_body">'."\n");	.'<h2>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'</h2>'
	."\n"
	);

	# Show additional functions if allowed
	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'));
	}

	# Show Problem
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;
if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {	if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {
Line 2092 KEYWORDS	Line 2090 KEYWORDS

# Display student info	# Display student info
$request->print(($counter == 0 ? '' : '<br />'));	$request->print(($counter == 0 ? '' : '<br />'));
my $result='<div class="LC_grade_submissions">';
	my $result='<div class="LC_Box">'
$result.='<div class="LC_grade_submissions_header">';	.'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>';
$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') {	if ($env{'form.handgrade'} eq 'no') {
$result.='<span class="LC_grade_check_note">'.	$result.='<p class="LC_info">'
&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)."</span>\n";	.&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)
	."</p>\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 $fullname;	my $fullname;
my $col_fullnames = [];	my $col_fullnames = [];
Line 2116 KEYWORDS	Line 2111 KEYWORDS
$result.=$sub_result;	$result.=$sub_result;
}	}
$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) Handgraded submission only
# (2) Last submission, includes submission that is not handgraded	# (2) Last submission, includes submission that is not handgraded
# (for multi-response type part)	# (for multi-response type part)
# (3) Last submission plus the parts info	# (3) Last submission plus the parts info
Line 2128 KEYWORDS	Line 2123 KEYWORDS

my $lastsubonly;	my $lastsubonly;

if ($$timestamp eq '') {	if ($$timestamp eq '') {
$lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>';	$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";	$lastsubonly =
	'<div class="LC_grade_submissions_body">'
	.'<b>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n";

my %seenparts;	my %seenparts;
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
Line 2158 KEYWORDS	Line 2155 KEYWORDS
$lastsubonly.="\n".'<div class="LC_grade_submission_part">'.	$lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
'<b>'.&mt('Part: [_1]',$display_part).'</b>'.	'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' <span class="LC_internal_info">'.	' <span class="LC_internal_info">'.
'('.&mt('Part ID: [_1]',$respid).')</b>'.	'('.&mt('Part ID: [_1]',$respid).')'.
'</span>   '.	'</span>   '.
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';	'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
next;	next;
Line 2166 KEYWORDS	Line 2163 KEYWORDS
foreach my $submission (@$string) {	foreach my $submission (@$string) {
my ($partid,$respid) = ($submission =~ /^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(/:/,$submission,2);	my ($ressub,$hide,$subval) = split(/:/,$submission,3);
# Similarity check	# Similarity check
my $similar='';	my $similar='';
if($env{'form.checkPlag'}){	if($env{'form.checkPlag'}){
Line 2178 KEYWORDS	Line 2175 KEYWORDS
&Apache::lonnet::coursedescription($ocrsid,	&Apache::lonnet::coursedescription($ocrsid,
{'one_time' => 1});	{'one_time' => 1});

$similar="<hr /><h3><span class=\"LC_warning\">".	if ($hide) {
&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',	$similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.
$osim,	&mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';
&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',	} else {
$old_course_desc{'description'},	$similar="<hr /><h3><span class=\"LC_warning\">".
$old_course_desc{'num'},	&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
$old_course_desc{'domain'}).	$osim,
'</span></h3><blockquote><i>'.	&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
&keywords_highlight($oessay).	$old_course_desc{'description'},
'</i></blockquote><hr />';	$old_course_desc{'num'},
	$old_course_desc{'domain'}).
	'</span></h3><blockquote><i>'.
	&keywords_highlight($oessay).
	'</i></blockquote><hr />';
	}
}	}
}	}
my $order=&get_order($partid,$respid,$symb,$uname,$udom);	my $order=&get_order($partid,$respid,$symb,$uname,$udom);
Line 2199 KEYWORDS	Line 2201 KEYWORDS
'<b>'.&mt('Part: [_1]',$display_part).'</b>'.	'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' <span class="LC_internal_info">'.	' <span class="LC_internal_info">'.
'('.&mt('Part ID: [_1]',$respid).')'.	'('.&mt('Part ID: [_1]',$respid).')'.
'</b></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">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';	if ($hide) {
my $file_counter = 0;	$lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));
foreach my $file (@$files) {	} else {
$file_counter++;	$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';
&Apache::lonnet::allowuploaded('/adm/grades',$file);	foreach my $file (@$files) {
$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" /> '.$file.'</a>';	&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 />';	$lastsubonly.='<br />';
}	}
$lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.	if ($hide) {
&cleanRecord($subval,$responsetype,$symb,$partid,	$lastsubonly.='<b>'.&mt('Anonymous Survey').'</b>';
$respid,\%record,$order,undef,$uname,$udom);	} else {
	$lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.
	&cleanRecord($subval,$responsetype,$symb,$partid,
	$respid,\%record,$order,undef,$uname,$udom);
	}
if ($similar) {$lastsubonly.="<br /><br />$similar\n";}	if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
$lastsubonly.='</div>';	$lastsubonly.='</div>';
}	}
}	}
}	}
$lastsubonly.='</div>'."\n";	$lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body
}	}
$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);
	my ($parts,$handgrade,$responseType) = &response_type($symb);

$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
} elsif ($env{'form.lastSub'} =~ /^(last\|all)$/) {	} elsif ($env{'form.lastSub'} =~ /^(last\|all)$/) {
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
Line 2237 KEYWORDS	Line 2247 KEYWORDS
# 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.='</div>'."\n";	$toGrade.='</div>'."\n";
if (($env{'form.command'} eq 'submission') \|\|	if (($env{'form.command'} eq 'submission') \|\|
Line 2281 KEYWORDS	Line 2291 KEYWORDS
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">'.	$request->print(
	'<div class="LC_Box">'
'<div class="LC_grade_assign_header">'.	.'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>'
&mt('Assign Grades').'</div>'.	);
'<div class="LC_grade_assign_body">');	$request->print(&gradeBox_start());
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 2297 KEYWORDS	Line 2307 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(&gradeBox_end()); # </div>
	$request->print('</div>');

$request->print('<div class="LC_grade_info_links">');	$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>');	$request->print('</div>');

$result='<input type="hidden" name="partlist'.$counter.	$result='<input type="hidden" name="partlist'.$counter.
Line 2326 KEYWORDS	Line 2327 KEYWORDS

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

$request->print('</div>');#LC_grade_show_user_body
$request->print('</div>');#LC_grade_show_user	$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='<br /><hr /><table border="0"><tr><td>'."\n";
$endform.='<input type="button" value="'.&mt('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">'.
'<option>1</option><option>2</option>'.	'<option>1</option><option>2</option>'.
Line 2344 KEYWORDS	Line 2344 KEYWORDS
$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
$endform.=&mt('[_1]student(s)',$ntstu);	$endform.=&mt('[_1]student(s)',$ntstu);
$endform.='  <input type="button" value="'.&mt('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="'.&mt('Next').'" '.	'<input type="button" value="'.&mt('Next').'" '.
'onClick="javascript:checksubmit(this.form,\'Next\');" target="_self" />  ';	'onclick="javascript:checksubmit(this.form,\'Next\');" target="_self" />  ';
$endform.=&mt('(Next and Previous (student) do not save the scores.)')."\n" ;	$endform.='<span class="LC_warning">'.
	&mt('(Next and Previous (student) do not save the scores.)').
	'</span>'."\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>';
Line 2416 sub check_collaborators {	Line 2418 sub check_collaborators {
#--- 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)=@_;
my (@string,$timestamp);	my (@string,$timestamp,%lasthidden);
if ($$returnhash{'version'}) {	if ($$returnhash{'version'}) {
my %lasthash=();	my %lasthash=();
my ($version);	my ($version);
Line 2428 sub get_last_submission {	Line 2430 sub get_last_submission {
&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});	&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
}	}
}	}
	my %typeparts;
	my $showsurv =
	&Apache::lonnet::allowed('vas',$env{'request.course.id'});
	foreach my $key (sort(keys(%lasthash))) {
	if ($key =~ /\.type$/) {
	if (($lasthash{$key} eq 'anonsurvey') \|\|
	($lasthash{$key} eq 'anonsurveycred')) {
	my ($ign,@parts) = split(/\./,$key);
	pop(@parts);
	unless ($showsurv) {
	my $id = join(',',@parts);
	$typeparts{$ign.'.'.$id} = $lasthash{$key};
	}
	delete($lasthash{$key});
	}
	}
	}
	my @hidden = keys(%typeparts);
foreach my $key (keys(%lasthash)) {	foreach my $key (keys(%lasthash)) {
next if ($key !~ /\.submission$/);	next if ($key !~ /\.submission$/);
	my $hide;
	if (@hidden) {
	foreach my $id (@hidden) {
	if ($key =~ /^\Q$id\E/) {
	$hide = 1;
	last;
	}
	}
	}
my ($partid,$foo) = split(/submission$/,$key);	my ($partid,$foo) = split(/submission$/,$key);
my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?	my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
'<span class="LC_warning">Draft Copy</span> ' : '';	'<span class="LC_warning">Draft Copy</span> ' : '';
push(@string, join(':', $key, $draft.$lasthash{$key}));	push(@string, join(':', $key, $hide, $draft.$lasthash{$key}));
}	}
}	}
if (!@string) {	if (!@string) {
Line 2500 sub processHandGrade {	Line 2528 sub processHandGrade {
if ($env{'form.withgrades'.$ctr}) {	if ($env{'form.withgrades'.$ctr}) {
$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;	$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
$messagetail = " for <a href=\"".	$messagetail = " for <a href=\"".
$feedurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";	$feedurl."?symb=$showsymb\">$restitle</a>";
}	}
$msgstatus =	$msgstatus =
&Apache::lonmsg::user_normal_msg($uname,$udom,$subject,	&Apache::lonmsg::user_normal_msg($uname,$udom,$subject,
Line 2528 sub processHandGrade {	Line 2556 sub processHandGrade {
$udom);	$udom);
if ($env{'form.withgrades'.$ctr}) {	if ($env{'form.withgrades'.$ctr}) {
$messagetail = " for <a href=\"".	$messagetail = " for <a href=\"".
$baseurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";	$baseurl."?symb=$showsymb\">$restitle</a>";
}	}
$msgstatus =	$msgstatus =
&Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);	&Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);
Line 2601 sub processHandGrade {	Line 2629 sub processHandGrade {

# Go directly to grade student - from submission or link from chart page	# Go directly to grade student - from submission or link from chart page
if ($button eq 'Grade Student') {	if ($button eq 'Grade Student') {
(undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb);	# (undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb);
my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};	my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};
($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);	($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
$env{'form.fullname'} = $$fullname{$processUser};	$env{'form.fullname'} = $$fullname{$processUser};
Line 2628 sub processHandGrade {	Line 2656 sub processHandGrade {
}	}
return $a cmp $b;	return $a cmp $b;
} (keys(%$fullname))) {	} (keys(%$fullname))) {
	# FIXME: this is fishy, looks like the button label
if ($nextflg == 1 && $button =~ /Next$/) {	if ($nextflg == 1 && $button =~ /Next$/) {
push(@parsedlist,$item);	push(@parsedlist,$item);
}	}
Line 2638 sub processHandGrade {	Line 2667 sub processHandGrade {
}	}
}	}
$ctr = 0;	$ctr = 0;
	# FIXME: this is fishy, looks like the button label
@parsedlist = reverse @parsedlist if ($button eq 'Previous');	@parsedlist = reverse @parsedlist if ($button eq 'Previous');
my $res_error;	my $res_error;
my ($partlist) = &response_type($symb,\$res_error);	my ($partlist) = &response_type($symb,\$res_error);
Line 3095 sub viewgrades_js {	Line 3125 sub viewgrades_js {
my ($request) = shift;	my ($request) = shift;

my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');	my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
$request->print(<<VIEWJAVASCRIPT);	$request->print(&Apache::lonhtmlcommon::scripttag(<<VIEWJAVASCRIPT));
<script type="text/javascript" language="javascript">
function writePoint(partid,weight,point) {	function writePoint(partid,weight,point) {
var radioButton = document.classgrade["RADVAL_"+partid];	var radioButton = document.classgrade["RADVAL_"+partid];
var textbox = document.classgrade["TEXTVAL_"+partid];	var textbox = document.classgrade["TEXTVAL_"+partid];
Line 3257 sub viewgrades_js {	Line 3286 sub viewgrades_js {
}	}
}	}

</script>
VIEWJAVASCRIPT	VIEWJAVASCRIPT
}	}

Line 3275 sub viewgrades {	Line 3303 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>'.&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 3288 sub viewgrades {	Line 3315 sub viewgrades {
&build_section_inputs().	&build_section_inputs().
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".	'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";

my ($common_header,$specific_header);	my ($common_header,$specific_header);
if ($env{'form.section'} eq 'all') {	if ($env{'form.section'} eq 'all') {
Line 3335 sub viewgrades {	Line 3361 sub viewgrades {
}	}
$radio.='</tr></table>';	$radio.='</tr></table>';
my $line = '<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}.' '.&mt('(problem weight)').'</td>'."\n";	$weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n";
$line.= '<td><b>'.&mt('Grade Status').':</b><select name="SELVAL_'.$partid.'"'.	$line.= '<td><b>'.&mt('Grade Status').':</b><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 value="excused">'.&mt('excused').'</option>'.	'<option value="excused">'.&mt('excused').'</option>'.
Line 3360 sub viewgrades {	Line 3386 sub viewgrades {
$result.=&Apache::loncommon::end_data_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="'.&mt('Revert to Default').'" '.	$result.='<input type="button" value="'.&mt('Revert to Default').'" '.
'onClick="javascript:resetEntry('.$ctsparts.');" />';	'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
Line 3424 sub viewgrades {	Line 3450 sub viewgrades {
$result.=&Apache::loncommon::end_data_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="'.&mt('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'));
Line 3476 sub viewstudentgrade {	Line 3502 sub viewstudentgrade {
'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";	'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
$result.='<input type="text" name="'.	$result.='<input type="text" name="'.
'GD_'.$student.'_'.$part.'_awarded" '.	'GD_'.$student.'_'.$part.'_awarded" '.
'onChange="javascript:changeSelect(\''.$part.'\',\''.$student.	'onchange="javascript:changeSelect(\''.$part.'\',\''.$student.
'\')" value="'.$pts.'" size="4" /></td>'."\n";	'\')" value="'.$pts.'" size="4" /></td>'."\n";
} elsif ($type eq 'solved') {	} elsif ($type eq 'solved') {
my ($status,$foo)=split(/_/,$score,2);	my ($status,$foo)=split(/_/,$score,2);
Line 3485 sub viewstudentgrade {	Line 3511 sub viewstudentgrade {
$part.'_solved_s" value="'.$status.'" />'."\n";	$part.'_solved_s" value="'.$status.'" />'."\n";
$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" value="excused">'.&mt('excused').'</option>'	$result.= (($status eq 'excused') ? '<option> </option><option selected="selected" value="excused">'.&mt('excused').'</option>'
: '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n";	: '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n";
$result.='<option value="reset status">'.&mt('reset status').'</option>';	$result.='<option value="reset status">'.&mt('reset status').'</option>';
Line 3511 sub editgrades {	Line 3537 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='<h2>'.&mt('Current Grade Status').'</h2>';	my $title='<h2>'.&mt('Current Grade Status').'</h2>';
$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= &Apache::loncommon::start_data_table().	my $result= &Apache::loncommon::start_data_table().
Line 3523 sub editgrades {	Line 3548 sub editgrades {
'incorrect'=>'incorrect_by_override',	'incorrect'=>'incorrect_by_override',
'excused' =>'excused',	'excused' =>'excused',
'ungraded' =>'ungraded_attempted',	'ungraded' =>'ungraded_attempted',
	'credited' =>'credit_attempted',
'nothing' => '',	'nothing' => '',
);	);
my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0');	my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0');
Line 3832 sub csvuploadmap_header {	Line 3858 sub csvuploadmap_header {
$javascript=&csvupload_javascript_forward_associate();	$javascript=&csvupload_javascript_forward_associate();
}	}

my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});	my $result='';
my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');	my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
my $ignore=&mt('Ignore First Line');	my $ignore=&mt('Ignore First Line');
$symb = &Apache::lonenc::check_encrypt($symb);	$symb = &Apache::lonenc::check_encrypt($symb);
Line 3845 $result	Line 3871 $result
Total number of records found in file: $distotal <hr />	Total number of records found in file: $distotal <hr />
Enter as many fields as you can. The system will inform you and bring you back	Enter as many fields as you can. The system will inform you and bring you back
to this page if the data selected is insufficient to run your class.<hr />	to this page if the data selected is insufficient to run your class.<hr />
<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />	<input type="button" value="Reverse Association" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>	<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
<input type="hidden" name="associate" value="" />	<input type="hidden" name="associate" value="" />
<input type="hidden" name="phase" value="three" />	<input type="hidden" name="phase" value="three" />
Line 3856 to this page if the data selected is ins	Line 3882 to this page if the data selected is ins
value="$env{'form.upfile_associate'}" />	value="$env{'form.upfile_associate'}" />
<input type="hidden" name="symb" value="$symb" />	<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="command" value="csvuploadoptions" />	<input type="hidden" name="command" value="csvuploadoptions" />
<hr />	<hr />
<script type="text/javascript" language="Javascript">
$javascript
</script>
ENDPICK	ENDPICK
	$request->print(&Apache::lonhtmlcommon::scripttag($javascript));
return '';	return '';

}	}
Line 3900 sub csvuploadmap_footer {	Line 3923 sub csvuploadmap_footer {
</table>	</table>
<input type="hidden" name="nfields" value="$i" />	<input type="hidden" name="nfields" value="$i" />
<input type="hidden" name="keyfields" value="$keyfields" />	<input type="hidden" name="keyfields" value="$keyfields" />
<input type="button" onClick="javascript:verify(this.form)" value="Assign Grades" /><br />	<input type="button" onclick="javascript:verify(this.form)" value="Assign Grades" /><br />
</form>	</form>
ENDPICK	ENDPICK
}	}

sub checkforfile_js {	sub checkforfile_js {
my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');	my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
my $result =<<CSVFORMJS;	my $result = &Apache::lonhtmlcommon::scripttag(<<CSVFORMJS);
<script type="text/javascript" language="javascript">
function checkUpload(formname) {	function checkUpload(formname) {
if (formname.upfile.value == "") {	if (formname.upfile.value == "") {
alert("$alertmsg");	alert("$alertmsg");
Line 3916 sub checkforfile_js {	Line 3938 sub checkforfile_js {
}	}
formname.submit();	formname.submit();
}	}
</script>
CSVFORMJS	CSVFORMJS
return $result;	return $result;
}	}
Line 3926 sub upcsvScores_form {	Line 3947 sub upcsvScores_form {
my ($symb)=&get_symb($request);	my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $result=&checkforfile_js();	my $result=&checkforfile_js();
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
$result.=$table;
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";	$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";	$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
$result.=' <b>'.&mt('Specify a file containing the class scores for current resource.').	$result.=' <b>'.&mt('Specify a file containing the class scores for current resource.').
Line 3942 sub upcsvScores_form {	Line 3960 sub upcsvScores_form {
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<input type="hidden" name="symb" value="$symb" />	<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="command" value="csvuploadmap" />	<input type="hidden" name="command" value="csvuploadmap" />
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
$upfile_select	$upfile_select
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />	<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
<label><input type="checkbox" name="noFirstLine" />$ignore</label>	<label><input type="checkbox" name="noFirstLine" />$ignore</label>
</form>	</form>
ENDUPFORM	ENDUPFORM
Line 4190 sub pickStudentPage {	Line 4207 sub pickStudentPage {
my ($request) = shift;	my ($request) = shift;

my $alertmsg = &mt('Please select the student you wish to grade.');	my $alertmsg = &mt('Please select the student you wish to grade.');
$request->print(<<LISTJAVASCRIPT);	$request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
<script type="text/javascript" language="javascript">

function checkPickOne(formname) {	function checkPickOne(formname) {
if (radioSelection(formname.student) == null) {	if (radioSelection(formname.student) == null) {
Line 4204 function checkPickOne(formname) {	Line 4220 function checkPickOne(formname) {
formname.submit();	formname.submit();
}	}

</script>
LISTJAVASCRIPT	LISTJAVASCRIPT
&commonJSfunctions($request);	&commonJSfunctions($request);
my ($symb) = &get_symb($request);	my ($symb) = &get_symb($request);
Line 4268 LISTJAVASCRIPT	Line 4283 LISTJAVASCRIPT
$result.=' <b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n";	$result.=' <b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n";

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

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

Line 4307 LISTJAVASCRIPT	Line 4322 LISTJAVASCRIPT
}	}
$studentTable.=&Apache::loncommon::end_data_table()."\n";	$studentTable.=&Apache::loncommon::end_data_table()."\n";
$studentTable.='<input type="button" '.	$studentTable.='<input type="button" '.
'onClick="javascript:checkPickOne(this.form);" value="'.&mt('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 4414 sub displayPage {	Line 4429 sub displayPage {
my $checkIcon = '<img alt="'.&mt('Check Mark').	my $checkIcon = '<img alt="'.&mt('Check Mark').
'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';	'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';

$studentTable.=' '.&mt('<b>Note:</b> Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon)."\n".	$studentTable.=' <span class="LC_info">'.
	&mt('Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon).
	'</span>'."\n".
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th align="center"> Prob. </th>'.	'<th align="center"> Prob. </th>'.
Line 4485 sub displayPage {	Line 4502 sub displayPage {

}	}
if (&canmodify($usec)) {	if (&canmodify($usec)) {
	$studentTable.=&gradeBox_start();
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
$studentTable.=&gradeBox($request,$symbx,$uname,$udom,$question,$partid,\%record);	$studentTable.=&gradeBox($request,$symbx,$uname,$udom,$question,$partid,\%record);
$studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n";	$studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n";
$question++;	$question++;
}	}
	$studentTable.=&gradeBox_end();
$prob++;	$prob++;
}	}
$studentTable.='</td></tr>';	$studentTable.='</td></tr>';
Line 4498 sub displayPage {	Line 4517 sub displayPage {
$curRes = $iterator->next();	$curRes = $iterator->next();
}	}

$studentTable.='</table>'."\n".	$studentTable.=
'<input type="button" value="'.&mt('Save').'" '.	'</table>'."\n".
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'.	'<input type="button" value="'.&mt('Save').'" '.
'</form>'."\n";	'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
	'</form>'."\n";
$studentTable.=&show_grading_menu_form($symb);	$studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);	$request->print($studentTable);

Line 4547 sub displaySubByDates {	Line 4567 sub displaySubByDates {
my @versionKeys = split(/\:/,$$record{$version.':keys'});	my @versionKeys = split(/\:/,$$record{$version.':keys'});
my @displaySub = ();	my @displaySub = ();
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
	my $hidden;
	if (($$record{$version.':resource.'.$partid.'.type'} eq 'anonsurvey') \|\|
	($$record{$version.':resource.'.$partid.'.type'} eq 'anonsurveycred')) {
	$hidden = 1;
	}
my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)	my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)
: sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));	: sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));


# next if ($$record{"$version:resource.$partid.solved"} eq '');	# next if ($$record{"$version:resource.$partid.solved"} eq '');
my $display_part=&get_display_part($partid,$symb);	my $display_part=&get_display_part($partid,$symb);
foreach my $matchKey (@matchKey) {	foreach my $matchKey (@matchKey) {
if (exists($$record{$version.':'.$matchKey}) &&	if (exists($$record{$version.':'.$matchKey}) &&
$$record{$version.':'.$matchKey} ne '') {	$$record{$version.':'.$matchKey} ne '') {

my ($responseId)= ($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].='<span class="LC_nobreak"';	$displaySub[0].='<span class="LC_nobreak"';
Line 4565 sub displaySubByDates {	Line 4589 sub displaySubByDates {
.'('.&mt('Part ID: [_1]',$responseId).')'	.'('.&mt('Part ID: [_1]',$responseId).')'
.'</span>'	.'</span>'
.' <b>';	.' <b>';
if ($$record{"$where.$partid.tries"} eq '') {	if ($hidden) {
$displaySub[0].=&mt('Trial not counted');	$displaySub[0].= &mt('Anonymous Survey').'</b>';
} else {	} else {
$displaySub[0].=&mt('Trial: [_1]',	if ($$record{"$where.$partid.tries"} eq '') {
	$displaySub[0].=&mt('Trial not counted');
	} else {
	$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});
if (!exists($orders{$partid})) { $orders{$partid}={}; }	if (!exists($orders{$partid})) { $orders{$partid}={}; }
if (!exists($orders{$partid}->{$responseId})) {	if (!exists($orders{$partid}->{$responseId})) {
$orders{$partid}->{$responseId}=	$orders{$partid}->{$responseId}=
&get_order($partid,$responseId,$symb,$uname,$udom,	&get_order($partid,$responseId,$symb,$uname,$udom,
$no_increment);	$no_increment);
}	}
$displaySub[0].='</b></span>'; # /nobreak	$displaySub[0].='</b></span>'; # /nobreak
$displaySub[0].='  '.	$displaySub[0].='  '.
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';	&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
	}
}	}
}	}
if (exists($$record{"$where.$partid.checkedin"})) {	if (exists($$record{"$where.$partid.checkedin"})) {
Line 4857 the homework problem.	Line 4885 the homework problem.
sub defaultFormData {	sub defaultFormData {
my ($symb)=@_;	my ($symb)=@_;
return '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	return '<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'}.'" />';
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
}	}


Line 5229 sub scantron_selectphase {	Line 5256 sub scantron_selectphase {
my $default_form_data=&defaultFormData(&get_symb($r,1));	my $default_form_data=&defaultFormData(&get_symb($r,1));
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};	my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
$r->print('	$r->print(&Apache::lonhtmlcommon::scripttag('
<script type="text/javascript" language="javascript">
function checkUpload(formname) {	function checkUpload(formname) {
if (formname.upfile.value == "") {	if (formname.upfile.value == "") {
alert("'.&mt('Please use the browse button to select a file from your local directory.').'");	alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
return false;	return false;
}	}
formname.submit();	formname.submit();
}	}'));
</script>	$r->print('

<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">	<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
'.$default_form_data.'	'.$default_form_data.'
<input name="courseid" type="hidden" value="'.$cnum.'" />	<input name="courseid" type="hidden" value="'.$cnum.'" />
Line 5247 sub scantron_selectphase {	Line 5272 sub scantron_selectphase {
<input name="command" value="scantronupload_save" type="hidden" />	<input name="command" value="scantronupload_save" type="hidden" />
'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'	'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
<br />	<br />
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />	<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
</form>	</form>
');	');

Line 6926 sub scantron_get_correction {	Line 6951 sub scantron_get_correction {
$r->print("\n<br />");	$r->print("\n<br />");
}	}

$r->print(<<ENDSCRIPT);	$r->print(&Apache::lonhtmlcommon::scripttag(<<ENDSCRIPT));
<script type="text/javascript">
function change_radio(field) {	function change_radio(field) {
var slct=document.scantronupload.scantron_CODE_resolution;	var slct=document.scantronupload.scantron_CODE_resolution;
var i;	var i;
Line 6935 function change_radio(field) {	Line 6959 function change_radio(field) {
if (slct[i].value==field) { slct[i].checked=true; }	if (slct[i].value==field) { slct[i].checked=true; }
}	}
}	}
</script>
ENDSCRIPT	ENDSCRIPT
my $href="/adm/pickcode?".	my $href="/adm/pickcode?".
"form=".&escape("scantronupload").	"form=".&escape("scantronupload").
Line 7007 sub verify_bubbles_checked {	Line 7030 sub verify_bubbles_checked {
my (@ansnums) = @_;	my (@ansnums) = @_;
my $ansnumstr = join('","',@ansnums);	my $ansnumstr = join('","',@ansnums);
my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines.");	my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines.");
my $output = (<<ENDSCRIPT);	my $output = &Apache::lonhtmlcommon::scripttag((<<ENDSCRIPT));
<script type="text/javascript">
function verify_bubble_radio(form) {	function verify_bubble_radio(form) {
var ansnumArray = new Array ("$ansnumstr");	var ansnumArray = new Array ("$ansnumstr");
var need_bubble_count = 0;	var need_bubble_count = 0;
Line 7031 function verify_bubble_radio(form) {	Line 7053 function verify_bubble_radio(form) {
}	}
form.submit();	form.submit();
}	}
</script>
ENDSCRIPT	ENDSCRIPT
return $output;	return $output;
}	}
Line 7434 sub scantron_get_maxbubble {	Line 7455 sub scantron_get_maxbubble {
if (ref($nav_error)) {	if (ref($nav_error)) {
$$nav_error = 1;	$$nav_error = 1;
}	}
	return;
}	}
my $map=$navmap->getResourceByUrl($sequence);	my $map=$navmap->getResourceByUrl($sequence);
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
Line 7597 sub scantron_process_students {	Line 7619 sub scantron_process_students {
my (%grader_partids_by_symb,%grader_randomlists_by_symb);	my (%grader_partids_by_symb,%grader_randomlists_by_symb);
&graders_resources_pass(\@resources,\%grader_partids_by_symb,	&graders_resources_pass(\@resources,\%grader_partids_by_symb,
\%grader_randomlists_by_symb);	\%grader_randomlists_by_symb);
	my $resource_error;
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my $ressymb = $resource->symb();	my $ressymb;
	if (ref($resource)) {
	$ressymb = $resource->symb();
	} else {
	$resource_error = 1;
	last;
	}
my ($analysis,$parts) =	my ($analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},	&scantron_partids_tograde($resource,$env{'request.course.id'},
$env{'user.name'},$env{'user.domain'},1);	$env{'user.name'},$env{'user.domain'},1);
Line 7610 sub scantron_process_students {	Line 7639 sub scantron_process_students {
}	}
}	}
}	}
	if ($resource_error) {
	$r->print(&navmap_errormsg());
	return '';
	}

my ($uname,$udom);	my ($uname,$udom);
my $result= <<SCANTRONFORM;	my $result= <<SCANTRONFORM;
Line 7680 SCANTRONFORM	Line 7713 SCANTRONFORM
}	}
($uname,$udom)=split(/:/,$uname);	($uname,$udom)=split(/:/,$uname);

my %partids_by_symb;	my (%partids_by_symb,$res_error);
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my $ressymb = $resource->symb();	my $ressymb;
	if (ref($resource)) {
	$ressymb = $resource->symb();
	} else {
	$res_error = 1;
	last;
	}
if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|	if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {	(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
my ($analysis,$parts) =	my ($analysis,$parts) =
Line 7693 SCANTRONFORM	Line 7732 SCANTRONFORM
}	}
}	}

	if ($res_error) {
	&scantron_add_delay(\@delayqueue,$line,
	'An error occurred while grading student '.$uname,2);
	next;
	}

&Apache::lonxml::clear_problem_counter();	&Apache::lonxml::clear_problem_counter();
&Apache::lonnet::appenv($scan_record);	&Apache::lonnet::appenv($scan_record);

Line 7866 sub scantron_upload_scantron_data {	Line 7911 sub scantron_upload_scantron_data {
my $default_form_data=&defaultFormData(&get_symb($r,1));	my $default_form_data=&defaultFormData(&get_symb($r,1));
my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');	my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');
my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");	my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");
$r->print('	$r->print(&Apache::lonhtmlcommon::scripttag('
<script type="text/javascript" language="javascript">
function checkUpload(formname) {	function checkUpload(formname) {
if (formname.upfile.value == "") {	if (formname.upfile.value == "") {
alert("'.$nofile_alert.'");	alert("'.$nofile_alert.'");
Line 7894 sub scantron_upload_scantron_data {	Line 7938 sub scantron_upload_scantron_data {
return;	return;
}	}

</script>	'));
	$r->print('
<h3>'.&mt('Send scanned bubblesheet data to a course').'</h3>	<h3>'.&mt('Send scanned bubblesheet data to a course').'</h3>

<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">	<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
Line 7916 sub scantron_upload_scantron_data {	Line 7960 sub scantron_upload_scantron_data {
&Apache::lonhtmlcommon::end_pick_box().'<br />	&Apache::lonhtmlcommon::end_pick_box().'<br />

<input name="command" value="scantronupload_save" type="hidden" />	<input name="command" value="scantronupload_save" type="hidden" />
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />	<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
</form>	</form>
');	');
return '';	return '';
Line 8416 sub show_grading_menu_form {	Line 8460 sub show_grading_menu_form {
return $result;	return $result;
}	}

# -- Retrieve choices for grading form
sub savedState {
my %savedState = ();
if ($env{'form.saveState'}) {
foreach (split(/:/,$env{'form.saveState'})) {
my ($key,$value) = split(/=/,$_,2);
$savedState{$key} = $value;
}
}
return \%savedState;
}

sub grading_menu {	sub grading_menu {
my ($request) = @_;	my ($request) = @_;
my ($symb)=&get_symb($request);	my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $probTitle = &Apache::lonnet::gettitle($symb);
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);

$request->print($table);
my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),	my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
'handgrade'=>$hdgrade,	'command'=>'individual',
'probTitle'=>$probTitle,
'command'=>'submit_options',
'saveState'=>"",
'gradingMenu'=>1,	'gradingMenu'=>1,
'showgrading'=>"yes");	'showgrading'=>"yes");

my $url1 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields);

	$fields{'command'}='ungraded';
	my $url1b=&Apache::lonhtmlcommon::build_url('grades/',\%fields);

	$fields{'command'}='table';
	my $url1c=&Apache::lonhtmlcommon::build_url('grades/',\%fields);

	$fields{'command'}='all_for_one';
	my $url1d=&Apache::lonhtmlcommon::build_url('grades/',\%fields);

$fields{'command'} = 'csvform';	$fields{'command'} = 'csvform';
my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);

Line 8454 sub grading_menu {	Line 8489 sub grading_menu {

$fields{'command'} = 'scantron_selectphase';	$fields{'command'} = 'scantron_selectphase';
my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);

	$fields{'command'} = 'initialverifyreceipt';
	my $url5 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);

my @menu = ({ categorytitle=>'Course Grading',	my @menu = ({ categorytitle=>'Hand Grading',
items =>[	items =>[
{ linktext => 'Manual Grading/View Submissions',	{ linktext => 'Select individual students to grade',
url => $url1,	url => $url1a,
permission => 'F',	permission => 'F',
icon => 'edit-find-replace.png',	icon => 'edit-find-replace.png',
linktitle => 'Start the process of hand grading submissions.'	linktitle => 'Grade current resource for a selection of students.'
	},
	{ linktext => 'Grade ungraded submissions.',
	url => $url1b,
	permission => 'F',
	icon => 'edit-find-replace.png',
	linktitle => 'Grade all submissions that have not been graded yet.'
},	},

	{ linktext => 'Grading table',
	url => $url1c,
	permission => 'F',
	icon => 'edit-find-replace.png',
	linktitle => 'Grade current resource for all students.'
	},
	{ linktext => 'Grade complete page/sequence/folder for one student',
	url => $url1d,
	permission => 'F',
	icon => 'edit-find-replace.png',
	linktitle => 'Grade all resources in current page/sequence/folder for one student.'
	}]},
	{ categorytitle=>'Automated Grading',
	items =>[

{ linktext => 'Upload Scores',	{ linktext => 'Upload Scores',
url => $url2,	url => $url2,
permission => 'F',	permission => 'F',
Line 8475 sub grading_menu {	Line 8535 sub grading_menu {
icon => 'addClickerInfoFile.png',	icon => 'addClickerInfoFile.png',
linktitle => 'Specify a file containing the clicker information for this resource.'	linktitle => 'Specify a file containing the clicker information for this resource.'
},	},
{ linktext => 'Grade/Manage/Review Bubblesheet Forms',	{ linktext => 'Grade/Manage/Review Bubblesheets',
url => $url4,	url => $url4,
permission => 'F',	permission => 'F',
icon => 'stat.png',	icon => 'stat.png',
linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'	linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'
}	},
	{ linktext => 'Verify Receipt No.',
	url => $url5,
	permission => 'F',
	icon => 'edit-find-replace.png',
	linktitle => 'Verify a system-generated receipt number for correct problem solution.'
	}

]	]
});	});

#$fields{'command'} = 'verify';
#$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
#
# Create the menu	# Create the menu
my $Str;	my $Str;
# $Str .= '<h2>'.&mt('Please select a grading task').'</h2>';
$Str .= '<form method="post" action="" name="gradingMenu">';	$Str .= '<form method="post" action="" name="gradingMenu">';
$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="probTitle" value="'.$probTitle.'" />'."\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";

$Str .= Apache::lonhtmlcommon::generate_menu(@menu);	$Str .= &Apache::lonhtmlcommon::generate_menu(@menu);
#$menudata->{'jscript'}	return $Str;
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '.	}
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
' /> '.
&Apache::lonnet::recprefix($env{'request.course.id'}).
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';

$Str .="</form>\n";
my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");
$request->print(<<GRADINGMENUJS);
<script type="text/javascript" language="javascript">
function checkChoice(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;
} else {
formname.submit();
}
}
}

function checkReceiptNo(formname,nospace) {	sub ungraded {
var receiptNo = formname.receipt.value;	my ($request)=@_;
var checkOpt = false;	&submit_options($request);
if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}	}
if (nospace == "notOK" && (isNaN(receiptNo) \|\| receiptNo == "")) {checkOpt = true;}
if (checkOpt) {	sub submit_options_sequence {
alert("$receiptalert");	my ($request) = @_;
formname.receipt.value = "";	my ($symb)=&get_symb($request);
formname.receipt.focus();	if (!$symb) {return '';}
return false;
}
return true;
}
</script>
GRADINGMENUJS
&commonJSfunctions($request);	&commonJSfunctions($request);
return $Str;	my $result;

	$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="gradingMenu" value="1" />'."\n".
	'<input type="hidden" name="showgrading" value="yes" />'."\n";

	$result.='
	<h2>
	'.&mt('Grade complete page/sequence/folder for one student').'
	</h2>'.
	&selectfield(0).
	'<input type="hidden" name="command" value="pickStudentPage" />
	<div>
	<input type="submit" value="'.&mt('Next').' →" />
	</div>
	</div>
	</form>';
	$result .= &show_grading_menu_form($symb);
	return $result;
}	}

	sub submit_options_table {
	my ($request) = @_;
	my ($symb)=&get_symb($request);
	if (!$symb) {return '';}
	&commonJSfunctions($request);
	my $result;

	$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="gradingMenu" value="1" />'."\n".
	'<input type="hidden" name="showgrading" value="yes" />'."\n";

	$result.='
	<h2>
	'.&mt('Grading table').'
	</h2>'.
	&selectfield(0).
	'<input type="hidden" name="command" value="viewgrades" />
	<div>
	<input type="submit" value="'.&mt('Next').' →" />
	</div>
	</div>
	</form>';
	$result .= &show_grading_menu_form($symb);
	return $result;
	}



#--- Displays the submissions first page -------	#--- Displays the submissions first page -------
sub submit_options {	sub submit_options {
my ($request) = @_;	my ($request) = @_;
my ($symb)=&get_symb($request);	my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $probTitle = &Apache::lonnet::gettitle($symb);

my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");
$request->print(<<GRADINGMENUJS);
<script type="text/javascript" language="javascript">
function checkChoice(formname,val,cmdx) {
if (val <= 2) {
var cmd = radioSelection(formname.radioChoice);
var cmdsave = cmd;
} else {
cmd = cmdx;
cmdsave = 'submission';
}
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) {
if (!checkReceiptNo(formname,'notOK')) { return false;}
formname.submit();
}
if (val < 7) formname.submit();
}

function checkReceiptNo(formname,nospace) {
var receiptNo = formname.receipt.value;
var checkOpt = false;
if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
if (nospace == "notOK" && (isNaN(receiptNo) \|\| receiptNo == "")) {checkOpt = true;}
if (checkOpt) {
alert("$receiptalert");
formname.receipt.value = "";
formname.receipt.focus();
return false;
}
return true;
}
</script>
GRADINGMENUJS
&commonJSfunctions($request);	&commonJSfunctions($request);
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
my $result;	my $result;
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'});

# Preselect sections
my $selsec="";
if (ref($sections)) {
foreach my $section (sort(@$sections)) {
$selsec.='<option value="'.$section.'" '.
($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
}
}

$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".	$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
'<input type="hidden" name="symb" value="'.&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="probTitle" value="'.$probTitle.'" />'."\n".
'<input type="hidden" name="command" 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";

$result.='	$result.='
<h2>	<h2>
'.&mt('Grade Current Resource').'	'.&mt('Select individual students to grade').'
</h2>	</h2>'.&selectfield(1).'
<div>	<input type="hidden" name="command" value="submission" />
'.$table.'	<input type="submit" value="'.&mt('Next').' →" />
</div>	</div>
	</div>


	</form>';
	$result .= &show_grading_menu_form($symb);
	return $result;
	}

<div class="LC_columnSection">	sub selectfield {
	my ($full)=@_;
	my $result='<div class="LC_columnSection">

<fieldset>	<fieldset>
<legend>	<legend>
'.&mt('Sections').'	'.&mt('Sections').'
</legend>	</legend>
<select name="section" multiple="multiple" size="5">'."\n";	'.&Apache::lonstatistics::SectionSelect('section','multiple',5).'
$result.= $selsec;
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';
$result.='
</fieldset>	</fieldset>

<fieldset>	<fieldset>
Line 8653 GRADINGMENUJS	Line 8676 GRADINGMENUJS
<legend>	<legend>
'.&mt('Access Status').'	'.&mt('Access Status').'
</legend>	</legend>
'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'	'.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').'
</fieldset>	</fieldset>';
	if ($full) {
	$result.='
<fieldset>	<fieldset>
<legend>	<legend>
'.&mt('Submission Status').'	'.&mt('Submission Status').'
</legend>	</legend>'.
<select name="submitonly" size="5">	&Apache::loncommon::select_form('all','submitonly',
<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>	(&Apache::lonlocal::texthash(
<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>	'yes' => 'with submissions',
<option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>	'queued' => 'in grading queue',
<option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>	'graded' => 'with ungraded submissions',
<option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>	'incorrect' => 'with incorrect submissions',
</select>	'all' => 'with any status'),
</fieldset>	'select_form_order' => ['yes','queued','graded','incorrect','all'])).
	'</fieldset>';
</div>	}
	$result.='</div><br />';
<br />
<div>
<div>
<label>
<input type="radio" name="radioChoice" value="submission" '.
($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.
&mt('Select individual students to grade and view submissions.').'
</label>
</div>
<div>
<label>
<input type="radio" name="radioChoice" value="viewgrades" '.
($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
&mt('Grade all selected students in a grading table.').'
</label>
</div>
<div>
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" />
</div>
</div>


<h2>
'.&mt('Grade Complete Folder for One Student').'
</h2>
<div>
<div>
<label>
<input type="radio" name="radioChoice" value="pickStudentPage" '.
($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
&mt('The <b>complete</b> page/sequence/folder: For one student').'
</label>
</div>
<div>
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" />
</div>
</div>
</form>';
$result .= &show_grading_menu_form($symb);
return $result;	return $result;
}	}

Line 8801 sub process_clicker {	Line 8786 sub process_clicker {
my ($symb)=&get_symb($r);	my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $result=&checkforfile_js();	my $result=&checkforfile_js();
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
$result.=$table;
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";	$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";	$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource.').	$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource.').
'</b></td></tr>'."\n";	'</b></td></tr>'."\n";
$result.='<tr bgcolor=#ffffe6><td>'."\n";	$result.='<tr bgcolor="#ffffe6"><td>'."\n";
# Attempt to restore parameters from last session, set defaults if not present	# Attempt to restore parameters from last session, set defaults if not present
my %Saveable_Parameters=&clicker_grading_parameters();	my %Saveable_Parameters=&clicker_grading_parameters();
&Apache::loncommon::restore_course_settings('grades_clicker',	&Apache::loncommon::restore_course_settings('grades_clicker',
Line 8838 sub process_clicker {	Line 8820 sub process_clicker {
('iclicker' => 'i>clicker',	('iclicker' => 'i>clicker',
'interwrite' => 'interwrite PRS'));	'interwrite' => 'interwrite PRS'));
$symb = &Apache::lonenc::check_encrypt($symb);	$symb = &Apache::lonenc::check_encrypt($symb);
$result.=<<ENDUPFORM;	$result.= &Apache::lonhtmlcommon::scripttag(<<ENDUPFORM);
<script type="text/javascript">
function sanitycheck() {	function sanitycheck() {
// Accept only integer percentages	// Accept only integer percentages
document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value);	document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value);
Line 8877 function sanitycheck() {	Line 8858 function sanitycheck() {
// Remember the old state	// Remember the old state
document.forms.gradesupload.waschecked.value=newgradingchoice;	document.forms.gradesupload.waschecked.value=newgradingchoice;
}	}
</script>	ENDUPFORM
	$result.= <<ENDUPFORM;
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<input type="hidden" name="symb" value="$symb" />	<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="command" value="processclickerfile" />	<input type="hidden" name="command" value="processclickerfile" />
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />	<input type="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><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onClick="sanitycheck()" />$attendance </label>	<br /><label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onclick="sanitycheck()" />$attendance </label>
<br /><label><input type="radio" name="gradingmechanism" value="personnel"$checked{'personnel'} onClick="sanitycheck()" />$personnel</label>	<br /><label><input type="radio" name="gradingmechanism" value="personnel"$checked{'personnel'} onclick="sanitycheck()" />$personnel</label>
<br /><label><input type="radio" name="gradingmechanism" value="specific"$checked{'specific'} onClick="sanitycheck()" />$specific </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" />
<br /><label><input type="radio" name="gradingmechanism" value="given"$checked{'given'} onClick="sanitycheck()" />$given </label>	<br /><label><input type="radio" name="gradingmechanism" value="given"$checked{'given'} onclick="sanitycheck()" />$given </label>
<br />	<br />
<input type="text" name="givenanswer" size="50" />	<input type="text" name="givenanswer" size="50" />
<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>
<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onChange="sanitycheck()" /></label>	<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onchange="sanitycheck()" /></label>
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />	<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
</form>	</form>'
ENDUPFORM	ENDUPFORM
$result.='</td></tr></table>'."\n".	$result.='</td></tr></table>'."\n".
'</td></tr></table><br /><br />'."\n";	'</td></tr></table><br /><br />'."\n";
Line 8912 sub process_clicker_file {	Line 8893 sub process_clicker_file {
my %Saveable_Parameters=&clicker_grading_parameters();	my %Saveable_Parameters=&clicker_grading_parameters();
&Apache::loncommon::store_course_settings('grades_clicker',	&Apache::loncommon::store_course_settings('grades_clicker',
\%Saveable_Parameters);	\%Saveable_Parameters);
	my $result='';
my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) {	if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) {
$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>';	$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>';
return $result.&show_grading_menu_form($symb);	return $result.&show_grading_menu_form($symb);
Line 8990 sub process_clicker_file {	Line 8970 sub process_clicker_file {
<form method="post" action="/adm/grades" name="clickeranalysis">	<form method="post" action="/adm/grades" name="clickeranalysis">
<input type="hidden" name="symb" value="$symb" />	<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="command" value="assignclickergrades" />	<input type="hidden" name="command" value="assignclickergrades" />
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
<input type="hidden" name="gradingmechanism" value="$env{'form.gradingmechanism'}" />	<input type="hidden" name="gradingmechanism" value="$env{'form.gradingmechanism'}" />
<input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" />	<input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" />
Line 9152 sub assign_clicker_grades {	Line 9131 sub assign_clicker_grades {
# FIXME: This should probably look for the first handgradeable part	# FIXME: This should probably look for the first handgradeable part
my $part=$$partlist[0];	my $part=$$partlist[0];
# Start screen output	# Start screen output
my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});	my $result='';

my $heading=&mt('Assigning grades based on clicker file');	my $heading=&mt('Assigning grades based on clicker file');
$result.=(<<ENDHEADER);	$result.=(<<ENDHEADER);
Line 9255 ENDHEADER	Line 9234 ENDHEADER
sub navmap_errormsg {	sub navmap_errormsg {
return '<div class="LC_error">'.	return '<div class="LC_error">'.
&mt('An error occurred retrieving information about resources in the course.').'<br />'.	&mt('An error occurred retrieving information about resources in the course.').'<br />'.
&mt('It is recommended that you [_1]re-initialize the course[_2] and then return to this grading page..','<a href="/adm/roles?selectrole=1&newrole='.$env{'request.role'}.'">','</a>').	&mt('It is recommended that you [_1]re-initialize the course[_2] and then return to this grading page.','<a href="/adm/roles?selectrole=1&newrole='.$env{'request.role'}.'">','</a>').
'</div>';	'</div>';
}	}

Line 9283 sub handler {	Line 9262 sub handler {
$request->print(&Apache::loncommon::start_page('Grading',undef,	$request->print(&Apache::loncommon::start_page('Grading',undef,
{'bread_crumbs' => $brcrum}));	{'bread_crumbs' => $brcrum}));
if ($symb eq '' && $command eq '') {	if ($symb eq '' && $command eq '') {
if ($env{'user.adv'}) {	#
if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&	# Not called from a resource
($env{'form.codethree'})) {	#
my $token=$env{'form.codeone'}.''.$env{'form.codetwo'}.''.
$env{'form.codethree'};
my ($tsymb,$tuname,$tudom,$tcrsid)=
&Apache::lonnet::checkin($token);
if ($tsymb) {
my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb);
if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
$request->print(&ssi_with_retries('/res/'.$url, $ssi_retries,
('grade_username' => $tuname,
'grade_domain' => $tudom,
'grade_courseid' => $tcrsid,
'grade_symb' => $tsymb)));
} else {
$request->print('<h3>Not authorized: '.$token.'</h3>');
}
} else {
$request->print('<h3>Not a valid DocID: '.$token.'</h3>');
}
} else {
$request->print(&Apache::lonxml::tokeninputfield());
}
}
} else {	} else {
&init_perm();	&init_perm();
if ($command eq 'submission' && $perm{'vgr'}) {	if ($command eq 'submission' && $perm{'vgr'}) {
Line 9322 sub handler {	Line 9280 sub handler {
&processGroup($request);	&processGroup($request);
} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {	} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
$request->print(&grading_menu($request));	$request->print(&grading_menu($request));
} elsif ($command eq 'submit_options' && $perm{'vgr'}) {	} elsif ($command eq 'individual' && $perm{'vgr'}) {
$request->print(&submit_options($request));	$request->print(&submit_options($request));
	} elsif ($command eq 'ungraded' && $perm{'vgr'}) {
	$request->print(&submit_options($request));
	} elsif ($command eq 'table' && $perm{'vgr'}) {
	$request->print(&submit_options_table($request));
	} elsif ($command eq 'all_for_one' && $perm{'vgr'}) {
	$request->print(&submit_options_sequence($request));
} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {	} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
$request->print(&viewgrades($request));	$request->print(&viewgrades($request));
} elsif ($command eq 'handgrade' && $perm{'mgr'}) {	} elsif ($command eq 'handgrade' && $perm{'mgr'}) {
$request->print(&processHandGrade($request));	$request->print(&processHandGrade($request));
} elsif ($command eq 'editgrades' && $perm{'mgr'}) {	} elsif ($command eq 'editgrades' && $perm{'mgr'}) {
$request->print(&editgrades($request));	$request->print(&editgrades($request));
	} elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) {
	$request->print(&initialverifyreceipt($request));
} elsif ($command eq 'verify' && $perm{'vgr'}) {	} elsif ($command eq 'verify' && $perm{'vgr'}) {
$request->print(&verifyreceipt($request));	$request->print(&verifyreceipt($request));
} elsif ($command eq 'processclicker' && $perm{'mgr'}) {	} elsif ($command eq 'processclicker' && $perm{'mgr'}) {

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

Removed from v.1.584
changed lines
	Added in v.1.605