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.663 and 1.674

version 1.663, 2011/11/14 03:08:01	version 1.674, 2012/08/09 20:06:07
Line 54 use POSIX qw(floor);	Line 54 use POSIX qw(floor);


my %perm=();	my %perm=();
	my %old_essays=();

# These variables are used to recover from ssi errors	# These variables are used to recover from ssi errors

Line 202 sub get_display_part {	Line 203 sub get_display_part {
sub reset_caches {	sub reset_caches {
&reset_analyze_cache();	&reset_analyze_cache();
&reset_perm();	&reset_perm();
	&reset_old_essays();
}	}

{	{
Line 681 sub compute_points {	Line 683 sub compute_points {
#	#

sub most_similar {	sub most_similar {
my ($uname,$udom,$uessay,$old_essays)=@_;	my ($uname,$udom,$symb,$uessay)=@_;

	unless ($symb) { return ''; }

	unless (ref($old_essays{$symb}) eq 'HASH') { return ''; }

# ignore spaces and punctuation	# ignore spaces and punctuation

Line 698 sub most_similar {	Line 704 sub most_similar {
my $scrsid='';	my $scrsid='';
my $sessay='';	my $sessay='';
# go through all essays ...	# go through all essays ...
foreach my $tkey (keys(%$old_essays)) {	foreach my $tkey (keys(%{$old_essays{$symb}})) {
my ($tname,$tdom,$tcrsid)=map {&unescape($_)} (split(/\./,$tkey));	my ($tname,$tdom,$tcrsid)=map {&unescape($_)} (split(/\./,$tkey));
# ... except the same student	# ... except the same student
next if (($tname eq $uname) && ($tdom eq $udom));	next if (($tname eq $uname) && ($tdom eq $udom));
my $tessay=$old_essays->{$tkey};	my $tessay=$old_essays{$symb}{$tkey};
$tessay=~s/\W+/ /gs;	$tessay=~s/\W+/ /gs;
# String similarity gives up if not even limit	# String similarity gives up if not even limit
my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit);	my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit);
Line 712 sub most_similar {	Line 718 sub most_similar {
$sname=$tname;	$sname=$tname;
$sdom=$tdom;	$sdom=$tdom;
$scrsid=$tcrsid;	$scrsid=$tcrsid;
$sessay=$old_essays->{$tkey};	$sessay=$old_essays{$symb}{$tkey};
}	}
}	}
if ($limit>0.6) {	if ($limit>0.6) {
Line 1524 INNERJS	Line 1530 INNERJS

function savedMsgHeader(Nmsg,usrctr,fullname) {	function savedMsgHeader(Nmsg,usrctr,fullname) {
var height = 70*Nmsg+250;	var height = 70*Nmsg+250;
var scrollbar = "no";
if (height > 600) {	if (height > 600) {
height = 600;	height = 600;
scrollbar = "yes";
}	}
var xpos = (screen.width-600)/2;	var xpos = (screen.width-600)/2;
xpos = (xpos < 0) ? '0' : xpos;	xpos = (xpos < 0) ? '0' : xpos;
var ypos = (screen.height-height)/2-30;	var ypos = (screen.height-height)/2-30;
ypos = (ypos < 0) ? '0' : ypos;	ypos = (ypos < 0) ? '0' : ypos;

pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=700,height='+height);	pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars=yes,screenx='+xpos+',screeny='+ypos+',width=700,height='+height);
pWin.focus();	pWin.focus();
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.$docopen;	pDoc.$docopen;
Line 1829 sub show_problem {	Line 1833 sub show_problem {
$companswer=~s\|</form>\|\|g;	$companswer=~s\|</form>\|\|g;
$companswer=~s\|name="submit"\|name="would_have_been_submit"\|g;	$companswer=~s\|name="submit"\|name="would_have_been_submit"\|g;
}	}
	my $renderheading = &mt('View of the problem');
	my $answerheading = &mt('Correct answer');
	if (($uname ne $env{'user.name'}) \|\| ($udom ne $env{'user.domain'})) {
	my $stu_fullname = $env{'form.fullname'};
	if ($stu_fullname eq '') {
	$stu_fullname = &Apache::loncommon::plainname($uname,$udom,'lastname');
	}
	my $forwhom = &nameUserString(undef,$stu_fullname,$uname,$udom);
	if ($forwhom ne '') {
	$renderheading = &mt('View of the problem for[_1]',$forwhom);
	$answerheading = &mt('Correct answer for[_1]',$forwhom);
	}
	}
$rendered=	$rendered=
'<div class="LC_Box">'	'<div class="LC_Box">'
.'<h3 class="LC_hcell">'.&mt('View of the problem').'</h3>'	.'<h3 class="LC_hcell">'.$renderheading.'</h3>'
.$rendered	.$rendered
.'</div>';	.'</div>';
$companswer=	$companswer=
'<div class="LC_Box">'	'<div class="LC_Box">'
.'<h3 class="LC_hcell">'.&mt('Correct answer').'</h3>'	.'<h3 class="LC_hcell">'.$answerheading.'</h3>'
.$companswer	.$companswer
.'</div>';	.'</div>';
my $result;	my $result;
Line 1938 sub submission {	Line 1955 sub submission {
'" src="'.$request->dir_config('lonIconsURL').	'" src="'.$request->dir_config('lonIconsURL').
'/check.gif" height="16" border="0" />';	'/check.gif" height="16" border="0" />';

my %old_essays;
# header info	# header info
if ($counter == 0) {	if ($counter == 0) {
&sub_page_js($request);	&sub_page_js($request);
Line 2046 KEYWORDS	Line 2062 KEYWORDS
my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);	my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
$apath=&escape($apath);	$apath=&escape($apath);
$apath=~s/\W/\_/gs;	$apath=~s/\W/\_/gs;
%old_essays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);	&init_old_essays($symb,$apath,$adom,$aname);
}	}
}	}

Line 2185 KEYWORDS	Line 2201 KEYWORDS
}	}
if($env{'form.checkPlag'}){	if($env{'form.checkPlag'}){
my ($oname,$odom,$ocrsid,$oessay,$osim)=	my ($oname,$odom,$ocrsid,$oessay,$osim)=
&most_similar($uname,$udom,$subval,\%old_essays);	&most_similar($uname,$udom,$symb,$subval);
if ($osim) {	if ($osim) {
$osim=int($osim*100.0);	$osim=int($osim*100.0);
my %old_course_desc =	my %old_course_desc =
Line 2508 sub keywords_highlight {	Line 2524 sub keywords_highlight {
return $string;	return $string;
}	}

	# For Tasks provide a mechanism to display previous version for one specific student

	sub show_previous_task_version {
	my ($request,$symb) = @_;
	if ($symb eq '') {
	$request->print("Unable to handle ambiguous references.");

	return '';
	}
	my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
	my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
	if (!&canview($usec)) {
	$request->print('<span class="LC_warning">Unable to view previous version for requested student.('.
	$uname.':'.$udom.' in section '.$usec.' in course id '.
	$env{'request.course.id'}.')</span>');
	return;
	}
	my $mode = 'both';
	my $isTask = ($symb =~/\.task$/);
	if ($isTask) {
	if ($env{'form.previousversion'} =~ /^\d+$/) {
	if ($env{'form.fullname'} eq '') {
	$env{'form.fullname'} =
	&Apache::loncommon::plainname($uname,$udom,'lastname');
	}
	my $probtitle=&Apache::lonnet::gettitle($symb);
	$request->print("\n\n".
	'<div class="LC_grade_show_user">'.
	'<h2>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
	'</h2>'."\n");
	&Apache::lonxml::clear_problem_counter();
	$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode,
	{'previousversion' => $env{'form.previousversion'} }));
	$request->print("\n</div>");
	}
	}
	return;
	}

	sub choose_task_version_form {
	my ($symb,$uname,$udom,$nomenu) = @_;
	my $isTask = ($symb =~/\.task$/);
	my ($current,$version,$result,$js,$displayed,$rowtitle);
	if ($isTask) {
	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
	$udom,$uname);
	if (($record{'resource.0.version'} eq '') \|\|
	($record{'resource.0.version'} < 2)) {
	return ($record{'resource.0.version'},
	$record{'resource.0.version'},$result,$js);
	} else {
	$current = $record{'resource.0.version'};
	}
	if ($env{'form.previousversion'}) {
	$displayed = $env{'form.previousversion'};
	$rowtitle = &mt('Choose another version:')
	} else {
	$displayed = $current;
	$rowtitle = &mt('Show earlier version:');
	}
	$result = '<div class="LC_left_float">';
	my $list;
	my $numversions = 0;
	for (my $i=1; $i<=$record{'resource.0.version'}; $i++) {
	if ($i == $current) {
	if (!$env{'form.previousversion'} \|\| $nomenu) {
	next;
	} else {
	$list .= '<option value="'.$i.'">'.&mt('Current').'</option>'."\n";
	$numversions ++;
	}
	} elsif (defined($record{'resource.'.$i.'.0.status'})) {
	unless ($i == $env{'form.previousversion'}) {
	$numversions ++;
	}
	$list .= '<option value="'.$i.'">'.$i.'</option>'."\n";
	}
	}
	if ($numversions) {
	$symb = &HTML::Entities::encode($symb,'<>"&');
	$result .=
	'<form name="getprev" method="post" action=""'.
	' onsubmit="return previousVersion('."'$uname','$udom','$symb','$displayed'".');">'.
	&Apache::loncommon::start_data_table().
	&Apache::loncommon::start_data_table_row().
	'<th align="left">'.$rowtitle.'</th>'.
	'<td><select name="version">'.
	'<option>'.&mt('Select').'</option>'.
	$list.
	'</select></td>'.
	&Apache::loncommon::end_data_table_row();
	unless ($nomenu) {
	$result .= &Apache::loncommon::start_data_table_row().
	'<th align="left">'.&mt('Open in new window').'</th>'.
	'<td><span class="LC_nobreak">'.
	'<label><input type="radio" name="prevwin" value="1" />'.
	&mt('Yes').'</label>'.
	'<label><input type="radio" name="prevwin" value="0" checked="checked" />'.&mt('No').'</label>'.
	'</span></td>'.
	&Apache::loncommon::end_data_table_row();
	}
	$result .=
	&Apache::loncommon::start_data_table_row().
	'<th align="left"> </th>'.
	'<td>'.
	'<input type="submit" name="prevsub" value="'.&mt('Display').'" />'.
	'</td>'.
	&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::end_data_table().
	'</form>';
	$js = &previous_display_javascript($nomenu,$current);
	} elsif ($displayed && $nomenu) {
	$result .= '<a href="javascript:window.close()">'.&mt('Close window').'</a>';
	} else {
	$result .= &mt('No previous versions to show for this student');
	}
	$result .= '</div>';
	}
	return ($current,$displayed,$result,$js);
	}

	sub previous_display_javascript {
	my ($nomenu,$current) = @_;
	my $js = <<"JSONE";
	<script type="text/javascript">
	// <![CDATA[
	function previousVersion(uname,udom,symb) {
	var current = '$current';
	var version = document.getprev.version.options[document.getprev.version.selectedIndex].value;
	var prevstr = new RegExp("^\\\\d+\$");
	if (!prevstr.test(version)) {
	return false;
	}
	var url = '';
	if (version == current) {
	url = '/adm/grades?student='+uname+'&userdom='+udom+'&symb='+symb+'&command=submission';
	} else {
	url = '/adm/grades?student='+uname+'&userdom='+udom+'&symb='+symb+'&command=versionsub&previousversion='+version;
	}
	JSONE
	if ($nomenu) {
	$js .= <<"JSTWO";
	document.location.href = url;
	JSTWO
	} else {
	$js .= <<"JSTHREE";
	var newwin = 0;
	for (var i=0; i<document.getprev.prevwin.length; i++) {
	if (document.getprev.prevwin[i].checked == true) {
	newwin = document.getprev.prevwin[i].value;
	}
	}
	if (newwin == 1) {
	var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no';
	url = url+'&inhibitmenu=yes';
	if (typeof(previousWin) == 'undefined' \|\| previousWin.closed) {
	previousWin = window.open(url,'',options,1);
	} else {
	previousWin.location.href = url;
	}
	previousWin.focus();
	return false;
	} else {
	document.location.href = url;
	return false;
	}
	JSTHREE
	}
	$js .= <<"ENDJS";
	return false;
	}
	// ]]>
	</script>
	ENDJS

	}

#--- Called from submission routine	#--- Called from submission routine
sub processHandGrade {	sub processHandGrade {
my ($request,$symb) = @_;	my ($request,$symb) = @_;
Line 4540 sub displaySubByDates {	Line 4733 sub displaySubByDates {
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('Date/Time').'</th>'.	'<th>'.&mt('Date/Time').'</th>'.
($isCODE?'<th>'.&mt('CODE').'</th>':'').	($isCODE?'<th>'.&mt('CODE').'</th>':'').
	($isTask?'<th>'.&mt('Version').'</th>':'').
'<th>'.&mt('Submission').'</th>'.	'<th>'.&mt('Submission').'</th>'.
'<th>'.&mt('Status').'</th>'.	'<th>'.&mt('Status').'</th>'.
&Apache::loncommon::end_data_table_header_row();	&Apache::loncommon::end_data_table_header_row();
Line 4560 sub displaySubByDates {	Line 4754 sub displaySubByDates {
if (exists($$record{$version.':resource.0.version'})) {	if (exists($$record{$version.':resource.0.version'})) {
$interaction = $$record{$version.':resource.0.version'};	$interaction = $$record{$version.':resource.0.version'};
}	}
	if ($isTask && $env{'form.previousversion'}) {
	next unless ($interaction == $env{'form.previousversion'});
	}
my $where = ($isTask ? "$version:resource.$interaction"	my $where = ($isTask ? "$version:resource.$interaction"
: "$version:resource");	: "$version:resource");
$studentTable.=&Apache::loncommon::start_data_table_row().	$studentTable.=&Apache::loncommon::start_data_table_row().
Line 4568 sub displaySubByDates {	Line 4764 sub displaySubByDates {
if ($isCODE) {	if ($isCODE) {
$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';	$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
}	}
	if ($isTask) {
	$studentTable.='<td>'.$interaction.'</td>';
	}
my @versionKeys = split(/\:/,$$record{$version.':keys'});	my @versionKeys = split(/\:/,$$record{$version.':keys'});
my @displaySub = ();	my @displaySub = ();
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
Line 4587 sub displaySubByDates {	Line 4786 sub displaySubByDates {

my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)	my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));	: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
$displaySub[0].='<span class="LC_nobreak"';	$displaySub[0].='<span class="LC_nobreak">';
$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'	$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
.' <span class="LC_internal_info">'	.' <span class="LC_internal_info">'
.'('.&mt('Response ID: [_1]',$responseId).')'	.'('.&mt('Response ID: [_1]',$responseId).')'
Line 5412 sub scantron_selectphase {	Line 5611 sub scantron_selectphase {
LastNameLength - number of columns that the last name spans	LastNameLength - number of columns that the last name spans
BubblesPerRow - number of bubbles available in each row used to	BubblesPerRow - number of bubbles available in each row used to
bubble an answer. (If not specified, 10 assumed).	bubble an answer. (If not specified, 10 assumed).

=cut	=cut

sub get_scantron_config {	sub get_scantron_config {
Line 6909 sub scantron_get_correction {	Line 7109 sub scantron_get_correction {
.&mt('The ID on the form is [_1]',	.&mt('The ID on the form is [_1]',
"<tt>$$scan_record{'scantron.ID'}</tt>")	"<tt>$$scan_record{'scantron.ID'}</tt>")
.'<br />'	.'<br />'
.&mt('The name on the paper is [_2], [_3]',	.&mt('The name on the paper is [_1], [_2]',
$$scan_record{'scantron.LastName'},	$$scan_record{'scantron.LastName'},
$$scan_record{'scantron.FirstName'})	$$scan_record{'scantron.FirstName'})
.'</p>';	.'</p>';
Line 7518 sub scantron_get_maxbubble {	Line 7718 sub scantron_get_maxbubble {
my $response_number = 0;	my $response_number = 0;
my $bubble_line = 0;	my $bubble_line = 0;
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom,undef,$bubbles_per_row);	my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,
	$udom,undef,$bubbles_per_row);
if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {	if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
foreach my $part_id (@{$parts}) {	foreach my $part_id (@{$parts}) {
my $lines;	my $lines;
Line 7723 sub scantron_process_students {	Line 7924 sub scantron_process_students {
}	}
my ($analysis,$parts) =	my ($analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},	&scantron_partids_tograde($resource,$env{'request.course.id'},
$env{'user.name'},$env{'user.domain'},1,$bubbles_per_row);	$env{'user.name'},$env{'user.domain'},
	1,$bubbles_per_row);
$grader_partids_by_symb{$ressymb} = $parts;	$grader_partids_by_symb{$ressymb} = $parts;
if (ref($analysis) eq 'HASH') {	if (ref($analysis) eq 'HASH') {
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {	if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {
Line 7750 SCANTRONFORM	Line 7952 SCANTRONFORM

my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));	my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
my $count=&get_todo_count($scanlines,$scan_data);	my $count=&get_todo_count($scanlines,$scan_data);
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status',	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);
'Bubblesheet Progress',$count,	&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,'Processing first student');
'inline',undef,'scantronupload');
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
'Processing first student');
$r->print('<br />');	$r->print('<br />');
my $start=&Time::HiRes::time();	my $start=&Time::HiRes::time();
my $i=-1;	my $i=-1;
Line 7786 SCANTRONFORM	Line 7985 SCANTRONFORM
my $line=&scantron_get_line($scanlines,$scan_data,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }	if ($line=~/^[\s\cz]*$/) { next; }
if ($started) {	if ($started) {
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
'last student');
}	}
$started=1;	$started=1;
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
Line 7817 SCANTRONFORM	Line 8015 SCANTRONFORM
if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|	if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {	(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
my ($analysis,$parts) =	my ($analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom,undef,$bubbles_per_row);	&scantron_partids_tograde($resource,$env{'request.course.id'},
	$uname,$udom,undef,$bubbles_per_row);
$partids_by_symb{$ressymb} = $parts;	$partids_by_symb{$ressymb} = $parts;
} else {	} else {
$partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb};	$partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb};
Line 7946 sub graders_resources_pass {	Line 8145 sub graders_resources_pass {
my $ressymb = $resource->symb();	my $ressymb = $resource->symb();
my ($analysis,$parts) =	my ($analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},	&scantron_partids_tograde($resource,$env{'request.course.id'},
$env{'user.name'},$env{'user.domain'},1,$bubbles_per_row);	$env{'user.name'},$env{'user.domain'},
	1,$bubbles_per_row);
$grader_partids_by_symb->{$ressymb} = $parts;	$grader_partids_by_symb->{$ressymb} = $parts;
if (ref($analysis) eq 'HASH') {	if (ref($analysis) eq 'HASH') {
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {	if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {
Line 8267 sub checkscantron_results {	Line 8467 sub checkscantron_results {
my $map=$navmap->getResourceByUrl($sequence);	my $map=$navmap->getResourceByUrl($sequence);
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
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, \%grader_randomlists_by_symb);	&graders_resources_pass(\@resources,\%grader_partids_by_symb,
	\%grader_randomlists_by_symb,$bubbles_per_row);

my ($uname,$udom);	my ($uname,$udom);
my (%scandata,%lastname,%bylast);	my (%scandata,%lastname,%bylast);
Line 8278 sub checkscantron_results {	Line 8479 sub checkscantron_results {
my %completedstudents;	my %completedstudents;

my $count=&Apache::grades::get_todo_count($scanlines,$scan_data);	my $count=&Apache::grades::get_todo_count($scanlines,$scan_data);
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status',	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);
'Progress of Bubblesheet Data/Submission Records Comparison',$count,
'inline',undef,'checkscantron');
my ($username,$domain,$started);	my ($username,$domain,$started);
my $nav_error;	my $nav_error;
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse.	&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse.
Line 8289 sub checkscantron_results {	Line 8488 sub checkscantron_results {
return '';	return '';
}	}

&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,	&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,'Processing first student');
'Processing first student');
my $start=&Time::HiRes::time();	my $start=&Time::HiRes::time();
my $i=-1;	my $i=-1;

Line 8300 sub checkscantron_results {	Line 8498 sub checkscantron_results {
my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i);	my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }	if ($line=~/^[\s\cz]*$/) { next; }
if ($started) {	if ($started) {
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
'last student');
}	}
$started=1;	$started=1;
my $scan_record=	my $scan_record=
Line 8333 sub checkscantron_results {	Line 8530 sub checkscantron_results {
if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|	if ((exists($grader_randomlists_by_symb{$ressymb})) \|\|
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {	(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
(my $analysis,$parts) =	(my $analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain,undef,$bubbles_per_row);	&scantron_partids_tograde($resource,$env{'request.course.id'},
	$username,$domain,undef,
	$bubbles_per_row);
} else {	} else {
$parts = $grader_partids_by_symb{$ressymb};	$parts = $grader_partids_by_symb{$ressymb};
}	}
Line 8553 sub letter_to_digits {	Line 8752 sub letter_to_digits {

sub href_symb_cmd {	sub href_symb_cmd {
my ($symb,$cmd)=@_;	my ($symb,$cmd)=@_;
return '/adm/grades?symb='.&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'<>&"').'&command='.$cmd;	return '/adm/grades?symb='.&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'<>&"').'&command='.$cmd;
}	}

sub grading_menu {	sub grading_menu {
Line 8816 sub init_perm {	Line 9015 sub init_perm {
}	}
}	}

	sub init_old_essays {
	my ($symb,$apath,$adom,$aname) = @_;
	if ($symb ne '') {
	my %essays = &Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
	if (keys(%essays) > 0) {
	$old_essays{$symb} = \%essays;
	}
	}
	return;
	}

	sub reset_old_essays {
	undef(%old_essays);
	}

sub gather_clicker_ids {	sub gather_clicker_ids {
my %clicker_ids;	my %clicker_ids;

Line 8913 sub process_clicker {	Line 9127 sub process_clicker {
my $pincorrect=&mt("Percentage points for incorrect solution");	my $pincorrect=&mt("Percentage points for incorrect solution");
my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',	my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',
{'iclicker' => 'i>clicker',	{'iclicker' => 'i>clicker',
'interwrite' => 'interwrite PRS'});	'interwrite' => 'interwrite PRS',
	'turning' => 'Turning Technologies'});
$symb = &Apache::lonenc::check_encrypt($symb);	$symb = &Apache::lonenc::check_encrypt($symb);
$result.= &Apache::lonhtmlcommon::scripttag(<<ENDUPFORM);	$result.= &Apache::lonhtmlcommon::scripttag(<<ENDUPFORM);
function sanitycheck() {	function sanitycheck() {
Line 9087 ENDHEADER	Line 9302 ENDHEADER
if ($env{'form.upfiletype'} eq 'interwrite') {	if ($env{'form.upfiletype'} eq 'interwrite') {
($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);	($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);
}	}
	if ($env{'form.upfiletype'} eq 'turning') {
	($errormsg,$number)=&turning_eval(\@questiontitles,\%responses);
	}
$result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.	$result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.
'<input type="hidden" name="number" value="'.$number.'" />'.	'<input type="hidden" name="number" value="'.$number.'" />'.
&mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',	&mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',
Line 9223 sub interwrite_eval {	Line 9441 sub interwrite_eval {
return ($errormsg,$number);	return ($errormsg,$number);
}	}

	sub turning_eval {
	my ($questiontitles,$responses)=@_;
	my $number=0;
	my $errormsg='';
	foreach my $line (split(/[\n\r]/,$env{'form.upfile'})) {
	my %components=&Apache::loncommon::record_sep($line);
	my @entries=map {$components{$_}} (sort(keys(%components)));
	if ($#entries>$number) { $number=$#entries; }
	my $id=$entries[0];
	my @idresponses;
	$id=~s/^[\#0]+//;
	unless ($id) { next; }
	for (my $idx=1;$idx<=$#entries;$idx++) {
	$entries[$idx]=~s/\,/\;/g;
	$entries[$idx]=~s/[^a-zA-Z0-9\.\*\-\+\;]+//g;
	push(@idresponses,$entries[$idx]);
	}
	$$responses{$id}=join(',',@idresponses);
	}
	for (my $i=1; $i<=$number; $i++) {
	$$questiontitles[$i]=&mt('Question [_1]',$i);
	}
	return ($errormsg,$number);
	}


sub assign_clicker_grades {	sub assign_clicker_grades {
my ($r,$symb)=@_;	my ($r,$symb)=@_;
if (!$symb) {return '';}	if (!$symb) {return '';}
Line 9360 sub navmap_errormsg {	Line 9604 sub navmap_errormsg {
}	}

sub startpage {	sub startpage {
my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag) = @_;	my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js) = @_;
unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});	if ($nomenu) {
$r->print(&Apache::loncommon::start_page('Grading',undef,	$r->print(&Apache::loncommon::start_page("Student's Version",$js,{'only_body' => '1'}));
{'bread_crumbs' => $crumbs}));	} else {
&Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading'));	unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});
	$r->print(&Apache::loncommon::start_page('Grading',$js,
	{'bread_crumbs' => $crumbs}));
	&Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading'));
	}
unless ($nodisplayflag) {	unless ($nodisplayflag) {
$r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag));	$r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp));
}	}
}	}

Line 9388 sub handler {	Line 9636 sub handler {
}	}
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});

	# see what command we need to execute

	my @commands=&Apache::loncommon::get_env_multiple('form.command');
	my $command=$commands[0];

&init_perm();	&init_perm();
if (!$env{'request.course.id'}) {	if (!$env{'request.course.id'}) {
# Not in a course.	unless ((&Apache::lonnet::allowed('usc',$env{'request.role.domain'})) &&
$env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";	($command =~ /^scantronupload/)) {
return HTTP_NOT_ACCEPTABLE;	# Not in a course.
	$env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";
	return HTTP_NOT_ACCEPTABLE;
	}
} elsif (!%perm) {	} elsif (!%perm) {
$request->internal_redirect('/adm/quickgrades');	$request->internal_redirect('/adm/quickgrades');
}	}
&Apache::loncommon::content_type($request,'text/html');	&Apache::loncommon::content_type($request,'text/html');
$request->send_http_header;	$request->send_http_header;


# see what command we need to execute

my @commands=&Apache::loncommon::get_env_multiple('form.command');
my $command=$commands[0];

if ($#commands > 0) {	if ($#commands > 0) {
&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));	&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
}	}
Line 9427 sub handler {	Line 9677 sub handler {
&select_problem($request);	&select_problem($request);
} else {	} else {
if ($command eq 'submission' && $perm{'vgr'}) {	if ($command eq 'submission' && $perm{'vgr'}) {
&startpage($request,$symb,[{href=>"", text=>"Student Submissions"}]);	my ($stuvcurrent,$stuvdisp,$versionform,$js);
	if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) {
	($stuvcurrent,$stuvdisp,$versionform,$js) =
	&choose_task_version_form($symb,$env{'form.student'},
	$env{'form.userdom'});
	}
	&startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,$stuvcurrent,$stuvdisp,undef,$js);
	if ($versionform) {
	$request->print($versionform);
	}
	$request->print('<br clear="all" />');
($env{'form.student'} eq '' ? &listStudents($request,$symb) : &submission($request,0,0,$symb));	($env{'form.student'} eq '' ? &listStudents($request,$symb) : &submission($request,0,0,$symb));
	} elsif ($command eq 'versionsub' && $perm{'vgr'}) {
	my ($stuvcurrent,$stuvdisp,$versionform,$js) =
	&choose_task_version_form($symb,$env{'form.student'},
	$env{'form.userdom'},
	$env{'form.inhibitmenu'});
	&startpage($request,$symb,[{href=>"", text=>"Previous Student Version"}],undef,undef,$stuvcurrent,$stuvdisp,$env{'form.inhibitmenu'},$js);
	if ($versionform) {
	$request->print($versionform);
	}
	$request->print('<br clear="all" />');
	$request->print(&show_previous_task_version($request,$symb));
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},	&startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
{href=>'',text=>'Select student'}],1,1);	{href=>'',text=>'Select student'}],1,1);
Line 9566 sub handler {	Line 9837 sub handler {
if ($ssi_error) {	if ($ssi_error) {
&ssi_print_error($request);	&ssi_print_error($request);
}	}
&Apache::lonquickgrades::endGradeScreen($request);	if ($env{'form.inhibitmenu'}) {
$request->print(&Apache::loncommon::end_page());	$request->print(&Apache::loncommon::end_page());
	} else {
	&Apache::lonquickgrades::endGradeScreen($request);
	}
&reset_caches();	&reset_caches();
return OK;	return OK;
}	}
Line 9638 ssi_with_retries()	Line 9912 ssi_with_retries()

=over	=over

	=head1 Routines to display previous version of a Task for a specific student

	Tasks are graded pass/fail. Students who have yet to pass a particular Task
	can receive another opportunity. Access to tasks is slot-based. If a slot
	requires a proctor to check-in the student, a new version of the Task will
	be created when the student is checked in to the new opportunity.

	If a particular student has tried two or more versions of a particular task,
	the submission screen provides a user with vgr privileges (e.g., a Course
	Coordinator) the ability to display a previous version worked on by the
	student. By default, the current version is displayed. If a previous version
	has been selected for display, submission data are only shown that pertain
	to that particular version, and the interface to submit grades is not shown.

	=over 4

	=item show_previous_task_version()

	Displays a specified version of a student's Task, as the student sees it.

	Inputs: 2
	request - request object
	symb - unique symb for current instance of resource

	Output: None.

	Side Effects: calls &show_problem() to print version of Task, with
	version contained in form item: $env{'form.previousversion'}

	=item choose_task_version_form()

	Displays a web form used to select which version of a student's view of a
	Task should be displayed. Either launches a pop-up window, or replaces
	content in existing pop-up, or replaces page in main window.

	Inputs: 4
	symb - unique symb for current instance of resource
	uname - username of student
	udom - domain of student
	nomenu - 1 if display is in a pop-up window, and hence no menu
	breadcrumbs etc., are displayed

	Output: 4
	current - student's current version
	displayed - student's version being displayed
	result - scalar containing HTML for web form used to switch to
	a different version (or a link to close window, if pop-up).
	js - javascript for processing selection in versions web form

	Side Effects: None.

	=item previous_display_javascript()

	Inputs: 2
	nomenu - 1 if display is in a pop-up window, and hence no menu
	breadcrumbs etc., are displayed.
	current - student's current version number.

	Output: 1
	js - javascript for processing selection in versions web form.

	Side Effects: None.

	=back

	=head1 Routines to process bubblesheet data.

	=over 4

=item scantron_get_correction() :	=item scantron_get_correction() :

Builds the interface screen to interact with the operator to fix a	Builds the interface screen to interact with the operator to fix a
Line 9743 ssi_with_retries()	Line 10086 ssi_with_retries()
=item navmap_errormsg() :	=item navmap_errormsg() :

Returns HTML mark-up inside a <div></div> with a link to re-initialize the course.	Returns HTML mark-up inside a <div></div> with a link to re-initialize the course.
Should be called whenever the request to instantiate a navmap object fails.	Should be called whenever the request to instantiate a navmap object fails.

	=back

=back	=back

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

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