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.489 and 1.499

version 1.489, 2007/11/13 01:47:36	version 1.499, 2007/12/05 18:40:59
Line 48 use POSIX qw(floor);	Line 48 use POSIX qw(floor);


my %perm=();	my %perm=();
my %bubble_lines_per_response = (); # no. bubble lines for each response.
# index is "symb.part_id"

my %first_bubble_line = (); # First bubble line no. for each bubble.

# Save and restore the bubble lines array to the form env.


sub save_bubble_lines {
foreach my $line (keys(%bubble_lines_per_response)) {
$env{"form.scantron.bubblelines.$line"} = $bubble_lines_per_response{$line};
$env{"form.scantron.first_bubble_line.$line"} =
$first_bubble_line{$line};
}
}


sub restore_bubble_lines {
my $line = 0;
%bubble_lines_per_response = ();
while ($env{"form.scantron.bubblelines.$line"}) {
my $value = $env{"form.scantron.bubblelines.$line"};
$bubble_lines_per_response{$line} = $value;
$first_bubble_line{$line} =
$env{"form.scantron.first_bubble_line.$line"};
$line++;
}

}

# Given the parsed scanline, get the response for
# 'answer' number n:

sub get_response_bubbles {
my ($parsed_line, $response) = @_;


my $bubble_line = $first_bubble_line{$response-1} +1;
my $bubble_lines= $bubble_lines_per_response{$response-1};

my $selected = "";

for (my $bline = 0; $bline < $bubble_lines; $bline++) {
$selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":";
$bubble_line++;
}
return $selected;
}


# ----- These first few routines are general use routines.----

# Return the number of occurences of a pattern in a string.

sub occurence_count {
my ($string, $pattern) = @_;

my @matches = ($string =~ /$pattern/g);

return scalar(@matches);
}


# Take a string known to have digits and convert all the
# digits into letters in the range J,A..I.

sub digits_to_letters {
my ($input) = @_;

my @alphabet = ('J', 'A'..'I');

my @input = split(//, $input);
my $output ='';
for (my $i = 0; $i < scalar(@input); $i++) {
if ($input[$i] =~ /\d/) {
$output .= $alphabet[$input[$i]];
} else {
$output .= $input[$i];
}
}
return $output;
}

#	#
# --- Retrieve the parts from the metadata file.---	# --- Retrieve the parts from the metadata file.---
Line 4757 sub getSequenceDropDown {	Line 4675 sub getSequenceDropDown {
return $result;	return $result;
}	}

	my %bubble_lines_per_response; # no. bubble lines for each response.
	# index is "symb.part_id"

	my %first_bubble_line; # First bubble line no. for each bubble.

	# Save and restore the bubble lines array to the form env.


	sub save_bubble_lines {
	foreach my $line (keys(%bubble_lines_per_response)) {
	$env{"form.scantron.bubblelines.$line"} = $bubble_lines_per_response{$line};
	$env{"form.scantron.first_bubble_line.$line"} =
	$first_bubble_line{$line};
	}
	}


	sub restore_bubble_lines {
	my $line = 0;
	%bubble_lines_per_response = ();
	while ($env{"form.scantron.bubblelines.$line"}) {
	my $value = $env{"form.scantron.bubblelines.$line"};
	$bubble_lines_per_response{$line} = $value;
	$first_bubble_line{$line} =
	$env{"form.scantron.first_bubble_line.$line"};
	$line++;
	}

	}

	# Given the parsed scanline, get the response for
	# 'answer' number n:

	sub get_response_bubbles {
	my ($parsed_line, $response) = @_;


	my $bubble_line = $first_bubble_line{$response-1} +1;
	my $bubble_lines= $bubble_lines_per_response{$response-1};

	my $selected = "";

	for (my $bline = 0; $bline < $bubble_lines; $bline++) {
	$selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":";
	$bubble_line++;
	}
	return $selected;
	}

=pod	=pod

Line 4909 sub scantron_selectphase {	Line 4875 sub scantron_selectphase {
'.&Apache::loncommon::start_data_table('LC_scantron_action').'	'.&Apache::loncommon::start_data_table('LC_scantron_action').'
'.&Apache::loncommon::start_data_table_header_row().'	'.&Apache::loncommon::start_data_table_header_row().'
<th colspan="2">	<th colspan="2">
Specify file and which Folder/Sequence to grade	'.&mt('Specify file and which Folder/Sequence to grade').'
</th>	</th>
'.&Apache::loncommon::end_data_table_header_row().'	'.&Apache::loncommon::end_data_table_header_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td> Sequence to grade: </td><td> '.$sequence_selector.' </td>	<td> '.&mt('Sequence to grade:').' </td><td> '.$sequence_selector.' </td>
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td> Filename of scoring office file: </td><td> '.$file_selector.' </td>	<td> '.&mt('Filename of scoring office file:').' </td><td> '.$file_selector.' </td>
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td> Format of data file: </td><td> '.$format_selector.' </td>	<td> '.&mt('Format of data file:').' </td><td> '.$format_selector.' </td>
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td> Saved CODEs to validate against: </td><td> '.$CODE_selector.' </td>	<td> '.&mt('Saved CODEs to validate against:').' </td><td> '.$CODE_selector.' </td>
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td> Each CODE is only to be used once:</td><td> '.$CODE_unique.' </td>	<td> '.&mt('Each CODE is only to be used once:').'</td><td> '.$CODE_unique.' </td>
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td> Options: </td>	<td> '.&mt('Options:').' </td>
<td>	<td>
<label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />	<label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> '.&mt('Do only previously skipped records').'</label> <br />
<label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all existing corrections</label> <br />	<label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> '.&mt('Remove all existing corrections').'</label> <br />
<label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> Skip hidden resources when grading</label>	<label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> '.&mt('Skip hidden resources when grading').'</label>
</td>	</td>
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td colspan="2">	<td colspan="2">
<input type="submit" value="Grading: Validate Scantron Records" />	<input type="submit" value="'.&mt('Grading: Validate Scantron Records').'" />
</td>	</td>
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::end_data_table().'	'.&Apache::loncommon::end_data_table().'
Line 4956 sub scantron_selectphase {	Line 4922 sub scantron_selectphase {
'.&Apache::loncommon::start_data_table('LC_scantron_action').'	'.&Apache::loncommon::start_data_table('LC_scantron_action').'
'.&Apache::loncommon::start_data_table_header_row().'	'.&Apache::loncommon::start_data_table_header_row().'
<th>	<th>
Specify a Scantron data file to upload.	'.&mt('Specify a Scantron data file to upload.').'
</th>	</th>
'.&Apache::loncommon::end_data_table_header_row().'	'.&Apache::loncommon::end_data_table_header_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
Line 4965 sub scantron_selectphase {	Line 4931 sub scantron_selectphase {
my $default_form_data=&defaultFormData(&get_symb($r,1));	my $default_form_data=&defaultFormData(&get_symb($r,1));
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};	my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
$r->print(<<UPLOAD);	$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("Please use the browse button to select a file from your local directory.");	alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
return false;	return false;
}	}
formname.submit();	formname.submit();
}	}
</script>	</script>

<form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>	<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
$default_form_data	'.$default_form_data.'
<input name='courseid' type='hidden' value='$cnum' />	<input name="courseid" type="hidden" value="'.$cnum.'" />
<input name='domainid' type='hidden' value='$cdom' />	<input name="domainid" type="hidden" value="'.$cdom.'" />
<input name='command' value='scantronupload_save' type='hidden' />	<input name="command" value="scantronupload_save" type="hidden" />
File to upload:<input type="file" name="upfile" size="50" />	'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
<br />	<br />
<input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />	<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
</form>	</form>
UPLOAD	');

$r->print('	$r->print('
</td>	</td>
Line 5005 UPLOAD	Line 4971 UPLOAD
'.&Apache::loncommon::start_data_table('LC_scantron_action').'	'.&Apache::loncommon::start_data_table('LC_scantron_action').'
'.&Apache::loncommon::start_data_table_header_row().'	'.&Apache::loncommon::start_data_table_header_row().'
<th>	<th>
Download a scoring office file	'.&mt('Download a scoring office file').'
</th>	</th>
'.&Apache::loncommon::end_data_table_header_row().'	'.&Apache::loncommon::end_data_table_header_row().'
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td> Filename of scoring office file: '.$file_selector.'	<td> '.&mt('Filename of scoring office file: [_1]',$file_selector).'
<br />	<br />
<input type="submit" value="Download: Show List of Associated Files" />	<input type="submit" value="'.&mt('Download: Show List of Associated Files').'" />
'.&Apache::loncommon::end_data_table_row().'	'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::end_data_table().'	'.&Apache::loncommon::end_data_table().'
</form>	</form>
Line 5098 sub get_scantron_config {	Line 5064 sub get_scantron_config {
$config{'IDstart'}=$config[5];	$config{'IDstart'}=$config[5];
$config{'IDlength'}=$config[6];	$config{'IDlength'}=$config[6];
$config{'Qstart'}=$config[7];	$config{'Qstart'}=$config[7];
$config{'Qlength'}=$config[8];	$config{'Qlength'}=$config[8];
$config{'Qoff'}=$config[9];	$config{'Qoff'}=$config[9];
$config{'Qon'}=$config[10];	$config{'Qon'}=$config[10];
$config{'PaperID'}=$config[11];	$config{'PaperID'}=$config[11];
Line 5184 sub username_to_idmap {	Line 5150 sub username_to_idmap {

sub scantron_fixup_scanline {	sub scantron_fixup_scanline {
my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;	my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;


if ($field eq 'ID') {	if ($field eq 'ID') {
if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {	if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {
return ($line,1,'New value too large');	return ($line,1,'New value too large');
Line 5216 sub scantron_fixup_scanline {	Line 5180 sub scantron_fixup_scanline {
$$scantron_config{'CODElength'})=$args->{'CODE'};	$$scantron_config{'CODElength'})=$args->{'CODE'};
}	}
} elsif ($field eq 'answer') {	} elsif ($field eq 'answer') {
&scantron_get_maxbubble(); # Need the bubble counter info.	my $length=$scantron_config->{'Qlength'};
my $length =$scantron_config->{'Qlength'};
my $off=$scantron_config->{'Qoff'};	my $off=$scantron_config->{'Qoff'};
my $on=$scantron_config->{'Qon'};	my $on=$scantron_config->{'Qon'};
my $question_number = $args->{'question'} -1;	my $answer=${off}x$length;
my $first_position = $first_bubble_line{$question_number};	if ($args->{'response'} eq 'none') {
my $bubble_count = $bubble_lines_per_response{$question_number};	&scan_data($scan_data,
my $bubbles_per_line= $$scantron_config{'Qlength'};	"$whichline.no_bubble.".$args->{'question'},'1');
my $answer=${off}x($bubbles_per_line*$bubble_count);	} else {
my $final_answer;	if ($on eq 'letter') {
if ($$scantron_config{'Qon'} eq 'letter' \|\|	my @alphabet=('A'..'Z');
$$scantron_config{'Qon'} eq 'number') {	$answer=$alphabet[$args->{'response'}];
$bubbles_per_line = 10;	} elsif ($on eq 'number') {
}	$answer=$args->{'response'}+1;
if (defined $args->{'response'}) {	if ($answer == 10) { $answer = '0'; }

if ($args->{'response'} eq 'none') {
&scan_data($scan_data,
"$whichline.no_bubble.".$args->{'question'},'1');
} else {	} else {
my ($bubble_line, $bubble_number) = split(/:/,$args->{'response'});	substr($answer,$args->{'response'},1)=$on;
if ($on eq 'letter') {
my @alphabet=('A'..'Z');
$answer=$alphabet[$bubble_number];
} elsif ($on eq 'number') {
$answer= $bubble_number+1;
if ($answer == 10) { $answer = '0'; }
} else {
substr($answer,$bubble_number+$bubble_line*$bubbles_per_line,1)=$on;
$final_answer = $answer;
}
&scan_data($scan_data,
"$whichline.no_bubble.".$args->{'question'},undef,'1');

# Positional notation already has the right final answer length..

if (($on eq 'letter') \|\| ($on eq 'number')) {
for (my $l = 0; $l < $bubble_count; $l++) {
if ($l eq $bubble_line) {
$final_answer .= $answer;
} else {
$final_answer .= ' ';
}
}
}
}	}
# $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};	&scan_data($scan_data,
#substr($line,$where-1,$length)=$answer;	"$whichline.no_bubble.".$args->{'question'},undef,'1');
substr($line,
$scantron_config->{'Qstart'}+$first_position-1,
$bubbles_per_line*$length) = $final_answer;
}	}
	my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
	substr($line,$where-1,$length)=$answer;
}	}
return $line;	return $line;
}	}
Line 5301 sub scan_data {	Line 5235 sub scan_data {
return $scan_data->{$filename.'_'.$key};	return $scan_data->{$filename.'_'.$key};
}	}

	# ----- These first few routines are general use routines.----

	# Return the number of occurences of a pattern in a string.

	sub occurence_count {
	my ($string, $pattern) = @_;

	my @matches = ($string =~ /$pattern/g);

	return scalar(@matches);
	}


	# Take a string known to have digits and convert all the
	# digits into letters in the range J,A..I.

	sub digits_to_letters {
	my ($input) = @_;

	my @alphabet = ('J', 'A'..'I');

	my @input = split(//, $input);
	my $output ='';
	for (my $i = 0; $i < scalar(@input); $i++) {
	if ($input[$i] =~ /\d/) {
	$output .= $alphabet[$input[$i]];
	} else {
	$output .= $input[$i];
	}
	}
	return $output;
	}

=pod	=pod

=item scantron_parse_scanline	=item scantron_parse_scanline
Line 5403 sub scantron_parse_scanline {	Line 5370 sub scantron_parse_scanline {
$questions =~ s/\r$//; # Get rid of trailing \r too (MAC or Win uploads).	$questions =~ s/\r$//; # Get rid of trailing \r too (MAC or Win uploads).
while (length($questions)) {	while (length($questions)) {
my $answers_needed = $bubble_lines_per_response{$questnum};	my $answers_needed = $bubble_lines_per_response{$questnum};
my $answer_length = $$scantron_config{'Qlength'} * $answers_needed;	my $answer_length = ($$scantron_config{'Qlength'} * $answers_needed)
	\|\| 1;


$questnum++;	$questnum++;
my $currentquest = substr($questions,0,$answer_length);	my $currentquest = substr($questions,0,$answer_length);
$questions = substr($questions,0,$answer_length)='';	$questions = substr($questions,$answer_length);
if (length($currentquest) < $answer_length) { next; }	if (length($currentquest) < $answer_length) { next; }

# Qon letter implies for each slot in currentquest we have:	# Qon letter implies for each slot in currentquest we have:
Line 5419 sub scantron_parse_scanline {	Line 5385 sub scantron_parse_scanline {


if ($$scantron_config{'Qon'} eq 'letter') {	if ($$scantron_config{'Qon'} eq 'letter') {

if ($currentquest =~ /\?/	if ($currentquest =~ /\?/
\|\| $currentquest =~ /\*/	\|\| $currentquest =~ /\*/
\|\| (&occurence_count($currentquest, "[A-Z]") > 1)) {	\|\| (&occurence_count($currentquest, "[A-Z]") > 1)) {
Line 5448 sub scantron_parse_scanline {	Line 5413 sub scantron_parse_scanline {
}	}
} else {	} else {
for (my $ans = 0; $ans < $answers_needed; $ans++) {	for (my $ans = 0; $ans < $answers_needed; $ans++) {
$record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);	my $bubble = substr($currentquest, $ans, 1);
	$record{"scantron.$ansnum.answer"} = $bubble;
$ansnum++;	$ansnum++;
}	}
}	}
Line 5515 sub scantron_parse_scanline {	Line 5481 sub scantron_parse_scanline {
push(@{$record{"scantron.missingerror"}},$questnum);	push(@{$record{"scantron.missingerror"}},$questnum);
}	}

# If the bubble is not the last position, there will be
# 2 elements. If it is the last position, there will be 1 element.

} elsif (scalar(@array) le 2) {
	} elsif (scalar(@array) eq 2) {

my $location = length($array[0]);	my $location = length($array[0]);
my $line_num = int($location / $$scantron_config{'Qlength'});	my $line_num = int($location / $$scantron_config{'Qlength'});
Line 5704 sub scantron_process_corrections {	Line 5669 sub scantron_process_corrections {
&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,	&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,
$which,'answer',	$which,'answer',
{ 'question'=>$question,	{ 'question'=>$question,
'response'=>$env{"form.scantron_correct_Q_$question"}});	'response'=>$env{"form.scantron_correct_Q_$question"}});
if ($err) { last; }	if ($err) { last; }
}	}
}	}
Line 5809 sub remember_current_skipped {	Line 5774 sub remember_current_skipped {
sub check_for_error {	sub check_for_error {
my ($r,$result)=@_;	my ($r,$result)=@_;
if ($result ne 'ok' && $result ne 'not_found' ) {	if ($result ne 'ok' && $result ne 'not_found' ) {
$r->print("An error occurred ($result) when trying to Remove the existing corrections.");	$r->print(&mt("An error occurred ([_1]) when trying to remove the existing corrections.",$result));
}	}
}	}

Line 5833 sub scantron_warning_screen {	Line 5798 sub scantron_warning_screen {
$CODElist=$env{'form.scantron_CODElist'};	$CODElist=$env{'form.scantron_CODElist'};
if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; }	if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; }
$CODElist=	$CODElist=
'<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.	'<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'.
$env{'form.scantron_CODElist'}.'</tt></td></tr>';	$env{'form.scantron_CODElist'}.'</tt></td></tr>';
}	}
return (<<STUFF);	return ('
<p>	<p>
<span class="LC_warning">Please double check the information	<span class="LC_warning">
below before clicking on '$button_text'</span>	'.&mt('Please double check the information below before clicking on \'[_1]\'',&mt($button_text)).'</span>
</p>	</p>
<table>	<table>
<tr><td><b>Sequence to be Graded:</b></td><td>$title</td></tr>	<tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr>
<tr><td><b>Data File that will be used:</b></td><td><tt>$env{'form.scantron_selectfile'}</tt></td></tr>	<tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr>
$CODElist	'.$CODElist.'
</table>	</table>
<br />	<br />
<p> If this information is correct, please click on '$button_text'.</p>	<p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p>
<p> If something is incorrect, please click the 'Grading Menu' button to start over.</p>	<p> '.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').'</p>

<br />	<br />
STUFF	');
}	}

=pod	=pod
Line 5872 sub scantron_do_warning {	Line 5837 sub scantron_do_warning {
if ( $env{'form.selectpage'} eq '' \|\|	if ( $env{'form.selectpage'} eq '' \|\|
$env{'form.scantron_selectfile'} eq '' \|\|	$env{'form.scantron_selectfile'} eq '' \|\|
$env{'form.scantron_format'} eq '' ) {	$env{'form.scantron_format'} eq '' ) {
$r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>");	$r->print("<p>".&mt('You have forgetten to specify some information. Please go Back and try again.')."</p>");
if ( $env{'form.selectpage'} eq '') {	if ( $env{'form.selectpage'} eq '') {
$r->print('<p><span class="LC_error">You have not selected a Sequence to grade</span></p>');	$r->print('<p><span class="LC_error">'.&mt('You have not selected a Sequence to grade').'</span></p>');
}	}
if ( $env{'form.scantron_selectfile'} eq '') {	if ( $env{'form.scantron_selectfile'} eq '') {
$r->print('<p><span class="LC_error">You have not selected a file that contains the student\'s response data.</span></p>');	$r->print('<p><span class="LC_error">'.&mt('You have not selected a file that contains the student\'s response data.').'</span></p>');
}	}
if ( $env{'form.scantron_format'} eq '') {	if ( $env{'form.scantron_format'} eq '') {
$r->print('<p><span class="LC_error">You have not selected a the format of the student\'s response data.</span></p>');	$r->print('<p><span class="LC_error">'.&mt('You have not selected a the format of the student\'s response data.').'</span></p>');
}	}
} else {	} else {
my $warning=&scantron_warning_screen('Grading: Validate Records');	my $warning=&scantron_warning_screen('Grading: Validate Records');
$r->print(<<STUFF);	$r->print('
$warning	'.$warning.'
<input type="submit" name="submit" value="Grading: Validate Records" />	<input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" />
<input type="hidden" name="command" value="scantron_validate" />	<input type="hidden" name="command" value="scantron_validate" />
STUFF	');
}	}
$r->print("</form><br />".&show_grading_menu_form($symb));	$r->print("</form><br />".&show_grading_menu_form($symb));
return '';	return '';
Line 5967 sub scantron_validate_file {	Line 5932 sub scantron_validate_file {
if ($env{'form.scantron_corrections'}) {	if ($env{'form.scantron_corrections'}) {
&scantron_process_corrections($r);	&scantron_process_corrections($r);
}	}
$r->print("<p>Gathering necessary info.</p>");$r->rflush();	$r->print('<p>'.&mt('Gathering necessary info.').'</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 $max_bubble=&scantron_get_maxbubble();
Line 5987 sub scantron_validate_file {	Line 5952 sub scantron_validate_file {

my $stop=0;	my $stop=0;
while (!$stop && $currentphase < scalar(@validate_phases)) {	while (!$stop && $currentphase < scalar(@validate_phases)) {
$r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");	$r->print('<p> '.&mt('Validating '.$validate_phases[$currentphase]).'</p>');
$r->rflush();	$r->rflush();
my $which="scantron_validate_".$validate_phases[$currentphase];	my $which="scantron_validate_".$validate_phases[$currentphase];
{	{
Line 5997 sub scantron_validate_file {	Line 5962 sub scantron_validate_file {
}	}
if (!$stop) {	if (!$stop) {
my $warning=&scantron_warning_screen('Start Grading');	my $warning=&scantron_warning_screen('Start Grading');
$r->print(<<STUFF);	$r->print('
Validation process complete.<br />	'.&mt('Validation process complete.').'<br />
$warning	'.$warning.'
<input type="submit" name="submit" value="Start Grading" />	<input type="submit" name="submit" value="'.&mt('Start Grading').'" />
<input type="hidden" name="command" value="scantron_process" />	<input type="hidden" name="command" value="scantron_process" />
STUFF	');

} else {	} else {
$r->print('<input type="hidden" name="command" value="scantron_validate" />');	$r->print('<input type="hidden" name="command" value="scantron_validate" />');
Line 6010 STUFF	Line 5975 STUFF
}	}
if ($stop) {	if ($stop) {
if ($validate_phases[$currentphase] eq 'sequence') {	if ($validate_phases[$currentphase] eq 'sequence') {
$r->print('<input type="submit" name="submit" value="Ignore -> " />');	$r->print('<input type="submit" name="submit" value="'.&mt('Ignore ->').' " />');
$r->print(' this error <br />');	$r->print(' '.&mt('this error').' <br />');

$r->print(" <p>Or click the 'Grading Menu' button to start over.</p>");	$r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>");
} else {	} else {
$r->print('<input type="submit" name="submit" value="Continue ->" />');	$r->print('<input type="submit" name="submit" value="'.&mt('Continue ->').'" />');
$r->print(' using corrected info <br />');	$r->print(' '.&mt('using corrected info').' <br />');
$r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");	$r->print("<input type='submit' value='".&mt("Skip")."' name='scantron_skip_record' />");
$r->print(" this scanline saving it for later.");	$r->print(" ".&mt("this scanline saving it for later."));
}	}
}	}
$r->print(" </form><br />".&show_grading_menu_form($symb));	$r->print(" </form><br />".&show_grading_menu_form($symb));
Line 6079 sub scantron_remove_scan_data {	Line 6044 sub scantron_remove_scan_data {
}	}
my $result;	my $result;
if (@todelete) {	if (@todelete) {
$result=&Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname);	$result = &Apache::lonnet::del('nohist_scantrondata',
	\@todelete,$cdom,$cname);
	} else {
	$result = 'ok';
}	}
return $result;	return $result;
}	}
Line 6499 sub scantron_get_correction {	Line 6467 sub scantron_get_correction {
#to show both the current line and the previous one and allow skipping	#to show both the current line and the previous one and allow skipping
#the previous one or the current one	#the previous one or the current one

$r->print("<p><b>An error was detected ($error)</b>");
if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {	if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {
$r->print(" for PaperID <tt>".	$r->print("<p>".&mt("<b>An error was detected ($error)</b>".
$$scan_record{'scantron.PaperID'}."</tt> \n");	" for PaperID <tt>[_1]</tt>",
	$$scan_record{'scantron.PaperID'})."</p> \n");
} else {	} else {
$r->print(" in scanline $i <pre>".	$r->print("<p>".&mt("<b>An error was detected ($error)</b>".
$line."</pre> \n");	" in scanline [_1] <pre>[_2]</pre>",
}	$i,$line)."</p> \n");
my $message="<p>The ID on the form is <tt>".	}
$$scan_record{'scantron.ID'}."</tt><br />\n".	my $message="<p>".&mt("The ID on the form is <tt>[_1]</tt><br />".
"The name on the paper is ".	"The name on the paper is [_2],[_3]",
$$scan_record{'scantron.LastName'}.",".	$$scan_record{'scantron.ID'},
$$scan_record{'scantron.FirstName'}."</p>";	$$scan_record{'scantron.LastName'},
	$$scan_record{'scantron.FirstName'})."</p>";

$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");	$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");	$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");
if ($error =~ /ID$/) {	if ($error =~ /ID$/) {
if ($error eq 'incorrectID') {	if ($error eq 'incorrectID') {
$r->print("The encoded ID is not in the classlist</p>\n");	$r->print("<p>".&mt("The encoded ID is not in the classlist").
	"</p>\n");
} elsif ($error eq 'duplicateID') {	} elsif ($error eq 'duplicateID') {
$r->print("The encoded ID has also been used by a previous paper $arg</p>\n");	$r->print("<p>".&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");
}	}
$r->print($message);	$r->print($message);
$r->print("<p>How should I handle this? <br /> \n");	$r->print("<p>".&mt("How should I handle this?")." <br /> \n");
$r->print("\n<ul><li> ");	$r->print("\n<ul><li> ");
#FIXME it would be nice if this sent back the user ID and	#FIXME it would be nice if this sent back the user ID and
#could do partial userID matches	#could do partial userID matches
Line 6535 sub scantron_get_correction {	Line 6505 sub scantron_get_correction {
$r->print('</li>');	$r->print('</li>');
} elsif ($error =~ /CODE$/) {	} elsif ($error =~ /CODE$/) {
if ($error eq 'incorrectCODE') {	if ($error eq 'incorrectCODE') {
$r->print("</p><p>The encoded CODE is not in the list of possible CODEs</p>\n");	$r->print("<p>".&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n");
} elsif ($error eq 'duplicateCODE') {	} elsif ($error eq 'duplicateCODE') {
$r->print("</p><p>The encoded CODE has also been used by a previous paper ".join(', ',@{$arg}).", and CODEs are supposed to be unique</p>\n");	$r->print("<p>".&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n");
}	}
$r->print("<p>The CODE on the form is <tt>'".	$r->print("<p>".&mt("The CODE on the form is <tt>'[_1]'</tt>",
$$scan_record{'scantron.CODE'}."'</tt><br />\n");	$$scan_record{'scantron.CODE'})."<br />\n");
$r->print($message);	$r->print($message);
$r->print("<p>How should I handle this? <br /> \n");	$r->print("<p>".&mt("How should I handle this?")." <br /> \n");
$r->print("\n<br /> ");	$r->print("\n<br /> ");
my $i=0;	my $i=0;
if ($error eq 'incorrectCODE'	if ($error eq 'incorrectCODE'
Line 6552 sub scantron_get_correction {	Line 6522 sub scantron_get_correction {
foreach my $testcode (@{$closest}) {	foreach my $testcode (@{$closest}) {
my $checked='';	my $checked='';
if (!$i) { $checked=' checked="checked" '; }	if (!$i) { $checked=' checked="checked" '; }
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");	$r->print("
	<label>
	<input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked />
	".&mt("Use the similar CODE [_1] instead.",
	"<b><tt>".$testcode."</tt></b>")."
	</label>
	<input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
$r->print("\n<br />");	$r->print("\n<br />");
$i++;	$i++;
}	}
Line 6560 sub scantron_get_correction {	Line 6536 sub scantron_get_correction {
}	}
if ($$scan_record{'scantron.CODE'}=~/\S/ ) {	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
my $checked; if (!$i) { $checked=' checked="checked" '; }	my $checked; if (!$i) { $checked=' checked="checked" '; }
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.</label>");	$r->print("
	<label>
	<input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked />
	".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.",
	"<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")."
	</label>");
$r->print("\n<br />");	$r->print("\n<br />");
}	}

Line 6582 ENDSCRIPT	Line 6563 ENDSCRIPT
"&curCODE=".&escape($$scan_record{'scantron.CODE'}).	"&curCODE=".&escape($$scan_record{'scantron.CODE'}).
"&scantron_selectfile=".&escape($env{'form.scantron_selectfile'});	"&scantron_selectfile=".&escape($env{'form.scantron_selectfile'});
if ($env{'form.scantron_CODElist'} =~ /\S/) {	if ($env{'form.scantron_CODElist'} =~ /\S/) {
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");	$r->print("
	<label>
	<input type='radio' name='scantron_CODE_resolution' value='use_found' />
	".&mt("[_1]Select[_2] a CODE from the list of all CODEs and use it.",
	"<a target='_blank' href='$href'>","</a>")."
	</label>
	".&mt("Selected CODE is [_1]","<input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />"));
$r->print("\n<br />");	$r->print("\n<br />");
}	}
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use </label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" /> as the CODE.");	$r->print("
	<label>
	<input type='radio' name='scantron_CODE_resolution' value='use_typed' />
	".&mt("Use [_1] as the CODE.",
	"</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />"));
$r->print("\n<br /><br />");	$r->print("\n<br /><br />");
} elsif ($error eq 'doublebubble') {	} elsif ($error eq 'doublebubble') {
$r->print("<p>There have been multiple bubbles scanned for a some question(s)</p>\n");	$r->print("<p>".&mt("There have been multiple bubbles scanned for a some question(s)")."</p>\n");

	# The form field scantron_questions is acutally a list of line numbers.
	# represented by this form so:

	my $line_list = &questions_to_line_list($arg);

$r->print('<input type="hidden" name="scantron_questions" value="'.	$r->print('<input type="hidden" name="scantron_questions" value="'.
join(',',@{$arg}).'" />');	$line_list.'" />');
$r->print($message);	$r->print($message);
$r->print("<p>Please indicate which bubble should be used for grading</p>");	$r->print("<p>".&mt("Please indicate which bubble should be used for grading")."</p>");
foreach my $question (@{$arg}) {	foreach my $question (@{$arg}) {
my $selected = &get_response_bubbles($scan_record, $question);	&prompt_for_corrections($r, $question, $scan_config, $scan_record);
my @select_array = split(/:/,$selected);
&scantron_bubble_selector($r,$scan_config,$question,
@select_array);
}	}
} elsif ($error eq 'missingbubble') {	} elsif ($error eq 'missingbubble') {
$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");	$r->print("<p>".&mt("There have been <b>no</b> bubbles scanned for some question(s)")."</p>\n");
$r->print($message);	$r->print($message);
$r->print("<p>Please indicate which bubble should be used for grading</p>");	$r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");
$r->print("Some questions have no scanned bubbles\n");	$r->print(&mt("Some questions have no scanned bubbles")."\n");

	# The form field scantron_questinos is actually a list of line numbers not
	# a list of question numbers. Therefore:
	#

	my $line_list = &questions_to_line_list($arg);

$r->print('<input type="hidden" name="scantron_questions" value="'.	$r->print('<input type="hidden" name="scantron_questions" value="'.
join(',',@{$arg}).'" />');	$line_list.'" />');
foreach my $question (@{$arg}) {	foreach my $question (@{$arg}) {
my $selected = &get_response_bubbles($scan_record, $question);	&prompt_for_corrections($r, $question, $scan_config, $scan_record);
my @select_array = split(/:/,$selected); # ought to be an array of empties.
&scantron_bubble_selector($r,$scan_config,$question, @select_array);
}	}
} else {	} else {
$r->print("\n<ul>");	$r->print("\n<ul>");
}	}
$r->print("\n</li></ul>");	$r->print("\n</li></ul>");

}	}

=pod	=pod

=item scantron_bubble_selector	=item questions_to_line_list

Generates the html radiobuttons to correct a single bubble line
possibly showing the existing the selected bubbles if known

Arguments:	Converts a list of questions into a string of comma separated
$r - Apache request object	line numbers in the answer sheet used by the questions. This is
$scan_config - hash from &get_scantron_config()	used to fill in the scantron_questions form field.
$quest - number of the bubble line to make a corrector for
@lines - array of answer lines.	Arguments:
	questions - Reference to an array of questions.

=cut	=cut

sub scantron_bubble_selector {
my ($r,$scan_config,$quest,@lines)=@_;
my $max=$$scan_config{'Qlength'};

	sub questions_to_line_list {
	my ($questions) = @_;
	my @lines;

my $scmode=$$scan_config{'Qon'};	foreach my $question (@{$questions}) {
	my $first = $first_bubble_line{$question-1} + 1;
	my $count = $bubble_lines_per_response{$question-1};
	my $last = $first+$count-1;
	push(@lines, ($first..$last));
	}
	return join(',', @lines);
	}

my $bubble_length = scalar(@lines);	=pod

	=item prompt_for_corrections

if ($scmode eq 'number' \|\| $scmode eq 'letter') { $max=10; }	Prompts for a potentially multiline correction to the
	user's bubbling (factors out common code from scantron_get_correction
	for multi and missing bubble cases).

my $response = $quest-1;	Arguments:
my $lines = $bubble_lines_per_response{$response};	$r - Apache request object.
	$question - The question number to prompt for.
	$scan_config - The scantron file configuration hash.
	$scan_record - Reference to the hash that has the the parsed scanlines.

my $total_lines = $lines*2;	Implicit inputs:
my @alphabet=('A'..'Z');	%bubble_lines_per_response - Starting line numbers for each question.
	Numbered from 0 (but question numbers are from
	1.
	%first_bubble_line - Starting bubble line for each question.

$r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");	=cut

for (my $l = 0; $l < $lines; $l++) {	sub prompt_for_corrections {
if ($l != 0) {	my ($r, $question, $scan_config, $scan_record) = @_;
$r->print('<tr>');
}
my @selected = split(//,$lines[$l]);
for (my $i=0;$i<$max;$i++) {
$r->print("\n".'<td align="center">');
if ($selected[0] eq $alphabet[$i]) {
$r->print('X');
shift(@selected) ;
} else {
$r->print(' ');
}
$r->print('</td>');

}

if ($l == 0) {	my $lines = $bubble_lines_per_response{$question-1};
my $lspan = $total_lines * 2; # 2 table rows per bubble line.	my $current_line = $first_bubble_line{$question-1} + 1 ;

$r->print('<td rowspan='.$lspan.'><label><input type="radio" name="scantron_correct_Q_'.	if ($lines > 1) {
$quest.'" value="none" /> No bubble </label></td>');	$r->print(&mt("The group of bubble lines below responds to a single question. Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />");
	}
}	for (my $i =0; $i < $lines; $i++) {
	my $selected = $$scan_record{"scantron.$current_line.answer"};
	&scantron_bubble_selector($r, $scan_config, $current_line,
	split('', $selected));
	$current_line++;
	}
	if ($lines > 1) {
	$r->print("<hr /><br />");
	}
	}

$r->print('</tr><tr>');	=pod

# FIXME: This may have to be a bit more clever for	=item scantron_bubble_selector
# multiline questions (different values e.g..).
	Generates the html radiobuttons to correct a single bubble line
	possibly showing the existing the selected bubbles if known

for (my $i=0;$i<$max;$i++) {	Arguments:
my $value = "$l:$i"; # Relative bubble line #: Bubble in line.	$r - Apache request object
$r->print("\n".	$scan_config - hash from &get_scantron_config()
'<td><label><input type="radio" name="scantron_correct_Q_'.	$line - Number of the line being displayed.
$quest.'" value="'.$value.'" />'.$alphabet[$i]."</label></td>");	@selected - Array of bubbles picked on this line.
}
$r->print('</tr>');

	=cut
}
$r->print('</table>');	sub scantron_bubble_selector {
	my ($r,$scan_config,$line,@selected)=@_;
	my $max=$$scan_config{'Qlength'};

	my $scmode=$$scan_config{'Qon'};
	if ($scmode eq 'number' \|\| $scmode eq 'letter') { $max=10; }

	my @alphabet=('A'..'Z');
	$r->print("<table border='1'><tr><td rowspan='2'>$line</td>");
	for (my $i=0;$i<$max+1;$i++) {
	$r->print("\n".'<td align="center">');
	if ($selected[0] eq $alphabet[$i]) { $r->print('X'); shift(@selected) }
	else { $r->print(' '); }
	$r->print('</td>');
	}
	$r->print('</tr><tr>');
	for (my $i=0;$i<$max;$i++) {
	$r->print("\n".
	'<td><label><input type="radio" name="scantron_correct_Q_'.
	$line.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");
	}
	$r->print('<td><label><input type="radio" name="scantron_correct_Q_'.
	$line.'" value="none" /> No bubble </label></td>');
	$r->print('</tr></table>');
}	}

=pod	=pod
Line 6935 sub scantron_get_maxbubble {	Line 6965 sub scantron_get_maxbubble {
my $bubble_line = 0;	my $bubble_line = 0;
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my $symb = $resource->symb();	my $symb = $resource->symb();
&Apache::lonxml::clear_bubble_lines_for_part();
my $result=&Apache::lonnet::ssi($resource->src(),	my $result=&Apache::lonnet::ssi($resource->src(),
('symb' => $resource->symb()),	('symb' => $resource->symb()),
('grade_target' => 'analyze'),	('grade_target' => 'analyze'),
Line 6951 sub scantron_get_maxbubble {	Line 6980 sub scantron_get_maxbubble {

foreach my $part_id (@{$analysis{'parts'}}) {	foreach my $part_id (@{$analysis{'parts'}}) {


my $lines = $analysis{"$part_id.bubble_lines"};;	my $lines = $analysis{"$part_id.bubble_lines"};;



# TODO - make this a persistent hash not an array.	# TODO - make this a persistent hash not an array.


Line 7165 sub scantron_upload_scantron_data {	Line 7195 sub scantron_upload_scantron_data {
my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},	my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},
'domainid');	'domainid');
my $default_form_data=&defaultFormData(&get_symb($r,1));	my $default_form_data=&defaultFormData(&get_symb($r,1));
$r->print(<<UPLOAD);	$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 == "") {
Line 7176 sub scantron_upload_scantron_data {	Line 7206 sub scantron_upload_scantron_data {
}	}
</script>	</script>

<form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>	<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
$default_form_data	'.$default_form_data.'
<table>	<table>
<tr><td>$select_link </td></tr>	<tr><td>'.$select_link.' </td></tr>
<tr><td>Course ID: </td><td><input name='courseid' type='text' /> </td></tr>	<tr><td>'.&mt('Course ID:').' </td>
<tr><td>Course Name: </td><td><input name='coursename' type='text' /></td></tr>	<td><input name="courseid" type="text" /> </td></tr>
<tr><td>Domain: </td><td>$domsel </td></tr>	<tr><td>'.&mt('Course Name:').' </td>
<tr><td>File to upload:</td><td><input type="file" name="upfile" size="50" /></td></tr>	<td><input name="coursename" type="text" /> </td></tr>
	<tr><td>'.&mt('Domain:').' </td>
	<td>'.$domsel.' </td></tr>
	<tr><td>'.&mt('File to upload:').'</td>
	<td><input type="file" name="upfile" size="50" /></td></tr>
</table>	</table>
<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="Upload Scantron Data" />	<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
</form>	</form>
UPLOAD	');
return '';	return '';
}	}

Line 7207 sub scantron_upload_scantron_data_save {	Line 7241 sub scantron_upload_scantron_data_save {
my $doanotherupload=	my $doanotherupload=
'<br /><form action="/adm/grades" method="post">'."\n".	'<br /><form action="/adm/grades" method="post">'."\n".
'<input type="hidden" name="command" value="scantronupload" />'."\n".	'<input type="hidden" name="command" value="scantronupload" />'."\n".
'<input type="submit" name="submit" value="Do Another Upload" />'."\n".	'<input type="submit" name="submit" value="'.&mt('Do Another Upload').'" />'."\n".
'</form>'."\n";	'</form>'."\n";
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("You are not allowed to upload Scantron data to the requested course.<br />");	$r->print(&mt("You are not allowed to upload Scantron 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 7221 sub scantron_upload_scantron_data_save {	Line 7255 sub scantron_upload_scantron_data_save {
return '';	return '';
}	}
my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});	my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
$r->print("Doing upload to ".$coursedata{'description'}." <br />");	$r->print(&mt("Doing upload to [_1]",$coursedata{'description'})." <br />");
my $fname=$env{'form.upfile.filename'};	my $fname=$env{'form.upfile.filename'};
#FIXME	#FIXME
#copied from lonnet::userfileupload()	#copied from lonnet::userfileupload()
Line 7239 sub scantron_upload_scantron_data_save {	Line 7273 sub scantron_upload_scantron_data_save {
my $uploadedfile=$fname;	my $uploadedfile=$fname;
$fname='scantron_orig_'.$fname;	$fname='scantron_orig_'.$fname;
if (length($env{'form.upfile'}) < 2) {	if (length($env{'form.upfile'}) < 2) {
$r->print("<span class=\"LC_error\">Error:</span> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");	$r->print(&mt("<span class=\"LC_error\">Error:</span> The file you attempted to upload, [_1] contained no information. Please check that you entered the correct filename.",'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));
} else {	} else {
my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);	my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);
if ($result =~ m\|^/uploaded/\|) {	if ($result =~ m\|^/uploaded/\|) {
$r->print("<span class=\"LC_success\">Success:</span> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");	$r->print(&mt("<span class=\"LC_success\">Success:</span> Successfully uploaded [_1] bytes of data into location [_2]",
	(length($env{'form.upfile'})-1),
	'<span class="LC_filename">'.$result."</span>"));
} else {	} else {
$r->print("<span class=\"LC_error\">Error:</span> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>");	$r->print(&mt("<span class=\"LC_error\">Error:</span> An error ([_1]) occurred when attempting to upload the file, [_2]",
	$result,
	'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));

}	}
}	}
if ($symb) {	if ($symb) {
Line 7289 sub scantron_download_scantron_data {	Line 7328 sub scantron_download_scantron_data {
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $file=$env{'form.scantron_selectfile'};	my $file=$env{'form.scantron_selectfile'};
if (! &valid_file($file)) {	if (! &valid_file($file)) {
$r->print(<<ERROR);	$r->print('
<p>	<p>
The requested file name was invalid.	'.&mt('The requested file name was invalid.').'
</p>	</p>
ERROR	');
$r->print(&show_grading_menu_form(&get_symb($r,1)));	$r->print(&show_grading_menu_form(&get_symb($r,1)));
return;	return;
}	}
Line 7303 ERROR	Line 7342 ERROR
&Apache::lonnet::allowuploaded('/adm/grades',$orig);	&Apache::lonnet::allowuploaded('/adm/grades',$orig);
&Apache::lonnet::allowuploaded('/adm/grades',$corrected);	&Apache::lonnet::allowuploaded('/adm/grades',$corrected);
&Apache::lonnet::allowuploaded('/adm/grades',$skipped);	&Apache::lonnet::allowuploaded('/adm/grades',$skipped);
$r->print(<<DOWNLOAD);	$r->print('
<p>	<p>
<a href="$orig">Original</a> file as uploaded by the scantron office.	'.&mt('[_1]Original[_2] file as uploaded by the scantron office.',
	'<a href="'.$orig.'">','</a>').'
</p>	</p>
<p>	<p>
<a href="$corrected">Corrections</a>, a file of corrected records that were used in grading.	'.&mt('[_1]Corrections[_2], a file of corrected records that were used in grading.',
	'<a href="'.$corrected.'">','</a>').'
</p>	</p>
<p>	<p>
<a href="$skipped">Skipped</a>, a file of records that were skipped.	'.&mt('[_1]Skipped[_2], a file of records that were skipped.',
	'<a href="'.$skipped.'">','</a>').'
</p>	</p>
DOWNLOAD	');
$r->print(&show_grading_menu_form(&get_symb($r,1)));	$r->print(&show_grading_menu_form(&get_symb($r,1)));
return '';	return '';
}	}
Line 7634 GRADINGMENUJS	Line 7676 GRADINGMENUJS
</div>	</div>
</div>	</div>
</form>';	</form>';
	$result .= &show_grading_menu_form($symb);
return $result;	return $result;
}	}

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

Removed from v.1.489
changed lines
	Added in v.1.499