version 1.522, 2008/05/24 00:34:12
|
version 1.548, 2009/01/16 10:59:52
|
Line 26
|
Line 26
|
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
|
|
|
|
|
|
package Apache::grades; |
package Apache::grades; |
use strict; |
use strict; |
use Apache::style; |
use Apache::style; |
Line 58 my $ssi_error_resource;
|
Line 60 my $ssi_error_resource;
|
my $ssi_error_message; |
my $ssi_error_message; |
|
|
|
|
# Do an ssi with retries: |
|
# While I'd love to factor out this with the vesrion in lonprintout, |
|
# that would either require a data coupling between modules, which I refuse to perpetuate |
|
# (there's quite enough of that already), or would require the invention of another infrastructure |
|
# I'm not quite ready to invent (e.g. an ssi_with_retry object). |
|
# |
|
# At least the logic that drives this has been pulled out into loncommon. |
|
|
|
|
|
# |
|
# ssi_with_retries - Does the server side include of a resource. |
|
# if the ssi call returns an error we'll retry it up to |
|
# the number of times requested by the caller. |
|
# If we still have a proble, no text is appended to the |
|
# output and we set some global variables. |
|
# to indicate to the caller an SSI error occurred. |
|
# All of this is supposed to deal with the issues described |
|
# in LonCAPA BZ 5631 see: |
|
# http://bugs.lon-capa.org/show_bug.cgi?id=5631 |
|
# by informing the user that this happened. |
|
# |
|
# Parameters: |
|
# resource - The resource to include. This is passed directly, without |
|
# interpretation to lonnet::ssi. |
|
# form - The form hash parameters that guide the interpretation of the resource |
|
# |
|
# retries - Number of retries allowed before giving up completely. |
|
# Returns: |
|
# On success, returns the rendered resource identified by the resource parameter. |
|
# Side Effects: |
|
# The following global variables can be set: |
|
# ssi_error - If an unrecoverable error occurred this becomes true. |
|
# It is up to the caller to initialize this to false |
|
# if desired. |
|
# ssi_error_resource - If an unrecoverable error occurred, this is the value |
|
# of the resource that could not be rendered by the ssi |
|
# call. |
|
# ssi_error_message - The error string fetched from the ssi response |
|
# in the event of an error. |
|
# |
|
sub ssi_with_retries { |
sub ssi_with_retries { |
my ($resource, $retries, %form) = @_; |
my ($resource, $retries, %form) = @_; |
my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form); |
my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form); |
Line 240 sub showResourceInfo {
|
Line 202 sub showResourceInfo {
|
my %resptype = (); |
my %resptype = (); |
my $hdgrade='no'; |
my $hdgrade='no'; |
my %partsseen; |
my %partsseen; |
foreach my $partID (sort keys(%$responseType)) { |
foreach my $partID (sort(keys(%$responseType))) { |
foreach my $resID (sort keys(%{ $responseType->{$partID} })) { |
foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) { |
my $handgrade=$$handgrade{$partID.'_'.$resID}; |
my $handgrade=$$handgrade{$partID.'_'.$resID}; |
my $responsetype = $responseType->{$partID}->{$resID}; |
my $responsetype = $responseType->{$partID}->{$resID}; |
$hdgrade = $handgrade if ($handgrade eq 'yes'); |
$hdgrade = $handgrade if ($handgrade eq 'yes'); |
Line 255 sub showResourceInfo {
|
Line 217 sub showResourceInfo {
|
$partsseen{$partID}=1; |
$partsseen{$partID}=1; |
} |
} |
my $display_part=&get_display_part($partID,$symb); |
my $display_part=&get_display_part($partID,$symb); |
$result.='<td>'.&mt('<b>Part: </b>[_1]',$display_part).' <span class="LC_internal_info">'. |
$result.='<td><b>'.&mt('Part').': </b>'.$display_part. |
$resID.'</span></td>'. |
' <span class="LC_internal_info">'.$resID.'</span></td>'. |
'<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>'; |
'<td><b>'.&mt('Type').': </b>'.$responsetype.'</td></tr>'; |
# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>'; |
# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>'; |
} |
} |
} |
} |
Line 278 sub reset_caches {
|
Line 240 sub reset_caches {
|
} |
} |
|
|
sub get_analyze { |
sub get_analyze { |
my ($symb,$uname,$udom)=@_; |
my ($symb,$uname,$udom,$no_increment)=@_; |
my $key = "$symb\0$uname\0$udom"; |
my $key = "$symb\0$uname\0$udom"; |
return $analyze_cache{$key} if (exists($analyze_cache{$key})); |
return $analyze_cache{$key} if (exists($analyze_cache{$key})); |
|
|
Line 290 sub reset_caches {
|
Line 252 sub reset_caches {
|
'grade_symb' => $symb, |
'grade_symb' => $symb, |
'grade_courseid' => |
'grade_courseid' => |
$env{'request.course.id'}, |
$env{'request.course.id'}, |
'grade_username' => $uname)); |
'grade_username' => $uname, |
|
'grade_noincrement' => $no_increment)); |
(undef,$subresult)=split(/_HASH_REF__/,$subresult,2); |
(undef,$subresult)=split(/_HASH_REF__/,$subresult,2); |
my %analyze=&Apache::lonnet::str2hash($subresult); |
my %analyze=&Apache::lonnet::str2hash($subresult); |
return $analyze_cache{$key} = \%analyze; |
return $analyze_cache{$key} = \%analyze; |
} |
} |
|
|
sub get_order { |
sub get_order { |
my ($partid,$respid,$symb,$uname,$udom)=@_; |
my ($partid,$respid,$symb,$uname,$udom,$no_increment)=@_; |
my $analyze = &get_analyze($symb,$uname,$udom); |
my $analyze = &get_analyze($symb,$uname,$udom,$no_increment); |
return $analyze->{"$partid.$respid.shown"}; |
return $analyze->{"$partid.$respid.shown"}; |
} |
} |
|
|
Line 820 sub listStudents {
|
Line 783 sub listStudents {
|
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? |
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? |
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; |
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; |
|
|
my $result='<h3><span class="LC_info"> '. |
my $result='<h3><span class="LC_info"> ' |
&mt($viewgrade.' Submissions for a Student or a Group of Students') |
.&mt("$viewgrade Submissions for a Student or a Group of Students") |
.'</span></h3>'; |
.'</span></h3>'; |
|
|
my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes')); |
my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes')); |
|
|
my %lt = ( 'multiple' => |
my %lt = ( 'multiple' => |
"Please select a student or group of students before clicking on the Next button.", |
&mt("Please select a student or group of students before clicking on the Next button."), |
'single' => |
'single' => |
"Please select the student before clicking on the Next button.", |
&mt("Please select the student before clicking on the Next button."), |
); |
); |
%lt = &Apache::lonlocal::texthash(%lt); |
%lt = &Apache::lonlocal::texthash(%lt); |
$request->print(<<LISTJAVASCRIPT); |
$request->print(<<LISTJAVASCRIPT); |
Line 874 LISTJAVASCRIPT
|
Line 837 LISTJAVASCRIPT
|
"\n".$table; |
"\n".$table; |
|
|
$gradeTable .= |
$gradeTable .= |
' '. |
' <b>'.&mt('View Problem Text').': </b>'. |
&mt('<b>View Problem Text: </b>[_1]', |
|
'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n". |
'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n". |
'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n". |
'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n". |
'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label>').'<br />'."\n"; |
'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n"; |
$gradeTable .= |
$gradeTable .= |
' '. |
' <b>'.&mt('View Answer').': </b>'. |
&mt('<b>View Answer: </b>[_1]', |
|
'<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n". |
'<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n". |
'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n". |
'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n". |
'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label>').'<br />'."\n"; |
'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n"; |
|
|
my $submission_options; |
my $submission_options; |
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) { |
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) { |
Line 900 LISTJAVASCRIPT
|
Line 861 LISTJAVASCRIPT
|
'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n". |
'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n". |
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>'; |
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>'; |
$gradeTable .= |
$gradeTable .= |
' '. |
' <b>'.&mt('Submissions').': </b>'.$submission_options.'<br />'."\n"; |
&mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n"; |
|
|
|
$gradeTable .= |
$gradeTable .= |
' '. |
' <b>'.&mt('Grading Increments').': </b>'. |
&mt('<b>Grading Increments:</b> [_1]', |
|
'<select name="increment">'. |
'<select name="increment">'. |
'<option value="1">'.&mt('Whole Points').'</option>'. |
'<option value="1">'.&mt('Whole Points').'</option>'. |
'<option value=".5">'.&mt('Half Points').'</option>'. |
'<option value=".5">'.&mt('Half Points').'</option>'. |
'<option value=".25">'.&mt('Quarter Points').'</option>'. |
'<option value=".25">'.&mt('Quarter Points').'</option>'. |
'<option value=".1">'.&mt('Tenths of a Point').'</option>'. |
'<option value=".1">'.&mt('Tenths of a Point').'</option>'. |
'</select>'); |
'</select>'; |
|
|
$gradeTable .= |
$gradeTable .= |
&build_section_inputs(). |
&build_section_inputs(). |
Line 930 LISTJAVASCRIPT
|
Line 889 LISTJAVASCRIPT
|
&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />'; |
&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />'; |
} |
} |
|
|
$gradeTable.=&mt('To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '. |
$gradeTable.=&mt('To '.lc($viewgrade)." a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.").'<br />'."\n". |
'next to the student\'s name(s). Then click on the Next button.').'<br />'."\n". |
|
'<input type="hidden" name="command" value="processGroup" />'."\n"; |
'<input type="hidden" name="command" value="processGroup" />'."\n"; |
|
|
# checkall buttons |
# checkall buttons |
$gradeTable.=&check_script('gradesub', 'stuinfo'); |
$gradeTable.=&check_script('gradesub', 'stuinfo'); |
$gradeTable.='<input type="button" '."\n". |
$gradeTable.='<input type="button" '."\n". |
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n". |
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n". |
'value="'.&mt('Next->').'" /> <br />'."\n"; |
'value="'.&mt('Next').' →" /> <br />'."\n"; |
$gradeTable.=&check_buttons(); |
$gradeTable.=&check_buttons(); |
$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />'.&mt('Check For Plagiarism').'</label>'; |
$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />'.&mt('Check For Plagiarism').'</label>'; |
my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup); |
my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup); |
Line 1030 LISTJAVASCRIPT
|
Line 988 LISTJAVASCRIPT
|
' '.$section.($group ne '' ?'/'.$group:'').'</td>'."\n"; |
' '.$section.($group ne '' ?'/'.$group:'').'</td>'."\n"; |
|
|
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
foreach (sort keys(%status)) { |
foreach (sort(keys(%status))) { |
next if ($_ =~ /^resource.*?submitted_by$/); |
next if ($_ =~ /^resource.*?submitted_by$/); |
$gradeTable.='<td align="center"> '.&mt($status{$_}).' </td>'."\n"; |
$gradeTable.='<td align="center"> '.&mt($status{$_}).' </td>'."\n"; |
} |
} |
Line 1058 LISTJAVASCRIPT
|
Line 1016 LISTJAVASCRIPT
|
$gradeTable.=&Apache::loncommon::end_data_table()."\n". |
$gradeTable.=&Apache::loncommon::end_data_table()."\n". |
'<input type="button" '. |
'<input type="button" '. |
'onClick="javascript:checkSelect(this.form.stuinfo);" '. |
'onClick="javascript:checkSelect(this.form.stuinfo);" '. |
'value="'.&mt('Next->').'" /></form>'."\n"; |
'value="'.&mt('Next').' →" /></form>'."\n"; |
if ($ctr == 0) { |
if ($ctr == 0) { |
my $num_students=(scalar(keys(%$fullname))); |
my $num_students=(scalar(keys(%$fullname))); |
if ($num_students eq 0) { |
if ($num_students eq 0) { |
Line 1154 sub processGroup {
|
Line 1112 sub processGroup {
|
#--- Javascript to handle the submission page functionality --- |
#--- Javascript to handle the submission page functionality --- |
sub sub_page_js { |
sub sub_page_js { |
my $request = shift; |
my $request = shift; |
|
my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = '); |
$request->print(<<SUBJAVASCRIPT); |
$request->print(<<SUBJAVASCRIPT); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
function updateRadio(formname,id,weight) { |
function updateRadio(formname,id,weight) { |
Line 1164 sub sub_page_js {
|
Line 1123 sub sub_page_js {
|
gradeBox.value = pts; |
gradeBox.value = pts; |
var resetbox = false; |
var resetbox = false; |
if (isNaN(pts) || pts < 0) { |
if (isNaN(pts) || pts < 0) { |
alert("A number equal or greater than 0 is expected. Entered value = "+pts); |
alert("$alertmsg"+pts); |
for (var i=0; i<radioButton.length; i++) { |
for (var i=0; i<radioButton.length; i++) { |
if (radioButton[i].checked) { |
if (radioButton[i].checked) { |
gradeBox.value = i; |
gradeBox.value = i; |
Line 1409 INNERJS
|
Line 1368 INNERJS
|
|
|
my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); |
my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); |
$docopen=~s/^document\.//; |
$docopen=~s/^document\.//; |
|
my $alertmsg = &mt('Please select a word or group of words from document and then click this link.'); |
$request->print(<<SUBJAVASCRIPT); |
$request->print(<<SUBJAVASCRIPT); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
|
|
Line 1441 INNERJS
|
Line 1401 INNERJS
|
else return; |
else return; |
var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," "); |
var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," "); |
if (cleantxt=="") { |
if (cleantxt=="") { |
alert("Please select a word or group of words from document and then click this link."); |
alert("$alertmsg"); |
return; |
return; |
} |
} |
var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt); |
var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt); |
Line 1680 sub gradeBox {
|
Line 1640 sub gradeBox {
|
|
|
my $radio.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across |
my $radio.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across |
while ($thisweight<=$wgt) { |
while ($thisweight<=$wgt) { |
$radio.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '. |
$radio.= '<td><span class="LC_nobreak"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '. |
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','. |
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','. |
$thisweight.')" value="'.$thisweight.'" '. |
$thisweight.')" value="'.$thisweight.'" '. |
($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n"; |
($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n"; |
Line 1696 sub gradeBox {
|
Line 1656 sub gradeBox {
|
$wgt.')" /></td>'."\n"; |
$wgt.')" /></td>'."\n"; |
$line.='<td>/'.$wgt.' '.$wgtmsg. |
$line.='<td>/'.$wgt.' '.$wgtmsg. |
($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : ''). |
($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : ''). |
' </td><td>'."\n"; |
' </td><td><b>'.&mt('Grade Status').':</b>'."\n"; |
$line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '. |
$line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '. |
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n"; |
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n"; |
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') { |
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') { |
Line 1709 sub gradeBox {
|
Line 1669 sub gradeBox {
|
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n"; |
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n"; |
|
|
|
|
|
#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line); |
$result .= |
$result .= |
&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line); |
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'. |
|
|
|
|
$result.='</tr></table>'."\n"; |
$result.='</tr></table>'."\n"; |
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n". |
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n". |
Line 2093 KEYWORDS
|
Line 2053 KEYWORDS
|
$lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '. |
$lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '. |
$display_part.' <span class="LC_internal_info">( ID '.$respid. |
$display_part.' <span class="LC_internal_info">( ID '.$respid. |
' )</span> '. |
' )</span> '. |
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br /><br /></div>'; |
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>'; |
next; |
next; |
} |
} |
foreach my $submission (@$string) { |
foreach my $submission (@$string) { |
Line 2134 KEYWORDS
|
Line 2094 KEYWORDS
|
' )</span> '; |
' )</span> '; |
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record); |
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record); |
if (@$files) { |
if (@$files) { |
$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain virusses').'</span><br />'; |
$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />'; |
my $file_counter = 0; |
my $file_counter = 0; |
foreach my $file (@$files) { |
foreach my $file (@$files) { |
$file_counter++; |
$file_counter++; |
Line 2225 KEYWORDS
|
Line 2185 KEYWORDS
|
$seen{$partid}++; |
$seen{$partid}++; |
next if ($$handgrade{$part_resp} ne 'yes' |
next if ($$handgrade{$part_resp} ne 'yes' |
&& $env{'form.lastSub'} eq 'hdgrade'); |
&& $env{'form.lastSub'} eq 'hdgrade'); |
push @partlist,$partid; |
push(@partlist,$partid); |
push @gradePartRespid,$partid.'.'.$respid; |
push(@gradePartRespid,$partid.'.'.$respid); |
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record)); |
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record)); |
} |
} |
$request->print('</div></div>'); |
$request->print('</div></div>'); |
Line 2357 sub get_last_submission {
|
Line 2317 sub get_last_submission {
|
$$returnhash{$version.':keys'}))) { |
$$returnhash{$version.':keys'}))) { |
$lasthash{$key}=$$returnhash{$version.':'.$key}; |
$lasthash{$key}=$$returnhash{$version.':'.$key}; |
$timestamp = |
$timestamp = |
scalar(localtime($$returnhash{$version.':timestamp'})); |
&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'}); |
} |
} |
} |
} |
foreach my $key (keys(%lasthash)) { |
foreach my $key (keys(%lasthash)) { |
Line 2371 sub get_last_submission {
|
Line 2331 sub get_last_submission {
|
} |
} |
if (!@string) { |
if (!@string) { |
$string[0] = |
$string[0] = |
'<span class="LC_warning">Nothing submitted - no attempts.</span>'; |
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span>'; |
} |
} |
return (\@string,\$timestamp); |
return (\@string,\$timestamp); |
} |
} |
Line 2553 sub processHandGrade {
|
Line 2513 sub processHandGrade {
|
|
|
my (@parsedlist,@nextlist); |
my (@parsedlist,@nextlist); |
my ($nextflg) = 0; |
my ($nextflg) = 0; |
foreach (sort |
foreach my $item (sort |
{ |
{ |
if (lc($$fullname{$a}) ne lc($$fullname{$b})) { |
if (lc($$fullname{$a}) ne lc($$fullname{$b})) { |
return (lc($$fullname{$a}) cmp lc($$fullname{$b})); |
return (lc($$fullname{$a}) cmp lc($$fullname{$b})); |
Line 2561 sub processHandGrade {
|
Line 2521 sub processHandGrade {
|
return $a cmp $b; |
return $a cmp $b; |
} (keys(%$fullname))) { |
} (keys(%$fullname))) { |
if ($nextflg == 1 && $button =~ /Next$/) { |
if ($nextflg == 1 && $button =~ /Next$/) { |
push @parsedlist,$_; |
push(@parsedlist,$item); |
} |
} |
$nextflg = 1 if ($_ eq $laststu); |
$nextflg = 1 if ($item eq $laststu); |
if ($button eq 'Previous') { |
if ($button eq 'Previous') { |
last if ($_ eq $firststu); |
last if ($item eq $firststu); |
push @parsedlist,$_; |
push(@parsedlist,$item); |
} |
} |
} |
} |
$ctr = 0; |
$ctr = 0; |
Line 2589 sub processHandGrade {
|
Line 2549 sub processHandGrade {
|
my $submitted = 0; |
my $submitted = 0; |
my $ungraded = 0; |
my $ungraded = 0; |
my $incorrect = 0; |
my $incorrect = 0; |
foreach (keys(%status)) { |
foreach my $item (keys(%status)) { |
$submitted = 1 if ($status{$_} ne 'nothing'); |
$submitted = 1 if ($status{$item} ne 'nothing'); |
$ungraded = 1 if ($status{$_} =~ /^ungraded/); |
$ungraded = 1 if ($status{$item} =~ /^ungraded/); |
$incorrect = 1 if ($status{$_} =~ /^incorrect/); |
$incorrect = 1 if ($status{$item} =~ /^incorrect/); |
my ($foo,$partid,$foo1) = split(/\./,$_); |
my ($foo,$partid,$foo1) = split(/\./,$item); |
if ($status{'resource.'.$partid.'.submitted_by'} ne '') { |
if ($status{'resource.'.$partid.'.submitted_by'} ne '') { |
$submitted = 0; |
$submitted = 0; |
} |
} |
Line 2604 sub processHandGrade {
|
Line 2564 sub processHandGrade {
|
next if (!$ungraded && ($submitonly eq 'graded')); |
next if (!$ungraded && ($submitonly eq 'graded')); |
next if (!$incorrect && $submitonly eq 'incorrect'); |
next if (!$incorrect && $submitonly eq 'incorrect'); |
} |
} |
push @nextlist,$student if ($ctr < $ntstu); |
push(@nextlist,$student) if ($ctr < $ntstu); |
last if ($ctr == $ntstu); |
last if ($ctr == $ntstu); |
$ctr++; |
$ctr++; |
} |
} |
Line 2612 sub processHandGrade {
|
Line 2572 sub processHandGrade {
|
$ctr = 0; |
$ctr = 0; |
my $total = scalar(@nextlist)-1; |
my $total = scalar(@nextlist)-1; |
|
|
foreach (sort @nextlist) { |
foreach (sort(@nextlist)) { |
my ($uname,$udom,$submitter) = split(/:/); |
my ($uname,$udom,$submitter) = split(/:/); |
$env{'form.student'} = $uname; |
$env{'form.student'} = $uname; |
$env{'form.userdom'} = $udom; |
$env{'form.userdom'} = $udom; |
Line 2658 sub saveHandGrade {
|
Line 2618 sub saveHandGrade {
|
} |
} |
} elsif ($dropMenu eq 'reset status' |
} elsif ($dropMenu eq 'reset status' |
&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts |
&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts |
foreach my $key (keys (%record)) { |
foreach my $key (keys(%record)) { |
if ($key=~/^resource\.\Q$new_part\E\./) { $newrecord{$key} = ''; } |
if ($key=~/^resource\.\Q$new_part\E\./) { $newrecord{$key} = ''; } |
} |
} |
$newrecord{'resource.'.$new_part.'.regrader'}= |
$newrecord{'resource.'.$new_part.'.regrader'}= |
Line 2693 sub saveHandGrade {
|
Line 2653 sub saveHandGrade {
|
&handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord); |
&handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord); |
next; |
next; |
} else { |
} else { |
push @parts_graded, $new_part; |
push(@parts_graded,$new_part); |
} |
} |
if ($record{'resource.'.$new_part.'.awarded'} ne $partial) { |
if ($record{'resource.'.$new_part.'.awarded'} ne $partial) { |
$newrecord{'resource.'.$new_part.'.awarded'} = $partial; |
$newrecord{'resource.'.$new_part.'.awarded'} = $partial; |
Line 2720 sub saveHandGrade {
|
Line 2680 sub saveHandGrade {
|
$record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' || |
$record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' || |
$dropMenu eq 'reset status') |
$dropMenu eq 'reset status') |
{ |
{ |
push (@version_parts,$new_part); |
push(@version_parts,$new_part); |
} |
} |
} |
} |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
Line 2795 sub handback_files {
|
Line 2755 sub handback_files {
|
$newflg.'_'.$part_resp.'_returndoc'.$file_counter, |
$newflg.'_'.$part_resp.'_returndoc'.$file_counter, |
$save_file_name); |
$save_file_name); |
if ($result !~ m|^/uploaded/|) { |
if ($result !~ m|^/uploaded/|) { |
$request->print('<span class="LC_error">An error occurred ('.$result. |
$request->print('<br /><span class="LC_error">'. |
') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</span><br />'); |
&mt('An error occurred ([_1]) while trying to upload [_2].', |
|
$result,$newflg.'_'.$part_resp.'_returndoc'.$file_counter). |
|
'</span>'); |
} else { |
} else { |
# mark the file as read only |
# mark the file as read only |
my @files = ($save_file_name); |
my @files = ($save_file_name); |
Line 2893 sub decrement_aggs {
|
Line 2855 sub decrement_aggs {
|
if ($aggtries == $totaltries) { |
if ($aggtries == $totaltries) { |
$decrement{'users'} = 1; |
$decrement{'users'} = 1; |
} |
} |
foreach my $type (keys (%decrement)) { |
foreach my $type (keys(%decrement)) { |
$$aggregate{$symb."\0".$part."\0".$type} = -$decrement{$type}; |
$$aggregate{$symb."\0".$part."\0".$type} = -$decrement{$type}; |
} |
} |
return; |
return; |
Line 3015 sub file_name_version_ext {
|
Line 2977 sub file_name_version_ext {
|
sub viewgrades_js { |
sub viewgrades_js { |
my ($request) = shift; |
my ($request) = shift; |
|
|
|
my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = '); |
$request->print(<<VIEWJAVASCRIPT); |
$request->print(<<VIEWJAVASCRIPT); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
function writePoint(partid,weight,point) { |
function writePoint(partid,weight,point) { |
Line 3023 sub viewgrades_js {
|
Line 2986 sub viewgrades_js {
|
if (point == "textval") { |
if (point == "textval") { |
point = document.classgrade["TEXTVAL_"+partid].value; |
point = document.classgrade["TEXTVAL_"+partid].value; |
if (isNaN(point) || parseFloat(point) < 0) { |
if (isNaN(point) || parseFloat(point) < 0) { |
alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point)); |
alert("$alertmsg"+parseFloat(point)); |
var resetbox = false; |
var resetbox = false; |
for (var i=0; i<radioButton.length; i++) { |
for (var i=0; i<radioButton.length; i++) { |
if (radioButton[i].checked) { |
if (radioButton[i].checked) { |
Line 3121 sub viewgrades_js {
|
Line 3084 sub viewgrades_js {
|
var weight = document.classgrade["weight_"+partid].value; |
var weight = document.classgrade["weight_"+partid].value; |
|
|
if (isNaN(point) || parseFloat(point) < 0) { |
if (isNaN(point) || parseFloat(point) < 0) { |
alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point)); |
alert("$alertmsg"+parseFloat(point)); |
textbox.value = ""; |
textbox.value = ""; |
return; |
return; |
} |
} |
Line 3213 sub viewgrades {
|
Line 3176 sub viewgrades {
|
my $sectionClass; |
my $sectionClass; |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
if ($env{'form.section'} eq 'all') { |
if ($env{'form.section'} eq 'all') { |
$sectionClass='Class'; |
$sectionClass=&mt('Class'); |
} elsif ($env{'form.section'} eq 'none') { |
} elsif ($env{'form.section'} eq 'none') { |
$sectionClass='Students in no Section'; |
$sectionClass=&mt('Students in no Section'); |
} else { |
} else { |
$sectionClass='Students in Section(s) [_1]'; |
$sectionClass=&mt('Students in Section(s) [_1]'); |
} |
} |
$result.= |
$result.= |
'<h3>'. |
'<h3>'. |
&mt("Assign Common Grade To $sectionClass",$section_display).'</h3>'; |
&mt("Assign Common Grade to [_1]",$sectionClass,$section_display).'</h3>'; |
$result.= &Apache::loncommon::start_data_table(); |
$result.= &Apache::loncommon::start_data_table(); |
#radio buttons/text box for assigning points for a section or class. |
#radio buttons/text box for assigning points for a section or class. |
#handles different parts of a problem |
#handles different parts of a problem |
Line 3253 sub viewgrades {
|
Line 3216 sub viewgrades {
|
my $line = '<input type="text" name="TEXTVAL_'. |
my $line = '<input type="text" name="TEXTVAL_'. |
$partid.'" size="4" '.'onChange="javascript:writePoint(\''. |
$partid.'" size="4" '.'onChange="javascript:writePoint(\''. |
$partid.'\','.$weight{$partid}.',\'textval\')" /> /'. |
$partid.'\','.$weight{$partid}.',\'textval\')" /> /'. |
$weight{$partid}.' (problem weight)</td>'."\n"; |
$weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n"; |
$line.= '<td><select name="SELVAL_'.$partid.'"'. |
$line.= '<td><b>'.&mt('Grade Status').':</b><select name="SELVAL_'.$partid.'"'. |
'onChange="javascript:writeRadText(\''.$partid.'\','. |
'onChange="javascript:writeRadText(\''.$partid.'\','. |
$weight{$partid}.')"> '. |
$weight{$partid}.')"> '. |
'<option selected="selected"> </option>'. |
'<option selected="selected"> </option>'. |
Line 3269 sub viewgrades {
|
Line 3232 sub viewgrades {
|
|
|
$result.= |
$result.= |
&Apache::loncommon::start_data_table_row()."\n". |
&Apache::loncommon::start_data_table_row()."\n". |
&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line). |
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'. |
&Apache::loncommon::end_data_table_row()."\n"; |
&Apache::loncommon::end_data_table_row()."\n"; |
$ctsparts++; |
$ctsparts++; |
} |
} |
Line 3280 sub viewgrades {
|
Line 3243 sub viewgrades {
|
|
|
#table listing all the students in a section/class |
#table listing all the students in a section/class |
#header of table |
#header of table |
$result.= '<h3>'.&mt('Assign Grade to Specific Students in '.$sectionClass, |
$result.= '<h3>'.&mt('Assign Grade to Specific Students in ').$sectionClass, |
$section_display).'</h3>'; |
$section_display.'</h3>'; |
$result.= &Apache::loncommon::start_data_table(). |
$result.= &Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
'<th>'.&mt('No.').'</th>'. |
'<th>'.&mt('No.').'</th>'. |
Line 3291 sub viewgrades {
|
Line 3254 sub viewgrades {
|
my @partids = (); |
my @partids = (); |
foreach my $part (@parts) { |
foreach my $part (@parts) { |
my $display=&Apache::lonnet::metadata($url,$part.'.display'); |
my $display=&Apache::lonnet::metadata($url,$part.'.display'); |
$display =~ s|^Number of Attempts|Tries<br />|; # makes the column narrower |
my $narrowtext = &mt('Tries'); |
|
$display =~ s|^Number of Attempts|$narrowtext <br />|; # makes the column narrower |
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } |
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } |
my ($partid) = &split_part_type($part); |
my ($partid) = &split_part_type($part); |
push(@partids, $partid); |
push(@partids,$partid); |
my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
if ($display =~ /^Partial Credit Factor/) { |
if ($display =~ /^Partial Credit Factor/) { |
$result.='<th>'. |
$result.='<th>'. |
Line 3448 sub editgrades {
|
Line 3412 sub editgrades {
|
my $header; |
my $header; |
while ($ctr < $env{'form.totalparts'}) { |
while ($ctr < $env{'form.totalparts'}) { |
my $partid = $env{'form.partid_'.$ctr}; |
my $partid = $env{'form.partid_'.$ctr}; |
push @partid,$partid; |
push(@partid,$partid); |
$weight{$partid} = $env{'form.weight_'.$partid}; |
$weight{$partid} = $env{'form.weight_'.$partid}; |
$ctr++; |
$ctr++; |
} |
} |
Line 3463 sub editgrades {
|
Line 3427 sub editgrades {
|
if ($type eq 'awarded' || $type eq 'solved') { next; } |
if ($type eq 'awarded' || $type eq 'solved') { next; } |
my $display=&Apache::lonnet::metadata($url,$stores.'.display'); |
my $display=&Apache::lonnet::metadata($url,$stores.'.display'); |
$display =~ s/\[Part: (\w)+\]//; |
$display =~ s/\[Part: (\w)+\]//; |
$display =~ s/Number of Attempts/Tries/; |
my $narrowtext = &mt('Tries'); |
$header .= '<th align="center">'.&mt('Old '.$display).'</th>'. |
$display =~ s/Number of Attempts/$narrowtext/; |
'<th align="center">'.&mt('New '.$display).'</th>'; |
$header .= '<th align="center">'.&mt('Old').' '.$display.'</th>'. |
|
'<th align="center">'.&mt('New').' '.$display.'</th>'; |
$columns{$partid}+=2; |
$columns{$partid}+=2; |
} |
} |
} |
} |
Line 3807 ENDPICK
|
Line 3772 ENDPICK
|
} |
} |
|
|
sub checkforfile_js { |
sub checkforfile_js { |
|
my $alertmsg = &mt('Please use the browse button to select a file from your local directory.'); |
my $result =<<CSVFORMJS; |
my $result =<<CSVFORMJS; |
<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("$alertmsg"); |
return false; |
return false; |
} |
} |
formname.submit(); |
formname.submit(); |
Line 3831 sub upcsvScores_form {
|
Line 3797 sub upcsvScores_form {
|
$result.=$table; |
$result.=$table; |
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n"; |
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n"; |
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n"; |
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n"; |
$result.=' <b>'.&mt('Specify a file containing the class scores for current resource'). |
$result.=' <b>'.&mt('Specify a file containing the class scores for current resource.'). |
'.</b></td></tr>'."\n"; |
'</b></td></tr>'."\n"; |
$result.='<tr bgcolor=#ffffe6><td>'."\n"; |
$result.='<tr bgcolor=#ffffe6><td>'."\n"; |
my $upload=&mt("Upload Scores"); |
my $upload=&mt("Upload Scores"); |
my $upfile_select=&Apache::loncommon::upfile_select_html(); |
my $upfile_select=&Apache::loncommon::upfile_select_html(); |
Line 4085 sub csvuploadassign {
|
Line 4051 sub csvuploadassign {
|
sub pickStudentPage { |
sub pickStudentPage { |
my ($request) = shift; |
my ($request) = shift; |
|
|
|
my $alertmsg = &mt('Please select the student you wish to grade.'); |
$request->print(<<LISTJAVASCRIPT); |
$request->print(<<LISTJAVASCRIPT); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
|
|
function checkPickOne(formname) { |
function checkPickOne(formname) { |
if (radioSelection(formname.student) == null) { |
if (radioSelection(formname.student) == null) { |
alert("Please select the student you wish to grade."); |
alert("$alertmsg"); |
return; |
return; |
} |
} |
ptr = pullDownSelection(formname.selectpage); |
ptr = pullDownSelection(formname.selectpage); |
Line 4125 LISTJAVASCRIPT
|
Line 4092 LISTJAVASCRIPT
|
$ctr++; |
$ctr++; |
} |
} |
$select.= '</select>'; |
$select.= '</select>'; |
$result.=&mt(' <b>Problems from:</b> [_1]',$select)."<br />\n"; |
$result.=' <b>'.&mt('Problems from').':</b> '.$select."<br />\n"; |
|
|
$ctr=0; |
$ctr=0; |
foreach (@$titles) { |
foreach (@$titles) { |
Line 4140 LISTJAVASCRIPT
|
Line 4107 LISTJAVASCRIPT
|
my $options = |
my $options = |
'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n". |
'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n". |
'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n"; |
'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n"; |
$result.=' '.&mt('<b>View Problems Text: </b> [_1]',$options); |
$result.=' <b>'.&mt('View Problem Text').': </b>'.$options; |
|
|
$options = |
$options = |
'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n". |
'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n". |
'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n". |
'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n". |
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n"; |
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n"; |
$result.=' '.&mt('<b>Submission Details: </b>[_1]',$options); |
$result.=' <b>'.&mt('Submissions').': </b>'.$options; |
|
|
$result.=&build_section_inputs(); |
$result.=&build_section_inputs(); |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
Line 4155 LISTJAVASCRIPT
|
Line 4122 LISTJAVASCRIPT
|
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n"; |
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n"; |
|
|
$result.=' '.&mt('<b>Use CODE: [_1] </b>', |
$result.=' <b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n"; |
'<input type="text" name="CODE" value="" />'). |
|
'<br />'."\n"; |
|
|
|
$result.=' <input type="button" '. |
$result.=' <input type="button" '. |
'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next->').'" /><br />'."\n"; |
'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' →" /><br />'."\n"; |
|
|
$request->print($result); |
$request->print($result); |
|
|
Line 4199 LISTJAVASCRIPT
|
Line 4164 LISTJAVASCRIPT
|
} |
} |
$studentTable.=&Apache::loncommon::end_data_table()."\n"; |
$studentTable.=&Apache::loncommon::end_data_table()."\n"; |
$studentTable.='<input type="button" '. |
$studentTable.='<input type="button" '. |
'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next->').'" /></form>'."\n"; |
'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' →" /></form>'."\n"; |
|
|
$studentTable.=&show_grading_menu_form($symb); |
$studentTable.=&show_grading_menu_form($symb); |
$request->print($studentTable); |
$request->print($studentTable); |
Line 4336 sub displayPage {
|
Line 4301 sub displayPage {
|
# $request->print('match='.$1."<br />\n"); |
# $request->print('match='.$1."<br />\n"); |
# } |
# } |
# $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g; |
# $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g; |
$studentTable.=' <b>'.$title.'</b> <br /> '.&mt('<b>Correct answer:</b><br />[_1]',$companswer); |
$studentTable.=' <b>'.$title.'</b> <br /> <b>'.&mt('Correct answer').':</b><br />'.$companswer; |
} |
} |
|
|
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); |
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); |
Line 4406 sub displaySubByDates {
|
Line 4371 sub displaySubByDates {
|
my %orders; |
my %orders; |
$mark{'correct_by_student'} = $checkIcon; |
$mark{'correct_by_student'} = $checkIcon; |
if (!exists($$record{'1:timestamp'})) { |
if (!exists($$record{'1:timestamp'})) { |
return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br />'; |
return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />'; |
} |
} |
|
|
my $interaction; |
my $interaction; |
|
my $no_increment = 1; |
for ($version=1;$version<=$$record{'version'};$version++) { |
for ($version=1;$version<=$$record{'version'};$version++) { |
my $timestamp = |
my $timestamp = |
&Apache::lonlocal::locallocaltime($$record{$version.':timestamp'}); |
&Apache::lonlocal::locallocaltime($$record{$version.':timestamp'}); |
Line 4453 sub displaySubByDates {
|
Line 4419 sub displaySubByDates {
|
if (!exists($orders{$partid})) { $orders{$partid}={}; } |
if (!exists($orders{$partid})) { $orders{$partid}={}; } |
if (!exists($orders{$partid}->{$responseId})) { |
if (!exists($orders{$partid}->{$responseId})) { |
$orders{$partid}->{$responseId}= |
$orders{$partid}->{$responseId}= |
&get_order($partid,$responseId,$symb,$uname,$udom); |
&get_order($partid,$responseId,$symb,$uname,$udom, |
|
$no_increment); |
} |
} |
$displaySub[0].='</b> '. |
$displaySub[0].='</b> '. |
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />'; |
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />'; |
Line 4506 sub updateGradeByPage {
|
Line 4473 sub updateGradeByPage {
|
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]; |
if (!&canmodify($usec)) { |
if (!&canmodify($usec)) { |
$request->print('<span class="LC_warning">Unable to modify requested student.('.$env{'form.student'}.'</span>'); |
$request->print('<span class="LC_warning">'.&mt('Unable to modify requested student ([_1])',$env{'form.student'}).'</span>'); |
$request->print(&show_grading_menu_form($env{'form.symb'})); |
$request->print(&show_grading_menu_form($env{'form.symb'})); |
return; |
return; |
} |
} |
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>'; |
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>'; |
$result.='<h3> Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom). |
$result.='<h3> '.&mt('Student: ').&nameUserString(undef,$env{'form.fullname'},$uname,$udom). |
'</h3>'."\n"; |
'</h3>'."\n"; |
|
|
$request->print($result); |
$request->print($result); |
Line 4520 sub updateGradeByPage {
|
Line 4487 sub updateGradeByPage {
|
my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'}); |
my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'}); |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
if (!$map) { |
if (!$map) { |
$request->print('<span class="LC_warning">Unable to grade requested sequence. ('.$resUrl.')</span>'); |
$request->print('<span class="LC_warning">'.&mt('Unable to grade requested sequence ([_1]).',$resUrl).'</span>'); |
my ($symb)=&get_symb($request); |
my ($symb)=&get_symb($request); |
$request->print(&show_grading_menu_form($symb)); |
$request->print(&show_grading_menu_form($symb)); |
return; |
return; |
Line 4552 sub updateGradeByPage {
|
Line 4519 sub updateGradeByPage {
|
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
'<td align="center" valign="top" >'.$prob. |
'<td align="center" valign="top" >'.$prob. |
(scalar(@{$parts}) == 1 ? '' |
(scalar(@{$parts}) == 1 ? '' |
: '<br />('.&mt('[quant,_1, parts]',scalar(@{$parts})) |
: '<br />('.&mt('[quant,_1, part]',scalar(@{$parts})) |
).')</td>'; |
.')').'</td>'; |
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>'; |
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>'; |
|
|
my %newrecord=(); |
my %newrecord=(); |
Line 4597 sub updateGradeByPage {
|
Line 4564 sub updateGradeByPage {
|
} |
} |
my $display_part=&get_display_part($partid,$curRes->symb()); |
my $display_part=&get_display_part($partid,$curRes->symb()); |
my $oldstatus = $env{'form.solved'.$question.'_'.$partid}; |
my $oldstatus = $env{'form.solved'.$question.'_'.$partid}; |
$displayPts[0].=' <b>Part:</b> '.$display_part.' = '. |
$displayPts[0].=' <b>'.&mt('Part').':</b> '.$display_part.' = '. |
(($oldstatus eq 'excused') ? 'excused' : $oldpts). |
(($oldstatus eq 'excused') ? 'excused' : $oldpts). |
' <br />'; |
' <br />'; |
$displayPts[1].=' <b>Part:</b> '.$display_part.' = '. |
$displayPts[1].=' <b>'.&mt('Part').':</b> '.$display_part.' = '. |
(($score eq 'excused') ? 'excused' : $newpts). |
(($score eq 'excused') ? 'excused' : $newpts). |
' <br />'; |
' <br />'; |
$question++; |
$question++; |
Line 4649 sub updateGradeByPage {
|
Line 4616 sub updateGradeByPage {
|
|
|
$studentTable.=&Apache::loncommon::end_data_table(); |
$studentTable.=&Apache::loncommon::end_data_table(); |
$studentTable.=&show_grading_menu_form($env{'form.symb'}); |
$studentTable.=&show_grading_menu_form($env{'form.symb'}); |
my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' : |
my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') : |
'The scores were changed for '. |
&mt('The scores were changed for [quant,_1,problem].', |
$changeflag.' problem'.($changeflag == 1 ? '.' : 's.')); |
$changeflag)); |
$request->print($grademsg.$studentTable); |
$request->print($grademsg.$studentTable); |
|
|
return ''; |
return ''; |
Line 4982 sub scantron_CODElist {
|
Line 4949 sub scantron_CODElist {
|
=cut |
=cut |
|
|
sub scantron_CODEunique { |
sub scantron_CODEunique { |
my $result='<span style="white-space: nowrap;"> |
my $result='<span class="LC_nobreak"> |
<label><input type="radio" name="scantron_CODEunique" |
<label><input type="radio" name="scantron_CODEunique" |
value="yes" checked="checked" />'.&mt('Yes').' </label> |
value="yes" checked="checked" />'.&mt('Yes').' </label> |
</span> |
</span> |
<span style="white-space: nowrap;"> |
<span class="LC_nobreak"> |
<label><input type="radio" name="scantron_CODEunique" |
<label><input type="radio" name="scantron_CODEunique" |
value="no" />'.&mt('No').' </label> |
value="no" />'.&mt('No').' </label> |
</span>'; |
</span>'; |
Line 5145 sub scantron_selectphase {
|
Line 5112 sub scantron_selectphase {
|
'); |
'); |
|
|
&Apache::lonpickcode::code_list($r,2); |
&Apache::lonpickcode::code_list($r,2); |
|
|
|
$r->print('<br /><form method="post" name="checkscantron">'. |
|
$default_form_data."\n". |
|
&Apache::loncommon::start_data_table('LC_scantron_action')."\n". |
|
&Apache::loncommon::start_data_table_header_row()."\n". |
|
'<th colspan="2"> |
|
'.&mt('Review scantron data and submissions for a previously graded folder/sequence')."\n". |
|
'</th>'."\n". |
|
&Apache::loncommon::end_data_table_header_row()."\n". |
|
&Apache::loncommon::start_data_table_row()."\n". |
|
'<td> '.&mt('Graded folder/sequence:').' </td>'."\n". |
|
'<td> '.$sequence_selector.' </td>'. |
|
&Apache::loncommon::end_data_table_row()."\n". |
|
&Apache::loncommon::start_data_table_row()."\n". |
|
'<td> '.&mt('Filename of scoring office file:').' </td>'."\n". |
|
'<td> '.$file_selector.' </td>'."\n". |
|
&Apache::loncommon::end_data_table_row()."\n". |
|
&Apache::loncommon::start_data_table_row()."\n". |
|
'<td> '.&mt('Format of data file:').' </td>'."\n". |
|
'<td> '.$format_selector.' </td>'."\n". |
|
&Apache::loncommon::end_data_table_row()."\n". |
|
&Apache::loncommon::start_data_table_row()."\n". |
|
'<td colspan="2">'."\n". |
|
'<input type="hidden" name="command" value="checksubmissions" />'."\n". |
|
'<input type="submit" value="'.&mt('Review Scantron Data and Submission Records').'" />'."\n". |
|
'</td>'."\n". |
|
&Apache::loncommon::end_data_table_row()."\n". |
|
&Apache::loncommon::end_data_table()."\n". |
|
'</form><br />'); |
$r->print($grading_menu_button); |
$r->print($grading_menu_button); |
return |
return; |
} |
} |
|
|
=pod |
=pod |
Line 6181 sub scantron_validate_file {
|
Line 6177 sub scantron_validate_file {
|
} |
} |
if (!$stop) { |
if (!$stop) { |
my $warning=&scantron_warning_screen('Start Grading'); |
my $warning=&scantron_warning_screen('Start Grading'); |
$r->print(&mt('Validation process complete.').'<br /> |
$r->print(&mt('Validation process complete.').'<br />'. |
'.$warning.' |
$warning. |
<input type="submit" name="submit" value="'.&mt('Start Grading').'" /> |
&mt('Perform verification for each student after storage of submissions?'). |
<input type="hidden" name="command" value="scantron_process" /> |
' <span class="LC_nobreak"><label>'. |
'); |
'<input type="radio" name="verifyrecord" value="1" />'.&mt('Yes').'</label>'. |
|
(' 'x3).'<label>'. |
|
'<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No'). |
|
'</label></span><br />'. |
|
&mt('Grading will take longer if you use verification.').'<br />'. |
|
&mt("Alternatively, the 'Review scantron data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'. |
|
'<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'. |
|
'<input type="hidden" name="command" value="scantron_process" />'."\n"); |
} 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."' />"); |
} |
} |
if ($stop) { |
if ($stop) { |
if ($validate_phases[$currentphase] eq 'sequence') { |
if ($validate_phases[$currentphase] eq 'sequence') { |
$r->print('<input type="submit" name="submit" value="'.&mt('Ignore ->').' " />'); |
$r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' → " />'); |
$r->print(' '.&mt('this error').' <br />'); |
$r->print(' '.&mt('this error').' <br />'); |
|
|
$r->print(" <p>".&mt("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 { |
if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') { |
if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') { |
$r->print('<input type="button" name="submitbutton" value="'.&mt('Continue ->').'" onclick="javascript:verify_bubble_radio(this.form)" />'); |
$r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' →" onclick="javascript:verify_bubble_radio(this.form)" />'); |
} else { |
} else { |
$r->print('<input type="submit" name="submit" value="'.&mt('Continue ->').'" />'); |
$r->print('<input type="submit" name="submit" value="'.&mt('Continue').' →" />'); |
} |
} |
$r->print(' '.&mt('using corrected info').' <br />'); |
$r->print(' '.&mt('using corrected info').' <br />'); |
$r->print("<input type='submit' value='".&mt("Skip")."' name='scantron_skip_record' />"); |
$r->print("<input type='submit' value='".&mt("Skip")."' name='scantron_skip_record' />"); |
Line 6579 sub scantron_validate_sequence {
|
Line 6581 sub scantron_validate_sequence {
|
return (0,$currentphase+1); |
return (0,$currentphase+1); |
} |
} |
|
|
=pod |
|
|
|
=item scantron_validate_ID |
|
|
|
Validates all scanlines in the selected file to not have any |
|
invalid or underspecified student IDs |
|
|
|
=cut |
|
|
|
sub scantron_validate_ID { |
sub scantron_validate_ID { |
my ($r,$currentphase) = @_; |
my ($r,$currentphase) = @_; |
Line 6652 sub scantron_validate_ID {
|
Line 6647 sub scantron_validate_ID {
|
return (0,$currentphase+1); |
return (0,$currentphase+1); |
} |
} |
|
|
=pod |
|
|
|
=item scantron_get_correction |
|
|
|
Builds the interface screen to interact with the operator to fix a |
|
specific error condition in a specific scanline |
|
|
|
Arguments: |
|
$r - Apache request object |
|
$i - number of the current scanline |
|
$scan_record - hash ref as returned from &scantron_parse_scanline() |
|
$scan_config - hash ref as returned from &get_scantron_config() |
|
$line - full contents of the current scanline |
|
$error - error condition, valid values are |
|
'incorrectCODE', 'duplicateCODE', |
|
'doublebubble', 'missingbubble', |
|
'duplicateID', 'incorrectID' |
|
$arg - extra information needed |
|
For errors: |
|
- duplicateID - paper number that this studentID was seen before on |
|
- duplicateCODE - array ref of the paper numbers this CODE was |
|
seen on before |
|
- incorrectCODE - current incorrect CODE |
|
- doublebubble - array ref of the bubble lines that have double |
|
bubble errors |
|
- missingbubble - array ref of the bubble lines that have missing |
|
bubble errors |
|
|
|
=cut |
|
|
|
sub scantron_get_correction { |
sub scantron_get_correction { |
my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_; |
my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_; |
Line 6818 ENDSCRIPT
|
Line 6784 ENDSCRIPT
|
foreach my $question (@{$arg}) { |
foreach my $question (@{$arg}) { |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
$scan_record, $error); |
$scan_record, $error); |
push (@lines_to_correct,@linenums); |
push(@lines_to_correct,@linenums); |
} |
} |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
} elsif ($error eq 'missingbubble') { |
} elsif ($error eq 'missingbubble') { |
Line 6838 ENDSCRIPT
|
Line 6804 ENDSCRIPT
|
foreach my $question (@{$arg}) { |
foreach my $question (@{$arg}) { |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
$scan_record, $error); |
$scan_record, $error); |
push (@lines_to_correct,@linenums); |
push(@lines_to_correct,@linenums); |
} |
} |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
} else { |
} else { |
Line 6996 sub prompt_for_corrections {
|
Line 6962 sub prompt_for_corrections {
|
my $selected = $$scan_record{"scantron.$current_line.answer"}; |
my $selected = $$scan_record{"scantron.$current_line.answer"}; |
&scantron_bubble_selector($r,$scan_config,$current_line, |
&scantron_bubble_selector($r,$scan_config,$current_line, |
$questionnum,$error,split('', $selected)); |
$questionnum,$error,split('', $selected)); |
push (@linenums,$current_line); |
push(@linenums,$current_line); |
$current_line++; |
$current_line++; |
} |
} |
if ($lines > 1) { |
if ($lines > 1) { |
Line 7212 sub scantron_validate_CODE {
|
Line 7178 sub scantron_validate_CODE {
|
$line,'duplicateCODE',$usedCODEs{$CODE}); |
$line,'duplicateCODE',$usedCODEs{$CODE}); |
return(1,$currentphase); |
return(1,$currentphase); |
} |
} |
push (@{$usedCODEs{$CODE}},$$scan_record{'scantron.PaperID'}); |
push(@{$usedCODEs{$CODE}},$$scan_record{'scantron.PaperID'}); |
} |
} |
return (0,$currentphase+1); |
return (0,$currentphase+1); |
} |
} |
Line 7251 sub scantron_validate_doublebubble {
|
Line 7217 sub scantron_validate_doublebubble {
|
return (0,$currentphase+1); |
return (0,$currentphase+1); |
} |
} |
|
|
=pod |
|
|
|
=item scantron_get_maxbubble |
|
|
|
Returns the maximum number of bubble lines that are expected to |
|
occur. Does this by walking the selected sequence rendering the |
|
resource and then checking &Apache::lonxml::get_problem_counter() |
|
for what the current value of the problem counter is. |
|
|
|
Caches the results to $env{'form.scantron_maxbubble'}, |
|
$env{'form.scantron.bubble_lines.n'}, |
|
$env{'form.scantron.first_bubble_line.n'} and |
|
$env{"form.scantron.sub_bubblelines.n"} |
|
which are the total number of bubble, lines, the number of bubble |
|
lines for response n and number of the first bubble line for response n, |
|
and a comma separated list of numbers of bubble lines for sub-questions |
|
(for optionresponse, matchresponse, and rankresponse items), for response n. |
|
|
|
=cut |
|
|
|
sub scantron_get_maxbubble { |
sub scantron_get_maxbubble { |
if (defined($env{'form.scantron_maxbubble'}) && |
if (defined($env{'form.scantron_maxbubble'}) && |
Line 7299 sub scantron_get_maxbubble {
|
Line 7246 sub scantron_get_maxbubble {
|
my $response_number = 0; |
my $response_number = 0; |
my $bubble_line = 0; |
my $bubble_line = 0; |
foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
my $symb = $resource->symb(); |
my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom); |
# Need to retrieve part IDs and response IDs because essayresponse, |
if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) { |
# reactionresponse and organicresponse items are not included in |
foreach my $part_id (@{$parts}) { |
# $analysis{'parts'} from lonnet::ssi. |
my $lines; |
my %possible_part_ids; |
|
if (ref($resource->parts()) eq 'ARRAY') { |
# TODO - make this a persistent hash not an array. |
foreach my $part (@{$resource->parts()}) { |
|
if (!&Apache::loncommon::check_if_partid_hidden($part,$symb,$udom,$uname)) { |
# optionresponse, matchresponse and rankresponse type items |
my @resp_ids = $resource->responseIds($part); |
# render as separate sub-questions in exam mode. |
foreach my $id (@resp_ids) { |
if (($analysis->{$part_id.'.type'} eq 'optionresponse') || |
$possible_part_ids{$part.'.'.$id} = 1; |
($analysis->{$part_id.'.type'} eq 'matchresponse') || |
|
($analysis->{$part_id.'.type'} eq 'rankresponse')) { |
|
my ($numbub,$numshown); |
|
if ($analysis->{$part_id.'.type'} eq 'optionresponse') { |
|
if (ref($analysis->{$part_id.'.options'}) eq 'ARRAY') { |
|
$numbub = scalar(@{$analysis->{$part_id.'.options'}}); |
|
} |
|
} elsif ($analysis->{$part_id.'.type'} eq 'matchresponse') { |
|
if (ref($analysis->{$part_id.'.items'}) eq 'ARRAY') { |
|
$numbub = scalar(@{$analysis->{$part_id.'.items'}}); |
|
} |
|
} elsif ($analysis->{$part_id.'.type'} eq 'rankresponse') { |
|
if (ref($analysis->{$part_id.'.foils'}) eq 'ARRAY') { |
|
$numbub = scalar(@{$analysis->{$part_id.'.foils'}}); |
|
} |
} |
} |
} |
if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') { |
} |
$numshown = scalar(@{$analysis->{$part_id.'.shown'}}); |
} |
|
my $result=&ssi_with_retries($resource->src(), $ssi_retries, |
|
('symb' => $symb, |
|
'grade_target' => 'analyze', |
|
'grade_courseid' => $cid, |
|
'grade_domain' => $udom, |
|
'grade_username' => $uname)); |
|
my (undef, $an) = |
|
split(/_HASH_REF__/,$result, 2); |
|
|
|
my @parts; |
|
|
|
my %analysis = &Apache::lonnet::str2hash($an); |
|
|
|
if (ref($analysis{'parts'}) eq 'ARRAY') { |
|
foreach my $part (@{$analysis{'parts'}}) { |
|
my ($id,$respid) = split(/\./,$part); |
|
if (!&Apache::loncommon::check_if_partid_hidden($id,$symb,$udom,$uname)) { |
|
push(@parts,$part); |
|
} |
|
} |
|
} |
|
# Add part_ids for any essayresponse items. |
|
foreach my $part_id (keys(%possible_part_ids)) { |
|
if (($analysis{$part_id.'.type'} eq 'essayresponse') || |
|
($analysis{$part_id.'.type'} eq 'reactionresponse') || |
|
($analysis{$part_id.'.type'} eq 'organicresponse')) { |
|
if (!grep(/^\Q$part_id\E$/,@parts)) { |
|
push (@parts,$part_id); |
|
} |
|
} |
|
} |
|
|
|
foreach my $part_id (@parts) { |
|
my $lines = $analysis{"$part_id.bubble_lines"}; |
|
|
|
# TODO - make this a persistent hash not an array. |
|
|
|
# optionresponse, matchresponse and rankresponse type items |
|
# render as separate sub-questions in exam mode. |
|
if (($analysis{$part_id.'.type'} eq 'optionresponse') || |
|
($analysis{$part_id.'.type'} eq 'matchresponse') || |
|
($analysis{$part_id.'.type'} eq 'rankresponse')) { |
|
my ($numbub,$numshown); |
|
if ($analysis{$part_id.'.type'} eq 'optionresponse') { |
|
if (ref($analysis{$part_id.'.options'}) eq 'ARRAY') { |
|
$numbub = scalar(@{$analysis{$part_id.'.options'}}); |
|
} |
} |
} elsif ($analysis{$part_id.'.type'} eq 'matchresponse') { |
my $bubbles_per_line = 10; |
if (ref($analysis{$part_id.'.items'}) eq 'ARRAY') { |
my $inner_bubble_lines = int($numbub/$bubbles_per_line); |
$numbub = scalar(@{$analysis{$part_id.'.items'}}); |
if (($numbub % $bubbles_per_line) != 0) { |
|
$inner_bubble_lines++; |
} |
} |
} elsif ($analysis{$part_id.'.type'} eq 'rankresponse') { |
for (my $i=0; $i<$numshown; $i++) { |
if (ref($analysis{$part_id.'.foils'}) eq 'ARRAY') { |
$subdivided_bubble_lines{$response_number} .= |
$numbub = scalar(@{$analysis{$part_id.'.foils'}}); |
$inner_bubble_lines.','; |
} |
} |
} |
$subdivided_bubble_lines{$response_number} =~ s/,$//; |
if (ref($analysis{$part_id.'.shown'}) eq 'ARRAY') { |
$lines = $numshown * $inner_bubble_lines; |
$numshown = scalar(@{$analysis{$part_id.'.shown'}}); |
} else { |
} |
$lines = $analysis->{"$part_id.bubble_lines"}; |
my $bubbles_per_line = 10; |
} |
my $inner_bubble_lines = int($numshown/$bubbles_per_line); |
|
if (($numshown % $bubbles_per_line) != 0) { |
|
$inner_bubble_lines++; |
|
} |
|
for (my $i=0; $i<$numshown; $i++) { |
|
$subdivided_bubble_lines{$response_number} .= |
|
$inner_bubble_lines.','; |
|
} |
|
$subdivided_bubble_lines{$response_number} =~ s/,$//; |
|
} |
|
|
|
$first_bubble_line{$response_number} = $bubble_line; |
|
$bubble_lines_per_response{$response_number} = $lines; |
|
$responsetype_per_response{$response_number} = |
|
$analysis{$part_id.'.type'}; |
|
$response_number++; |
|
|
|
$bubble_line += $lines; |
$first_bubble_line{$response_number} = $bubble_line; |
$total_lines += $lines; |
$bubble_lines_per_response{$response_number} = $lines; |
} |
$responsetype_per_response{$response_number} = |
|
$analysis->{$part_id.'.type'}; |
|
$response_number++; |
|
|
|
$bubble_line += $lines; |
|
$total_lines += $lines; |
|
} |
|
} |
} |
} |
&Apache::lonnet::delenv('scantron\.'); |
&Apache::lonnet::delenv('scantron\.'); |
|
|
Line 7404 sub scantron_get_maxbubble {
|
Line 7309 sub scantron_get_maxbubble {
|
return $env{'form.scantron_maxbubble'}; |
return $env{'form.scantron_maxbubble'}; |
} |
} |
|
|
=pod |
sub scantron_partids_tograde { |
|
my ($resource,$cid,$uname,$udom) = @_; |
|
my (%analysis,@parts); |
|
|
=item scantron_validate_missingbubbles |
if (ref($resource)) { |
|
my $symb = $resource->symb(); |
Validates all scanlines in the selected file to not have any |
my $result=&ssi_with_retries($resource->src(), $ssi_retries, |
answers that don't have bubbles that have not been verified |
('symb' => $symb, |
to be bubble free. |
'grade_target' => 'analyze', |
|
'grade_courseid' => $cid, |
|
'grade_domain' => $udom, |
|
'grade_username' => $uname)); |
|
my (undef, $an) = split(/_HASH_REF__/,$result, 2); |
|
%analysis = &Apache::lonnet::str2hash($an); |
|
|
=cut |
if (ref($analysis{'parts'}) eq 'ARRAY') { |
|
foreach my $part (@{$analysis{'parts'}}) { |
|
my ($id,$respid) = split(/\./,$part); |
|
if (!&Apache::loncommon::check_if_partid_hidden($id,$symb,$udom,$uname)) { |
|
push(@parts,$part); |
|
} |
|
} |
|
} |
|
} |
|
return (\%analysis,\@parts); |
|
} |
|
|
sub scantron_validate_missingbubbles { |
sub scantron_validate_missingbubbles { |
my ($r,$currentphase) = @_; |
my ($r,$currentphase) = @_; |
Line 7467 sub scantron_validate_missingbubbles {
|
Line 7389 sub scantron_validate_missingbubbles {
|
return (0,$currentphase+1); |
return (0,$currentphase+1); |
} |
} |
|
|
=pod |
|
|
|
=item scantron_process_students |
|
|
|
Routine that does the actual grading of the bubble sheet information. |
|
|
|
The parsed scanline hash is added to %env |
|
|
|
Then foreach unskipped scanline it does an &Apache::lonnet::ssi() |
|
foreach resource , with the form data of |
|
|
|
'submitted' =>'scantron' |
|
'grade_target' =>'grade', |
|
'grade_username'=> username of student |
|
'grade_domain' => domain of student |
|
'grade_courseid'=> of course |
|
'grade_symb' => symb of resource to grade |
|
|
|
This triggers a grading pass. The problem grading code takes care |
|
of converting the bubbled letter information (now in %env) into a |
|
valid submission. |
|
|
|
=cut |
|
|
|
sub scantron_process_students { |
sub scantron_process_students { |
my ($r) = @_; |
my ($r) = @_; |
Line 7508 sub scantron_process_students {
|
Line 7407 sub scantron_process_students {
|
my $navmap=Apache::lonnavmaps::navmap->new(); |
my $navmap=Apache::lonnavmaps::navmap->new(); |
my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
|
|
|
my ($uname,$udom,%partids_by_symb); |
|
foreach my $resource (@resources) { |
|
my $ressymb = $resource->symb(); |
|
my ($analysis,$parts) = |
|
&scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom); |
|
$partids_by_symb{$ressymb} = $parts; |
|
} |
# $r->print("geto ".scalar(@resources)."<br />"); |
# $r->print("geto ".scalar(@resources)."<br />"); |
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"> |
Line 7517 SCANTRONFORM
|
Line 7424 SCANTRONFORM
|
$r->print($result); |
$r->print($result); |
|
|
my @delayqueue; |
my @delayqueue; |
my %completedstudents; |
my (%completedstudents,%scandata); |
|
|
my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam')); |
my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam')); |
my $count=&get_todo_count($scanlines,$scan_data); |
my $count=&get_todo_count($scanlines,$scan_data); |
Line 7526 SCANTRONFORM
|
Line 7433 SCANTRONFORM
|
'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'); |
|
$r->print('<br />'); |
my $start=&Time::HiRes::time(); |
my $start=&Time::HiRes::time(); |
my $i=-1; |
my $i=-1; |
my ($uname,$udom,$started); |
my $started; |
|
|
&scantron_get_maxbubble(); # Need the bubble lines array to parse. |
&scantron_get_maxbubble(); # Need the bubble lines array to parse. |
|
|
Line 7544 SCANTRONFORM
|
Line 7452 SCANTRONFORM
|
return ''; # Dunno why the other returns return '' rather than just returning. |
return ''; # Dunno why the other returns return '' rather than just returning. |
} |
} |
|
|
|
my %lettdig = &letter_to_digits(); |
|
my $numletts = scalar(keys(%lettdig)); |
|
|
while ($i<$scanlines->{'count'}) { |
while ($i<$scanlines->{'count'}) { |
($uname,$udom)=('',''); |
($uname,$udom)=('',''); |
$i++; |
$i++; |
Line 7576 SCANTRONFORM
|
Line 7487 SCANTRONFORM
|
&scantron_putfile($scanlines,$scan_data); |
&scantron_putfile($scanlines,$scan_data); |
} |
} |
|
|
my $i=0; |
my $scancode; |
foreach my $resource (@resources) { |
if ((exists($scan_record->{'scantron.CODE'})) && |
$i++; |
(&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) { |
my %form=('submitted' =>'scantron', |
$scancode = $scan_record->{'scantron.CODE'}; |
'grade_target' =>'grade', |
} else { |
'grade_username'=>$uname, |
$scancode = ''; |
'grade_domain' =>$udom, |
} |
'grade_courseid'=>$env{'request.course.id'}, |
|
'grade_symb' =>$resource->symb()); |
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
if (exists($scan_record->{'scantron.CODE'}) |
@resources) eq 'ssi_error') { |
&& |
$ssi_error = 0; # So end of handler error message does not trigger. |
&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'})) { |
$r->print("</form>"); |
$form{'CODE'}=$scan_record->{'scantron.CODE'}; |
&ssi_print_error($r); |
} else { |
$r->print(&show_grading_menu_form($symb)); |
$form{'CODE'}=''; |
&Apache::lonnet::remove_lock($lock); |
} |
return ''; # Why return ''? Beats me. |
my $result=&ssi_with_retries($resource->src(), $ssi_retries, %form); |
} |
if ($ssi_error) { |
|
$ssi_error = 0; # So end of handler error message does not trigger. |
|
$r->print("</form>"); |
|
&ssi_print_error($r); |
|
$r->print(&show_grading_menu_form($symb)); |
|
&Apache::lonnet::remove_lock($lock); |
|
return ''; # Why return ''? Beats me. |
|
} |
|
|
|
if (&Apache::loncommon::connection_aborted($r)) { last; } |
|
} |
|
$completedstudents{$uname}={'line'=>$line}; |
$completedstudents{$uname}={'line'=>$line}; |
if (&Apache::loncommon::connection_aborted($r)) { last; } |
if ($env{'form.verifyrecord'}) { |
|
my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'}; |
|
my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos); |
|
chomp($studentdata); |
|
$studentdata =~ s/\r$//; |
|
my $studentrecord = ''; |
|
my $counter = -1; |
|
foreach my $resource (@resources) { |
|
($counter,my $recording) = |
|
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'}, |
|
$counter,$studentdata,\%partids_by_symb, |
|
\%scantron_config,\%lettdig,$numletts); |
|
$studentrecord .= $recording; |
|
} |
|
if ($studentrecord ne $studentdata) { |
|
$counter = -1; |
|
$studentrecord = ''; |
|
foreach my $resource (@resources) { |
|
($counter,my $recording) = |
|
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'}, |
|
$counter,$studentdata,\%partids_by_symb, |
|
\%scantron_config,\%lettdig,$numletts); |
|
$studentrecord .= $recording; |
|
} |
|
if ($studentrecord ne $studentdata) { |
|
$r->print('<p><span class="LC_error">'); |
|
if ($scancode eq '') { |
|
$r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2].', |
|
$uname.':'.$udom,$scan_record->{'scantron.ID'})); |
|
} else { |
|
$r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2] and CODE: [_3].', |
|
$uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode)); |
|
} |
|
$r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n". |
|
&Apache::loncommon::start_data_table_header_row()."\n". |
|
'<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'. |
|
&Apache::loncommon::end_data_table_header_row()."\n". |
|
&Apache::loncommon::start_data_table_row(). |
|
'<td>'.&mt('Bubble Sheet').'</td>'. |
|
'<td><span class="LC_nobreak">'.$studentdata.'</span></td>'. |
|
&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::start_data_table_row(). |
|
'<td>Stored submissions</td>'. |
|
'<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n". |
|
&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::end_data_table().'</p>'); |
|
} else { |
|
$r->print('<br /><span class="LC_warning">'. |
|
&mt('A second grading pass was needed for user: [_1] with ID: [_2], because a mismatch was seen on the first pass.',$uname.':'.$udom,$scan_record->{'scantron.ID'}).'<br />'. |
|
&mt("As a consequence, this user's submission history records two tries."). |
|
'</span><br />'); |
|
} |
|
} |
|
} |
|
if (&Apache::loncommon::connection_aborted($r)) { last; } |
} continue { |
} continue { |
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonnet::delenv('scantron\.'); |
&Apache::lonnet::delenv('scantron\.'); |
Line 7620 SCANTRONFORM
|
Line 7575 SCANTRONFORM
|
return ''; |
return ''; |
} |
} |
|
|
=pod |
sub grade_student_bubbles { |
|
my ($r,$uname,$udom,$scan_record,$scancode,@resources) = @_; |
=item scantron_upload_scantron_data |
foreach my $resource (@resources) { |
|
my %form = ('submitted' => 'scantron', |
Creates the screen for adding a new bubble sheet data file to a course. |
'grade_target' => 'grade', |
|
'grade_username'=> $uname, |
=cut |
'grade_domain' => $udom, |
|
'grade_courseid'=> $env{'request.course.id'}, |
|
'grade_symb' => $resource->symb(), |
|
'CODE' => $scancode); |
|
my $result=&ssi_with_retries($resource->src(),$ssi_retries,%form); |
|
return 'ssi_error' if ($ssi_error); |
|
last if (&Apache::loncommon::connection_aborted($r)); |
|
} |
|
return; |
|
} |
|
|
sub scantron_upload_scantron_data { |
sub scantron_upload_scantron_data { |
my ($r)=@_; |
my ($r)=@_; |
Line 7641 sub scantron_upload_scantron_data {
|
Line 7605 sub scantron_upload_scantron_data {
|
<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(); |
Line 7668 sub scantron_upload_scantron_data {
|
Line 7632 sub scantron_upload_scantron_data {
|
return ''; |
return ''; |
} |
} |
|
|
=pod |
|
|
|
=item scantron_upload_scantron_data_save |
|
|
|
Adds a provided bubble information data file to the course if user |
|
has the correct privileges to do so. |
|
|
|
=cut |
|
|
|
sub scantron_upload_scantron_data_save { |
sub scantron_upload_scantron_data_save { |
my($r)=@_; |
my($r)=@_; |
Line 7737 sub scantron_upload_scantron_data_save {
|
Line 7693 sub scantron_upload_scantron_data_save {
|
return ''; |
return ''; |
} |
} |
|
|
=pod |
|
|
|
=item valid_file |
|
|
|
Validates that the requested bubble data file exists in the course. |
|
|
|
=cut |
|
|
|
sub valid_file { |
sub valid_file { |
my ($requested_file)=@_; |
my ($requested_file)=@_; |
foreach my $filename (sort(&scantron_filenames())) { |
foreach my $filename (sort(&scantron_filenames())) { |
Line 7753 sub valid_file {
|
Line 7701 sub valid_file {
|
return 0; |
return 0; |
} |
} |
|
|
=pod |
|
|
|
=item scantron_download_scantron_data |
|
|
|
Shows a list of the three internal files (original, corrected, |
|
skipped) for a specific bubble sheet data file that exists in the |
|
course. |
|
|
|
=cut |
|
|
|
sub scantron_download_scantron_data { |
sub scantron_download_scantron_data { |
my ($r)=@_; |
my ($r)=@_; |
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
Line 7802 sub scantron_download_scantron_data {
|
Line 7740 sub scantron_download_scantron_data {
|
return ''; |
return ''; |
} |
} |
|
|
=pod |
sub checkscantron_results { |
|
my ($r) = @_; |
|
my ($symb)=&get_symb($r); |
|
if (!$symb) {return '';} |
|
my $grading_menu_button=&show_grading_menu_form($symb); |
|
my $cid = $env{'request.course.id'}; |
|
my %lettdig = &letter_to_digits(); |
|
my $numletts = scalar(keys(%lettdig)); |
|
my $cnum = $env{'course.'.$cid.'.num'}; |
|
my $cdom = $env{'course.'.$cid.'.domain'}; |
|
my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'}); |
|
my %record; |
|
my %scantron_config = |
|
&Apache::grades::get_scantron_config($env{'form.scantron_format'}); |
|
my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile(); |
|
my $classlist=&Apache::loncoursedata::get_classlist(); |
|
my %idmap=&Apache::grades::username_to_idmap($classlist); |
|
my $navmap=Apache::lonnavmaps::navmap->new(); |
|
my $map=$navmap->getResourceByUrl($sequence); |
|
my @resources=$navmap->retrieveResources($map,undef,1,0); |
|
my ($uname,$udom,%partids_by_symb); |
|
foreach my $resource (@resources) { |
|
my $ressymb = $resource->symb(); |
|
my ($analysis,$parts) = |
|
&scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom); |
|
$partids_by_symb{$ressymb} = $parts; |
|
} |
|
my (%scandata,%lastname,%bylast); |
|
$r->print(' |
|
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="checkscantron">'."\n"); |
|
|
=back |
my @delayqueue; |
|
my %completedstudents; |
|
|
|
my $count=&Apache::grades::get_todo_count($scanlines,$scan_data); |
|
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron/Submissions Comparison Status', |
|
'Progress of Scantron Data/Submission Records Comparison',$count, |
|
'inline',undef,'checkscantron'); |
|
my ($username,$domain,$started); |
|
|
|
&Apache::grades::scantron_get_maxbubble(); # Need the bubble lines array to parse. |
|
|
|
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
|
'Processing first student'); |
|
my $start=&Time::HiRes::time(); |
|
my $i=-1; |
|
|
|
while ($i<$scanlines->{'count'}) { |
|
($username,$domain,$uname)=('','',''); |
|
$i++; |
|
my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i); |
|
if ($line=~/^[\s\cz]*$/) { next; } |
|
if ($started) { |
|
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
|
'last student'); |
|
} |
|
$started=1; |
|
my $scan_record= |
|
&Apache::grades::scantron_parse_scanline($line,$i,\%scantron_config, |
|
$scan_data); |
|
unless ($uname=&Apache::grades::scantron_find_student($scan_record,$scan_data, |
|
\%idmap,$i)) { |
|
&Apache::grades::scantron_add_delay(\@delayqueue,$line, |
|
'Unable to find a student that matches',1); |
|
next; |
|
} |
|
if (exists $completedstudents{$uname}) { |
|
&Apache::grades::scantron_add_delay(\@delayqueue,$line, |
|
'Student '.$uname.' has multiple sheets',2); |
|
next; |
|
} |
|
my $pid = $scan_record->{'scantron.ID'}; |
|
$lastname{$pid} = $scan_record->{'scantron.LastName'}; |
|
push(@{$bylast{$lastname{$pid}}},$pid); |
|
my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'}; |
|
$scandata{$pid} = substr($line,$scantron_config{'Qstart'}-1,$lastpos); |
|
chomp($scandata{$pid}); |
|
$scandata{$pid} =~ s/\r$//; |
|
($username,$domain)=split(/:/,$uname); |
|
my $counter = -1; |
|
foreach my $resource (@resources) { |
|
($counter,my $recording) = |
|
&verify_scantron_grading($resource,$domain,$username,$cid,$counter, |
|
$scandata{$pid},\%partids_by_symb, |
|
\%scantron_config,\%lettdig,$numletts); |
|
$record{$pid} .= $recording; |
|
} |
|
} |
|
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
|
$r->print('<br />'); |
|
my ($okstudents,$badstudents,$numstudents,$passed,$failed); |
|
$passed = 0; |
|
$failed = 0; |
|
$numstudents = 0; |
|
foreach my $last (sort(keys(%bylast))) { |
|
if (ref($bylast{$last}) eq 'ARRAY') { |
|
foreach my $pid (sort(@{$bylast{$last}})) { |
|
my $showscandata = $scandata{$pid}; |
|
my $showrecord = $record{$pid}; |
|
$showscandata =~ s/\s/ /g; |
|
$showrecord =~ s/\s/ /g; |
|
if ($scandata{$pid} eq $record{$pid}) { |
|
my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row'; |
|
$okstudents .= '<tr class="'.$css_class.'">'. |
|
'<td>'.&mt('Scantron').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
|
'</tr>'."\n". |
|
'<tr class="'.$css_class.'">'."\n". |
|
'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n"; |
|
$passed ++; |
|
} else { |
|
my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row'; |
|
$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Scantron').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
|
'</tr>'."\n". |
|
'<tr class="'.$css_class.'">'."\n". |
|
'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n". |
|
'</tr>'."\n"; |
|
$failed ++; |
|
} |
|
$numstudents ++; |
|
} |
|
} |
|
} |
|
$r->print('<p>'.&mt('Comparison of scantron data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b> ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>'); |
|
$r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>'); |
|
if ($passed) { |
|
$r->print(&mt('Students with exact correspondence between scantron data and submissions are as follows:').'<br /><br />'); |
|
$r->print(&Apache::loncommon::start_data_table()."\n". |
|
&Apache::loncommon::start_data_table_header_row()."\n". |
|
'<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'. |
|
&Apache::loncommon::end_data_table_header_row()."\n". |
|
$okstudents."\n". |
|
&Apache::loncommon::end_data_table().'<br />'); |
|
} |
|
if ($failed) { |
|
$r->print(&mt('Students with differences between scantron data and submissions are as follows:').'<br /><br />'); |
|
$r->print(&Apache::loncommon::start_data_table()."\n". |
|
&Apache::loncommon::start_data_table_header_row()."\n". |
|
'<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'. |
|
&Apache::loncommon::end_data_table_header_row()."\n". |
|
$badstudents."\n". |
|
&Apache::loncommon::end_data_table()).'<br />'. |
|
&mt('Differences can occur if submissions were modified using manual grading after a scantron grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original scantron sheets.'); |
|
} |
|
$r->print('</form><br />'.$grading_menu_button); |
|
return; |
|
} |
|
|
|
sub verify_scantron_grading { |
|
my ($resource,$domain,$username,$cid,$counter,$scandata,$partids_by_symb, |
|
$scantron_config,$lettdig,$numletts) = @_; |
|
my ($record,%expected,%startpos); |
|
return ($counter,$record) if (!ref($resource)); |
|
return ($counter,$record) if (!$resource->is_problem()); |
|
my $symb = $resource->symb(); |
|
return ($counter,$record) if (ref($partids_by_symb) ne 'HASH'); |
|
return ($counter,$record) if (ref($partids_by_symb->{$symb}) ne 'ARRAY'); |
|
foreach my $part_id (@{$partids_by_symb->{$symb}}) { |
|
$counter ++; |
|
$expected{$part_id} = 0; |
|
if ($env{"form.scantron.sub_bubblelines.$counter"}) { |
|
my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$counter"}); |
|
foreach my $item (@sub_lines) { |
|
$expected{$part_id} += $item; |
|
} |
|
} else { |
|
$expected{$part_id} = $env{"form.scantron.bubblelines.$counter"}; |
|
} |
|
$startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"}; |
|
} |
|
if ($symb) { |
|
my %recorded; |
|
my (%returnhash) = &Apache::lonnet::restore($symb,$cid,$domain,$username); |
|
if ($returnhash{'version'}) { |
|
my %lasthash=(); |
|
my $version; |
|
for ($version=1;$version<=$returnhash{'version'};$version++) { |
|
foreach my $key (sort(split(/\:/,$returnhash{$version.':keys'}))) { |
|
$lasthash{$key}=$returnhash{$version.':'.$key}; |
|
} |
|
} |
|
foreach my $key (keys(%lasthash)) { |
|
if ($key =~ /\.scantron$/) { |
|
my $value = &unescape($lasthash{$key}); |
|
my ($part_id) = ($key =~ /^resource\.(.+)\.scantron$/); |
|
if ($value eq '') { |
|
for (my $i=0; $i<$expected{$part_id}; $i++) { |
|
for (my $j=0; $j<$scantron_config->{'length'}; $j++) { |
|
$recorded{$part_id} .= $scantron_config->{'Qoff'}; |
|
} |
|
} |
|
} else { |
|
my @tocheck; |
|
my @items = split(//,$value); |
|
if (($scantron_config->{'Qon'} eq 'letter') || |
|
($scantron_config->{'Qon'} eq 'number')) { |
|
if (@items < $expected{$part_id}) { |
|
my $fragment = substr($scandata,$startpos{$part_id},$expected{$part_id}); |
|
my @singles = split(//,$fragment); |
|
foreach my $pos (@singles) { |
|
if ($pos eq ' ') { |
|
push(@tocheck,$pos); |
|
} else { |
|
my $next = shift(@items); |
|
push(@tocheck,$next); |
|
} |
|
} |
|
} else { |
|
@tocheck = @items; |
|
} |
|
foreach my $letter (@tocheck) { |
|
if ($scantron_config->{'Qon'} eq 'letter') { |
|
if ($letter !~ /^[A-J]$/) { |
|
$letter = $scantron_config->{'Qoff'}; |
|
} |
|
$recorded{$part_id} .= $letter; |
|
} elsif ($scantron_config->{'Qon'} eq 'number') { |
|
my $digit; |
|
if ($letter !~ /^[A-J]$/) { |
|
$digit = $scantron_config->{'Qoff'}; |
|
} else { |
|
$digit = $lettdig->{$letter}; |
|
} |
|
$recorded{$part_id} .= $digit; |
|
} |
|
} |
|
} else { |
|
@tocheck = @items; |
|
for (my $i=0; $i<$expected{$part_id}; $i++) { |
|
my $curr_sub = shift(@tocheck); |
|
my $digit; |
|
if ($curr_sub =~ /^[A-J]$/) { |
|
$digit = $lettdig->{$curr_sub}-1; |
|
} |
|
if ($curr_sub eq 'J') { |
|
$digit += scalar($numletts); |
|
} |
|
for (my $j=0; $j<$scantron_config->{'Qlength'}; $j++) { |
|
if ($j == $digit) { |
|
$recorded{$part_id} .= $scantron_config->{'Qon'}; |
|
} else { |
|
$recorded{$part_id} .= $scantron_config->{'Qoff'}; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
foreach my $part_id (@{$partids_by_symb->{$symb}}) { |
|
if ($recorded{$part_id} eq '') { |
|
for (my $i=0; $i<$expected{$part_id}; $i++) { |
|
for (my $j=0; $j<$scantron_config->{'Qlength'}; $j++) { |
|
$recorded{$part_id} .= $scantron_config->{'Qoff'}; |
|
} |
|
} |
|
} |
|
$record .= $recorded{$part_id}; |
|
} |
|
} |
|
return ($counter,$record); |
|
} |
|
|
|
sub letter_to_digits { |
|
my %lettdig = ( |
|
A => 1, |
|
B => 2, |
|
C => 3, |
|
D => 4, |
|
E => 5, |
|
F => 6, |
|
G => 7, |
|
H => 8, |
|
I => 9, |
|
J => 0, |
|
); |
|
return %lettdig; |
|
} |
|
|
=cut |
|
|
|
#-------- end of section for handling grading scantron forms ------- |
#-------- end of section for handling grading scantron forms ------- |
# |
# |
Line 7853 sub grading_menu {
|
Line 8065 sub grading_menu {
|
'saveState'=>"", |
'saveState'=>"", |
'gradingMenu'=>1, |
'gradingMenu'=>1, |
'showgrading'=>"yes"); |
'showgrading'=>"yes"); |
my $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
|
my @menu = ({ url => $url, |
my $url1 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
name => &mt('Manual Grading/View Submissions'), |
|
short_description => |
|
&mt('Start the process of hand grading submissions.'), |
|
}); |
|
$fields{'command'} = 'csvform'; |
$fields{'command'} = 'csvform'; |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
push (@menu, { url => $url, |
|
name => &mt('Upload Scores'), |
|
short_description => |
|
&mt('Specify a file containing the class scores for current resource.')}); |
|
$fields{'command'} = 'processclicker'; |
$fields{'command'} = 'processclicker'; |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
my $url3 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
push (@menu, { url => $url, |
|
name => &mt('Process Clicker'), |
|
short_description => |
|
&mt('Specify a file containing the clicker information for this resource.')}); |
|
$fields{'command'} = 'scantron_selectphase'; |
$fields{'command'} = 'scantron_selectphase'; |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
push (@menu, { url => $url, |
|
name => &mt('Grade/Manage Scantron Forms'), |
my @menu = ({ categorytitle=>'Course Grading', |
short_description => |
items =>[ |
&mt('')}); |
{ linktext => 'Manual Grading/View Submissions', |
$fields{'command'} = 'verify'; |
url => $url1, |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
permission => 'F', |
push (@menu, { url => "", |
icon => 'edit-find-replace.png', |
name => &mt('Verify Receipt'), |
linktitle => 'Start the process of hand grading submissions.' |
short_description => |
}, |
&mt('')}); |
{ linktext => 'Upload Scores', |
|
url => $url2, |
|
permission => 'F', |
|
icon => 'uploadscores.png', |
|
linktitle => 'Specify a file containing the class scores for current resource.' |
|
}, |
|
{ linktext => 'Process Clicker', |
|
url => $url3, |
|
permission => 'F', |
|
icon => 'addClickerInfoFile.png', |
|
linktitle => 'Specify a file containing the clicker information for this resource.' |
|
}, |
|
{ linktext => 'Grade/Manage/Review Scantron Forms', |
|
url => $url4, |
|
permission => 'F', |
|
icon => 'stat.png', |
|
linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.' |
|
} |
|
] |
|
}); |
|
|
|
#$fields{'command'} = 'verify'; |
|
#$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
# |
# |
# Create the menu |
# Create the menu |
my $Str; |
my $Str; |
Line 7896 sub grading_menu {
|
Line 8121 sub grading_menu {
|
'<input type="hidden" name="gradingMenu" value="1" />'."\n". |
'<input type="hidden" name="gradingMenu" value="1" />'."\n". |
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
|
|
foreach my $menudata (@menu) { |
$Str .= Apache::lonhtmlcommon::generate_menu(@menu); |
if ($menudata->{'name'} ne &mt('Verify Receipt')) { |
#$menudata->{'jscript'} |
$Str .=' <h3><a '. |
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '. |
$menudata->{'jscript'}. |
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
' href="'. |
' /> '. |
$menudata->{'url'}.'" >'. |
&Apache::lonnet::recprefix($env{'request.course.id'}). |
$menudata->{'name'}."</a></h3>\n"; |
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'; |
} else { |
|
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '. |
|
$menudata->{'jscript'}. |
|
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
|
' /> '. |
|
&Apache::lonnet::recprefix($env{'request.course.id'}). |
|
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'; |
|
} |
|
$Str .= ' '.(' 'x8).$menudata->{'short_description'}. |
|
"\n"; |
|
} |
|
$Str .="</form>\n"; |
$Str .="</form>\n"; |
|
my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); |
$request->print(<<GRADINGMENUJS); |
$request->print(<<GRADINGMENUJS); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
function checkChoice(formname,val,cmdx) { |
function checkChoice(formname,val,cmdx) { |
Line 7942 sub grading_menu {
|
Line 8158 sub grading_menu {
|
if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;} |
if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;} |
if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;} |
if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;} |
if (checkOpt) { |
if (checkOpt) { |
alert("Please enter a receipt number given by a student in the receipt box."); |
alert("$receiptalert"); |
formname.receipt.value = ""; |
formname.receipt.value = ""; |
formname.receipt.focus(); |
formname.receipt.focus(); |
return false; |
return false; |
Line 7963 sub submit_options {
|
Line 8179 sub submit_options {
|
if (!$symb) {return '';} |
if (!$symb) {return '';} |
my $probTitle = &Apache::lonnet::gettitle($symb); |
my $probTitle = &Apache::lonnet::gettitle($symb); |
|
|
|
my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); |
$request->print(<<GRADINGMENUJS); |
$request->print(<<GRADINGMENUJS); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
function checkChoice(formname,val,cmdx) { |
function checkChoice(formname,val,cmdx) { |
Line 7990 sub submit_options {
|
Line 8207 sub submit_options {
|
if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;} |
if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;} |
if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;} |
if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;} |
if (checkOpt) { |
if (checkOpt) { |
alert("Please enter a receipt number given by a student in the receipt box."); |
alert("$receiptalert"); |
formname.receipt.value = ""; |
formname.receipt.value = ""; |
formname.receipt.focus(); |
formname.receipt.focus(); |
return false; |
return false; |
Line 8009 GRADINGMENUJS
|
Line 8226 GRADINGMENUJS
|
my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'}); |
my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'}); |
my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'}); |
my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'}); |
|
|
|
# Preselect sections |
|
my $selsec=""; |
|
if (ref($sections)) { |
|
foreach my $section (sort(@$sections)) { |
|
$selsec.='<option value="'.$section.'" '. |
|
($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n"; |
|
} |
|
} |
|
|
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n". |
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n". |
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n". |
Line 8019 GRADINGMENUJS
|
Line 8245 GRADINGMENUJS
|
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
|
|
$result.=' |
$result.=' |
<div class="LC_grade_select_mode"> |
<h2> |
<div class="LC_grade_select_mode_current"> |
'.&mt('Grade Current Resource').' |
<h2> |
</h2> |
'.&mt('Grade Current Resource').' |
<div> |
</h2> |
'.$table.' |
<div class="LC_grade_select_mode_body"> |
</div> |
<div class="LC_grades_resource_info"> |
|
'.$table.' |
<div class="LC_columnSection"> |
</div> |
|
<div class="LC_grade_select_mode_selector"> |
<fieldset> |
<div class="LC_grade_select_mode_selector_header"> |
<legend> |
'.&mt('Sections').' |
'.&mt('Sections').' |
</div> |
</legend> |
<div class="LC_grade_select_mode_selector_body"> |
<select name="section" multiple="multiple" size="5">'."\n"; |
<select name="section" multiple="multiple" size="5">'."\n"; |
$result.= $selsec; |
if (ref($sections)) { |
|
foreach my $section (sort (@$sections)) { |
|
$result.='<option value="'.$section.'" '. |
|
($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n"; |
|
} |
|
} |
|
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> '; |
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> '; |
$result.=' |
$result.=' |
</div> |
</fieldset> |
</div> |
|
<div class="LC_grade_select_mode_selector"> |
<fieldset> |
<div class="LC_grade_select_mode_selector_header"> |
<legend> |
'.&mt('Groups').' |
'.&mt('Groups').' |
</div> |
</legend> |
<div class="LC_grade_select_mode_selector_body"> |
'.&Apache::lonstatistics::GroupSelect('group','multiple',5).' |
'.&Apache::lonstatistics::GroupSelect('group','multiple',5).' |
</fieldset> |
</div> |
|
</div> |
<fieldset> |
<div class="LC_grade_select_mode_selector"> |
<legend> |
<div class="LC_grade_select_mode_selector_header"> |
'.&mt('Access Status').' |
'.&mt('Access Status').' |
</legend> |
</div> |
'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').' |
<div class="LC_grade_select_mode_selector_body"> |
</fieldset> |
'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').' |
|
</div> |
<fieldset> |
</div> |
<legend> |
<div class="LC_grade_select_mode_selector"> |
'.&mt('Submission Status').' |
<div class="LC_grade_select_mode_selector_header"> |
</legend> |
'.&mt('Submission Status').' |
<select name="submitonly" size="5"> |
</div> |
|
<div class="LC_grade_select_mode_selector_body"> |
|
<select name="submitonly" size="5"> |
|
<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option> |
<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option> |
<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option> |
<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option> |
<option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option> |
<option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option> |
<option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option> |
<option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option> |
<option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option> |
<option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option> |
</select> |
</select> |
</div> |
</fieldset> |
</div> |
|
<div class="LC_grade_select_mode_type_body"> |
</div> |
<div class="LC_grade_select_mode_type"> |
|
|
<br /> |
|
<div> |
|
<div> |
<label> |
<label> |
<input type="radio" name="radioChoice" value="submission" '. |
<input type="radio" name="radioChoice" value="submission" '. |
($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '. |
($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '. |
&mt('Select individual students to grade and view submissions.').' |
&mt('Select individual students to grade and view submissions.').' |
</label> |
</label> |
</div> |
</div> |
<div class="LC_grade_select_mode_type"> |
<div> |
<label> |
<label> |
<input type="radio" name="radioChoice" value="viewgrades" '. |
<input type="radio" name="radioChoice" value="viewgrades" '. |
($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '. |
($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '. |
&mt('Grade all selected students in a grading table.').' |
&mt('Grade all selected students in a grading table.').' |
</label> |
</label> |
</div> |
</div> |
<div class="LC_grade_select_mode_type"> |
<div> |
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" /> |
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" /> |
</div> |
</div> |
</div> |
</div> |
</div> |
|
</div> |
|
<div class="LC_grade_select_mode_page"> |
|
<h2> |
<h2> |
'.&mt('Grade Complete Folder for One Student').' |
'.&mt('Grade Complete Folder for One Student').' |
</h2> |
</h2> |
<div class="LC_grades_select_mode_body"> |
<div> |
<div class="LC_grade_select_mode_type_body"> |
<div> |
<div class="LC_grade_select_mode_type"> |
|
<label> |
<label> |
<input type="radio" name="radioChoice" value="pickStudentPage" '. |
<input type="radio" name="radioChoice" value="pickStudentPage" '. |
($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '. |
($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '. |
&mt('The <b>complete</b> page/sequence/folder: For one student').' |
&mt('The <b>complete</b> page/sequence/folder: For one student').' |
</label> |
</label> |
</div> |
</div> |
<div class="LC_grade_select_mode_type"> |
<div> |
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" /> |
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" /> |
</div> |
</div> |
</div> |
|
</div> |
</div> |
</div> |
|
</div> |
|
</form>'; |
</form>'; |
$result .= &show_grading_menu_form($symb); |
$result .= &show_grading_menu_form($symb); |
return $result; |
return $result; |
Line 8213 sub process_clicker {
|
Line 8428 sub process_clicker {
|
$result.=$table; |
$result.=$table; |
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n"; |
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n"; |
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n"; |
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n"; |
$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource'). |
$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource.'). |
'.</b></td></tr>'."\n"; |
'</b></td></tr>'."\n"; |
$result.='<tr bgcolor=#ffffe6><td>'."\n"; |
$result.='<tr bgcolor=#ffffe6><td>'."\n"; |
# Attempt to restore parameters from last session, set defaults if not present |
# Attempt to restore parameters from last session, set defaults if not present |
my %Saveable_Parameters=&clicker_grading_parameters(); |
my %Saveable_Parameters=&clicker_grading_parameters(); |
Line 8539 sub interwrite_eval {
|
Line 8754 sub interwrite_eval {
|
$id=~s/[\-\:]//g; |
$id=~s/[\-\:]//g; |
$idresponses{$id}[$number]=$entries[6]; |
$idresponses{$id}[$number]=$entries[6]; |
} |
} |
foreach my $id (keys %idresponses) { |
foreach my $id (keys(%idresponses)) { |
$$responses{$id}=join(',',@{$idresponses{$id}}); |
$$responses{$id}=join(',',@{$idresponses{$id}}); |
$$responses{$id}=~s/^\s*\,//; |
$$responses{$id}=~s/^\s*\,//; |
} |
} |
Line 8675 sub handler {
|
Line 8890 sub handler {
|
} |
} |
|
|
$ssi_error = 0; |
$ssi_error = 0; |
$request->print(&Apache::loncommon::start_page('Grading')); |
my $brcrum = [{href=>"/adm/grades",text=>"Grading"}]; |
|
$request->print(&Apache::loncommon::start_page('Grading',undef, |
|
{'bread_crumbs' => $brcrum})); |
if ($symb eq '' && $command eq '') { |
if ($symb eq '' && $command eq '') { |
if ($env{'user.adv'}) { |
if ($env{'user.adv'}) { |
if (($env{'form.codeone'}) && ($env{'form.codetwo'}) && |
if (($env{'form.codeone'}) && ($env{'form.codetwo'}) && |
Line 8770 sub handler {
|
Line 8987 sub handler {
|
} elsif ($command eq 'scantron_download' && |
} 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 eq 'checksubmissions' && $perm{'vgr'}) { |
|
$request->print(&checkscantron_results($request)); |
} elsif ($command) { |
} elsif ($command) { |
$request->print("Access Denied ($command)"); |
$request->print("Access Denied ($command)"); |
} |
} |
Line 8785 sub handler {
|
Line 9004 sub handler {
|
1; |
1; |
|
|
__END__; |
__END__; |
|
|
|
|
|
=head1 NAME |
|
|
|
Apache::grades |
|
|
|
=head1 SYNOPSIS |
|
|
|
Handles the viewing of grades. |
|
|
|
This is part of the LearningOnline Network with CAPA project |
|
described at http://www.lon-capa.org. |
|
|
|
=head1 OVERVIEW |
|
|
|
Do an ssi with retries: |
|
While I'd love to factor out this with the vesrion in lonprintout, |
|
that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure |
|
I'm not quite ready to invent (e.g. an ssi_with_retry object). |
|
|
|
At least the logic that drives this has been pulled out into loncommon. |
|
|
|
|
|
|
|
ssi_with_retries - Does the server side include of a resource. |
|
if the ssi call returns an error we'll retry it up to |
|
the number of times requested by the caller. |
|
If we still have a proble, no text is appended to the |
|
output and we set some global variables. |
|
to indicate to the caller an SSI error occurred. |
|
All of this is supposed to deal with the issues described |
|
in LonCAPA BZ 5631 see: |
|
http://bugs.lon-capa.org/show_bug.cgi?id=5631 |
|
by informing the user that this happened. |
|
|
|
Parameters: |
|
resource - The resource to include. This is passed directly, without |
|
interpretation to lonnet::ssi. |
|
form - The form hash parameters that guide the interpretation of the resource |
|
|
|
retries - Number of retries allowed before giving up completely. |
|
Returns: |
|
On success, returns the rendered resource identified by the resource parameter. |
|
Side Effects: |
|
The following global variables can be set: |
|
ssi_error - If an unrecoverable error occurred this becomes true. |
|
It is up to the caller to initialize this to false |
|
if desired. |
|
ssi_error_resource - If an unrecoverable error occurred, this is the value |
|
of the resource that could not be rendered by the ssi |
|
call. |
|
ssi_error_message - The error string fetched from the ssi response |
|
in the event of an error. |
|
|
|
|
|
=head1 HANDLER SUBROUTINE |
|
|
|
ssi_with_retries() |
|
|
|
=head1 SUBROUTINES |
|
|
|
=over |
|
|
|
=item scantron_get_correction() : |
|
|
|
Builds the interface screen to interact with the operator to fix a |
|
specific error condition in a specific scanline |
|
|
|
Arguments: |
|
$r - Apache request object |
|
$i - number of the current scanline |
|
$scan_record - hash ref as returned from &scantron_parse_scanline() |
|
$scan_config - hash ref as returned from &get_scantron_config() |
|
$line - full contents of the current scanline |
|
$error - error condition, valid values are |
|
'incorrectCODE', 'duplicateCODE', |
|
'doublebubble', 'missingbubble', |
|
'duplicateID', 'incorrectID' |
|
$arg - extra information needed |
|
For errors: |
|
- duplicateID - paper number that this studentID was seen before on |
|
- duplicateCODE - array ref of the paper numbers this CODE was |
|
seen on before |
|
- incorrectCODE - current incorrect CODE |
|
- doublebubble - array ref of the bubble lines that have double |
|
bubble errors |
|
- missingbubble - array ref of the bubble lines that have missing |
|
bubble errors |
|
|
|
=item scantron_get_maxbubble() : |
|
|
|
Returns the maximum number of bubble lines that are expected to |
|
occur. Does this by walking the selected sequence rendering the |
|
resource and then checking &Apache::lonxml::get_problem_counter() |
|
for what the current value of the problem counter is. |
|
|
|
Caches the results to $env{'form.scantron_maxbubble'}, |
|
$env{'form.scantron.bubble_lines.n'}, |
|
$env{'form.scantron.first_bubble_line.n'} and |
|
$env{"form.scantron.sub_bubblelines.n"} |
|
which are the total number of bubble, lines, the number of bubble |
|
lines for response n and number of the first bubble line for response n, |
|
and a comma separated list of numbers of bubble lines for sub-questions |
|
(for optionresponse, matchresponse, and rankresponse items), for response n. |
|
|
|
|
|
=item scantron_validate_missingbubbles() : |
|
|
|
Validates all scanlines in the selected file to not have any |
|
answers that don't have bubbles that have not been verified |
|
to be bubble free. |
|
|
|
=item scantron_process_students() : |
|
|
|
Routine that does the actual grading of the bubble sheet information. |
|
|
|
The parsed scanline hash is added to %env |
|
|
|
Then foreach unskipped scanline it does an &Apache::lonnet::ssi() |
|
foreach resource , with the form data of |
|
|
|
'submitted' =>'scantron' |
|
'grade_target' =>'grade', |
|
'grade_username'=> username of student |
|
'grade_domain' => domain of student |
|
'grade_courseid'=> of course |
|
'grade_symb' => symb of resource to grade |
|
|
|
This triggers a grading pass. The problem grading code takes care |
|
of converting the bubbled letter information (now in %env) into a |
|
valid submission. |
|
|
|
=item scantron_upload_scantron_data() : |
|
|
|
Creates the screen for adding a new bubble sheet data file to a course. |
|
|
|
=item scantron_upload_scantron_data_save() : |
|
|
|
Adds a provided bubble information data file to the course if user |
|
has the correct privileges to do so. |
|
|
|
=item valid_file() : |
|
|
|
Validates that the requested bubble data file exists in the course. |
|
|
|
=item scantron_download_scantron_data() : |
|
|
|
Shows a list of the three internal files (original, corrected, |
|
skipped) for a specific bubble sheet data file that exists in the |
|
course. |
|
|
|
=item scantron_validate_ID() : |
|
|
|
Validates all scanlines in the selected file to not have any |
|
invalid or underspecified student IDs |
|
|
|
=back |
|
|
|
=cut |