version 1.160, 2003/11/21 21:31:34
|
version 1.175, 2004/02/16 18:28:25
|
Line 48 use Apache::lonhomework;
|
Line 48 use Apache::lonhomework;
|
use Apache::loncoursedata; |
use Apache::loncoursedata; |
use Apache::lonmsg qw(:user_normal_msg); |
use Apache::lonmsg qw(:user_normal_msg); |
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
|
use Apache::lonlocal; |
use String::Similarity; |
use String::Similarity; |
|
|
my %oldessays=(); |
my %oldessays=(); |
Line 88 sub getpartlist {
|
Line 89 sub getpartlist {
|
|
|
# --- Get the symbolic name of a problem and the url |
# --- Get the symbolic name of a problem and the url |
sub get_symb_and_url { |
sub get_symb_and_url { |
my ($request) = @_; |
my ($request,$silent) = @_; |
(my $url=$ENV{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; |
(my $url=$ENV{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; |
my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))); |
my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))); |
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; } |
if ($symb eq '') { |
|
if (!$silent) { |
|
$request->print("Unable to handle ambiguous references:$url:."); |
|
return (); |
|
} |
|
} |
return ($symb,$url); |
return ($symb,$url); |
} |
} |
|
|
Line 168 sub showResourceInfo {
|
Line 174 sub showResourceInfo {
|
my $col=3; |
my $col=3; |
if ($checkboxes) { $col=4; } |
if ($checkboxes) { $col=4; } |
my $result ='<table border="0">'. |
my $result ='<table border="0">'. |
'<tr><td colspan="'.$col.'"><font size="+1"><b>Current Resource: </b>'. |
'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'. |
$probTitle.'</font></td></tr>'."\n"; |
$probTitle.'</font></td></tr>'."\n"; |
my ($partlist,$handgrade,$responseType) = &response_type($url); |
my ($partlist,$handgrade,$responseType) = &response_type($url); |
my %resptype = (); |
my %resptype = (); |
Line 290 sub cleanRecord {
|
Line 296 sub cleanRecord {
|
$ENV{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : ''; |
$ENV{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : ''; |
$ENV{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob. |
$ENV{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob. |
} |
} |
return '<br /><br /><blockquote><pre>'.&keywords_highlight($answer).'</pre></blockquote>'; |
$answer =~ s-\n-<br />-g; |
|
return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>'; |
} |
} |
return $answer; |
return $answer; |
} |
} |
Line 678 LISTJAVASCRIPT
|
Line 685 LISTJAVASCRIPT
|
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
(%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist); |
(%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist); |
my $submitted = 0; |
my $submitted = 0; |
my $graded = 1; |
my $graded = 0; |
foreach (keys(%status)) { |
foreach (keys(%status)) { |
$submitted = 1 if ($status{$_} ne 'nothing'); |
$submitted = 1 if ($status{$_} ne 'nothing'); |
$graded = 0 if ($status{$_} =~ /^correct/); |
$graded = 1 if ($status{$_} !~ /^correct/); |
|
|
my ($foo,$partid,$foo1) = split(/\./,$_); |
my ($foo,$partid,$foo1) = split(/\./,$_); |
if ($status{'resource.'.$partid.'.submitted_by'} ne '') { |
if ($status{'resource.'.$partid.'.submitted_by'} ne '') { |
$submitted = 0; |
$submitted = 0; |
Line 735 LISTJAVASCRIPT
|
Line 743 LISTJAVASCRIPT
|
if ($num_students eq 0) { |
if ($num_students eq 0) { |
$gradeTable='<br /> <font color="red">There are no students currently enrolled.</font>'; |
$gradeTable='<br /> <font color="red">There are no students currently enrolled.</font>'; |
} else { |
} else { |
|
my $submissions='submissions'; |
|
if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; } |
|
if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; } |
$gradeTable='<br /> <font color="red">'. |
$gradeTable='<br /> <font color="red">'. |
'No submissions found for this resource for any students. ('.$num_students. |
'No '.$submissions.' found for this resource for any students. ('.$num_students. |
' checked for submissions)</font><br />'; |
' students checked for '.$submissions.')</font><br />'; |
} |
} |
} elsif ($ctr == 1) { |
} elsif ($ctr == 1) { |
$gradeTable =~ s/type=checkbox/type=checkbox checked/; |
$gradeTable =~ s/type=checkbox/type=checkbox checked/; |
Line 1375 sub submission {
|
Line 1386 sub submission {
|
return; |
return; |
} |
} |
|
|
$ENV{'form.lastSub'} = ($ENV{'form.lastSub'} eq '' ? 'datesub' : $ENV{'form.lastSub'}); |
if (!$ENV{'form.lastSub'}) { $ENV{'form.lastSub'} = 'datesub'; } |
|
if (!$ENV{'form.vProb'}) { $ENV{'form.vProb'} = 'yes'; } |
|
if (!$ENV{'form.vAns'}) { $ENV{'form.vAns'} = 'yes'; } |
my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : ''); |
my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : ''); |
my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL'). |
my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL'). |
'/check.gif" height="16" border="0" />'; |
'/check.gif" height="16" border="0" />'; |
Line 1644 KEYWORDS
|
Line 1657 KEYWORDS
|
$partid.'</b> <font color="#999999">( ID '.$respid. |
$partid.'</b> <font color="#999999">( ID '.$respid. |
' )</font> '; |
' )</font> '; |
if ($record{"resource.$partid.$respid.uploadedurl"}) { |
if ($record{"resource.$partid.$respid.uploadedurl"}) { |
$lastsubonly.='<a href="'.&Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).'"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />'; |
$lastsubonly.='<a href="'.&Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).'" target="lonGRDs"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />'; |
} |
} |
$lastsubonly.='<b>Submitted Answer: </b>'. |
$lastsubonly.='<b>Submitted Answer: </b>'. |
&cleanRecord($subval,$responsetype,$symb,$partid, |
&cleanRecord($subval,$responsetype,$symb,$partid, |
Line 1674 KEYWORDS
|
Line 1687 KEYWORDS
|
my $toGrade.='<input type="button" value="Grade Student" '. |
my $toGrade.='<input type="button" value="Grade Student" '. |
'onClick="javascript:checksubmit(this.form,\'Grade Student\',\'' |
'onClick="javascript:checksubmit(this.form,\'Grade Student\',\'' |
.$counter.'\');" TARGET=_self> '."\n" if (&canmodify($usec)); |
.$counter.'\');" TARGET=_self> '."\n" if (&canmodify($usec)); |
$toGrade.='</td></tr></table></td></tr></table></form>'."\n"; |
$toGrade.='</td></tr></table></td></tr></table>'."\n"; |
$toGrade.=&show_grading_menu_form($symb,$url) |
if (($ENV{'form.command'} eq 'submission') || |
if (($ENV{'form.command'} eq 'submission') || |
($ENV{'form.command'} eq 'processGroup' && $counter == $total)) { |
($ENV{'form.command'} eq 'processGroup' && $counter == $total)); |
$toGrade.='</form>'.&show_grading_menu_form($symb,$url) |
|
} |
$request = print($toGrade); |
$request = print($toGrade); |
return; |
return; |
} |
} |
Line 2243 sub viewgrades {
|
Line 2257 sub viewgrades {
|
&viewgrades_js($request); |
&viewgrades_js($request); |
|
|
my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'}); |
my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'}); |
my $result='<h3><font color="#339933">Manual Grading</font></h3>'; |
#need to make sure we have the correct data for later EXT calls, |
|
#thus invalidate the cache |
|
&Apache::lonnet::devalidatecourseresdata( |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.num'}, |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}); |
|
&Apache::lonnet::clear_EXT_cache_status(); |
|
|
|
my $result='<h3><font color="#339933">'.&mt('Manual Grading').'</font></h3>'; |
$result.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n"; |
$result.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n"; |
|
|
#view individual student submission form - called using Javascript viewOneStudent |
#view individual student submission form - called using Javascript viewOneStudent |
Line 3027 sub displayPage {
|
Line 3047 sub displayPage {
|
my ($classlist,undef,$fullname) = &getclasslist($getsec,'1'); |
my ($classlist,undef,$fullname) = &getclasslist($getsec,'1'); |
my ($uname,$udom) = split(/:/,$ENV{'form.student'}); |
my ($uname,$udom) = split(/:/,$ENV{'form.student'}); |
my $usec=$classlist->{$ENV{'form.student'}}[5]; |
my $usec=$classlist->{$ENV{'form.student'}}[5]; |
|
|
|
#need to make sure we have the correct data for later EXT calls, |
|
#thus invalidate the cache |
|
&Apache::lonnet::devalidatecourseresdata( |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.num'}, |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}); |
|
&Apache::lonnet::clear_EXT_cache_status(); |
|
|
if (!&canview($usec)) { |
if (!&canview($usec)) { |
$request->print('<font color="red">Unable to view requested student.('.$ENV{'form.student'}.')</font>'); |
$request->print('<font color="red">Unable to view requested student.('.$ENV{'form.student'}.')</font>'); |
$request->print(&show_grading_menu_form($symb,$url)); |
$request->print(&show_grading_menu_form($symb,$url)); |
Line 3198 sub displaySubByDates {
|
Line 3226 sub displaySubByDates {
|
} |
} |
if (exists $$record{"$version:resource.$partid.regrader"}) { |
if (exists $$record{"$version:resource.$partid.regrader"}) { |
$displaySub[2].=$$record{"$version:resource.$partid.regrader"}. |
$displaySub[2].=$$record{"$version:resource.$partid.regrader"}. |
' (<b>Part:</b> '.$partid.')'; |
' (<b>'.&mt('Part').':</b> '.$partid.')'; |
} |
} |
} |
} |
# needed because old essay regrader has not parts info |
# needed because old essay regrader has not parts info |
Line 3379 sub scantron_uploads {
|
Line 3407 sub scantron_uploads {
|
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::locommon::propath($cdom,$cname)); |
&Apache::loncommon::propath($cdom,$cname)); |
foreach my $filename (@files) { |
foreach my $filename (@files) { |
($filename)=split(/&/,$filename); |
($filename)=split(/&/,$filename); |
if ($filename!~/^scantron_orig_/) { next ; } |
if ($filename!~/^scantron_orig_/) { next ; } |
Line 3416 sub scantron_selectphase {
|
Line 3444 sub scantron_selectphase {
|
#FIXME allow instructor to be able to download the scantron file |
#FIXME allow instructor to be able to download the scantron file |
# and to upload it, |
# and to upload it, |
$result.= <<SCANTRONFORM; |
$result.= <<SCANTRONFORM; |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantro_process"> |
<table width="100%" border="0"> |
<input type="hidden" name="command" value="scantron_validate" /> |
|
$default_form_data |
|
<table width="100%" border="0"> |
|
<tr> |
<tr> |
<td bgcolor="#777777"> |
<td bgcolor="#777777"> |
|
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantro_process"> |
|
<input type="hidden" name="command" value="scantron_validate" /> |
|
$default_form_data |
<table width="100%" border="0"> |
<table width="100%" border="0"> |
<tr bgcolor="#e6ffff"> |
<tr bgcolor="#e6ffff"> |
<td> |
<td colspan="2"> |
<b>Specify file location and which Folder/Sequence to grade</b> |
<b>Specify file and which Folder/Sequence to grade</b> |
</td> |
</td> |
</tr> |
</tr> |
<tr bgcolor="#ffffe6"> |
<tr bgcolor="#ffffe6"> |
<td> |
<td> Sequence to grade: </td><td> $sequence_selector </td> |
Sequence to grade: $sequence_selector |
|
</td> |
|
</tr> |
</tr> |
<tr bgcolor="#ffffe6"> |
<tr bgcolor="#ffffe6"> |
<td> |
<td> Filename of scoring office file: </td><td> $file_selector </td> |
Filename of scoring office file: $file_selector |
|
</td> |
|
</tr> |
</tr> |
<tr bgcolor="#ffffe6"> |
<tr bgcolor="#ffffe6"> |
<td> |
<td> Format of data file: </td><td> $format_selector </td> |
Format of data file: $format_selector |
|
</td> |
|
</tr> |
</tr> |
<tr bgcolor="#ffffe6"> |
<tr bgcolor="#ffffe6"> |
<td> |
<td> |
<!-- FIXME this is lazy, a single parse of the set should let me know what this is --> |
<!-- FIXME this is lazy, a single parse of the set should let me know what this is --> |
Last line to expect an answer on: |
Last line to expect an answer on: </td><td> |
<input type="text" name="scantron_maxbubble" /> |
<input type="text" name="scantron_maxbubble" /> |
</td> |
</td> |
</tr> |
</tr> |
|
<tr bgcolor="#ffffe6"> |
|
<td colspan="2"> |
|
<input type="submit" value="Validate Scantron Records" /> |
|
</td> |
|
</tr> |
|
</table> |
|
</form> |
|
</td> |
|
</tr> |
|
SCANTRONFORM |
|
|
|
$r->print($result); |
|
|
|
if (&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'}) || |
|
&Apache::lonnet::allowed('usc',$ENV{'request.course.id'})) { |
|
|
|
$r->print(<<SCANTRONFORM); |
|
<tr> |
|
<td bgcolor="#777777"> |
|
<table width="100%" border="0"> |
|
<tr bgcolor="#e6ffff"> |
|
<td> |
|
<b>Specify a Scantron data file to upload.</b> |
|
</td> |
|
</tr> |
|
<tr bgcolor="#ffffe6"> |
|
<td> |
|
SCANTRONFORM |
|
my $default_form_data=&defaultFormData(&get_symb_and_url($r,1)); |
|
my $cdom= $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
|
my $cnum= $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
|
$r->print(<<UPLOAD); |
|
<script type="text/javascript" language="javascript"> |
|
function checkUpload(formname) { |
|
if (formname.upfile.value == "") { |
|
alert("Please use the browse button to select a file from your local directory."); |
|
return false; |
|
} |
|
formname.submit(); |
|
} |
|
</script> |
|
|
|
<form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'> |
|
$default_form_data |
|
<input name='courseid' type='hidden' value='$cnum' /> |
|
<input name='domainid' type='hidden' value='$cdom' /> |
|
<input name='command' value='scantronupload_save' type='hidden' /> |
|
File to upload:<input type="file" name="upfile" size="50" /> |
|
<br /> |
|
<input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" /> |
|
</form> |
|
UPLOAD |
|
|
|
$r->print(<<SCANTRONFORM); |
|
</td> |
|
</tr> |
</table> |
</table> |
</td> |
</td> |
</tr> |
</tr> |
|
SCANTRONFORM |
|
} |
|
|
|
$r->print(<<SCANTRONFORM); |
</table> |
</table> |
<input type="submit" value="Validate Scantron Records" /> |
|
</form> |
</form> |
$grading_menu_button |
$grading_menu_button |
SCANTRONFORM |
SCANTRONFORM |
|
|
return $result; |
return |
} |
} |
|
|
sub get_scantron_config { |
sub get_scantron_config { |
Line 3634 sub scantron_filter {
|
Line 3715 sub scantron_filter {
|
return 0; |
return 0; |
} |
} |
|
|
#FIXME I think I am doing this in the wrong order, I think it would be |
|
#better to make a several passes analyzing all of the lines in the |
|
#file for common errors wrong/invalid PID/username duplicated |
|
#PID/username, missing bubbles, double bubbles, missing/invalid CODE |
|
#and then get the instructor to fix all of these errors, then grade |
|
#the corrected one, I'll still need to catch error conditions, but |
|
#maybe most will taken care even before we start |
|
|
|
sub scantron_validate_file { |
|
my ($r) = @_; |
|
} |
|
|
|
sub scantron_process_corrections { |
sub scantron_process_corrections { |
my ($r) = @_; |
my ($r) = @_; |
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'}); |
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'}); |
Line 3755 sub scantron_getfile {
|
Line 3824 sub scantron_getfile {
|
my $lines; |
my $lines; |
$lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'. |
$lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'. |
'scantron_orig_'.$ENV{'form.scantron_selectfile'}); |
'scantron_orig_'.$ENV{'form.scantron_selectfile'}); |
if ($lines eq '-1') { |
|
#FIXME need to actually replicate file to course space |
|
#FIXME when replicating strip CRLF to LF or CR to LF |
|
} |
|
my %scanlines; |
my %scanlines; |
$scanlines{'orig'}=[(split("\n",$lines,-1))]; |
$scanlines{'orig'}=[(split("\n",$lines,-1))]; |
my $temp=$scanlines{'orig'}; |
my $temp=$scanlines{'orig'}; |
Line 3778 sub scantron_getfile {
|
Line 3843 sub scantron_getfile {
|
} else { |
} else { |
$scanlines{'skipped'}=[(split("\n",$lines,-1))]; |
$scanlines{'skipped'}=[(split("\n",$lines,-1))]; |
} |
} |
my @tmp=&Apache::lonnet::dump('scantrondata',$cdom,$cname); |
my @tmp=&Apache::lonnet::dump('nohist_scantrondata',$cdom,$cname); |
if ($tmp[0] =~ /^(error:|no_such_host)/) { @tmp=(); } |
if ($tmp[0] =~ /^(error:|no_such_host)/) { @tmp=(); } |
my %scan_data = @tmp; |
my %scan_data = @tmp; |
return (\%scanlines,\%scan_data); |
return (\%scanlines,\%scan_data); |
Line 3810 sub scantron_putfile {
|
Line 3875 sub scantron_putfile {
|
&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('scantrondata',$scan_data,$cdom,$cname); |
&Apache::lonnet::put('nohist_scantrondata',$scan_data,$cdom,$cname); |
} |
} |
|
|
sub scantron_get_line { |
sub scantron_get_line { |
Line 3898 sub scantron_get_correction {
|
Line 3963 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>An error was detected ($error) "); |
$r->print("<p><b>An error was detected ($error)</b>"); |
if ( defined($$scan_record{'scantron.PaperID'}) ) { |
if ( defined($$scan_record{'scantron.PaperID'}) ) { |
$r->print(" for PaperID <tt>". |
$r->print(" for PaperID <tt>". |
$$scan_record{'scantron.PaperID'}."</tt> \n"); |
$$scan_record{'scantron.PaperID'}."</tt> \n"); |
Line 4075 SCANTRONFORM
|
Line 4140 SCANTRONFORM
|
($uname,$udom)=('',''); |
($uname,$udom)=('',''); |
$i++; |
$i++; |
my $line=&scantron_get_line($scanlines,$i); |
my $line=&scantron_get_line($scanlines,$i); |
# $r->print('<pre>line is'.$line.'</pre>'); |
|
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 4090 SCANTRONFORM
|
Line 4154 SCANTRONFORM
|
'Student '.$uname.' has multiple sheets',2); |
'Student '.$uname.' has multiple sheets',2); |
next; |
next; |
} |
} |
# $r->print('<pre>doing studnet'.$uname.'</pre>'); |
|
($uname,$udom)=split(/:/,$uname); |
($uname,$udom)=split(/:/,$uname); |
&Apache::lonnet::delenv('form.counter'); |
&Apache::lonnet::delenv('form.counter'); |
&Apache::lonnet::appenv(%$scan_record); |
&Apache::lonnet::appenv(%$scan_record); |
# &Apache::lonhomework::showhash(%ENV); |
|
# $Apache::lonxml::debug=1; |
my $i=0; |
# &Apache::lonxml::debug("line is $line"); |
|
|
|
my $i=0; |
|
foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
$i++; |
$i++; |
my $result=&Apache::lonnet::ssi($resource->src(), |
my $result=&Apache::lonnet::ssi($resource->src(), |
Line 4108 SCANTRONFORM
|
Line 4168 SCANTRONFORM
|
'grade_domain' =>$udom, |
'grade_domain' =>$udom, |
'grade_courseid'=>$ENV{'request.course.id'}, |
'grade_courseid'=>$ENV{'request.course.id'}, |
'grade_symb' =>$resource->symb())); |
'grade_symb' =>$resource->symb())); |
# my %score=&Apache::lonnet::restore($resource->symb(), |
|
# $ENV{'request.course.id'}, |
|
# $udom,$uname); |
|
# foreach my $part ($resource->{PARTS}) { |
|
# if ($score{'resource.'.$part.'.solved'} =~ /^correct/) { |
|
# $studentcorrect++; |
|
# $totalcorrect++; |
|
# } else { |
|
# $studentincorrect++; |
|
# $totalincorrect++; |
|
# } |
|
# } |
|
# $r->print('<pre>'. |
|
# $resource->symb().'-'. |
|
# $resource->src().'-'.'</pre>result is'.$result); |
|
# &Apache::lonhomework::showhash(%score); |
|
# if ($i eq 3) {last;} |
|
} |
} |
$completedstudents{$uname}={'line'=>$line}; |
$completedstudents{$uname}={'line'=>$line}; |
} continue { |
} continue { |
Line 4132 SCANTRONFORM
|
Line 4175 SCANTRONFORM
|
&Apache::lonnet::delenv('scantron\.'); |
&Apache::lonnet::delenv('scantron\.'); |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
'last student'); |
'last student'); |
#last; |
|
#FIXME |
|
#get iterator for $sequence |
|
#foreach question 'submit' the students answer to the server |
|
# through grade target { |
|
# generate data to pass back that includes grade recevied |
|
#} |
|
} |
} |
&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>"); |
|
|
#$Apache::lonxml::debug=0; |
|
foreach my $delay (@delayqueue) { |
|
#FIXME |
|
#print out each delayed student with interface to select how |
|
# to repair student provided info |
|
#Expected errors include |
|
# 1 bad/no stuid/username |
|
# 2 invalid bubblings |
|
|
|
} |
|
#FIXME |
|
# if delay queue exists 2 submits one to process delayed students one |
|
# to ignore delayed students, possibly saving the delay queue for later |
|
|
|
$navmap->untieHashes(); |
$navmap->untieHashes(); |
$r->print("<p>Done</p>"); |
$r->print("</form><p>Done</p>"); |
$r->print(&show_grading_menu_form($symb,$url)); |
$r->print(&show_grading_menu_form($symb,$url)); |
return ''; |
return ''; |
} |
} |
Line 4171 sub scantron_upload_scantron_data {
|
Line 4193 sub scantron_upload_scantron_data {
|
'domainid'); |
'domainid'); |
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_and_url($r,1)); |
$r->print(<<UPLOAD); |
$r->print(<<UPLOAD); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
function checkUpload(formname) { |
function checkUpload(formname) { |
Line 4183 sub scantron_upload_scantron_data {
|
Line 4206 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 |
Course: <input name='courseid' type='text' /> |
Course: <input name='courseid' type='text' /> |
Domain: $domsel $select_link |
Domain: $domsel $select_link |
<br /> |
<br /> |
Line 4197 UPLOAD
|
Line 4221 UPLOAD
|
|
|
sub scantron_upload_scantron_data_save { |
sub scantron_upload_scantron_data_save { |
my($r)=@_; |
my($r)=@_; |
$r->print("Doing upload to ".$ENV{'form.courseid'}); |
if (!&Apache::lonnet::allowed('usc',$ENV{'form.domainid'}) && |
|
!&Apache::lonnet::allowed('usc', |
|
$ENV{'form.domainid'}.'_'.$ENV{'form.courseid'})) { |
|
$r->print("You are not allowed to upload Scantron data to the requested course.<br />"); |
|
$r->print(&show_grading_menu_form(&get_symb_and_url($r))); |
|
return ''; |
|
} |
|
$r->print("Doing upload to ".$ENV{'form.courseid'}." <br />"); |
my $home=&Apache::lonnet::homeserver($ENV{'form.courseid'}, |
my $home=&Apache::lonnet::homeserver($ENV{'form.courseid'}, |
$ENV{'form.domainid'}); |
$ENV{'form.domainid'}); |
my $fname=$ENV{'form.upfile.filename'}; |
my $fname=$ENV{'form.upfile.filename'}; |
Line 4215 sub scantron_upload_scantron_data_save {
|
Line 4246 sub scantron_upload_scantron_data_save {
|
# See if there is anything left |
# See if there is anything left |
unless ($fname) { return 'error: no uploaded file'; } |
unless ($fname) { return 'error: no uploaded file'; } |
$fname='scantron_orig_'.$fname; |
$fname='scantron_orig_'.$fname; |
&Apache::lonnet::logthis("fname is $fname"); |
|
$r->print(&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'}, |
$r->print(&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'}, |
$ENV{'form.domainid'}, |
$ENV{'form.domainid'}, |
$home,'upfile',$fname)); |
$home,'upfile',$fname)); |
|
my ($symb,$url)=&get_symb_and_url($r); |
|
if ($symb) { |
|
$r->print(&show_grading_menu_form(&get_symb_and_url($r))); |
|
} else { |
|
$r->print('<br /><form action="/adm/grades" method="post">'."\n". |
|
'<input type="hidden" name="command" value="scantronupload" />'."\n". |
|
'<input type="submit" name="submit" value="Do Another Upload" />'."\n". |
|
'</form>'."\n"); |
|
} |
return ''; |
return ''; |
} |
} |
|
|
Line 4325 GRADINGMENUJS
|
Line 4364 GRADINGMENUJS
|
|
|
$result.='<table width="100%" border=0>'; |
$result.='<table width="100%" border=0>'; |
$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n". |
$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n". |
' Select Section: <select name="section">'."\n"; |
' '.&mt('Select Section').': <select name="section">'."\n"; |
if (ref($sections)) { |
if (ref($sections)) { |
foreach (sort (@$sections)) { |
foreach (sort (@$sections)) { |
$result.='<option value="'.$_.'" '. |
$result.='<option value="'.$_.'" '. |
Line 4334 GRADINGMENUJS
|
Line 4373 GRADINGMENUJS
|
} |
} |
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> '; |
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> '; |
|
|
$result.='Student Status:</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef); |
$result.=&mt('Student Status').':</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef); |
|
|
if (ref($sections) && (grep /no/,@$sections)) { |
if (ref($sections) && (grep /no/,@$sections)) { |
$result.=' (Section "no" implies the students were not assigned a section.)<br />'; |
$result.=' (Section "no" implies the students were not assigned a section.)<br />'; |
Line 4343 GRADINGMENUJS
|
Line 4382 GRADINGMENUJS
|
|
|
$result.='<tr bgcolor="#ffffe6"valign="top"><td>'. |
$result.='<tr bgcolor="#ffffe6"valign="top"><td>'. |
'<input type="radio" name="radioChoice" value="submission" '. |
'<input type="radio" name="radioChoice" value="submission" '. |
($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>Current Resource:</b> For one or more students '. |
($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students'). |
'<select name="submitonly">'. |
' <select name="submitonly">'. |
'<option value="yes" '. |
'<option value="yes" '. |
($saveSub eq 'yes' ? 'selected="on"' : '').'>with submissions</option>'. |
($saveSub eq 'yes' ? 'selected="on"' : '').'>with submissions</option>'. |
'<option value="graded" '. |
'<option value="graded" '. |
Line 4505 sub handler {
|
Line 4544 sub handler {
|
} elsif ($command eq 'scantron_process' && $perm{'mgr'}) { |
} elsif ($command eq 'scantron_process' && $perm{'mgr'}) { |
$request->print(&scantron_process_students($request)); |
$request->print(&scantron_process_students($request)); |
} elsif ($command eq 'scantronupload' && |
} elsif ($command eq 'scantronupload' && |
&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})) { |
(&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})|| |
$request->print(&scantron_upload_scantron_data($request)); |
&Apache::lonnet::allowed('usc',$ENV{'request.course.id'}))) { |
|
$request->print(&scantron_upload_scantron_data($request)); |
} elsif ($command eq 'scantronupload_save' && |
} elsif ($command eq 'scantronupload_save' && |
&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})) { |
(&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})|| |
|
&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' && |
|
&Apache::lonnet::allowed('usc',$ENV{'request.course.id'})) { |
|
$request->print(&scantron_download_scantron_data($request)); |
} elsif ($command) { |
} elsif ($command) { |
$request->print("Access Denied ($command)"); |
$request->print("Access Denied ($command)"); |
} |
} |