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.574.2.12 and 1.600

version 1.574.2.12, 2010/05/22 01:01:03	version 1.600, 2010/03/19 22:00:06
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 195 sub get_display_part {	Line 206 sub get_display_part {
my ($partID,$symb)=@_;	my ($partID,$symb)=@_;
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);	my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
if (defined($display) and $display ne '') {	if (defined($display) and $display ne '') {
$display.= " (<span class=\"LC_internal_info\">id $partID</span>)";	$display.= ' (<span class="LC_internal_info">'
	.&mt('Part ID: [_1]',$partID).'</span>)';
} else {	} else {
$display=$partID;	$display=$partID;
}	}
Line 204 sub get_display_part {	Line 216 sub get_display_part {

#--- Show resource title	#--- Show resource title
#--- and parts and response type	#--- and parts and response type
sub showResourceInfo {	#sub showResourceInfo {
my ($symb,$probTitle,$checkboxes,$res_error) = @_;	# my ($symb,$probTitle,$checkboxes,$res_error) = @_;
my $col=3;	# my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";
if ($checkboxes) { $col=4; }	# my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";	# if (ref($res_error)) {
my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);	# if ($$res_error) {
if (ref($res_error)) {	# return;
if ($$res_error) {	# }
return;	# }
}	# $result.=&Apache::loncommon::start_data_table()
}	# .&Apache::loncommon::start_data_table_header_row();
$result .='<table border="0">';	# if ($checkboxes) {
my %resptype = ();	# $result.='<th> </th>';
my $hdgrade='no';	# }
my %partsseen;	# $result.='<th>'.&mt('Problem Part').'</th>'
foreach my $partID (sort(keys(%$responseType))) {	# .'<th>'.&mt('Res. ID').'</th>'
foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {	# .'<th>'.&mt('Type').'</th>'
my $handgrade=$$handgrade{$partID.'_'.$resID};	# .&Apache::loncommon::end_data_table_header_row();
my $responsetype = $responseType->{$partID}->{$resID};	# my %resptype = ();
$hdgrade = $handgrade if ($handgrade eq 'yes');	# my $hdgrade='no';
$result.='<tr>';	# my %partsseen;
if ($checkboxes) {	# foreach my $partID (sort(keys(%$responseType))) {
if (exists($partsseen{$partID})) {	# foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {
$result.="<td> </td>";	# my $handgrade=$$handgrade{$partID.'_'.$resID};
} else {	# my $responsetype = $responseType->{$partID}->{$resID};
$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>";	# $hdgrade = $handgrade if ($handgrade eq 'yes');
}	# $result.=&Apache::loncommon::start_data_table_row();
$partsseen{$partID}=1;	# if ($checkboxes) {
}	# if (exists($partsseen{$partID})) {
my $display_part=&get_display_part($partID,$symb);	# $result.="<td> </td>";
$result.='<td><b>'.&mt('Part').': </b>'.$display_part.	# } else {
' <span class="LC_internal_info">'.$resID.'</span></td>'.	# $result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>";
'<td><b>'.&mt('Type').': </b>'.$responsetype.'</td></tr>';	# }
# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';	# $partsseen{$partID}=1;
}	# }
}	# my $display_part=&get_display_part($partID,$symb);
$result.='</table>'."\n";	# $result.='<td>'.$display_part.'</td>'
return $result,$responseType,$hdgrade,$partlist,$handgrade;	# .'<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();
Line 413 sub cleanRecord {	Line 432 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 475 sub cleanRecord {	Line 494 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 504 sub commonJSfunctions {	Line 522 sub commonJSfunctions {
return selectOne.value;	return selectOne.value;
}	}
}	}
</script>
COMMONJSFUNCTIONS	COMMONJSFUNCTIONS
}	}

Line 659 sub student_gradeStatus {	Line 676 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".
Line 722 sub most_similar {	Line 739 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 831 sub verifyreceipt {	Line 848 sub verifyreceipt {
}	}
}	}
if ($matches == 0) {	if ($matches == 0) {
$string = $title.&mt('No match found for the above receipt number.');	$string = $title
	.'<p class="LC_warning">'
	.&mt('No match found for the above receipt number.')
	.'</p>';
} else {	} else {
$string = &jscriptNform($symb).$title.	$string = &jscriptNform($symb).$title.
'<p>'.	'<p>'.
&mt('The above receipt number matches the following [numerate,_1,student].',$matches).	&mt('The above receipt number matches the following [quant,_1,student].',$matches).
'</p>'.	'</p>'.
$header.	$header.
$contents.	$contents.
Line 865 sub listStudents {	Line 885 sub listStudents {
.&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 ($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 901 sub listStudents {	Line 923 sub listStudents {
formname.command.value = 'submission';	formname.command.value = 'submission';
formname.submit();	formname.submit();
}	}
</script>
LISTJAVASCRIPT	LISTJAVASCRIPT

&commonJSfunctions($request);	&commonJSfunctions($request);
Line 910 LISTJAVASCRIPT	Line 931 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 933 LISTJAVASCRIPT	Line 954 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 982 LISTJAVASCRIPT	Line 1011 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 1100 LISTJAVASCRIPT	Line 1129 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 1129 LISTJAVASCRIPT	Line 1158 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 1160 sub check_script {	Line 1189 sub check_script {
}	}
}	}

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

Line 1199 sub processGroup {	Line 1228 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 1368 sub sub_page_js {	Line 1396 sub sub_page_js {

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

Line 1378 sub sub_page_kw_js {	Line 1405 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 1416 sub sub_page_kw_js {	Line 1442 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 1431 INNERJS	Line 1455 INNERJS
}	}
self.close()	self.close()
}	}
</script>
INNERJS	INNERJS

my $start_page_msg_central =	my $start_page_msg_central =
Line 1455 INNERJS	Line 1478 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 1606 INNERJS	Line 1628 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 1680 INNERJS	Line 1702 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 1700 sub get_increment {	Line 1721 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 1719 sub gradeBox {	Line 1759 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 1727 sub gradeBox {	Line 1767 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 1738 sub gradeBox {	Line 1778 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 1754 sub gradeBox {	Line 1794 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 1777 sub handback_box {	Line 1819 sub handback_box {
my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_;	my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_;
my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);	my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
my (@respids);	my (@respids);
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
foreach my $part_response_id (@part_response_id) {	foreach my $part_response_id (@part_response_id) {
my ($part,$resp) = @{ $part_response_id };	my ($part,$resp) = @{ $part_response_id };
if ($part eq $partid) {	if ($part eq $partid) {
Line 1837 sub show_problem {	Line 1879 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 2034 sub submission {	Line 2073 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 2050 KEYWORDS	Line 2089 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 2079 KEYWORDS	Line 2137 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 2103 KEYWORDS	Line 2158 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 2115 KEYWORDS	Line 2170 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 2142 KEYWORDS	Line 2199 KEYWORDS
}	}
my $responsetype = $responseType->{$partid}->{$respid};	my $responsetype = $responseType->{$partid}->{$respid};
if (!exists($record{"resource.$partid.$respid.submission"})) {	if (!exists($record{"resource.$partid.$respid.submission"})) {
$lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '.	$lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
$display_part.' <span class="LC_internal_info">( ID '.$respid.	'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' )</span>   '.	' <span class="LC_internal_info">'.
	'('.&mt('Part ID: [_1]',$respid).')'.
	'</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;
}	}
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 2163 KEYWORDS	Line 2222 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 2180 KEYWORDS	Line 2244 KEYWORDS
($env{'form.lastSub'} eq 'hdgrade' &&	($env{'form.lastSub'} eq 'hdgrade' &&
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {	$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
my $display_part=&get_display_part($partid,$symb);	my $display_part=&get_display_part($partid,$symb);
$lastsubonly.='<div class="LC_grade_submission_part"><b>Part:</b> '.	$lastsubonly.='<div class="LC_grade_submission_part">'.
$display_part.' <span class="LC_internal_info">( ID '.$respid.	'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' )</span>   ';	' <span class="LC_internal_info">'.
	'('.&mt('Part ID: [_1]',$respid).')'.
	'</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 2220 KEYWORDS	Line 2294 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 2264 KEYWORDS	Line 2338 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 2280 KEYWORDS	Line 2354 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 2309 KEYWORDS	Line 2374 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 2327 KEYWORDS	Line 2391 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 2399 sub check_collaborators {	Line 2465 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 2411 sub get_last_submission {	Line 2477 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 2584 sub processHandGrade {	Line 2676 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 3078 sub viewgrades_js {	Line 3170 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 3240 sub viewgrades_js {	Line 3331 sub viewgrades_js {
}	}
}	}

</script>
VIEWJAVASCRIPT	VIEWJAVASCRIPT
}	}

Line 3318 sub viewgrades {	Line 3408 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 3336 sub viewgrades {	Line 3426 sub viewgrades {

$result.=	$result.=
&Apache::loncommon::start_data_table_row()."\n".	&Apache::loncommon::start_data_table_row()."\n".
'<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><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>'.
&Apache::loncommon::end_data_table_row()."\n";	&Apache::loncommon::end_data_table_row()."\n";
$ctsparts++;	$ctsparts++;
}	}
$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 3407 sub viewgrades {	Line 3497 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 3459 sub viewstudentgrade {	Line 3549 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 3468 sub viewstudentgrade {	Line 3558 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 3506 sub editgrades {	Line 3596 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 3815 sub csvuploadmap_header {	Line 3906 sub csvuploadmap_header {
$javascript=&csvupload_javascript_forward_associate();	$javascript=&csvupload_javascript_forward_associate();
}	}

my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});	# 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 3828 $result	Line 3920 $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 3842 to this page if the data selected is ins	Line 3934 to this page if the data selected is ins
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />	<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="command" value="csvuploadoptions" />	<input type="hidden" name="command" value="csvuploadoptions" />
<hr />	<hr />
<script type="text/javascript" language="Javascript">
$javascript
</script>
ENDPICK	ENDPICK
	$request->print(&Apache::lonhtmlcommon::scripttag($javascript));
return '';	return '';

}	}
Line 3883 sub csvuploadmap_footer {	Line 3973 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 3899 sub checkforfile_js {	Line 3988 sub checkforfile_js {
}	}
formname.submit();	formname.submit();
}	}
</script>
CSVFORMJS	CSVFORMJS
return $result;	return $result;
}	}
Line 3910 sub upcsvScores_form {	Line 3998 sub upcsvScores_form {
if (!$symb) {return '';}	if (!$symb) {return '';}
my $result=&checkforfile_js();	my $result=&checkforfile_js();
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);	$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});	# my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
$result.=$table;	# $result.=$table;
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";	$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";	$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
$result.=' <b>'.&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 3928 sub upcsvScores_form {	Line 4016 sub upcsvScores_form {
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />	<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
$upfile_select	$upfile_select
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />	<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 3959 sub csvuploadmap {	Line 4047 sub csvuploadmap {
my ($i,$keyfields);	my ($i,$keyfields);
if (@records) {	if (@records) {
my $fieldserror;	my $fieldserror;
my @fields=&csvupload_fields($symb,\$fieldserror);	my @fields=&csvupload_fields($symb,\$fieldserror);
if ($fieldserror) {	if ($fieldserror) {
$request->print(&navmap_errormsg());	$request->print(&navmap_errormsg());
return;	return;
Line 4173 sub pickStudentPage {	Line 4261 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 4187 function checkPickOne(formname) {	Line 4274 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 4203 LISTJAVASCRIPT	Line 4289 LISTJAVASCRIPT
my ($titles,$symbx) = &getSymbMap($map_error);	my ($titles,$symbx) = &getSymbMap($map_error);
if ($map_error) {	if ($map_error) {
$request->print(&navmap_errormsg());	$request->print(&navmap_errormsg());
return;	return;
}	}
my ($curpage) =&Apache::lonnet::decode_symb($symb);	my ($curpage) =&Apache::lonnet::decode_symb($symb);
# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);	# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);
Line 4251 LISTJAVASCRIPT	Line 4337 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 4290 LISTJAVASCRIPT	Line 4376 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 4397 sub displayPage {	Line 4483 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 4468 sub displayPage {	Line 4556 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 4481 sub displayPage {	Line 4571 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 4530 sub displaySubByDates {	Line 4621 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].='<b>'.&mt('Part:').'</b> '.$display_part.' ';	$displaySub[0].='<span class="LC_nobreak"';
$displaySub[0].='<span class="LC_internal_info">('.&mt('ID').' '.	$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
$responseId.')</span> <b>';	.' <span class="LC_internal_info">'
if ($$record{"$where.$partid.tries"} eq '') {	.'('.&mt('Part ID: [_1]',$responseId).')'
$displaySub[0].=&mt('Trial not counted');	.'</span>'
} else {	.' <b>';
$displaySub[0].=&mt('Trial [_1]',	if ($hidden) {
	$displaySub[0].= &mt('Anonymous Survey').'</b>';
	} else {
	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>  '.	$displaySub[0].='</b></span>'; # /nobreak
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';	$displaySub[0].='  '.
	&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 4620 sub updateGradeByPage {	Line 4723 sub updateGradeByPage {

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


my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
unless (ref($navmap)) {	unless (ref($navmap)) {
$request->print(&navmap_errormsg());	$request->print(&navmap_errormsg());
Line 4769 sub updateGradeByPage {	Line 4873 sub updateGradeByPage {
#	#
#-------------------------------------------------------------------	#-------------------------------------------------------------------

#--------------------Bubblesheet (Scantron) Grading-----------------------------------	#-------------------- Bubblesheet (Scantron) Grading -------------------
#	#
#------ start of section for handling grading by page/sequence ---------	#------ start of section for handling grading by page/sequence ---------

Line 4828 the homework problem.	Line 4932 the homework problem.
Returns html hidden inputs used to hold context/default values.	Returns html hidden inputs used to hold context/default values.

Arguments:	Arguments:
$symb - $symb of the current resource	$symb - $symb of the current resource
$map_error - ref to scalar which will container error if
$navmap object is unavailable in &getSymbMap().

=cut	=cut

Line 4849 sub defaultFormData {	Line 4951 sub defaultFormData {
Return html dropdown of possible sequences to grade	Return html dropdown of possible sequences to grade

Arguments:	Arguments:
$symb - $symb of the current resource	$symb - $symb of the current resource
	$map_error - ref to scalar which will container error if
	$navmap object is unavailable in &getSymbMap().

=cut	=cut

Line 5207 sub scantron_selectphase {	Line 5311 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 5225 sub scantron_selectphase {	Line 5327 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 6756 sub scantron_validate_ID {	Line 6858 sub scantron_validate_ID {
#get scantron line setup	#get scantron line setup
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();

my $nav_error;	my $nav_error;
&scantron_get_maxbubble(\$nav_error); # parse needs the bubble_lines.. array.	&scantron_get_maxbubble(\$nav_error); # parse needs the bubble_lines.. array.
if ($nav_error) {	if ($nav_error) {
Line 6904 sub scantron_get_correction {	Line 7006 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 6913 function change_radio(field) {	Line 7014 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 6985 sub verify_bubbles_checked {	Line 7085 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 7009 function verify_bubble_radio(form) {	Line 7108 function verify_bubble_radio(form) {
}	}
form.submit();	form.submit();
}	}
</script>
ENDSCRIPT	ENDSCRIPT
return $output;	return $output;
}	}
Line 7398 sub scantron_validate_doublebubble {	Line 7496 sub scantron_validate_doublebubble {

sub scantron_get_maxbubble {	sub scantron_get_maxbubble {
my ($nav_error) = @_;	my ($nav_error) = @_;

if (defined($env{'form.scantron_maxbubble'}) &&	if (defined($env{'form.scantron_maxbubble'}) &&
$env{'form.scantron_maxbubble'}) {	$env{'form.scantron_maxbubble'}) {
&restore_bubble_lines();	&restore_bubble_lines();
Line 7869 sub scantron_upload_scantron_data {	Line 7966 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 7897 sub scantron_upload_scantron_data {	Line 7993 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 7919 sub scantron_upload_scantron_data {	Line 8015 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 8436 sub grading_menu {	Line 8532 sub grading_menu {
my ($symb)=&get_symb($request);	my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $probTitle = &Apache::lonnet::gettitle($symb);	my $probTitle = &Apache::lonnet::gettitle($symb);
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);

$request->print($table);	# $request->print($table);
my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),	my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
'handgrade'=>$hdgrade,
'probTitle'=>$probTitle,	'probTitle'=>$probTitle,
'command'=>'submit_options',	'command'=>'individual',
'saveState'=>"",	'saveState'=>"",
'gradingMenu'=>1,	'gradingMenu'=>1,
'showgrading'=>"yes");	'showgrading'=>"yes");
my $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
my @menu = ({ url => $url,	my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
name => &mt('Manual Grading/View Submissions'),
short_description =>	$fields{'command'}='ungraded';
&mt('Start the process of hand grading submissions.'),	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';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push(@menu, { url => $url,
name => &mt('Upload Scores'),
short_description =>
&mt('Specify a file containing the class scores for current resource.')});
$fields{'command'} = 'processclicker';	$fields{'command'} = 'processclicker';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url3 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push(@menu, { url => $url,
name => &mt('Process Clicker'),
short_description =>
&mt('Specify a file containing the clicker information for this resource.')});
$fields{'command'} = 'scantron_selectphase';	$fields{'command'} = 'scantron_selectphase';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push(@menu, { url => $url,
name => &mt('Grade/Manage/Review Bubblesheets'),	my @menu = ({ categorytitle=>'Hand Grading',
short_description =>	items =>[
&mt('Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.')});	{ linktext => 'Select individual students to grade',
$fields{'command'} = 'verify';	url => $url1a,
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	permission => 'F',
push(@menu, { url => "",	icon => 'edit-find-replace.png',
name => &mt('Verify Receipt No.'),	linktitle => 'Grade current resource for a selection of students.'
short_description =>	},
&mt('')});	{ 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',
	url => $url2,
	permission => 'F',
	icon => 'uploadscores.png',
	linktitle => 'Specify a file containing the class scores for current resource.'
	},
	{ linktext => 'Process Clicker',
	url => $url3,
	permission => 'F',
	icon => 'addClickerInfoFile.png',
	linktitle => 'Specify a file containing the clicker information for this resource.'
	},
	{ linktext => 'Grade/Manage/Review Bubblesheets',
	url => $url4,
	permission => 'F',
	icon => 'stat.png',
	linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'
	}
	]
	});

	#$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 .= '<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="handgrade" value="'.$hdgrade.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".	'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".
'<input type="hidden" name="saveState" value="" />'."\n".	'<input type="hidden" name="saveState" value="" />'."\n".
'<input type="hidden" name="gradingMenu" value="1" />'."\n".	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";	'<input type="hidden" name="showgrading" value="yes" />'."\n";
foreach my $menudata (@menu) {
if ($menudata->{'name'} ne &mt('Verify Receipt No.')) {	$Str .= Apache::lonhtmlcommon::generate_menu(@menu);
$Str .=' <h3><a '.	#$menudata->{'jscript'}
$menudata->{'jscript'}.	$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '.
' href="'.	' onclick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
$menudata->{'url'}.'" >'.	' /> '.
$menudata->{'name'}."</a></h3>\n";	&Apache::lonnet::recprefix($env{'request.course.id'}).
} else {	'-<input type="text" name="receipt" size="4" onchange="javascript:checkReceiptNo(this.form,\'OK\')" />';
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '.
$menudata->{'jscript'}.
' 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 .= ' '.(' 'x8).$menudata->{'short_description'}.
"\n";
}
$Str .="</form>\n";	$Str .="</form>\n";
my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");	my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");
$request->print(<<GRADINGMENUJS);	$request->print(&Apache::lonhtmlcommon::scripttag(<<GRADINGMENUJS));
<script type="text/javascript" language="javascript">
function checkChoice(formname,val,cmdx) {	function checkChoice(formname,val,cmdx) {
if (val <= 2) {	if (val <= 2) {
var cmd = radioSelection(formname.radioChoice);	var cmd = radioSelection(formname.radioChoice);
Line 8541 sub grading_menu {	Line 8670 sub grading_menu {
}	}
return true;	return true;
}	}
</script>
GRADINGMENUJS	GRADINGMENUJS
&commonJSfunctions($request);	&commonJSfunctions($request);
return $Str;	return $Str;
}	}


#--- Displays the submissions first page -------	sub ungraded {
sub submit_options {	my ($request)=@_;
	&submit_options($request);
	}

	sub submit_options_sequence {
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);	&commonJSfunctions($request);
	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'});

my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");	# Preselect sections
$request->print(<<GRADINGMENUJS);	my $selsec="";
<script type="text/javascript" language="javascript">	if (ref($sections)) {
function checkChoice(formname,val,cmdx) {	foreach my $section (sort(@$sections)) {
if (val <= 2) {	$selsec.='<option value="'.$section.'" '.
var cmd = radioSelection(formname.radioChoice);	($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
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) {	$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
var receiptNo = formname.receipt.value;	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
var checkOpt = false;	'<input type="hidden" name="saveState" value="" />'."\n".
if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
if (nospace == "notOK" && (isNaN(receiptNo) \|\| receiptNo == "")) {checkOpt = true;}	'<input type="hidden" name="showgrading" value="yes" />'."\n";
if (checkOpt) {
alert("$receiptalert");	$result.='
formname.receipt.value = "";	<h2>
formname.receipt.focus();	'.&mt('Grade complete page/sequence/folder for one student').'
return false;	</h2>
}
return true;	<div class="LC_columnSection">

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

	<fieldset>
	<legend>
	'.&mt('Groups').'
	</legend>
	'.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
	</fieldset>

	<fieldset>
	<legend>
	'.&mt('Access Status').'
	</legend>
	'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
	</fieldset>

	</div>

	<br />

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

	$result.='
	<h2>
	'.&mt('Grading table').'
	</h2>

	<div class="LC_columnSection">

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

	<fieldset>
	<legend>
	'.&mt('Groups').'
	</legend>
	'.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
	</fieldset>

	<fieldset>
	<legend>
	'.&mt('Access Status').'
	</legend>
	'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
	</fieldset>

	</div>

	<br />

	<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 -------
	sub submit_options {
	my ($request) = @_;
	my ($symb)=&get_symb($request);
	if (!$symb) {return '';}
	my $probTitle = &Apache::lonnet::gettitle($symb);

&commonJSfunctions($request);	&commonJSfunctions($request);
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
my $result;	my $result;
my (undef,$sections) = &getclasslist('all','0');	my (undef,$sections) = &getclasslist('all','0');
my $savedState = &savedState();	my $savedState = &savedState();
Line 8613 GRADINGMENUJS	Line 8856 GRADINGMENUJS

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

$result.='	$result.='
<div class="LC_grade_select_mode">	<h2>
<div class="LC_grade_select_mode_current">	'.&mt('Select individual students to grade').'
<h2>	</h2>
'.&mt('Grade Current Resource').'
</h2>	<div class="LC_columnSection">
<div class="LC_grade_select_mode_body">
<div class="LC_grades_resource_info">	<fieldset>
'.$table.'	<legend>
</div>	'.&mt('Sections').'
<div class="LC_grade_select_mode_selector">	</legend>
<div class="LC_grade_select_mode_selector_header">	<select name="section" multiple="multiple" size="5">'."\n";
'.&mt('Sections').'	$result.= $selsec;
</div>
<div class="LC_grade_select_mode_selector_body">
<select name="section" multiple="multiple" size="5">'."\n";
if (ref($sections)) {
foreach my $section (sort(@$sections)) {
$result.='<option value="'.$section.'" '.
($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
}
}
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';	$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';
$result.='	$result.='
</div>	</fieldset>
</div>
<div class="LC_grade_select_mode_selector">	<fieldset>
<div class="LC_grade_select_mode_selector_header">	<legend>
'.&mt('Groups').'	'.&mt('Groups').'
</div>	</legend>
<div class="LC_grade_select_mode_selector_body">	'.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
'.&Apache::lonstatistics::GroupSelect('group','multiple',5).'	</fieldset>
</div>
</div>	<fieldset>
<div class="LC_grade_select_mode_selector">	<legend>
<div class="LC_grade_select_mode_selector_header">	'.&mt('Access Status').'
'.&mt('Access Status').'	</legend>
</div>	'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
<div class="LC_grade_select_mode_selector_body">	</fieldset>
'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
</div>	<fieldset>
</div>	<legend>
<div class="LC_grade_select_mode_selector">	'.&mt('Submission Status').'
<div class="LC_grade_select_mode_selector_header">	</legend>
'.&mt('Submission Status').'	<select name="submitonly" size="5">
</div>	<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
<div class="LC_grade_select_mode_selector_body">	<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
<select name="submitonly" size="5">	<option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>	<option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>
<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
<option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
<option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>
<option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>	<option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>
</select>	</select>
</div>	</fieldset>
</div>
<div class="LC_grade_select_mode_type_body">	</div>
<div class="LC_grade_select_mode_type">
<label>	<br />
<input type="radio" name="radioChoice" value="submission" '.	<input type="hidden" name="command" value="submission" />
($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.	<input type="submit" value="'.&mt('Next').' →" />
&mt('Select individual students to grade and view submissions.').'
</label>
</div>
<div class="LC_grade_select_mode_type">
<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 class="LC_grade_select_mode_type">
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" />
</div>
</div>
</div>
</div>
<div class="LC_grade_select_mode_page">
<h2>
'.&mt('Grade Complete Folder for One Student').'
</h2>
<div class="LC_grades_select_mode_body">
<div class="LC_grade_select_mode_type_body">
<div class="LC_grade_select_mode_type">
<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 class="LC_grade_select_mode_type">
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" />
</div>	</div>
</div>	</div>
</div>
</div>
</div>
</form>';	</form>';
$result .= &show_grading_menu_form($symb);	$result .= &show_grading_menu_form($symb);
return $result;	return $result;
Line 8811 sub process_clicker {	Line 9008 sub process_clicker {
if (!$symb) {return '';}	if (!$symb) {return '';}
my $result=&checkforfile_js();	my $result=&checkforfile_js();
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);	$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});	# my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
$result.=$table;	# $result.=$table;
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";	$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";	$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource.').	$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource.').
Line 8847 sub process_clicker {	Line 9044 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 8886 function sanitycheck() {	Line 9082 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" />
Line 8894 function sanitycheck() {	Line 9091 function sanitycheck() {
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />	<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
<input type="file" name="upfile" size="50" />	<input type="file" name="upfile" size="50" />
<br /><label>$type: $selectform</label>	<br /><label>$type: $selectform</label>
<br /><label><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 8921 sub process_clicker_file {	Line 9118 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'});	# 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 9161 sub assign_clicker_grades {	Line 9358 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 ($result) = &showResourceInfo($symb,$env{'form.probTitle'});

my $heading=&mt('Assigning grades based on clicker file');	my $heading=&mt('Assigning grades based on clicker file');
$result.=(<<ENDHEADER);	$result.=(<<ENDHEADER);
Line 9264 ENDHEADER	Line 9462 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 9331 sub handler {	Line 9529 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'}) {

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

Removed from v.1.574.2.12
changed lines
	Added in v.1.600