loncom/homework/grades.pm - diff

Return to grades.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.574.2.2 and 1.574.2.12

version 1.574.2.2, 2009/06/06 19:36:37	version 1.574.2.12, 2010/05/22 01:01:03
Line 97 sub ssi_print_error {	Line 97 sub ssi_print_error {
#	#
# --- Retrieve the parts from the metadata file.---	# --- Retrieve the parts from the metadata file.---
sub getpartlist {	sub getpartlist {
my ($symb) = @_;	my ($symb,$errorref) = @_;

my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	if (ref($errorref)) {
	$$errorref = 'navmap';
	return;
	}
	}
my $res = $navmap->getBySymb($symb);	my $res = $navmap->getBySymb($symb);
my $partlist = $res->parts();	my $partlist = $res->parts();
my $url = $res->src();	my $url = $res->src();
Line 144 sub nameUserString {	Line 150 sub nameUserString {
#--- Get the partlist and the response type for a given problem. ---	#--- Get the partlist and the response type for a given problem. ---
#--- Indicate if a response type is coded handgraded or not. ---	#--- Indicate if a response type is coded handgraded or not. ---
sub response_type {	sub response_type {
my ($symb) = shift;	my ($symb,$response_error) = @_;

my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	if (ref($response_error)) {
	$$response_error = 1;
	}
	return;
	}
my $res = $navmap->getBySymb($symb);	my $res = $navmap->getBySymb($symb);
my $partlist = $res->parts();	my $partlist = $res->parts();
my %vPart =	my %vPart =
Line 193 sub get_display_part {	Line 205 sub get_display_part {
#--- Show resource title	#--- Show resource title
#--- and parts and response type	#--- and parts and response type
sub showResourceInfo {	sub showResourceInfo {
my ($symb,$probTitle,$checkboxes) = @_;	my ($symb,$probTitle,$checkboxes,$res_error) = @_;
my $col=3;	my $col=3;
if ($checkboxes) { $col=4; }	if ($checkboxes) { $col=4; }
my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";	my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";
	my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
	if (ref($res_error)) {
	if ($$res_error) {
	return;
	}
	}
$result .='<table border="0">';	$result .='<table border="0">';
my ($partlist,$handgrade,$responseType) = &response_type($symb);
my %resptype = ();	my %resptype = ();
my $hdgrade='no';	my $hdgrade='no';
my %partsseen;	my %partsseen;
Line 754 sub verifyreceipt {	Line 771 sub verifyreceipt {

my $title.=	my $title.=
'<h3><span class="LC_info">'.	'<h3><span class="LC_info">'.
&mt('Verifying Receipt No. [_1]',$receipt).	&mt('Verifying Receipt No. [_1]',$receipt).
'</span></h3>'."\n".	'</span></h3>'."\n".
'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).	'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
'</h4>'."\n";	'</h4>'."\n";
Line 766 sub verifyreceipt {	Line 783 sub verifyreceipt {
if ($env{"course.$courseid.receiptalg"} eq 'receipt2' \|\|	if ($env{"course.$courseid.receiptalg"} eq 'receipt2' \|\|
$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
my $parts=['0'];	my $parts=['0'];
if ($receiptparts) { ($parts)=&response_type($symb); }	if ($receiptparts) {
	my $res_error;
	($parts)=&response_type($symb,\$res_error);
	if ($res_error) {
	return &navmap_errormsg();
	}
	}

my $header =	my $header =
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
Line 808 sub verifyreceipt {	Line 831 sub verifyreceipt {
}	}
}	}
if ($matches == 0) {	if ($matches == 0) {
$string = $title.&mt('No match found for the above receipt.');	$string = $title.&mt('No match found for the above receipt number.');
} else {	} else {
$string = &jscriptNform($symb).$title.	$string = &jscriptNform($symb).$title.
'<p>'.	'<p>'.
&mt('The above receipt matches the following [numerate,_1,student].',$matches).	&mt('The above receipt number matches the following [numerate,_1,student].',$matches).
'</p>'.	'</p>'.
$header.	$header.
$contents.	$contents.
Line 1731 sub gradeBox {	Line 1754 sub gradeBox {
}	}
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";	$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";


#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
$result .=	$result .=
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.	'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';

$result.='</tr></table>'."\n";	$result.='</tr></table>'."\n";
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".	$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
Line 1745 sub gradeBox {	Line 1765 sub gradeBox {
$$record{'resource.'.$partid.'.tries'}.'" />'."\n".	$$record{'resource.'.$partid.'.tries'}.'" />'."\n".
'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.	'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
$aggtries.'" />'."\n";	$aggtries.'" />'."\n";
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);	my $res_error;
	$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error);
	if ($res_error) {
	return &navmap_errormsg();
	}
return $result;	return $result;
}	}

sub handback_box {	sub handback_box {
my ($symb,$uname,$udom,$counter,$partid,$record) = @_;	my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_;
my ($partlist,$handgrade,$responseType) = &response_type($symb);	my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
my (@respids);	my (@respids);
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
foreach my $part_response_id (@part_response_id) {	foreach my $part_response_id (@part_response_id) {
my ($part,$resp) = @{ $part_response_id };	my ($part,$resp) = @{ $part_response_id };
if ($part eq $partid) {	if ($part eq $partid) {
Line 2046 KEYWORDS	Line 2070 KEYWORDS
}	}

my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
my ($partlist,$handgrade,$responseType) = &response_type($symb);	my $res_error;
	my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
	if ($res_error) {
	$request->print(&navmap_errormsg());
	return;
	}

# Display student info	# Display student info
$request->print(($counter == 0 ? '' : '<br />'));	$request->print(($counter == 0 ? '' : '<br />'));
Line 2593 sub processHandGrade {	Line 2622 sub processHandGrade {
}	}
$ctr = 0;	$ctr = 0;
@parsedlist = reverse @parsedlist if ($button eq 'Previous');	@parsedlist = reverse @parsedlist if ($button eq 'Previous');
my ($partlist) = &response_type($symb);	my $res_error;
	my ($partlist) = &response_type($symb,\$res_error);
	if ($res_error) {
	$request->print(&navmap_errormsg());
	return;
	}
foreach my $student (@parsedlist) {	foreach my $student (@parsedlist) {
my $submitonly=$env{'form.submitonly'};	my $submitonly=$env{'form.submitonly'};
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);
Line 2791 sub check_and_remove_from_queue {	Line 2825 sub check_and_remove_from_queue {
sub handback_files {	sub handback_files {
my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;	my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;
my $portfolio_root = '/userfiles/portfolio';	my $portfolio_root = '/userfiles/portfolio';
my ($partlist,$handgrade,$responseType) = &response_type($symb);	my $res_error;
	my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
	if ($res_error) {
	$request->print('<br />'.&navmap_errormsg().'<br />');
	return;
	}
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
foreach my $part_response_id (@part_response_id) {	foreach my $part_response_id (@part_response_id) {
my ($part_id,$resp_id) = @{ $part_response_id };	my ($part_id,$resp_id) = @{ $part_response_id };
Line 3250 sub viewgrades {	Line 3288 sub viewgrades {
$result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table();	$result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table();
#radio buttons/text box for assigning points for a section or class.	#radio buttons/text box for assigning points for a section or class.
#handles different parts of a problem	#handles different parts of a problem
my ($partlist,$handgrade,$responseType) = &response_type($symb);	my $res_error;
	my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
	if ($res_error) {
	return &navmap_errormsg();
	}
my %weight = ();	my %weight = ();
my $ctsparts = 0;	my $ctsparts = 0;
my %seen = ();	my %seen = ();
Line 3310 sub viewgrades {	Line 3352 sub viewgrades {
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('No.').'</th>'.	'<th>'.&mt('No.').'</th>'.
'<th>'.&nameUserString('header')."</th>\n";	'<th>'.&nameUserString('header')."</th>\n";
my (@parts) = sort(&getpartlist($symb));	my $partserror;
	my (@parts) = sort(&getpartlist($symb,\$partserror));
	if ($partserror) {
	return &navmap_errormsg();
	}
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);	my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
my @partids = ();	my @partids = ();
foreach my $part (@parts) {	foreach my $part (@parts) {
Line 3469 sub editgrades {	Line 3515 sub editgrades {
my %columns = ();	my %columns = ();
my ($i,$ctr,$count,$rec_update) = (0,0,0,0);	my ($i,$ctr,$count,$rec_update) = (0,0,0,0);

my (@parts) = sort(&getpartlist($symb));	my $partserror;
	my (@parts) = sort(&getpartlist($symb,\$partserror));
	if ($partserror) {
	return &navmap_errormsg();
	}
my $header;	my $header;
while ($ctr < $env{'form.totalparts'}) {	while ($ctr < $env{'form.totalparts'}) {
my $partid = $env{'form.partid_'.$ctr};	my $partid = $env{'form.partid_'.$ctr};
Line 3801 ENDPICK	Line 3851 ENDPICK
}	}

sub csvupload_fields {	sub csvupload_fields {
my ($symb) = @_;	my ($symb,$errorref) = @_;
my (@parts) = &getpartlist($symb);	my (@parts) = &getpartlist($symb,$errorref);
	if (ref($errorref)) {
	if ($$errorref) {
	return;
	}
	}

my @fields=(['ID','Student/Employee ID'],	my @fields=(['ID','Student/Employee ID'],
['username','Student Username'],	['username','Student Username'],
['domain','Student Domain']);	['domain','Student Domain']);
Line 3902 sub csvuploadmap {	Line 3958 sub csvuploadmap {
&csvuploadmap_header($request,$symb,$datatoken,$#records+1);	&csvuploadmap_header($request,$symb,$datatoken,$#records+1);
my ($i,$keyfields);	my ($i,$keyfields);
if (@records) {	if (@records) {
my @fields=&csvupload_fields($symb);	my $fieldserror;
	my @fields=&csvupload_fields($symb,\$fieldserror);
	if ($fieldserror) {
	$request->print(&navmap_errormsg());
	return;
	}
if ($env{'form.upfile_associate'} eq 'reverse') {	if ($env{'form.upfile_associate'} eq 'reverse') {
&Apache::loncommon::csv_print_samples($request,\@records);	&Apache::loncommon::csv_print_samples($request,\@records);
$i=&Apache::loncommon::csv_print_select_table($request,\@records,	$i=&Apache::loncommon::csv_print_select_table($request,\@records,
Line 4139 LISTJAVASCRIPT	Line 4199 LISTJAVASCRIPT
&mt('Manual Grading by Page or Sequence').'</span></h3>';	&mt('Manual Grading by Page or Sequence').'</span></h3>';

$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";	$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
my ($titles,$symbx) = &getSymbMap();	my $map_error;
	my ($titles,$symbx) = &getSymbMap($map_error);
	if ($map_error) {
	$request->print(&navmap_errormsg());
	return;
	}
my ($curpage) =&Apache::lonnet::decode_symb($symb);	my ($curpage) =&Apache::lonnet::decode_symb($symb);
# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);	# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);
# my $type=($curpage =~ /\.(page\|sequence)/);	# my $type=($curpage =~ /\.(page\|sequence)/);
Line 4234 LISTJAVASCRIPT	Line 4299 LISTJAVASCRIPT
}	}

sub getSymbMap {	sub getSymbMap {
	my ($map_error) = @_;
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	if (ref($map_error)) {
	$$map_error = 'navmap';
	}
	return;
	}
my %symbx = ();	my %symbx = ();
my @titles = ();	my @titles = ();
my $minder = 0;	my $minder = 0;
Line 4294 sub displayPage {	Line 4365 sub displayPage {
$request->print($result);	$request->print($result);

my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	$request->print(&navmap_errormsg());
	$request->print(&show_grading_menu_form($symb));
	return;
	}
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});	my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {	if (!$map) {
Line 4545 sub updateGradeByPage {	Line 4621 sub updateGradeByPage {
$request->print($result);	$request->print($result);

my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	$request->print(&navmap_errormsg());
	return;
	}
my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});	my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {	if (!$map) {
Line 4689 sub updateGradeByPage {	Line 4769 sub updateGradeByPage {
#	#
#-------------------------------------------------------------------	#-------------------------------------------------------------------

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

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

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

=cut	=cut

Line 4772 sub defaultFormData {	Line 4854 sub defaultFormData {
=cut	=cut

sub getSequenceDropDown {	sub getSequenceDropDown {
my ($symb)=@_;	my ($symb,$map_error)=@_;
my $result='<select name="selectpage">'."\n";	my $result='<select name="selectpage">'."\n";
my ($titles,$symbx) = &getSymbMap();	my ($titles,$symbx) = &getSymbMap($map_error);
	if (ref($map_error)) {
	return if ($$map_error);
	}
my ($curpage)=&Apache::lonnet::decode_symb($symb);	my ($curpage)=&Apache::lonnet::decode_symb($symb);
my $ctr=0;	my $ctr=0;
foreach (@$titles) {	foreach (@$titles) {
Line 5040 sub scantron_selectphase {	Line 5125 sub scantron_selectphase {
my ($r,$file2grade) = @_;	my ($r,$file2grade) = @_;
my ($symb)=&get_symb($r);	my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $sequence_selector=&getSequenceDropDown($symb);	my $map_error;
	my $sequence_selector=&getSequenceDropDown($symb,\$map_error);
	if ($map_error) {
	$r->print('<br />'.&navmap_errormsg().'<br />');
	return;
	}
my $default_form_data=&defaultFormData($symb);	my $default_form_data=&defaultFormData($symb);
my $grading_menu_button=&show_grading_menu_form($symb);	my $grading_menu_button=&show_grading_menu_form($symb);
my $file_selector=&scantron_uploads($file2grade);	my $file_selector=&scantron_uploads($file2grade);
Line 5199 sub scantron_selectphase {	Line 5289 sub scantron_selectphase {
&Apache::loncommon::start_data_table_row()."\n".	&Apache::loncommon::start_data_table_row()."\n".
'<td colspan="2">'."\n".	'<td colspan="2">'."\n".
'<input type="hidden" name="command" value="checksubmissions" />'."\n".	'<input type="hidden" name="command" value="checksubmissions" />'."\n".
'<input type="submit" value="'.&mt('Review Scantron Data and Submission Records').'" />'."\n".	'<input type="submit" value="'.&mt('Review Bubblesheet Data and Submission Records').'" />'."\n".
'</td>'."\n".	'</td>'."\n".
&Apache::loncommon::end_data_table_row()."\n".	&Apache::loncommon::end_data_table_row()."\n".
&Apache::loncommon::end_data_table()."\n".	&Apache::loncommon::end_data_table()."\n".
Line 6214 sub scantron_validate_file {	Line 6304 sub scantron_validate_file {
$r->print('<p>'.&mt('Gathering necessary information.').'</p>');$r->rflush();	$r->print('<p>'.&mt('Gathering necessary information.').'</p>');$r->rflush();
#get the student pick code ready	#get the student pick code ready
$r->print(&Apache::loncommon::studentbrowser_javascript());	$r->print(&Apache::loncommon::studentbrowser_javascript());
my $max_bubble=&scantron_get_maxbubble();	my $nav_error;
	my $max_bubble=&scantron_get_maxbubble(\$nav_error);
	if ($nav_error) {
	$r->print(&navmap_errormsg());
	return '';
	}
my $result=&scantron_form_start($max_bubble).$default_form_data;	my $result=&scantron_form_start($max_bubble).$default_form_data;
$r->print($result);	$r->print($result);

Line 6626 sub scantron_validate_sequence {	Line 6721 sub scantron_validate_sequence {
my ($r,$currentphase) = @_;	my ($r,$currentphase) = @_;

my $navmap=Apache::lonnavmaps::navmap->new();	my $navmap=Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	$r->print(&navmap_errormsg());
	return (1,$currentphase);
	}
my (undef,undef,$sequence)=	my (undef,undef,$sequence)=
&Apache::lonnet::decode_symb($env{'form.selectpage'});	&Apache::lonnet::decode_symb($env{'form.selectpage'});

Line 6658 sub scantron_validate_ID {	Line 6757 sub scantron_validate_ID {
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();

&scantron_get_maxbubble(); # parse needs the bubble_lines.. array.	my $nav_error;
	&scantron_get_maxbubble(\$nav_error); # parse needs the bubble_lines.. array.
	if ($nav_error) {
	$r->print(&navmap_errormsg());
	return(1,$currentphase);
	}

my %found=('ids'=>{},'usernames'=>{});	my %found=('ids'=>{},'usernames'=>{});
for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
Line 7211 sub scantron_validate_CODE {	Line 7315 sub scantron_validate_CODE {

my %allcodes=&get_codes();	my %allcodes=&get_codes();

&scantron_get_maxbubble(); # parse needs the lines per response array.	my $nav_error;
	&scantron_get_maxbubble(\$nav_error); # parse needs the lines per response array.
	if ($nav_error) {
	$r->print(&navmap_errormsg());
	return(1,$currentphase);
	}

my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
Line 7265 sub scantron_validate_doublebubble {	Line 7374 sub scantron_validate_doublebubble {
#get scantron line setup	#get scantron line setup
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
&scantron_get_maxbubble(); # parse needs the bubble line array.	my $nav_error;
	&scantron_get_maxbubble(\$nav_error); # parse needs the bubble line array.
	if ($nav_error) {
	$r->print(&navmap_errormsg());
	return(1,$currentphase);
	}

for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$scan_data,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
Line 7283 sub scantron_validate_doublebubble {	Line 7397 sub scantron_validate_doublebubble {


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

if (defined($env{'form.scantron_maxbubble'}) &&	if (defined($env{'form.scantron_maxbubble'}) &&
$env{'form.scantron_maxbubble'}) {	$env{'form.scantron_maxbubble'}) {
&restore_bubble_lines();	&restore_bubble_lines();
Line 7293 sub scantron_get_maxbubble {	Line 7409 sub scantron_get_maxbubble {
&Apache::lonnet::decode_symb($env{'form.selectpage'});	&Apache::lonnet::decode_symb($env{'form.selectpage'});

my $navmap=Apache::lonnavmaps::navmap->new();	my $navmap=Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	if (ref($nav_error)) {
	$$nav_error = 1;
	}
	return;
	}
my $map=$navmap->getResourceByUrl($sequence);	my $map=$navmap->getResourceByUrl($sequence);
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);

Line 7382 sub scantron_validate_missingbubbles {	Line 7504 sub scantron_validate_missingbubbles {
#get scantron line setup	#get scantron line setup
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
my $max_bubble=&scantron_get_maxbubble();	my $nav_error;
	my $max_bubble=&scantron_get_maxbubble(\$nav_error);
	if ($nav_error) {
	return(1,$currentphase);
	}
if (!$max_bubble) { $max_bubble=2**31; }	if (!$max_bubble) { $max_bubble=2**31; }
for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$scan_data,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
Line 7442 sub scantron_process_students {	Line 7568 sub scantron_process_students {
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&username_to_idmap($classlist);	my %idmap=&username_to_idmap($classlist);
my $navmap=Apache::lonnavmaps::navmap->new();	my $navmap=Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	$r->print(&navmap_errormsg());
	return '';
	}
my $map=$navmap->getResourceByUrl($sequence);	my $map=$navmap->getResourceByUrl($sequence);
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
my (%grader_partids_by_symb,%grader_randomlists_by_symb);	my (%grader_partids_by_symb,%grader_randomlists_by_symb);
&graders_resources_pass(\@resources,\%grader_partids_by_symb,	&graders_resources_pass(\@resources,\%grader_partids_by_symb,
\%grader_randomlists_by_symb);	\%grader_randomlists_by_symb);
	my $resource_error;
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my $ressymb = $resource->symb();	my $ressymb;
	if (ref($resource)) {
	$ressymb = $resource->symb();
	} else {
	$resource_error = 1;
	last;
	}
my ($analysis,$parts) =	my ($analysis,$parts) =
&scantron_partids_tograde($resource,$env{'request.course.id'},	&scantron_partids_tograde($resource,$env{'request.course.id'},
$env{'user.name'},$env{'user.domain'},1);	$env{'user.name'},$env{'user.domain'},1);
Line 7460 sub scantron_process_students {	Line 7597 sub scantron_process_students {
}	}
}	}
}	}
	if ($resource_error) {
	$r->print(&navmap_errormsg());
	return '';
	}

my ($uname,$udom);	my ($uname,$udom);
my $result= <<SCANTRONFORM;	my $result= <<SCANTRONFORM;
Line 7474 SCANTRONFORM	Line 7615 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,'Scantron Status',	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status',
'Scantron Progress',$count,	'Bubblesheet Progress',$count,
'inline',undef,'scantronupload');	'inline',undef,'scantronupload');
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,	&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
'Processing first student');	'Processing first student');
Line 7484 SCANTRONFORM	Line 7625 SCANTRONFORM
my $i=-1;	my $i=-1;
my $started;	my $started;

&scantron_get_maxbubble(); # Need the bubble lines array to parse.	my $nav_error;
	&scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.
	if ($nav_error) {
	$r->print(&navmap_errormsg());
	return '';
	}

# If an ssi failed in scantron_get_maxbubble, put an error message out to	# If an ssi failed in scantron_get_maxbubble, put an error message out to
# the user and return.	# the user and return.
Line 7525 SCANTRONFORM	Line 7671 SCANTRONFORM
}	}
($uname,$udom)=split(/:/,$uname);	($uname,$udom)=split(/:/,$uname);

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

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

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

Line 7709 sub scantron_upload_scantron_data {	Line 7867 sub scantron_upload_scantron_data {
my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.	my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.
('&nbsp'x2).&mt('(shows course personnel)');	('&nbsp'x2).&mt('(shows course personnel)');
my $default_form_data=&defaultFormData(&get_symb($r,1));	my $default_form_data=&defaultFormData(&get_symb($r,1));
	my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');
	my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");
$r->print('	$r->print('
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function checkUpload(formname) {	function checkUpload(formname) {
if (formname.upfile.value == "") {	if (formname.upfile.value == "") {
alert("'.&mt('Please use the browse button to select a file from your local directory.').'");	alert("'.$nofile_alert.'");
return false;	return false;
}	}
if (formname.courseid.value == "") {	if (formname.courseid.value == "") {
alert("'.&mt('Please use the \"Select Course\" link to open a separate window where you can search for a course to which a file can be uploaded.').'");	alert("'.$nocourseid_alert.'");
return false;	return false;
}	}
formname.submit();	formname.submit();
Line 7759 sub scantron_upload_scantron_data {	Line 7919 sub scantron_upload_scantron_data {
&Apache::lonhtmlcommon::end_pick_box().'<br />	&Apache::lonhtmlcommon::end_pick_box().'<br />

<input name="command" value="scantronupload_save" type="hidden" />	<input name="command" value="scantronupload_save" type="hidden" />
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />	<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
</form>	</form>
');	');
return '';	return '';
Line 7777 sub scantron_upload_scantron_data_save {	Line 7937 sub scantron_upload_scantron_data_save {
if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&	if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&
!&Apache::lonnet::allowed('usc',	!&Apache::lonnet::allowed('usc',
$env{'form.domainid'}.'_'.$env{'form.courseid'})) {	$env{'form.domainid'}.'_'.$env{'form.courseid'})) {
$r->print(&mt("You are not allowed to upload Scantron data to the requested course.")."<br />");	$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />");
if ($symb) {	if ($symb) {
$r->print(&show_grading_menu_form($symb));	$r->print(&show_grading_menu_form($symb));
} else {	} else {
Line 7966 sub checkscantron_results {	Line 8126 sub checkscantron_results {
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&Apache::grades::username_to_idmap($classlist);	my %idmap=&Apache::grades::username_to_idmap($classlist);
my $navmap=Apache::lonnavmaps::navmap->new();	my $navmap=Apache::lonnavmaps::navmap->new();
	unless (ref($navmap)) {
	$r->print(&navmap_errormsg());
	return '';
	}
my $map=$navmap->getResourceByUrl($sequence);	my $map=$navmap->getResourceByUrl($sequence);
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
my (%grader_partids_by_symb,%grader_randomlists_by_symb);	my (%grader_partids_by_symb,%grader_randomlists_by_symb);
Line 7980 sub checkscantron_results {	Line 8144 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,'Scantron/Submissions Comparison Status',	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status',
'Progress of Scantron Data/Submission Records Comparison',$count,	'Progress of Bubblesheet Data/Submission Records Comparison',$count,
'inline',undef,'checkscantron');	'inline',undef,'checkscantron');
my ($username,$domain,$started);	my ($username,$domain,$started);
	my $nav_error;
&scantron_get_maxbubble(); # Need the bubble lines array to parse.	&scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.
	if ($nav_error) {
	$r->print(&navmap_errormsg());
	return '';
	}

&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,	&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
'Processing first student');	'Processing first student');
Line 8058 sub checkscantron_results {	Line 8226 sub checkscantron_results {
if ($scandata{$pid} eq $record{$pid}) {	if ($scandata{$pid} eq $record{$pid}) {
my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row';	my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row';
$okstudents .= '<tr class="'.$css_class.'">'.	$okstudents .= '<tr class="'.$css_class.'">'.
'<td>'.&mt('Scantron').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".	'<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
'</tr>'."\n".	'</tr>'."\n".
'<tr class="'.$css_class.'">'."\n".	'<tr class="'.$css_class.'">'."\n".
'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n";	'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n";
$passed ++;	$passed ++;
} else {	} else {
my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row';	my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row';
$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Scantron').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".	$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
'</tr>'."\n".	'</tr>'."\n".
'<tr class="'.$css_class.'">'."\n".	'<tr class="'.$css_class.'">'."\n".
'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".	'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".
Line 8299 sub grading_menu {	Line 8467 sub grading_menu {
$fields{'command'} = 'scantron_selectphase';	$fields{'command'} = 'scantron_selectphase';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push(@menu, { url => $url,	push(@menu, { url => $url,
name => &mt('Grade/Manage/Review Scantron Forms'),	name => &mt('Grade/Manage/Review Bubblesheets'),
short_description =>	short_description =>
&mt('Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.')});	&mt('Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.')});
$fields{'command'} = 'verify';	$fields{'command'} = 'verify';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push(@menu, { url => "",	push(@menu, { url => "",
name => &mt('Verify Receipt'),	name => &mt('Verify Receipt No.'),
short_description =>	short_description =>
&mt('')});	&mt('')});
# Create the menu	# Create the menu
Line 8320 sub grading_menu {	Line 8488 sub grading_menu {
'<input type="hidden" name="gradingMenu" value="1" />'."\n".	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";	'<input type="hidden" name="showgrading" value="yes" />'."\n";
foreach my $menudata (@menu) {	foreach my $menudata (@menu) {
if ($menudata->{'name'} ne &mt('Verify Receipt')) {	if ($menudata->{'name'} ne &mt('Verify Receipt No.')) {
$Str .=' <h3><a '.	$Str .=' <h3><a '.
$menudata->{'jscript'}.	$menudata->{'jscript'}.
' href="'.	' href="'.
$menudata->{'url'}.'" >'.	$menudata->{'url'}.'" >'.
$menudata->{'name'}."</a></h3>\n";	$menudata->{'name'}."</a></h3>\n";
} else {	} else {
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '.	$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '.
$menudata->{'jscript'}.	$menudata->{'jscript'}.
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.	' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
' /> '.	' /> '.
Line 8985 sub assign_clicker_grades {	Line 9153 sub assign_clicker_grades {
my ($symb)=&get_symb($r);	my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
# See which part we are saving to	# See which part we are saving to
my ($partlist,$handgrade,$responseType) = &response_type($symb);	my $res_error;
	my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
	if ($res_error) {
	return &navmap_errormsg();
	}
# FIXME: This should probably look for the first handgradeable part	# FIXME: This should probably look for the first handgradeable part
my $part=$$partlist[0];	my $part=$$partlist[0];
# Start screen output	# Start screen output
Line 9049 ENDHEADER	Line 9221 ENDHEADER
my $sum=0;	my $sum=0;
my $realnumber=$number;	my $realnumber=$number;
for (my $i=0;$i<$number;$i++) {	for (my $i=0;$i<$number;$i++) {
if ($answer[$i]) {	if ($correct[$i] eq '-') {
	$realnumber--;
	} elsif ($answer[$i]) {
if ($gradingmechanism eq 'attendance') {	if ($gradingmechanism eq 'attendance') {
$sum+=$pcorrect;	$sum+=$pcorrect;
} elsif ($answer[$i] eq '*') {	} elsif ($correct[$i] eq '*') {
$sum+=$pcorrect;	$sum+=$pcorrect;
} elsif ($answer[$i] eq '-') {
$realnumber--;
} else {	} else {
if ($answer[$i] eq $correct[$i]) {	if ($answer[$i] eq $correct[$i]) {
$sum+=$pcorrect;	$sum+=$pcorrect;
Line 9089 ENDHEADER	Line 9261 ENDHEADER
return $result.&show_grading_menu_form($symb);	return $result.&show_grading_menu_form($symb);
}	}

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

sub handler {	sub handler {
my $request=$_[0];	my $request=$_[0];
&reset_caches();	&reset_caches();
Line 9314 ssi_with_retries()	Line 9493 ssi_with_retries()

=item scantron_get_maxbubble() :	=item scantron_get_maxbubble() :

	Arguments:
	$nav_error - Reference to scalar which is a flag to indicate a
	failure to retrieve a navmap object.
	if $nav_error is set to 1 by scantron_get_maxbubble(), the
	calling routine should trap the error condition and display the warning
	found in &navmap_errormsg().

Returns the maximum number of bubble lines that are expected to	Returns the maximum number of bubble lines that are expected to
occur. Does this by walking the selected sequence rendering the	occur. Does this by walking the selected sequence rendering the
resource and then checking &Apache::lonxml::get_problem_counter()	resource and then checking &Apache::lonxml::get_problem_counter()
Line 9379 ssi_with_retries()	Line 9565 ssi_with_retries()
Validates all scanlines in the selected file to not have any	Validates all scanlines in the selected file to not have any
invalid or underspecified student/employee IDs	invalid or underspecified student/employee IDs

	=item navmap_errormsg() :

	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.

=back	=back

=cut	=cut

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

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