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.674 and 1.677

version 1.674, 2012/08/09 20:06:07	version 1.677, 2012/12/10 01:13:08
Line 1546 INNERJS	Line 1546 INNERJS

pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");	pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");	pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
pDoc.write("<h3><span class=\\"LC_info\\"> $lt{'comp'}\"+fullname+\"<\\/span><\\/h3><br /><br />");	pDoc.write("<h1> $lt{'comp'}\"+fullname+\"<\\/h1>");

pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');	pDoc.write('<table style="border:1px solid black;"><tr>');
pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');	pDoc.write("<td><b>$lt{'incl'}<\\/b><\\/td><td><b>$lt{'type'}<\\/b><\\/td><td><b>$lt{'mesa'}<\\/td><\\/tr>");
pDoc.write("<td><b>$lt{'type'}<\\/b><\\/td><td><b>$lt{'incl'}<\\/b><\\/td><td><b>$lt{'mesa'}<\\/td><\\/tr>");
}	}
function displaySubject(msg,shwsel) {	function displaySubject(msg,shwsel) {
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.write("<tr bgcolor=\\"#ffffdd\\">");	pDoc.write("<tr>");
pDoc.write("<td>$lt{'subj'}<\\/td>");
pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");	pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>");	pDoc.write("<td>$lt{'subj'}<\\/td>");
	pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"40\\" maxlength=\\"80\\"><\\/td><\\/tr>");
}	}

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

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

function msgTail() {	function msgTail() {
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.write("<\\/table>");	//pDoc.write("<\\/table>");
pDoc.write("<\\/td><\\/tr><\\/table> ");	pDoc.write("<\\/td><\\/tr><\\/table> ");
pDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:checkInput()\\">  ");	pDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:checkInput()\\">  ");
pDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />");	pDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />");
Line 7004 sub scantron_validate_sequence {	Line 7003 sub scantron_validate_sequence {
my @resources=	my @resources=
$navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0);	$navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0);
if (@resources) {	if (@resources) {
$r->print("<p>".&mt('Some resources in the sequence currently are not set to exam mode. Grading these resources currently may not work correctly.')."</p>");	$r->print(
	'<p class="LC_warning">'
	.&mt('Some resources in the sequence currently are not set to'
	.' exam mode. Grading these resources currently may not'
	.' work correctly.')
	.'</p>'
	);
return (1,$currentphase);	return (1,$currentphase);
}	}
}	}
Line 7909 sub scantron_process_students {	Line 7914 sub scantron_process_students {
return '';	return '';
}	}
my $map=$navmap->getResourceByUrl($sequence);	my $map=$navmap->getResourceByUrl($sequence);
	my $randomorder;
	if (ref($map)) {
	$randomorder = $map->randomorder();
	}
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
my (%grader_partids_by_symb,%grader_randomlists_by_symb);	my (%grader_partids_by_symb,%grader_randomlists_by_symb,%ordered);
&graders_resources_pass(\@resources,\%grader_partids_by_symb,	&graders_resources_pass(\@resources,\%grader_partids_by_symb,
\%grader_randomlists_by_symb,$bubbles_per_row);	\%grader_randomlists_by_symb,$bubbles_per_row);
my $resource_error;	my ($resource_error,%symb_to_resource,@master_seq);
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my $ressymb;	my $ressymb;
if (ref($resource)) {	if (ref($resource)) {
$ressymb = $resource->symb();	$ressymb = $resource->symb();
	push(@master_seq,$ressymb);
	$symb_to_resource{$ressymb} = $resource;
} else {	} else {
$resource_error = 1;	$resource_error = 1;
last;	last;
Line 8001 SCANTRONFORM	Line 8012 SCANTRONFORM
'Student '.$uname.' has multiple sheets',2);	'Student '.$uname.' has multiple sheets',2);
next;	next;
}	}
	my $usec = $classlist->{$uname}->[&Apache::loncoursedata::CL_SECTION];
	my $user = $uname.':'.$usec;
($uname,$udom)=split(/:/,$uname);	($uname,$udom)=split(/:/,$uname);

	my $scancode;
	if ((exists($scan_record->{'scantron.CODE'})) &&
	(&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {
	$scancode = $scan_record->{'scantron.CODE'};
	} else {
	$scancode = '';
	}

	my @mapresources = @resources;
	if ($randomorder && $scancode) {
	unless (ref($ordered{$scancode}) eq 'ARRAY') {
	$env{'form.CODE'} = $scancode;
	my $actual_seq =
	&Apache::lonprintout::master_seq_to_person_seq($sequence,
	\@master_seq,
	$user,$scancode);
	if (ref($actual_seq) eq 'ARRAY') {
	@{$ordered{$scancode}} =
	map { $symb_to_resource{$_}; } @{$actual_seq};
	}
	delete($env{'form.CODE'});
	}
	if (ref($ordered{$scancode}) eq 'ARRAY') {
	@mapresources = @{$ordered{$scancode}};
	}
	}
my (%partids_by_symb,$res_error);	my (%partids_by_symb,$res_error);
foreach my $resource (@resources) {	foreach my $resource (@mapresources) {
my $ressymb;	my $ressymb;
if (ref($resource)) {	if (ref($resource)) {
$ressymb = $resource->symb();	$ressymb = $resource->symb();
Line 8036 SCANTRONFORM	Line 8075 SCANTRONFORM
&scantron_putfile($scanlines,$scan_data);	&scantron_putfile($scanlines,$scan_data);
}	}

my $scancode;
if ((exists($scan_record->{'scantron.CODE'})) &&
(&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {
$scancode = $scan_record->{'scantron.CODE'};
} else {
$scancode = '';
}

if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,	if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
\@resources,\%partids_by_symb,	\@mapresources,\%partids_by_symb,
$bubbles_per_row) eq 'ssi_error') {	$bubbles_per_row) eq 'ssi_error') {
$ssi_error = 0; # So end of handler error message does not trigger.	$ssi_error = 0; # So end of handler error message does not trigger.
$r->print("</form>");	$r->print("</form>");
Line 8062 SCANTRONFORM	Line 8093 SCANTRONFORM
$studentdata =~ s/\r$//;	$studentdata =~ s/\r$//;
my $studentrecord = '';	my $studentrecord = '';
my $counter = -1;	my $counter = -1;
foreach my $resource (@resources) {	foreach my $resource (@mapresources) {
my $ressymb = $resource->symb();	my $ressymb = $resource->symb();
($counter,my $recording) =	($counter,my $recording) =
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},	&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
Line 8073 SCANTRONFORM	Line 8104 SCANTRONFORM
if ($studentrecord ne $studentdata) {	if ($studentrecord ne $studentdata) {
&Apache::lonxml::clear_problem_counter();	&Apache::lonxml::clear_problem_counter();
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,	if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
\@resources,\%partids_by_symb,	\@mapresources,\%partids_by_symb,
$bubbles_per_row) eq 'ssi_error') {	$bubbles_per_row) eq 'ssi_error') {
$ssi_error = 0; # So end of handler error message does not trigger.	$ssi_error = 0; # So end of handler error message does not trigger.
$r->print("</form>");	$r->print("</form>");
Line 8084 SCANTRONFORM	Line 8115 SCANTRONFORM
}	}
$counter = -1;	$counter = -1;
$studentrecord = '';	$studentrecord = '';
foreach my $resource (@resources) {	foreach my $resource (@mapresources) {
my $ressymb = $resource->symb();	my $ressymb = $resource->symb();
($counter,my $recording) =	($counter,my $recording) =
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},	&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
Line 8160 sub graders_resources_pass {	Line 8191 sub graders_resources_pass {
}	}

sub grade_student_bubbles {	sub grade_student_bubbles {
my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts,$bubbles_per_row) = @_;	my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts,$bubbles_per_row) = @_;
# Walk folder as student here to get resources in order student sees.
if (ref($resources) eq 'ARRAY') {	if (ref($resources) eq 'ARRAY') {
my $count = 0;	my $count = 0;
foreach my $resource (@{$resources}) {	foreach my $resource (@{$resources}) {
Line 8465 sub checkscantron_results {	Line 8495 sub checkscantron_results {
return '';	return '';
}	}
my $map=$navmap->getResourceByUrl($sequence);	my $map=$navmap->getResourceByUrl($sequence);
	my $randomorder;
	if (ref($map)) {
	$randomorder=$map->randomorder();
	}
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
my (%grader_partids_by_symb,%grader_randomlists_by_symb);	my (%grader_partids_by_symb,%grader_randomlists_by_symb);
&graders_resources_pass(\@resources,\%grader_partids_by_symb,	&graders_resources_pass(\@resources,\%grader_partids_by_symb,
\%grader_randomlists_by_symb,$bubbles_per_row);	\%grader_randomlists_by_symb,$bubbles_per_row);

my ($uname,$udom);	my ($uname,$udom);
my (%scandata,%lastname,%bylast);	my (%scandata,%lastname,%bylast);
$r->print('	$r->print('
Line 8523 sub checkscantron_results {	Line 8556 sub checkscantron_results {
chomp($scandata{$pid});	chomp($scandata{$pid});
$scandata{$pid} =~ s/\r$//;	$scandata{$pid} =~ s/\r$//;
($username,$domain)=split(/:/,$uname);	($username,$domain)=split(/:/,$uname);

	my ($scancode,%ordered);
	if ((exists($scan_record->{'scantron.CODE'})) &&
	(&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {
	$scancode = $scan_record->{'scantron.CODE'};
	} else {
	$scancode = '';
	}

	my @mapresources = @resources;
	if ($randomorder && $scancode) {
	unless (ref($ordered{$scancode}) eq 'ARRAY') {
	$env{'form.CODE'} = $scancode;
	$ordered{$scancode} =
	&Apache::lonprintout::master_seq_to_person_seq($sequence,
	\@resources,
	$uname,$scancode);
	delete($env{'form.CODE'});
	}
	if (ref($ordered{$scancode}) eq 'ARRAY') {
	@mapresources = @{$ordered{$scancode}};
	}
	}
my $counter = -1;	my $counter = -1;
foreach my $resource (@resources) {	foreach my $resource (@mapresources) {
my $parts;	my $parts;
my $ressymb = $resource->symb();	my $ressymb = $resource->symb();
if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|	if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|

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

Removed from v.1.674
changed lines
	Added in v.1.677