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.199 and 1.204.2.1

version 1.199, 2004/05/10 23:18:27	version 1.204.2.1, 2004/07/27 15:16:10
Line 1084 sub sub_page_kw_js {	Line 1084 sub sub_page_kw_js {
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', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);	pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
pWin.focus();	pWin.focus();
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.open('text/html','replace');	pDoc.open('text/html','replace');
Line 1215 sub sub_page_kw_js {	Line 1215 sub sub_page_kw_js {
var ypos = (screen.height-330)/2-30;	var ypos = (screen.height-330)/2-30;
ypos = (ypos < 0) ? '0' : ypos;	ypos = (ypos < 0) ? '0' : ypos;

hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);	hwdWin = window.open('', 'KeywordHighlightCentral', 'resizeable=yes,toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);
hwdWin.focus();	hwdWin.focus();
var hDoc = hwdWin.document;	var hDoc = hwdWin.document;
hDoc.open('text/html','replace');	hDoc.open('text/html','replace');
Line 2598 sub editgrades {	Line 2598 sub editgrades {
if ($noupdate) {	if ($noupdate) {
# my $numcols=(scalar(@partid)(scalar(@parts)-1)2)+3;	# my $numcols=(scalar(@partid)(scalar(@parts)-1)2)+3;
my $numcols=scalar(@partid)*4+2;	my $numcols=scalar(@partid)*4+2;
$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr>'.$noupdate;	$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr><tr bgcolor="#ffffde">'.$noupdate;
}	}
$result .= '</table></td></tr></table>'."\n".	$result .= '</table></td></tr></table>'."\n".
&show_grading_menu_form ($symb,$url);	&show_grading_menu_form ($symb,$url);
Line 3420 sub getSequenceDropDown {	Line 3420 sub getSequenceDropDown {
return $result;	return $result;
}	}

sub scantron_uploads {	sub scantron_filenames {
if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};
my $result= '<select name="scantron_selectfile">';
my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};	my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};	my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,	my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
&Apache::loncommon::propath($cdom,$cname));	&Apache::loncommon::propath($cdom,$cname));
$result.="<option></option>";	my @possiblenames;
foreach my $filename (@files) {	foreach my $filename (sort(@files)) {
($filename)=split(/&/,$filename);	($filename)=split(/&/,$filename);
if ($filename!~/^scantron_orig_/) { next ; }	if ($filename!~/^scantron_orig_/) { next ; }
$filename=~s/^scantron_orig_//;	$filename=~s/^scantron_orig_//;
	push(@possiblenames,$filename);
	}
	return @possiblenames;
	}

	sub scantron_uploads {
	my $result= '<select name="scantron_selectfile">';
	$result.="<option></option>";
	foreach my $filename (sort(&scantron_filenames())) {
$result.="<option>$filename</option>\n";	$result.="<option>$filename</option>\n";
}	}
$result.="</select>";	$result.="</select>";
Line 3457 sub scantron_CODElist {	Line 3464 sub scantron_CODElist {
my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};	my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);	my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
my $namechoice='<option></option>';	my $namechoice='<option></option>';
foreach my $name (@names) {	foreach my $name (sort(@names)) {
if ($name =~ /^error: 2 /) { next; }	if ($name =~ /^error: 2 /) { next; }
$namechoice.='<option value="'.$name.'">'.$name.'</option>';	$namechoice.='<option value="'.$name.'">'.$name.'</option>';
}	}
Line 3496 sub scantron_selectphase {	Line 3503 sub scantron_selectphase {
<tr>	<tr>
<td bgcolor="#777777">	<td bgcolor="#777777">
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
<input type="hidden" name="command" value="scantron_validate" />	<input type="hidden" name="command" value="scantron_warning" />
$default_form_data	$default_form_data
<table width="100%" border="0">	<table width="100%" border="0">
<tr bgcolor="#e6ffff">	<tr bgcolor="#e6ffff">
Line 3522 sub scantron_selectphase {	Line 3529 sub scantron_selectphase {
<tr bgcolor="#ffffe6">	<tr bgcolor="#ffffe6">
<td> Options: </td>	<td> Options: </td>
<td>	<td>
<input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only skipped records <br />	<input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records <br />
<input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove any exisiting corrections	<input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections
</td>	</td>
</tr>	</tr>
<tr bgcolor="#ffffe6">	<tr bgcolor="#ffffe6">
Line 3602 SCANTRONFORM	Line 3609 SCANTRONFORM
<td> Filename of scoring office file: </td><td> $file_selector </td>	<td> Filename of scoring office file: </td><td> $file_selector </td>
</tr>	</tr>
<tr bgcolor="#ffffe6">	<tr bgcolor="#ffffe6">
<td>
Records to download
</td>
<td>
<input type="radio" name="scantron_options" value="download_skipped"/> Skipped Records <br />
<input type="radio" name="scantron_options" value="download_corrected"/> Corrected Records <br />
<input checked="on" type="radio" name="scantron_options" value="dowload_orig"/> Original Records
</td>
</tr>
<tr bgcolor="#ffffe6">
<td colspan="2">	<td colspan="2">
<input type="submit" value="Validate Scantron Records" />	<input type="submit" value="Show List of Files" />
</td>	</td>
</tr>	</tr>
</table>	</table>
Line 3833 sub scantron_process_corrections {	Line 3830 sub scantron_process_corrections {
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
my $which=$ENV{'form.scantron_line'};	my $which=$ENV{'form.scantron_line'};
my $line=&scantron_get_line($scanlines,$which);	my $line=&scantron_get_line($scanlines,$scan_data,$which);
my ($skip,$err,$errmsg);	my ($skip,$err,$errmsg);
if ($ENV{'form.scantron_skip_record'}) {	if ($ENV{'form.scantron_skip_record'}) {
$skip=1;	$skip=1;
Line 3879 sub scantron_process_corrections {	Line 3876 sub scantron_process_corrections {
if ($err) {	if ($err) {
$r->print("Unable to accept last correction, an error occurred :$errmsg:");	$r->print("Unable to accept last correction, an error occurred :$errmsg:");
} else {	} else {
&scantron_put_line($scanlines,$which,$line,$skip);	&scantron_put_line($scanlines,$scan_data,$which,$line,$skip);
&scantron_putfile($scanlines,$scan_data);	&scantron_putfile($scanlines,$scan_data);
}	}
}	}

	sub reset_skipping_status {
	my ($scanlines,$scan_data)=&scantron_getfile();
	&scan_data($scan_data,'remember_skipping',undef,1);
	&scantron_putfile(undef,$scan_data);
	}

sub scantron_validate_file {	sub allow_skipping {
my ($r) = @_;	my ($scan_data,$i)=@_;
my ($symb,$url)=&get_symb_and_url($r);	my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
if (!$symb) {return '';}	delete($remembered{$i});
my $default_form_data=&defaultFormData($symb,$url);	&scan_data($scan_data,'remember_skipping',join(':',%remembered));
if ($ENV{'form.scantron_options_ignore'} eq 'ignore_corrections') {	}
my $result=&scantron_remove('corrected');
if ($result ne 'ok' && $result ne 'not_found' ) {	sub should_be_skipped {
$r->print("An error occured ($result) when trying to Remove the existing corrections.");	my ($scan_data,$i)=@_;
	if ($ENV{'form.scantron_options_redo'} !~ /^redo_/) {
	# not redoing old skips
	return 0;
	}
	my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
	if (exists($remembered{$i})) { return 0; }
	return 1;
	}

	sub remember_current_skipped {
	my ($scanlines,$scan_data)=&scantron_getfile();
	my %to_remember;
	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
	if ($scanlines->{'skipped'}[$i]) {
	$to_remember{$i}=1;
}	}
$ENV{'form.scantron_options_ignore'}='done';
}	}
if ($ENV{'form.scantron_corrections'}) {	&Apache::lonnet::logthis('remembering '.join(':',%to_remember));
&scantron_process_corrections($r);	&scan_data($scan_data,'remember_skipping',join(':',%to_remember));
	&scantron_putfile(undef,$scan_data);
	}

	sub check_for_error {
	my ($r,$result)=@_;
	if ($result ne 'ok' && $result ne 'not_found' ) {
	$r->print("An error occured ($result) when trying to Remove the existing corrections.");
}	}
$r->print("<p>Gathering neccessary info.</p>");$r->rflush();	}
my $max_bubble=&scantron_get_maxbubble($r);
#get the student pick code ready	sub scantron_warning_screen {
$r->print(&Apache::loncommon::studentbrowser_javascript());	my ($button_text)=@_;
	my $title=&Apache::lonnet::gettitle($ENV{'form.selectpage'});
	return (<<STUFF);
	<p>
	<font color="red">Please double check the information
	below before clicking on '$button_text'</font>
	</p>
	<table>
	<tr><td><b>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>
	</table>
	</font>
	<br />
	<p> If this information is correct, please click on '$button_text'.</p>
	<p> If something is incorrect, please click the 'Grading Menu' button to start over.</p>

	<br />
	STUFF
	}

	sub scantron_do_warning {
	my ($r)=@_;
	my ($symb,$url)=&get_symb_and_url($r);
	if (!$symb) {return '';}
	my $default_form_data=&defaultFormData($symb,$url);
	$r->print(&scantron_form_start().$default_form_data);
	my $warning=&scantron_warning_screen('Validate Records');
	$r->print(<<STUFF);
	$warning
	<input type="submit" name="submit" value="Validate Records" />
	<input type="hidden" name="command" value="scantron_validate" />
	</form>
	STUFF
	$r->print("<br />".&show_grading_menu_form($symb,$url)."</body></html>");
	return '';
	}

	sub scantron_form_start {
	my ($max_bubble)=@_;
my $result= <<SCANTRONFORM;	my $result= <<SCANTRONFORM;
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
<input type="hidden" name="selectpage" value="$ENV{'form.selectpage'}" />	<input type="hidden" name="selectpage" value="$ENV{'form.selectpage'}" />
Line 3914 sub scantron_validate_file {	Line 3975 sub scantron_validate_file {
<input type="hidden" name="scantron_CODEunique" value="$ENV{'form.scantron_CODEunique'}" />	<input type="hidden" name="scantron_CODEunique" value="$ENV{'form.scantron_CODEunique'}" />
<input type="hidden" name="scantron_options_redo" value="$ENV{'form.scantron_options_redo'}" />	<input type="hidden" name="scantron_options_redo" value="$ENV{'form.scantron_options_redo'}" />
<input type="hidden" name="scantron_options_ignore" value="$ENV{'form.scantron_options_ignore'}" />	<input type="hidden" name="scantron_options_ignore" value="$ENV{'form.scantron_options_ignore'}" />
$default_form_data
SCANTRONFORM	SCANTRONFORM
	return $result;
	}

	sub scantron_validate_file {
	my ($r) = @_;
	my ($symb,$url)=&get_symb_and_url($r);
	if (!$symb) {return '';}
	my $default_form_data=&defaultFormData($symb,$url);

	# do the detection of only doing skipped records first befroe we delete
	# them when doing the corrections reset
	if ($ENV{'form.scantron_options_redo'} ne 'redo_skipped_ready') {
	&reset_skipping_status();
	}
	if ($ENV{'form.scantron_options_redo'} eq 'redo_skipped') {
	&remember_current_skipped();
	&scantron_remove_file('skipped');
	$ENV{'form.scantron_options_redo'}='redo_skipped_ready';
	}

	if ($ENV{'form.scantron_options_ignore'} eq 'ignore_corrections') {
	&check_for_error($r,&scantron_remove_file('corrected'));
	&check_for_error($r,&scantron_remove_file('skipped'));
	&check_for_error($r,&scantron_remove_scan_data());
	$ENV{'form.scantron_options_ignore'}='done';
	}

	if ($ENV{'form.scantron_corrections'}) {
	&scantron_process_corrections($r);
	}
	$r->print("<p>Gathering neccessary info.</p>");$r->rflush();
	#get the student pick code ready
	$r->print(&Apache::loncommon::studentbrowser_javascript());
	my $max_bubble=&scantron_get_maxbubble($r);
	my $result=&scantron_form_start($max_bubble).$default_form_data;
$r->print($result);	$r->print($result);

my @validate_phases=( 'ID',	my @validate_phases=( 'ID',
Line 3938 SCANTRONFORM	Line 4033 SCANTRONFORM
}	}
}	}
if (!$stop) {	if (!$stop) {
$r->print("Validation process complete.<br />");	my $warning=&scantron_warning_screen('Start Grading');
$r->print('<input type="submit" name="submit" value="Start Grading" />');	$r->print(<<STUFF);
$r->print('<input type="hidden" name="command" value="scantron_process" />');	Validation process complete.<br />
	$warning
	<input type="submit" name="submit" value="Start Grading" />
	<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" />');
$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");	$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
Line 3956 SCANTRONFORM	Line 4056 SCANTRONFORM
return '';	return '';
}	}

sub scantron_remove {	sub scantron_remove_file {
my ($which)=@_;	my ($which)=@_;
my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};	my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};	my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
my $file='scantron_';	my $file='scantron_';
if ($which eq 'corrected') {	if ($which eq 'corrected' \|\| $which eq 'skipped') {
$file.='corrected_';	$file.=$which.'_';
} else {	} else {
return 'refused';	return 'refused';
}	}
$file.=$ENV{'form.scantron_selectfile'};	$file.=$ENV{'form.scantron_selectfile'};
my $result=&Apache::lonnet::removeuserfile($cname,$cdom,$file);	return &Apache::lonnet::removeuserfile($cname,$cdom,$file);
	}

	sub scantron_remove_scan_data {
	my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
	my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
my @keys=&Apache::lonnet::getkeys('nohist_scantrondata',$cdom,$cname);	my @keys=&Apache::lonnet::getkeys('nohist_scantrondata',$cdom,$cname);
my @todelete;	my @todelete;
my $filename=$ENV{'form.scantron_selectfile'};	my $filename=$ENV{'form.scantron_selectfile'};
foreach my $key (@keys) {	foreach my $key (@keys) {
if ($key=~/^\Q$filename\E_/) {	if ($key=~/^\Q$filename\E_/) {
	if ($ENV{'form.scantron_options_redo'} eq 'redo_skipped_ready' &&
	$key=~/remember_skipping/) {
	next;
	}
push(@todelete,$key);	push(@todelete,$key);
}	}
}	}
	my $result;
if (@todelete) {	if (@todelete) {
&Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname);	$result=&Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname);
}	}
return $result;	return $result;
}	}

sub scantron_getfile {	sub scantron_getfile {
#FIXME really would prefer a scantron directory but tokenwrapper	#FIXME really would prefer a scantron directory
# doesn't allow access to subdirs of userfiles
my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};	my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};	my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
my $lines;	my $lines;
Line 4027 sub lonnet_putfile {	Line 4136 sub lonnet_putfile {

sub scantron_putfile {	sub scantron_putfile {
my ($scanlines,$scan_data) = @_;	my ($scanlines,$scan_data) = @_;
#FIXME really would prefer a scantron directory but tokenwrapper	#FIXME really would prefer a scantron directory
# doesn't allow access to subdirs of userfiles
my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};	my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};	my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
my $prefix='scantron_';	if ($scanlines) {
	my $prefix='scantron_';
# no need to update orig, shouldn't change	# no need to update orig, shouldn't change
# &lonnet_putfile(join("\n",@{$scanlines->{'orig'}}),$prefix.'orig_'.	# &lonnet_putfile(join("\n",@{$scanlines->{'orig'}}),$prefix.'orig_'.
# $ENV{'form.scantron_selectfile'});	# $ENV{'form.scantron_selectfile'});
&lonnet_putfile(join("\n",@{$scanlines->{'corrected'}}),	&lonnet_putfile(join("\n",@{$scanlines->{'corrected'}}),
$prefix.'corrected_'.	$prefix.'corrected_'.
$ENV{'form.scantron_selectfile'});	$ENV{'form.scantron_selectfile'});
&lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),	&lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),
$prefix.'skipped_'.	$prefix.'skipped_'.
$ENV{'form.scantron_selectfile'});	$ENV{'form.scantron_selectfile'});
	}
&Apache::lonnet::put('nohist_scantrondata',$scan_data,$cdom,$cname);	&Apache::lonnet::put('nohist_scantrondata',$scan_data,$cdom,$cname);
}	}

sub scantron_get_line {	sub scantron_get_line {
my ($scanlines,$i)=@_;	my ($scanlines,$scan_data,$i)=@_;
if ($scanlines->{'skipped'}[$i]) {return undef;}	if (&should_be_skipped($scan_data,$i)) { return undef; }
	if ($scanlines->{'skipped'}[$i]) { return undef; }
if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}	if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}
return $scanlines->{'orig'}[$i];	return $scanlines->{'orig'}[$i];
}	}

	sub get_todo_count {
	my ($scanlines,$scan_data)=@_;
	my $count=0;
	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
	my $line=&scantron_get_line($scanlines,$scan_data,$i);
	if ($line=~/^[\s\cz]*$/) { next; }
	$count++;
	}
	return $count;
	}

sub scantron_put_line {	sub scantron_put_line {
my ($scanlines,$i,$newline,$skip)=@_;	my ($scanlines,$scan_data,$i,$newline,$skip)=@_;
if ($skip) {	if ($skip) {
$scanlines->{'skipped'}[$i]=$newline;	$scanlines->{'skipped'}[$i]=$newline;
	&allow_skipping($scan_data,$i);
return;	return;
}	}
$scanlines->{'corrected'}[$i]=$newline;	$scanlines->{'corrected'}[$i]=$newline;
Line 4073 sub scantron_validate_ID {	Line 4196 sub scantron_validate_ID {

my %found=('ids'=>{},'usernames'=>{});	my %found=('ids'=>{},'usernames'=>{});
for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }	if ($line=~/^[\s\cz]*$/) { next; }
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
$scan_data);	$scan_data);
Line 4308 sub scantron_validate_CODE {	Line 4431 sub scantron_validate_CODE {

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++) {
my $line=&scantron_get_line($scanlines,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }	if ($line=~/^[\s\cz]*$/) { next; }
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
$scan_data);	$scan_data);
Line 4342 sub scantron_validate_doublebubble {	Line 4465 sub scantron_validate_doublebubble {
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();
for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }	if ($line=~/^[\s\cz]*$/) { next; }
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
$scan_data);	$scan_data);
Line 4392 sub scantron_validate_missingbubbles {	Line 4515 sub scantron_validate_missingbubbles {
my $max_bubble=&scantron_get_maxbubble();	my $max_bubble=&scantron_get_maxbubble();
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,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }	if ($line=~/^[\s\cz]*$/) { next; }
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
$scan_data);	$scan_data);
Line 4437 SCANTRONFORM	Line 4560 SCANTRONFORM
my @delayqueue;	my @delayqueue;
my %completedstudents;	my %completedstudents;

	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,'Scantron Status',
'Scantron Progress',$scanlines->{'count'},	'Scantron 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');
my $start=&Time::HiRes::time();	my $start=&Time::HiRes::time();
my $i=-1;	my $i=-1;
my ($uname,$udom);	my ($uname,$udom,$started);
while ($i<$scanlines->{'count'}) {	while ($i<$scanlines->{'count'}) {
($uname,$udom)=('','');	($uname,$udom)=('','');
$i++;	$i++;
my $line=&scantron_get_line($scanlines,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }	if ($line=~/^[\s\cz]*$/) { next; }
	if ($started) {
	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
	'last student');
	}
	$started=1;
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
$scan_data);	$scan_data);
unless ($uname=&scantron_find_student($scan_record,$scan_data,	unless ($uname=&scantron_find_student($scan_record,$scan_data,
Line 4487 SCANTRONFORM	Line 4616 SCANTRONFORM
} continue {	} continue {
&Apache::lonnet::delenv('form.counter');	&Apache::lonnet::delenv('form.counter');
&Apache::lonnet::delenv('scantron\.');	&Apache::lonnet::delenv('scantron\.');
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
'last student');
}	}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
# my $lasttime = &Time::HiRes::time()-$start;	# my $lasttime = &Time::HiRes::time()-$start;
# $r->print("<p>took $lasttime</p>");	# $r->print("<p>took $lasttime</p>");

$navmap->untieHashes();	$navmap->untieHashes();
$r->print("</form><p>Done</p>");	$r->print("</form>");
$r->print(&show_grading_menu_form($symb,$url));	$r->print(&show_grading_menu_form($symb,$url));
return '';	return '';
}	}
Line 4591 sub scantron_upload_scantron_data_save {	Line 4718 sub scantron_upload_scantron_data_save {
return '';	return '';
}	}

	sub valid_file {
	my ($requested_file)=@_;
	foreach my $filename (sort(&scantron_filenames())) {
	&Apache::lonnet::logthis("$requested_file $filename");
	if ($requested_file eq $filename) { return 1; }
	}
	return 0;
	}

	sub scantron_download_scantron_data {
	my ($r)=@_;
	my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
	my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
	my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
	my $file=$ENV{'form.scantron_selectfile'};
	if (! &valid_file($file)) {
	$r->print(<<ERROR);
	<p>
	The requested file name was invalid.
	</p>
	ERROR
	$r->print(&show_grading_menu_form(&get_symb_and_url($r,1)));
	return;
	}
	my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
	my $corrected='/uploaded/'.$cdom.'/'.$cname.'/scantron_corrected_'.$file;
	my $skipped='/uploaded/'.$cdom.'/'.$cname.'/scantron_skipped_'.$file;
	&Apache::lonnet::allowuploaded('/adm/grades',$orig);
	&Apache::lonnet::allowuploaded('/adm/grades',$corrected);
	&Apache::lonnet::allowuploaded('/adm/grades',$skipped);
	$r->print(<<DOWNLOAD);
	<p>
	<a href="$orig">Original</a> file as uploaded by the scantron office.
	</p>
	<p>
	<a href="$corrected">Corrections</a>, a file of corrected records that were used in grading.
	</p>
	<p>
	<a href="$skipped">Skipped</a>, a file of records that were skipped.
	</p>
	DOWNLOAD
	$r->print(&show_grading_menu_form(&get_symb_and_url($r,1)));
	return '';
	}

#-------- end of section for handling grading scantron forms -------	#-------- end of section for handling grading scantron forms -------
#	#
Line 4868 sub handler {	Line 5039 sub handler {
}	}
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
$request->print(&scantron_selectphase($request));	$request->print(&scantron_selectphase($request));
} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
$request->print(&scantron_validate_file($request));	$request->print(&scantron_do_warning($request));
} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
$request->print(&scantron_validate_file($request));	$request->print(&scantron_validate_file($request));
} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
Line 4882 sub handler {	Line 5053 sub handler {
(&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})\|\|	(&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})\|\|
&Apache::lonnet::allowed('usc',$ENV{'request.course.id'}))) {	&Apache::lonnet::allowed('usc',$ENV{'request.course.id'}))) {
$request->print(&scantron_upload_scantron_data_save($request));	$request->print(&scantron_upload_scantron_data_save($request));
} elsif ($command eq 'scantrondownload' &&	} elsif ($command eq 'scantron_download' &&
&Apache::lonnet::allowed('usc',$ENV{'request.course.id'})) {	&Apache::lonnet::allowed('usc',$ENV{'request.course.id'})) {
$request->print(&scantron_download_scantron_data($request));	$request->print(&scantron_download_scantron_data($request));
} elsif ($command) {	} elsif ($command) {

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

Removed from v.1.199
changed lines
	Added in v.1.204.2.1