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.112 and 1.118

version 1.112, 2003/07/11 20:22:43	version 1.118, 2003/07/17 22:08:25
Line 106 sub response_type {	Line 106 sub response_type {
if (/^\w+response_\w+.*/) {	if (/^\w+response_\w+.*/) {
my ($responsetype,$part) = split(/_/,$_,2);	my ($responsetype,$part) = split(/_/,$_,2);
my ($partid,$respid) = split(/_/,$part);	my ($partid,$respid) = split(/_/,$part);
	$responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
$handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no');	$handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no');
next if ($seen{$partid} > 0);	next if ($seen{$partid} > 0);
$seen{$partid}++;	$seen{$partid}++;
Line 115 sub response_type {	Line 116 sub response_type {
return \@partlist,\%handgrade;	return \@partlist,\%handgrade;
}	}

	#--- Show resource title
	#--- and parts and response type
	sub showResourceInfo {
	my ($url,$probTitle) = @_;
	my $result ='<table border="0">'.
	'<tr><td colspan=3><font size=+1><b>Current Resource: </b>'.$probTitle.'</font></td></tr>'."\n";
	my ($partlist,$handgrade) = &response_type($url);
	my ($resptype,$hdgrade)=('','no');
	for (sort keys(%$handgrade)) {
	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
	$resptype = $responsetype;
	$hdgrade = $handgrade if ($handgrade eq 'yes');
	$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
	'<td><b>Type: </b>'.$responsetype.'</td></tr>';
	# '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
	}
	$result.='</table>'."\n";
	return $result,$resptype,$hdgrade,$partlist,$handgrade;
	}

	#--- Clean response type for display
	#--- Currently filters option response type only.
	sub cleanRecord {
	my ($answer,$response) = @_;
	$answer =~ s\|^<br />\|\|;
	if ($response eq 'option') {
	my (@IDs,@ans);
	foreach (split(/\&/,&Apache::lonnet::unescape($answer))) {
	my ($optionID,$ans) = split(/=/);
	push @IDs,$optionID.'</font>';
	push @ans,$ans;
	}
	my $grayFont = '<font color="#999999">';
	return '<table border="1">'.
	'<tr valign="top"><td>Answer</td><td>'.
	(join '</td><td>',@ans).'</td></tr>'.
	'<tr valign="top"><td>'.$grayFont.'Option ID</font></td><td>'.$grayFont.
	(join '</td><td>'.$grayFont,@IDs).'</font></td></tr>'.
	'</table>';
	}
	return $answer;
	}

	#-- A couple of common js functions
	sub commonJSfunctions {
	my $request = shift;
	$request->print(<<COMMONJSFUNCTIONS);
	<script type="text/javascript" language="javascript">
	function radioSelection(radioButton) {
	var selection=null;
	if (radioButton.length > 1) {
	for (var i=0; i<radioButton.length; i++) {
	if (radioButton[i].checked) {
	return radioButton[i].value;
	}
	}
	} else {
	if (radioButton.checked) return radioButton.value;
	}
	return selection;
	}

	function pullDownSelection(selectOne) {
	var selection="";
	if (selectOne.length > 1) {
	for (var i=0; i<selectOne.length; i++) {
	if (selectOne[i].selected) {
	return selectOne[i].value;
	}
	}
	} else {
	if (selectOne.selected) return selectOne.value;
	}
	}
	</script>
	COMMONJSFUNCTIONS
	}

#--- Dumps the class list with usernames,list of sections,	#--- Dumps the class list with usernames,list of sections,
#--- section, ids and fullnames for each user.	#--- section, ids and fullnames for each user.
sub getclasslist {	sub getclasslist {
Line 297 sub verifyreceipt {	Line 376 sub verifyreceipt {

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

my ($string,$contents,$matches) = ('','',0);	my ($string,$contents,$matches) = ('','',0);
my (undef,undef,$fullname) = &getclasslist('all','0');	my (undef,undef,$fullname) = &getclasslist('all','0');
Line 345 sub listStudents {	Line 424 sub listStudents {
my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};	my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
my $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};	my $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};

my $result;	my $viewgrade = $ENV{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
my ($partlist,$handgrade) = &response_type($url);
for (sort keys(%$handgrade)) {
my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
$ENV{'form.handgrade'} = 'yes' if ($handgrade eq 'yes');
$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
'<td><b>Type: </b>'.$responsetype.'</td>'.
'<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
}
$result.='</table>'."\n";

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

$result='<h3><font color="#339933"> '.	my $result='<h3><font color="#339933"> '.$viewgrade.
$viewgrade.	' Submissions for a Student or a Group of Students</font></h3>';
' Submissions for a Student or a Group of Students</font></h3>'.
'<table border="0"><tr><td colspan=3><font size=+1>'.	my ($table,$resptype,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'});
'<b>Problem: </b>'.$ENV{'form.probTitle'}.'</font></td></tr>'.$result;	$result.=$table;

$request->print(<<LISTJAVASCRIPT);	$request->print(<<LISTJAVASCRIPT);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
Line 396 sub listStudents {	Line 464 sub listStudents {
formname.command.value = 'submission';	formname.command.value = 'submission';
formname.submit();	formname.submit();
}	}

function pullDownSelection(selectOne) {
var selection="";
if (selectOne.length > 1) {
for (var i=0; i<selectOne.length; i++) {
if (selectOne[i].selected) {
return selectOne[i].value;
}
}
} else {
if (selectOne.selected) return selectOne.value;
}
}
</script>	</script>
LISTJAVASCRIPT	LISTJAVASCRIPT

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

my $checkhdgrade = $ENV{'form.handgrade'} eq 'yes' ? 'checked' : '';	my $checkhdgrade = ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : '';
my $checklastsub = $ENV{'form.handgrade'} eq 'yes' ? '' : 'checked';	my $checklastsub = ($ENV{'form.handgrade'} eq 'no') ? 'checked' : '';
	$checklastsub = 'checked' if ($checkhdgrade eq '' && $checklastsub eq '');
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'."\n".	my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'."\n".
' <b>View Problem: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".	' <b>View Problem Text: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
'<input type="radio" name="vProb" value="yes" /> one student '."\n".	'<input type="radio" name="vProb" value="yes" /> one student '."\n".
'<input type="radio" name="vProb" value="all" /> all students <br />'."\n".	'<input type="radio" name="vProb" value="all" /> all students <br />'."\n".
' <b>Submissions: </b>'."\n";	' <b>Submissions: </b>'."\n";
if ($ENV{'form.handgrade'} eq 'yes') {	if ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
$gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> handgrade only'."\n";	$gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only'."\n";
}	}

my $saveStatus = $ENV{'form.Status'} eq '' ? 'Active' : $ENV{'form.Status'};	my $saveStatus = $ENV{'form.Status'} eq '' ? 'Active' : $ENV{'form.Status'};
Line 654 sub sub_page_js {	Line 710 sub sub_page_js {

function checkSolved(formname,id) {	function checkSolved(formname,id) {
if (eval("formname.solved"+id+".value") == "correct_by_student") {	if (eval("formname.solved"+id+".value") == "correct_by_student") {
alert("This problem has been graded correct by the computer. The score cannot be changed.");	var reply = confirm("This problem has been graded correct by the computer. Do you want to change the score?");
return "noupdate";	if (!reply) {return "noupdate";}
}	}
return "update";	return "update";
}	}
Line 738 SUBJAVASCRIPT	Line 794 SUBJAVASCRIPT
sub sub_page_kw_js {	sub sub_page_kw_js {
my $request = shift;	my $request = shift;
my $iconpath = $request->dir_config('lonIconsURL');	my $iconpath = $request->dir_config('lonIconsURL');
	&commonJSfunctions($request);
$request->print(<<SUBJAVASCRIPT);	$request->print(<<SUBJAVASCRIPT);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">

Line 818 sub sub_page_kw_js {	Line 875 sub sub_page_kw_js {
return;	return;
}	}

// var pWin = null;
function savedMsgHeader(Nmsg,usrctr,fullname) {	function savedMsgHeader(Nmsg,usrctr,fullname) {
var height = 70*Nmsg+250;	var height = 70*Nmsg+250;
var scrollbar = "no";	var scrollbar = "no";
Line 827 sub sub_page_kw_js {	Line 883 sub sub_page_kw_js {
scrollbar = "yes";	scrollbar = "yes";
}	}
// if (window.pWin) {window.pWin.close(); window.pWin=null}	// if (window.pWin) {window.pWin.close(); window.pWin=null}
pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx=70,screeny=75,width=600,height='+height);	var xpos = (screen.width-600)/2;
	xpos = (xpos < 0) ? '0' : xpos;
	var ypos = (screen.height-height)/2-30;
	ypos = (ypos < 0) ? '0' : ypos;

	pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
pWin.focus();	pWin.focus();
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.write("<html><head>");	pDoc.write("<html><head>");
Line 947 sub sub_page_kw_js {	Line 1008 sub sub_page_kw_js {
return;	return;
}	}

// var hwdWin = null;
function highlightCentral() {	function highlightCentral() {
// if (window.hwdWin) window.hwdWin.close();	// if (window.hwdWin) window.hwdWin.close();
hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx=100,screeny=75');	var xpos = (screen.width-400)/2;
	xpos = (xpos < 0) ? '0' : xpos;
	var ypos = (screen.height-330)/2-30;
	ypos = (ypos < 0) ? '0' : ypos;

	hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);
hwdWin.focus();	hwdWin.focus();
var hDoc = hwdWin.document;	var hDoc = hwdWin.document;
hDoc.write("<html><head>");	hDoc.write("<html><head>");
Line 958 sub sub_page_kw_js {	Line 1023 sub sub_page_kw_js {

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

hDoc.write("function radioSelection(radioButton) {");	/* hDoc.write("function radioSelection(radioButton) {");
hDoc.write(" var selection=null;");	hDoc.write(" var selection=null;");
hDoc.write(" for (var i=0; i<radioButton.length; i++) {");	hDoc.write(" for (var i=0; i<radioButton.length; i++) {");
hDoc.write(" if (radioButton[i].checked) {");	hDoc.write(" if (radioButton[i].checked) {");
Line 976 sub sub_page_kw_js {	Line 1041 sub sub_page_kw_js {
hDoc.write(" return selection;");	hDoc.write(" return selection;");
hDoc.write(" }");	hDoc.write(" }");
hDoc.write(" }");	hDoc.write(" }");
hDoc.write("}");	hDoc.write("}"); */

hDoc.write("<");	hDoc.write("<");
hDoc.write("/script>");	hDoc.write("/script>");
Line 1114 sub submission {	Line 1179 sub submission {
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }	if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }

if (!&canview($usec)) {	if (!&canview($usec)) {
$request->print('<font color="red">Unable to view requested student.('.$uname.$udom.$usec.$ENV{'request.course.id'}.')</font>');	$request->print('<font color="red">Unable to view requested student.('.
	$uname.$udom.$usec.$ENV{'request.course.id'}.')</font>');
$request->print(&show_grading_menu_form($symb,$url));	$request->print(&show_grading_menu_form($symb,$url));
return;	return;
}	}
Line 1124 sub submission {	Line 1190 sub submission {
# header info	# header info
if ($counter == 0) {	if ($counter == 0) {
&sub_page_js($request);	&sub_page_js($request);
&sub_page_kw_js($request);	&sub_page_kw_js($request) if ($ENV{'form.handgrade'} eq 'yes');
$ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ?	$ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ?
&Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};	&Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};

$request->print('<h3> <font color="#339933">Submission Record</font></h3>'."\n".	$request->print('<h3> <font color="#339933">Submission Record</font></h3>'."\n".
'<font size=+1> <b>Problem: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");	'<font size=+1> <b>Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");

	if ($ENV{'form.handgrade'} eq 'no') {
	my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
	'/check.gif" height="16" border="0" />';
	my $checkMark='<br /><br /> <b>Note:</b> Part(s) graded correct by the computer is marked with a '.
	$checkIcon.' symbol.'."\n";
	$request->print($checkMark);
	}

# option to display problem, only once else it cause problems	# option to display problem, only once else it cause problems
# with the form later since the problem has a form.	# with the form later since the problem has a form.
Line 1140 sub submission {	Line 1214 sub submission {
# kwclr is the only variable that is guaranteed to be non blank	# kwclr is the only variable that is guaranteed to be non blank
# if this subroutine has been called once.	# if this subroutine has been called once.
my %keyhash = ();	my %keyhash = ();
if ($ENV{'form.kwclr'} eq '') {	if ($ENV{'form.kwclr'} eq '' && $ENV{'form.handgrade'} eq 'yes') {
%keyhash = &Apache::lonnet::dump('nohist_handgrade',	%keyhash = &Apache::lonnet::dump('nohist_handgrade',
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},	$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});	$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
Line 1226 KEYWORDS	Line 1300 KEYWORDS
'<table border="0" width=100%><tr bgcolor="#edffff"><td>'."\n";	'<table border="0" width=100%><tr bgcolor="#edffff"><td>'."\n";

$result.='<b>Fullname: </b>'.$ENV{'form.fullname'}.	$result.='<b>Fullname: </b>'.$ENV{'form.fullname'}.
'<font color="#999999">   Username: '.$uname.'</font>'.	'<font color="#999999">   Username: '.$uname.
'<font color="#999999">   Domain: '.$udom.'</font><br />'."\n";	($ENV{'user.domain'} eq $udom ? '' : ' ('.$udom.')').'</font><br />'."\n";
$result.='<input type="hidden" name="name'.$counter.	$result.='<input type="hidden" name="name'.$counter.
'" value="'.$ENV{'form.fullname'}.'" />'."\n";	'" value="'.$ENV{'form.fullname'}.'" />'."\n";

# If this is handgraded, then check for collaborators	# If any part of the problem is an essay-response (handgraded), then check for collaborators
my @col_fullnames;	my @col_fullnames;
my ($classlist,$fullname);	my ($classlist,$fullname);
if ($ENV{'form.handgrade'} eq 'yes') {	if ($ENV{'form.handgrade'} eq 'yes') {
Line 1307 KEYWORDS	Line 1381 KEYWORDS
&get_last_submission (%record);	&get_last_submission (%record);
my $lastsubonly=''.	my $lastsubonly=''.
($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.	($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
$$timestamp).'';	$$timestamp)."</td></tr>\n";
if ($$timestamp eq '') {	if ($$timestamp eq '') {
$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0].'</td></tr>'."\n";	$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0];
} else {	} else {
for my $part (sort keys(%$handgrade)) {	for my $part (sort keys(%$handgrade)) {
foreach (@$string) {	my ($responsetype,$foo) = split(/:/,$$handgrade{$part});
my ($partid,$respid) = /^resource\.(\w+)\.(\w+)\.submission/;	my ($partid,$respid) = split(/_/,$part);
if ($part eq ($partid.'_'.$respid)) {	if (!exists($record{'resource.'.$partid.'.'.$respid.'.submission'})) {
my ($ressub,$subval) = split(/:/,$_,2);	$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
# Similarity check	$partid.'</b> <font color="#999999">( ID '.$respid.
my $similar='';	' )</font>   Nothing submitted<br /><br />';
my ($oname,$odom,$ocrsid,$oessay,$osim)=&most_similar($uname,$udom,$subval);	} else {
if ($osim) {	foreach (@$string) {
$osim=int($osim*100.0);	my ($partid,$respid) = /^resource\.(\w+)\.(\w+)\.submission/;
$similar='<hr /><h3><font color="#FF0000">Essay is '.$osim.'% similar to an essay by '.&Apache::loncommon::plainname($oname,$odom).	if ($part eq ($partid.'_'.$respid)) {
'</font></h3><blockquote><i>'.	my ($ressub,$subval) = split(/:/,$_,2);
&keywords_highlight($oessay).'</i></blockquote><hr />';	# Similarity check
}	my $similar='';
$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.	my ($oname,$odom,$ocrsid,$oessay,$osim)=&most_similar($uname,$udom,$subval);
$partid.'</b> <font color="#999999">( ID '.$respid.	if ($osim) {
' )</font>   '.	$osim=int($osim*100.0);
($record{"resource.$partid.$respid.uploadedurl"}?	$similar='<hr /><h3><font color="#FF0000">Essay is '.$osim.
'<a href="'.	'% similar to an essay by '.&Apache::loncommon::plainname($oname,$odom).
&Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).	'</font></h3><blockquote><i>'.
'"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />':'').	&keywords_highlight($oessay).'</i></blockquote><hr />';
'<b>Answer: </b><blockquote>'.	}
&keywords_highlight($subval).'</blockquote><br /> '.$similar.'</td></tr>'."\n"	$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
if ($ENV{'form.lastSub'} eq 'lastonly' \|\|	$partid.'</b> <font color="#999999">( ID '.$respid.
($ENV{'form.lastSub'} eq 'hdgrade' &&	' )</font>   '.
$$handgrade{$part} =~ /:yes$/));	($record{"resource.$partid.$respid.uploadedurl"}?
	'<a href="'.
	&Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).
	'"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> '.
	'<font color="red" size="1">Like all files provided by users, '.
	'this file may contain virusses</font><br />':'').
	'<b>Submitted Answer: </b>'.($responsetype eq 'essay' ? '<blockquote>' : '').
	&cleanRecord(&keywords_highlight($subval),$responsetype).
	($responsetype eq 'essay' ? '</blockquote><br />' : '<br /><br />').$similar."\n"
	if ($ENV{'form.lastSub'} eq 'lastonly' \|\|
	($ENV{'form.lastSub'} eq 'hdgrade' &&
	$$handgrade{$part} =~ /:yes$/));
	}
}	}
}	}
}	}
}	}
$lastsubonly.='</td></tr>'."\n";	$lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
$request->print($lastsubonly);	$request->print($lastsubonly);
}	}
} else {	} else {
Line 1353 KEYWORDS	Line 1439 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))) {
	# if (!&canmodify($usec)) {
$request->print('</td></tr></table></td></tr></table></form>'."\n");	$request->print('</td></tr></table></td></tr></table></form>'."\n");
$request->print(&show_grading_menu_form($symb,$url))	$request->print(&show_grading_menu_form($symb,$url))
if (($ENV{'form.command'} eq 'submission') \|\|	if (($ENV{'form.command'} eq 'submission') \|\|
Line 1360 KEYWORDS	Line 1447 KEYWORDS
return;	return;
}	}

# Grading options	# essay grading options
$result='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".	if ($ENV{'form.handgrade'} eq 'yes') {
'<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".	$result='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".
'<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'	'<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
.$udom.'" />'."\n";	'<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});	.$udom.'" />'."\n";
my $msgfor = $givenn.' '.$lastname;	my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});
if (scalar(@col_fullnames) > 0) {	my $msgfor = $givenn.' '.$lastname;
my $lastone = pop @col_fullnames;	if (scalar(@col_fullnames) > 0) {
$msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';	my $lastone = pop @col_fullnames;
}	$msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
$msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript	}
$result.='<tr><td bgcolor="#ffffff">'."\n".	$msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
' <a href="javascript:msgCenter(document.SCORE,'.$counter.	# $result.='<tr><td bgcolor="#ffffff">'."\n".
',\''.$msgfor.'\')"; TARGET=_self>'.	$result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter.
'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a>  '.	',\''.$msgfor.'\')"; TARGET=_self>'.
'<img src="'.$request->dir_config('lonIconsURL').	'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a>  '.
'/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".	'<img src="'.$request->dir_config('lonIconsURL').
'<br /> (Message will be sent when you click on Save & Next below.)'."\n"	'/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
if ($ENV{'form.handgrade'} eq 'yes');	'<br /> (Message will be sent when you click on Save & Next below.)'."\n"
$request->print($result);	if ($ENV{'form.handgrade'} eq 'yes');
	$request->print($result);
	}

my %seen = ();	my %seen = ();
my @partlist;	my @partlist;
Line 1388 KEYWORDS	Line 1477 KEYWORDS
my ($partid,$respid) = split(/_/);	my ($partid,$respid) = split(/_/);
next if ($seen{$partid} > 0);	next if ($seen{$partid} > 0);
$seen{$partid}++;	$seen{$partid}++;
next if ($$handgrade{$_} =~ /:no$/);	next if ($$handgrade{$_} =~ /:no$/ && $ENV{'form.lastSub'} =~ /^(hdgrade)$/);
push @partlist,$partid;	push @partlist,$partid;

$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
Line 1407 KEYWORDS	Line 1496 KEYWORDS
if ($counter == $total) {	if ($counter == $total) {
my $endform='<table border="0"><tr><td>'.	my $endform='<table border="0"><tr><td>'.
'<input type="hidden" name="gradeOpt" value="" />'."\n";	'<input type="hidden" name="gradeOpt" value="" />'."\n";
if ($ENV{'form.handgrade'} eq 'yes') {	# if ($ENV{'form.handgrade'} eq 'yes') {
$endform.='<input type="button" value="Save & Next" '.	$endform.='<input type="button" value="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";
Line 1418 KEYWORDS	Line 1507 KEYWORDS
my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');	my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
$ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;	$ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;
$endform.=$ntstu.'student(s)   ';	$endform.=$ntstu.'student(s)   ';
} else {	# } else {
$endform.='<input type="hidden" name="NTSTU" value="1" />'."\n";	# $endform.='<input type="hidden" name="NTSTU" value="1" />'."\n";
}	# }
$endform.='<input type="button" value="Next" '.	$endform.='<input type="button" value="Next" '.
'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self>  '."\n".	'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self>  '."\n".
'<input type="button" value="Previous" '.	'<input type="button" value="Previous" '.
'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self>  ';	'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self>  ';
$endform.='(Next and Previous do not save the scores.)'."\n"	$endform.='(Next and Previous do not save the scores.)'."\n" ;
if ($ENV{'form.handgrade'} eq 'yes');	# if ($ENV{'form.handgrade'} eq 'yes');
$endform.='</td><tr></table></form>';	$endform.='</td><tr></table></form>';
$endform.=&show_grading_menu_form($symb,$url);	$endform.=&show_grading_menu_form($symb,$url);
$request->print($endform);	$request->print($endform);
Line 1889 sub viewgrades {	Line 1978 sub viewgrades {
my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'});	my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'});
my $result='<h3><font color="#339933">Manual Grading</font></h3>';	my $result='<h3><font color="#339933">Manual Grading</font></h3>';

$result.='<font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";	$result.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";

#view individual student submission form - called using Javascript viewOneStudent	#view individual student submission form - called using Javascript viewOneStudent
$result.=&jscriptNform($url,$symb);	$result.=&jscriptNform($url,$symb);
Line 1977 sub viewgrades {	Line 2066 sub viewgrades {
my (@parts) = sort(&getpartlist($url));	my (@parts) = sort(&getpartlist($url));
foreach my $part (@parts) {	foreach my $part (@parts) {
my $display=&Apache::lonnet::metadata($url,$part.'.display');	my $display=&Apache::lonnet::metadata($url,$part.'.display');
	next if ($display =~ /Number of Attempts/);
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }	if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
if ($display =~ /^Partial Credit Factor/) {	if ($display =~ /^Partial Credit Factor/) {
my ($partid) = &split_part_type($part);	my ($partid) = &split_part_type($part);
Line 2007 sub viewgrades {	Line 2097 sub viewgrades {
'onClick="javascript:submit();" TARGET=_self /></form>'."\n";	'onClick="javascript:submit();" TARGET=_self /></form>'."\n";
if (scalar(%$fullname) eq 0) {	if (scalar(%$fullname) eq 0) {
my $colspan=3+scalar(@parts);	my $colspan=3+scalar(@parts);
$result='<font color="red">There are no students in section "'.$ENV{'form.section'}.'" with enrollment status "'.$ENV{'form.Status'}.'" to modify or grade.</font>';	$result='<font color="red">There are no students in section "'.$ENV{'form.section'}.
	'" with enrollment status "'.$ENV{'form.Status'}.'" to modify or grade.</font>';
}	}
$result.=&show_grading_menu_form($symb,$url);	$result.=&show_grading_menu_form($symb,$url);
return $result;	return $result;
Line 2047 sub viewstudentgrade {	Line 2138 sub viewstudentgrade {
if ($status eq 'excused');	if ($status eq 'excused');
$result.=$optsel;	$result.=$optsel;
$result.="</select></td>\n";	$result.="</select></td>\n";
} else {	# } else {
$result.='<input type="hidden" name="'.	# $result.='<input type="hidden" name="'.
'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.	# 'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
"\n";	# "\n";
$result.='<td align="middle"><input type="text" name="'.	# $result.='<td align="middle"><input type="text" name="'.
'GD_'.$student.'_'.$part.'_'.$type.'" '.	# 'GD_'.$student.'_'.$part.'_'.$type.'" '.
'value="'.$score.'" size="4" /></td>'."\n";	# 'value="'.$score.'" size="4" /></td>'."\n";
}	}
}	}
$result.='</tr>';	$result.='</tr>';
Line 2068 sub editgrades {	Line 2159 sub editgrades {
my $symb=$ENV{'form.symb'};	my $symb=$ENV{'form.symb'};
my $url =$ENV{'form.url'};	my $url =$ENV{'form.url'};
my $title='<h3><font color="#339933">Current Grade Status</font></h3>';	my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
$title.='<font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font><br />'."\n";	$title.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font><br />'."\n";
$title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n";	$title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n";
my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";	my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
$result.= '<table border="0"><tr bgcolor="#deffff">'.	$result.= '<table border="0"><tr bgcolor="#deffff">'.
Line 2306 sub csvuploadmap_header {	Line 2397 sub csvuploadmap_header {
$javascript=&csvupload_javascript_forward_associate();	$javascript=&csvupload_javascript_forward_associate();
}	}

my $result='<table border="0">';	my ($result,$resptype,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'});
$result.='<tr><td colspan=3><font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font></td></tr>';
my ($partlist,$handgrade) = &response_type($url);
my ($resptype,$hdgrade)=('','no');
for (sort keys(%$handgrade)) {
my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
$resptype = $responsetype;
$hdgrade = $handgrade if ($handgrade eq 'yes');
$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
'<td><b>Type: </b>'.$responsetype.'</td>'.
'<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
}
$result.='</table>';
$request->print(<<ENDPICK);	$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<h3><font color="#339933">Uploading Class Grades</font></h3>	<h3><font color="#339933">Uploading Class Grades</font></h3>
Line 2346 to this page if the data selected is ins	Line 2426 to this page if the data selected is ins
$javascript	$javascript
</script>	</script>
ENDPICK	ENDPICK
return '';	$request->print(&show_grading_menu_form($symb,$url));
	return '';

}	}

Line 2392 sub upcsvScores_form {	Line 2473 sub upcsvScores_form {
</script>	</script>
CSVFORMJS	CSVFORMJS
$ENV{'form.probTitle'} = &Apache::lonnet::gettitle($symb);	$ENV{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
	my ($table) = &showResourceInfo($url,$ENV{'form.probTitle'});
	$result.=$table;
$result.='<br /><table width=100% border=0><tr><td bgcolor="#777777">'."\n";	$result.='<br /><table width=100% border=0><tr><td bgcolor="#777777">'."\n";
$result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";	$result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
$result.=' <b>Specify a file containing the class scores for problem - '.$ENV{'form.probTitle'}.	$result.=' <b>Specify a file containing the class scores for current resource'.
'.</b></td></tr>'."\n";	'.</b></td></tr>'."\n";
$result.='<tr bgcolor=#ffffe6><td>'."\n";	$result.='<tr bgcolor=#ffffe6><td>'."\n";
my $upfile_select=&Apache::loncommon::upfile_select_html();	my $upfile_select=&Apache::loncommon::upfile_select_html();
Line 2413 ENDUPFORM	Line 2496 ENDUPFORM
$result.='</td></tr></table>'."\n";	$result.='</td></tr></table>'."\n";
$result.='</td></tr></table><br /><br />'."\n";	$result.='</td></tr></table><br /><br />'."\n";
$result.=&show_grading_menu_form($symb,$url);	$result.=&show_grading_menu_form($symb,$url);

return $result;	return $result;
}	}

Line 2547 function checkPickOne(formname) {	Line 2629 function checkPickOne(formname) {
formname.submit();	formname.submit();
}	}

function radioSelection(radioButton) {
var selection=null;
if (radioButton.length > 1) {
for (var i=0; i<radioButton.length; i++) {
if (radioButton[i].checked) {
return radioButton[i].value;
}
}
} else {
if (radioButton.checked) return radioButton.value;
}
return selection;
}

function pullDownSelection(selectOne) {
var selection="";
if (selectOne.length > 1) {
for (var i=0; i<selectOne.length; i++) {
if (selectOne[i].selected) {
return selectOne[i].value;
}
}
} else {
if (selectOne.selected) return selectOne.value;
}
}
</script>	</script>
LISTJAVASCRIPT	LISTJAVASCRIPT
	&commonJSfunctions($request);
my ($symb,$url) = &get_symb_and_url($request);	my ($symb,$url) = &get_symb_and_url($request);
my $cdom = $ENV{"course.$ENV{'request.course.id'}.domain"};	my $cdom = $ENV{"course.$ENV{'request.course.id'}.domain"};
my $cnum = $ENV{"course.$ENV{'request.course.id'}.num"};	my $cnum = $ENV{"course.$ENV{'request.course.id'}.num"};
Line 2607 LISTJAVASCRIPT	Line 2663 LISTJAVASCRIPT
$result.='<input type="hidden" name="page" />'."\n".	$result.='<input type="hidden" name="page" />'."\n".
'<input type="hidden" name="title" />'."\n";	'<input type="hidden" name="title" />'."\n";

$result.=' <b>View Problems: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".	$result.=' <b>View Problems Text: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
'<input type="radio" name="vProb" value="yes" /> yes '."<br>\n";	'<input type="radio" name="vProb" value="yes" /> yes '."<br>\n";

$result.=' <b>Submission Details: </b>'.	$result.=' <b>Submission Details: </b>'.
Line 2616 LISTJAVASCRIPT	Line 2672 LISTJAVASCRIPT
'<input type="radio" name="lastSub" value="all" /> all details'."\n";	'<input type="radio" name="lastSub" value="all" /> all details'."\n";

$result.='<input type="hidden" name="section" value="'.$getsec.'" />'."\n".	$result.='<input type="hidden" name="section" value="'.$getsec.'" />'."\n".
'<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".	'<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
'<input type="hidden" name="command" value="displayPage" />'."\n".	'<input type="hidden" name="command" value="displayPage" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".	'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
Line 2661 LISTJAVASCRIPT	Line 2717 LISTJAVASCRIPT
sub getSymbMap {	sub getSymbMap {
my ($request) = @_;	my ($request) = @_;
my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',	my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
$ENV{'request.course.fn'}.'_parms.db',1, 1);	$ENV{'request.course.fn'}.'_parms.db');

my $res = $navmap->firstResource(); # temp resource to access constants
$navmap->init();	$navmap->init();

# End navmap using boilerplate

my $iterator = $navmap->getIterator(undef, undef, undef, 1);
my $depth = 1;
$iterator->next(); # ignore first BEGIN_MAP
my $curRes = $iterator->next();

my %symbx = ();	my %symbx = ();
my @titles = ();	my @titles = ();
my $minder=0;	my $minder = 0;
while ($depth > 0) {
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
if ($curRes == $iterator->END_MAP()) { $depth--; }

if (ref($curRes) && $curRes->is_map()) {	# Gather every sequence that has problems.
my ($mapUrl, $id, $resUrl) = split(/___/, $curRes->symb()); # check map contains at least one problem	my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); }, 1);
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	for my $sequence ($navmap->getById('0.0'), @sequences) {
	if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
my $mapiterator = $navmap->getIterator($map->map_start(),	my $title = $minder.'.'.$sequence->compTitle();
$map->map_finish());	push @titles, $title; # minder in case two titles are identical
	$symbx{$title} = $sequence->symb();
my $mapdepth = 1;	$minder++;
my $countProblems = 0;	}
$mapiterator->next(); # skip the first BEGIN_MAP
my $mapcurRes = $mapiterator->next(); # for "current resource"
while ($mapdepth > 0) {
if($mapcurRes == $mapiterator->BEGIN_MAP) { $mapdepth++; }
if($mapcurRes == $mapiterator->END_MAP) { $mapdepth--; }

if (ref($mapcurRes) && $mapcurRes->is_problem() && !$mapcurRes->randomout) {
$countProblems++;
}
$mapcurRes = $mapiterator->next();
}
if ($countProblems > 0) {
my $title = $curRes->compTitle();
push @titles,$minder.'.'.$title; # minder, just in case two titles are identical
$symbx{$minder.'.'.$title} = $curRes->symb();
$minder++;
}
}
$curRes = $iterator->next();
}	}

$navmap->untieHashes();	$navmap->untieHashes();
Line 2759 sub displayPage {	Line 2784 sub displayPage {
my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').	my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
'/check.gif" height="16" border="0" />';	'/check.gif" height="16" border="0" />';

$studentTable.=' <b>Note:</b> A problem graded correct ('.$checkIcon.	$studentTable.=' <b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
') by the computer cannot be changed.'."\n".	' symbol.'."\n".
'<table border="0"><tr><td bgcolor="#777777">'.	'<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">'.	'<table border="0"><tr bgcolor="#e6ffff">'.
'<td align="center"><b> No </b></td>'.	'<td align="center"><b> Prob. </b></td>'.
'<td><b> '.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem View').'/Grade</b></td></tr>';	'<td><b> '.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';

my ($depth,$question) = (1,1);	my ($depth,$question) = (1,1);
$iterator->next(); # skip the first BEGIN_MAP	$iterator->next(); # skip the first BEGIN_MAP
Line 2783 sub displayPage {	Line 2808 sub displayPage {
if ($ENV{'form.vProb'} eq 'yes') {	if ($ENV{'form.vProb'} eq 'yes') {
$studentTable.=&show_problem($request,$symbx,$uname,$udom,1);	$studentTable.=&show_problem($request,$symbx,$uname,$udom,1);
} else {	} else {
my $companswer = &Apache::loncommon::get_student_answers(	my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$ENV{'request.course.id'});
$symbx,$uname,$udom,$ENV{'request.course.id'});
$companswer =~ s\|<form(.*?)>\|\|g;	$companswer =~ s\|<form(.*?)>\|\|g;
$companswer =~ s\|</form>\|\|g;	$companswer =~ s\|</form>\|\|g;

# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>	# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
# $request->print('match='.$1.'<br>');	# $companswer =~ s/$1/ /ms;
# $companswer =~ s/$1/ /s;	# $request->print('match='.$1."<br>\n");
# }	# }
# $companswer =~ s/<table border=\"1\">/<table border=\"0\">/g;	# $companswer =~ s\|<table border=\"1\">\|<table border=\"0\">\|g;
$studentTable.=' <b>'.$title.'</b> <br> <b>Correct answer:</b><br>'.$companswer;	$studentTable.=' <b>'.$title.'</b> <br> <b>Correct answer:</b><br>'.$companswer;
}	}

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

if ($ENV{'form.lastSub'} eq 'datesub') {	if ($ENV{'form.lastSub'} eq 'datesub') {
if ($record{'version'} eq '') {	if ($record{'version'} eq '') {
$studentTable.='<br /> <font color="red">No recorded submission for this problem</font><br />';	$studentTable.='<br /> <font color="red">No recorded submission for this problem</font><br />';
Line 2807 sub displayPage {	Line 2829 sub displayPage {
'<td><b>Date/Time</b></td>'.	'<td><b>Date/Time</b></td>'.
'<td><b>Submission</b></td>'.	'<td><b>Submission</b></td>'.
'<td><b>Status </b></td></tr>';	'<td><b>Status </b></td></tr>';
	my %responseType = ();
	foreach my $partid (@{$parts}) {
	$responseType{$partid} = $curRes->responseType($partid);
	}
my ($version);	my ($version);
	my %mark;
	$mark{'correct_by_student'} = $checkIcon;
for ($version=1;$version<=$record{'version'};$version++) {	for ($version=1;$version<=$record{'version'};$version++) {
my $timestamp = scalar(localtime($record{$version.':timestamp'}));	my $timestamp = scalar(localtime($record{$version.':timestamp'}));
$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';	$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
Line 2816 sub displayPage {	Line 2844 sub displayPage {
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;	my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;
next if ($record{"$version:resource.$partid.solved"} eq '');	next if ($record{"$version:resource.$partid.solved"} eq '');
# next if ($record{"$version:resource.$partid.award"} eq 'APPROX_ANS' &&
# $record{"$version:resource.$partid.solved"} eq '');
$displaySub[0].=(exists $record{$version.':'.$matchKey[0]}) ?	$displaySub[0].=(exists $record{$version.':'.$matchKey[0]}) ?
'<b>Part '.$partid.' '.	'<b>Part '.$partid.' '.
($record{"$version:resource.$partid.tries"} eq '' ? 'Trial not counted' :	($record{"$version:resource.$partid.tries"} eq '' ? 'Trial not counted' :
'Trial '.$record{"$version:resource.$partid.tries"}).'</b>  '.	'Trial '.$record{"$version:resource.$partid.tries"}).'</b>  '.
$record{$version.':'.$matchKey[0]}.'<br />' : '';	&cleanRecord($record{$version.':'.$matchKey[0]},$responseType{$partid}).'<br />' : '';
$displaySub[1].=(exists $record{"$version:resource.$partid.award"}) ?	$displaySub[1].=(exists $record{"$version:resource.$partid.award"}) ?
'<b>Part '.$partid.'</b>  '.	'<b>Part '.$partid.'</b>  '.
$record{"$version:resource.$partid.award"}.'/'.	lc($record{"$version:resource.$partid.award"}).' '.
$record{"$version:resource.$partid.solved"}.'<br />' : '';	$mark{$record{"$version:resource.$partid.solved"}}.'<br />' : '';
	# $record{"$version:resource.$partid.solved"}.'<br />' : '';
$displaySub[2].=(exists $record{"$version:resource.$partid.regrader"}) ?	$displaySub[2].=(exists $record{"$version:resource.$partid.regrader"}) ?
$record{"$version:resource.$partid.regrader"}.' (<b>Part:</b> '.$partid.')' : '';	$record{"$version:resource.$partid.regrader"}.' (<b>Part:</b> '.$partid.')' : '';
}	}
Line 3336 sub gradingmenu {	Line 3363 sub gradingmenu {

$request->print(<<GRADINGMENUJS);	$request->print(<<GRADINGMENUJS);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function checkChoice(formname) {	function checkChoice(formname,val,cmdx) {
var cmd = formname.command;	if (val <= 2) {
formname.saveState.value = "saveCmd="+radioSelection(cmd)+":saveSec="+pullDownSelection(formname.section)+	var cmd = radioSelection(formname.radioChoice);
	var cmdsave = cmd;
	} else {
	cmd = cmdx;
	cmdsave = 'submission';
	}
	formname.command.value = cmd;
	formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
":saveSub="+radioSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);	":saveSub="+radioSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
if (cmd[0].checked \|\| cmd[1].checked \|\| cmd[2].checked \|\| cmd[3].checked \|\| cmd[4].checked) formname.submit();	if (val < 5) formname.submit();
if (cmd[5].checked) {	if (val == 5) {
if (!checkReceiptNo(formname,'notOK')) { return false;}	if (!checkReceiptNo(formname,'notOK')) { return false;}
formname.submit();	formname.submit();
}	}
Line 3358 sub gradingmenu {	Line 3392 sub gradingmenu {
formname.receipt.focus();	formname.receipt.focus();
return false;	return false;
}	}
formname.command[5].checked = true;
return true;	return true;
}	}

function radioSelection(radioButton) {
var selection=null;
if (radioButton.length > 1) {
for (var i=0; i<radioButton.length; i++) {
if (radioButton[i].checked) {
return radioButton[i].value;
}
}
} else {
if (radioButton.checked) return radioButton.value;
}
return selection;
}

function pullDownSelection(selectOne) {
var selection="";
if (selectOne.length > 1) {
for (var i=0; i<selectOne.length; i++) {
if (selectOne[i].selected) {
return selectOne[i].value;
}
}
} else {
if (selectOne.selected) return selectOne.value;
}
}

</script>	</script>
GRADINGMENUJS	GRADINGMENUJS
	&commonJSfunctions($request);
my $result='<h3> <font color="#339933">Manual Grading/View Submission</font></h3>'.	my $result='<h3> <font color="#339933">Manual Grading/View Submission</font></h3>';
'<table border="0">'.	my ($table,$resptype,$hdgrade) = &showResourceInfo($url,$probTitle);
'<tr><td colspan=3><font size=+1><b>Problem: </b>'.$probTitle.'</font></td></tr>'."\n";	$result.=$table;
my ($partlist,$handgrade) = &response_type($url);
my ($resptype,$hdgrade)=('','no');
for (sort keys(%$handgrade)) {
my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
$resptype = $responsetype;
$hdgrade = $handgrade if ($handgrade eq 'yes');
$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
'<td><b>Type: </b>'.$responsetype.'</td>'.
'<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
}
$result.='</table>'."\n";

my (undef,$sections) = &getclasslist('all','0');	my (undef,$sections) = &getclasslist('all','0');
my $savedState = &savedState();	my $savedState = &savedState();
my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'pickStudentPage' : $$savedState{'saveCmd'});	my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});	my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
my $saveSub = ($$savedState{'saveSub'} eq '' ? 'yes' : $$savedState{'saveSub'});	my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});	my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});

$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".	$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
Line 3420 GRADINGMENUJS	Line 3413 GRADINGMENUJS
'<input type="hidden" name="response" value="'.$resptype.'" />'."\n".	'<input type="hidden" name="response" value="'.$resptype.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".	'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".	'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".
	'<input type="hidden" name="command" value="" />'."\n".
'<input type="hidden" name="saveState" value="" />'."\n".	'<input type="hidden" name="saveState" value="" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";	'<input type="hidden" name="showgrading" value="yes" />'."\n";

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

$result.='<table width=100% border=0>'.
'<tr bgcolor="#ffffe6" valign="top"><td colspan="2">'.
'<input type="radio" name="command" value="pickStudentPage" '.
($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.
'Handgrade/View Submission for a student by page/sequence</td></tr>'."\n".

'<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
'<input type="radio" name="command" value="viewgrades" '.
($saveCmd eq 'viewgrades' ? 'checked' : '').'> '.
'Grade by section or class</td></tr>'."\n".

'<tr bgcolor="#ffffe6"valign="top"><td><input type="radio" name="command" value="submission" '.
($saveCmd eq 'submission' ? 'checked' : '').'> '.
($hdgrade eq 'yes' ? 'View/Grade essay response of' : 'View').
' an individual student </td>'."\n".
'<td>--> For students who has: '.
'<input type="radio" name="submitonly" value="yes" '.
($saveSub eq 'yes' ? 'checked' : '').' /> submitted'.
'<input type="radio" name="submitonly" value="all" '.
($saveSub eq 'all' ? 'checked' : '').' /> everybody</td></tr>'."\n".

'<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
'<input type="radio" name="command" value="csvform" '.
($saveCmd eq 'csvform' ? 'checked' : '').'> '.
'Upload scores from file</td></tr>'."\n";

$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.	$result.='<table width="100%" border=0>';
'<input type="radio" name="command" value="scantron_selectphase" '.	$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
($saveCmd eq 'scantron_selectphase' ? 'checked="on"' : '').' /> '.	' Select Section: <select name="section">'."\n";
'Grade scantron forms</td></tr>'."\n";

if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)) {
$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
'<input type="radio" name="command" value="verify" onChecked="javascript:this.form.receipt.focus()" '.
($saveCmd eq 'verify' ? 'checked' : '').'> '.
'Verify a submission receipt issued by this server</td>'.
'<td>--> Receipt no: '.unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')">'.
'</td></tr>'."\n";
}

$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2"><br />'."\n".
' Select section: <select name="section">'."\n";
if (ref($sections)) {	if (ref($sections)) {
foreach (sort (@$sections)) {$result.='<option value="'.$_.'" '.	foreach (sort (@$sections)) {$result.='<option value="'.$_.'" '.
($saveSec eq $_ ? 'selected="on"' : '').'>'.$_.'</option>'."\n";}	($saveSec eq $_ ? 'selected="on"' : '').'>'.$_.'</option>'."\n";}
Line 3478 GRADINGMENUJS	Line 3432 GRADINGMENUJS
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select>   ';	$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select>   ';

$result.='Student Status:</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);	$result.='Student Status:</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
$result.='   <font color="red">(Applies to the first three options only.)</font>'."\n";

if (ref($sections)) {	if (ref($sections)) {
$result.=' (Section "no" implies the students were not assigned a section.)<br />'	$result.=' (Section "no" implies the students were not assigned a section.)<br />'
Line 3486 GRADINGMENUJS	Line 3439 GRADINGMENUJS
}	}
$result.='</td></tr>';	$result.='</td></tr>';

$result.='<tr bgcolor="#ffffe6"><td colspan="2"><br />'.	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
'<input type="button" onClick="javascript:checkChoice(this.form);" value="View/Grade" />'."\n".	'<input type="radio" name="radioChoice" value="submission" '.
'</form></td></tr></table>'."\n".	($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>Current Resource:</b> For one or more students'.
	'<br />            -->For students with '.
	'<input type="radio" name="submitonly" value="yes" '.
	($saveSub eq 'yes' ? 'checked' : '').' /> submissions or '.
	'<input type="radio" name="submitonly" value="all" '.
	($saveSub eq 'all' ? 'checked' : '').' /> for all</td></tr>'."\n";

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

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

	$result.='<tr bgcolor="#ffffe6"><td><br />'.
	'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="View/Grade/Regrade" />'.
	'</td></tr></table>'."\n";

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

	$result.='<table width="100%" border=0>';
	$result.='<tr bgcolor="#ffffe6"><td>'.
	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="Upload" />'.
	' scores from file </td></tr>'."\n";

	$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
	'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
	'" value="Grade" /> scantron forms</td></tr>'."\n";

	if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)) {
	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
	'<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="Verify" />'.
	' submission Receipt no: '.unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).
	'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')">'.
	'</td></tr>'."\n";
	}

	$result.='</form></td></tr></table>'."\n".
'</td></tr></table>'."\n".	'</td></tr></table>'."\n".
'</td></tr></table>'."\n";	'</td></tr></table>'."\n";
return $result;	return $result;

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

Removed from v.1.112
changed lines
	Added in v.1.118