version 1.681, 2012/12/18 18:00:14
|
version 1.726, 2014/11/08 18:26:01
|
Line 330 sub cleanRecord {
|
Line 330 sub cleanRecord {
|
my $grayFont = '<span class="LC_internal_info">'; |
my $grayFont = '<span class="LC_internal_info">'; |
if ($response =~ /^(option|rank)$/) { |
if ($response =~ /^(option|rank)$/) { |
my %answer=&Apache::lonnet::str2hash($answer); |
my %answer=&Apache::lonnet::str2hash($answer); |
|
my @answer = %answer; |
|
%answer = map {&HTML::Entities::encode($_, '"<>&')} @answer; |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
my ($toprow,$bottomrow); |
my ($toprow,$bottomrow); |
foreach my $foil (@$order) { |
foreach my $foil (@$order) { |
Line 346 sub cleanRecord {
|
Line 348 sub cleanRecord {
|
$bottomrow.'</tr></table></blockquote>'; |
$bottomrow.'</tr></table></blockquote>'; |
} elsif ($response eq 'match') { |
} elsif ($response eq 'match') { |
my %answer=&Apache::lonnet::str2hash($answer); |
my %answer=&Apache::lonnet::str2hash($answer); |
|
my @answer = %answer; |
|
%answer = map {&HTML::Entities::encode($_, '"<>&')} @answer; |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"}); |
my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"}); |
my ($toprow,$middlerow,$bottomrow); |
my ($toprow,$middlerow,$bottomrow); |
Line 368 sub cleanRecord {
|
Line 372 sub cleanRecord {
|
$bottomrow.'</tr></table></blockquote>'; |
$bottomrow.'</tr></table></blockquote>'; |
} elsif ($response eq 'radiobutton') { |
} elsif ($response eq 'radiobutton') { |
my %answer=&Apache::lonnet::str2hash($answer); |
my %answer=&Apache::lonnet::str2hash($answer); |
|
my @answer = %answer; |
|
%answer = map {&HTML::Entities::encode($_, '"<>&')} @answer; |
my ($toprow,$bottomrow); |
my ($toprow,$bottomrow); |
my $correct = |
my $correct = |
&get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed); |
&get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed); |
Line 400 sub cleanRecord {
|
Line 406 sub cleanRecord {
|
$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : ''; |
$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : ''; |
$env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob. |
$env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob. |
} |
} |
$answer =~ s-\n-<br />-g; |
return '<br /><br /><blockquote><tt>'.&keywords_highlight(&HTML::Entities::encode($answer, '"<>&')).'</tt></blockquote>'; |
return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>'; |
|
} elsif ( $response eq 'organic') { |
} elsif ( $response eq 'organic') { |
my $result='Smile representation: "<tt>'.$answer.'</tt>"'; |
my $result=&mt('Smile representation: [_1]', |
|
'"<tt>'.&HTML::Entities::encode($answer, '"<>&').'</tt>"'); |
my $jme=$record->{$version."resource.$partid.$respid.molecule"}; |
my $jme=$record->{$version."resource.$partid.$respid.molecule"}; |
$result.=&Apache::chemresponse::jme_img($jme,$answer,400); |
$result.=&Apache::chemresponse::jme_img($jme,$answer,400); |
return $result; |
return $result; |
Line 437 sub cleanRecord {
|
Line 444 sub cleanRecord {
|
$result.='</ul>'; |
$result.='</ul>'; |
return $result; |
return $result; |
} |
} |
} elsif ( $response =~ m/(?:numerical|formula)/) { |
} elsif ( $response =~ m/(?:numerical|formula|custom)/) { |
|
# Respect multiple input fields, see Bug #5409 |
$answer = |
$answer = |
&Apache::loncommon::format_previous_attempt_value('submission', |
&Apache::loncommon::format_previous_attempt_value('submission', |
$answer); |
$answer); |
|
return $answer; |
} |
} |
return $answer; |
return &HTML::Entities::encode($answer, '"<>&'); |
} |
} |
|
|
#-- A couple of common js functions |
#-- A couple of common js functions |
Line 736 sub most_similar {
|
Line 745 sub most_similar {
|
sub initialverifyreceipt { |
sub initialverifyreceipt { |
my ($request,$symb) = @_; |
my ($request,$symb) = @_; |
&commonJSfunctions($request); |
&commonJSfunctions($request); |
return '<form name="gradingMenu"><input type="submit" value="'.&mt('Verify Receipt Number.').'" />'. |
return '<form name="gradingMenu" action=""><input type="submit" value="'.&mt('Verify Receipt Number.').'" />'. |
&Apache::lonnet::recprefix($env{'request.course.id'}). |
&Apache::lonnet::recprefix($env{'request.course.id'}). |
'-<input type="text" name="receipt" size="4" />'. |
'-<input type="text" name="receipt" size="4" />'. |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
Line 908 LISTJAVASCRIPT
|
Line 917 LISTJAVASCRIPT
|
$submission_options.= |
$submission_options.= |
'<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
'<label><input type="radio" name="lastSub" value="lastonly" /> '. |
'<label><input type="radio" name="lastSub" value="lastonly" /> '. |
&mt('last submission only').' </label></span>'."\n". |
&mt('last submission').' </label></span>'."\n". |
'<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
'<label><input type="radio" name="lastSub" value="last" /> '. |
'<label><input type="radio" name="lastSub" value="last" /> '. |
&mt('last submission & parts info').' </label></span>'."\n". |
&mt('last submission with details').' </label></span>'."\n". |
'<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '. |
'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '. |
&mt('by dates and submissions').'</label></span>'."\n". |
&mt('all submissions').'</label></span>'."\n". |
'<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
'<label><input type="radio" name="lastSub" value="all" /> '. |
'<label><input type="radio" name="lastSub" value="all" /> '. |
&mt('all details').'</label></span>'; |
&mt('all submissions with details').'</label></span>'; |
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions')) |
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Submissions')) |
.$submission_options |
.$submission_options |
.&Apache::lonhtmlcommon::row_closure(); |
.&Apache::lonhtmlcommon::row_closure(); |
|
|
Line 1084 LISTJAVASCRIPT
|
Line 1093 LISTJAVASCRIPT
|
if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; } |
if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; } |
if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; } |
if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; } |
$gradeTable='<br /> <span class="LC_warning">'. |
$gradeTable='<br /> <span class="LC_warning">'. |
&mt('No '.$submissions.' found for this resource for any students. ([_1] students checked for '.$submissions.')', |
&mt('No '.$submissions.' found for this resource for any students. ([quant,_1,student] checked for '.$submissions.')', |
$num_students). |
$num_students). |
'</span><br />'; |
'</span><br />'; |
} |
} |
Line 1286 sub sub_page_js {
|
Line 1295 sub sub_page_js {
|
} |
} |
} |
} |
} |
} |
|
|
} |
} |
} |
} |
|
|
} |
} |
formname.submit(); |
formname.submit(); |
} |
} |
Line 1431 INNERJS
|
Line 1438 INNERJS
|
txtc => 'Text Color', |
txtc => 'Text Color', |
font => 'Font Size', |
font => 'Font Size', |
fnst => 'Font Style', |
fnst => 'Font Style', |
|
col1 => 'red', |
|
col2 => 'green', |
|
col3 => 'blue', |
|
siz1 => 'normal', |
|
siz2 => '+1', |
|
siz3 => '+2', |
|
sty1 => 'normal', |
|
sty2 => 'italic', |
|
sty3 => 'bold', |
); |
); |
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT)); |
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT)); |
|
|
Line 1594 INNERJS
|
Line 1610 INNERJS
|
var redsel = ""; |
var redsel = ""; |
var grnsel = ""; |
var grnsel = ""; |
var blusel = ""; |
var blusel = ""; |
if (kwclr=="red") {var redsel="checked"}; |
var txtcol1 = "$lt{'col1'}"; |
if (kwclr=="green") {var grnsel="checked"}; |
var txtcol2 = "$lt{'col2'}"; |
if (kwclr=="blue") {var blusel="checked"}; |
var txtcol3 = "$lt{'col3'}"; |
|
var txtsiz1 = "$lt{'siz1'}"; |
|
var txtsiz2 = "$lt{'siz2'}"; |
|
var txtsiz3 = "$lt{'siz3'}"; |
|
var txtsty1 = "$lt{'sty1'}"; |
|
var txtsty2 = "$lt{'sty2'}"; |
|
var txtsty3 = "$lt{'sty3'}"; |
|
if (kwclr=="red") {var redsel="checked='checked'"}; |
|
if (kwclr=="green") {var grnsel="checked='checked'"}; |
|
if (kwclr=="blue") {var blusel="checked='checked'"}; |
var sznsel = ""; |
var sznsel = ""; |
var sz1sel = ""; |
var sz1sel = ""; |
var sz2sel = ""; |
var sz2sel = ""; |
if (kwsize=="0") {var sznsel="checked"}; |
if (kwsize=="0") {var sznsel="checked='checked'"}; |
if (kwsize=="+1") {var sz1sel="checked"}; |
if (kwsize=="+1") {var sz1sel="checked='checked'"}; |
if (kwsize=="+2") {var sz2sel="checked"}; |
if (kwsize=="+2") {var sz2sel="checked='checked'"}; |
var synsel = ""; |
var synsel = ""; |
var syisel = ""; |
var syisel = ""; |
var sybsel = ""; |
var sybsel = ""; |
if (kwstyle=="") {var synsel="checked"}; |
if (kwstyle=="") {var synsel="checked='checked'"}; |
if (kwstyle=="<i>") {var syisel="checked"}; |
if (kwstyle=="<i>") {var syisel="checked='checked'"}; |
if (kwstyle=="<b>") {var sybsel="checked"}; |
if (kwstyle=="<b>") {var sybsel="checked='checked'"}; |
highlightCentral(); |
highlightCentral(); |
highlightbody('red','red',redsel,'0','normal',sznsel,'','normal',synsel); |
highlightbody('red',txtcol1,redsel,'0',txtsiz1,sznsel,'',txtsty1,synsel); |
highlightbody('green','green',grnsel,'+1','+1',sz1sel,'<i>','italic',syisel); |
highlightbody('green',txtcol2,grnsel,'+1',txtsiz2,sz1sel,'<i>',txtsty2,syisel); |
highlightbody('blue','blue',blusel,'+2','+2',sz2sel,'<b>','bold',sybsel); |
highlightbody('blue',txtcol3,blusel,'+2',txtsiz3,sz2sel,'<b>',txtsty3,sybsel); |
highlightend(); |
highlightend(); |
return; |
return; |
} |
} |
Line 1630 INNERJS
|
Line 1655 INNERJS
|
hDoc.$docopen; |
hDoc.$docopen; |
hDoc.write('$start_page_highlight_central'); |
hDoc.write('$start_page_highlight_central'); |
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">"); |
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">"); |
hDoc.write("<h3><span class=\\"LC_info\\"> $lt{'kehi'}<\\/span><\\/h3><br /><br />"); |
hDoc.write("<h1>$lt{'kehi'}<\\/h1>"); |
|
|
hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
hDoc.write('<table border="0" width="100%"><tr style="background-color:#A1D676">'); |
hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
hDoc.write("<th>$lt{'txtc'}<\\/th><th>$lt{'font'}<\\/th><th>$lt{'fnst'}<\\/th><\\/tr>"); |
hDoc.write("<td><b>$lt{'txtc'}<\\/b><\\/td><td><b>$lt{'font'}<\\/b><\\/td><td><b>$lt{'fnst'}<\\/td><\\/tr>"); |
|
} |
} |
|
|
function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { |
function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { |
var hDoc = hwdWin.document; |
var hDoc = hwdWin.document; |
hDoc.write("<tr bgcolor=\\"#ffffdd\\">"); |
hDoc.write("<tr>"); |
hDoc.write("<td align=\\"left\\">"); |
hDoc.write("<td align=\\"left\\">"); |
hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+"> "+clrtxt+"<\\/td>"); |
hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+" \\/> "+clrtxt+"<\\/td>"); |
hDoc.write("<td align=\\"left\\">"); |
hDoc.write("<td align=\\"left\\">"); |
hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+"> "+sztxt+"<\\/td>"); |
hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+" \\/> "+sztxt+"<\\/td>"); |
hDoc.write("<td align=\\"left\\">"); |
hDoc.write("<td align=\\"left\\">"); |
hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+"> "+sytxt+"<\\/td>"); |
hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+" \\/> "+sytxt+"<\\/td>"); |
hDoc.write("<\\/tr>"); |
hDoc.write("<\\/tr>"); |
} |
} |
|
|
function highlightend() { |
function highlightend() { |
var hDoc = hwdWin.document; |
var hDoc = hwdWin.document; |
hDoc.write("<\\/table>"); |
hDoc.write("<\\/table><br \\/>"); |
hDoc.write("<\\/td><\\/tr><\\/table> "); |
hDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\" \\/> "); |
hDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\"> "); |
hDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\" \\/><br /><br />"); |
hDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />"); |
|
hDoc.write("<\\/form>"); |
hDoc.write("<\\/form>"); |
hDoc.write('$end_page_highlight_central'); |
hDoc.write('$end_page_highlight_central'); |
hDoc.close(); |
hDoc.close(); |
Line 1702 sub gradeBox {
|
Line 1725 sub gradeBox {
|
$wgt = ($wgt > 0 ? $wgt : '1'); |
$wgt = ($wgt > 0 ? $wgt : '1'); |
my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ? |
my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ? |
'' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt)); |
'' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt)); |
my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n"; |
my $data_WGT='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n"; |
my $display_part= &get_display_part($partid,$symb); |
my $display_part= &get_display_part($partid,$symb); |
my %last_resets = &get_last_resets($symb,$env{'request.course.id'}, |
my %last_resets = &get_last_resets($symb,$env{'request.course.id'}, |
[$partid]); |
[$partid]); |
Line 1710 sub gradeBox {
|
Line 1733 sub gradeBox {
|
if ($last_resets{$partid}) { |
if ($last_resets{$partid}) { |
$aggtries = &get_num_tries($record,$last_resets{$partid},$partid); |
$aggtries = &get_num_tries($record,$last_resets{$partid},$partid); |
} |
} |
$result.=&Apache::loncommon::start_data_table_row(); |
my $result=&Apache::loncommon::start_data_table_row(); |
my $ctr = 0; |
my $ctr = 0; |
my $thisweight = 0; |
my $thisweight = 0; |
my $increment = &get_increment(); |
my $increment = &get_increment(); |
Line 1747 sub gradeBox {
|
Line 1770 sub gradeBox {
|
|
|
|
|
$result .= |
$result .= |
'<td>'.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'; |
'<td>'.$data_WGT.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'; |
$result.=&Apache::loncommon::end_data_table_row(); |
$result.=&Apache::loncommon::end_data_table_row(); |
|
$result.=&Apache::loncommon::start_data_table_row().'<td colspan="6">'; |
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n". |
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n". |
'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n". |
'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n". |
'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'. |
'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'. |
Line 1759 sub gradeBox {
|
Line 1783 sub gradeBox {
|
$aggtries.'" />'."\n"; |
$aggtries.'" />'."\n"; |
my $res_error; |
my $res_error; |
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error); |
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error); |
|
$result.='</td>'.&Apache::loncommon::end_data_table_row(); |
if ($res_error) { |
if ($res_error) { |
return &navmap_errormsg(); |
return &navmap_errormsg(); |
} |
} |
Line 1940 sub submission {
|
Line 1965 sub submission {
|
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; } |
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; } |
|
|
if (!&canview($usec)) { |
if (!&canview($usec)) { |
$request->print('<span class="LC_warning">Unable to view requested student.('. |
$request->print( |
$uname.':'.$udom.' in section '.$usec.' in course id '. |
'<span class="LC_warning">'. |
$env{'request.course.id'}.')</span>'); |
&mt('Unable to view requested student.'). |
|
' '.&mt('([_1] in section [_2] in course id [_3])', |
|
$uname.':'.$udom,$usec,$env{'request.course.id'}). |
|
'</span>'); |
return; |
return; |
} |
} |
|
|
Line 1974 sub submission {
|
Line 2002 sub submission {
|
$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode)); |
$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode)); |
} |
} |
|
|
# kwclr is the only variable that is guaranteed to be non blank |
# kwclr is the only variable that is guaranteed not to be blank |
# if this subroutine has been called once. |
# if this subroutine has been called once. |
my %keyhash = (); |
my %keyhash = (); |
# if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') { |
# if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') { |
Line 2039 sub submission {
|
Line 2067 sub submission {
|
if (1) { |
if (1) { |
|
|
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
|
keyh => 'Keyword Highlighting for Essays', |
keyw => 'Keyword Options', |
keyw => 'Keyword Options', |
list => 'List', |
list => 'List', |
past => 'Paste Selection to List', |
past => 'Paste Selection to List', |
Line 2047 sub submission {
|
Line 2076 sub submission {
|
# |
# |
# Print out the keyword options line |
# Print out the keyword options line |
# |
# |
$request->print(<<KEYWORDS); |
$request->print( |
<br /><b>$lt{'keyw'}:</b> |
'<div class="LC_columnSection">' |
<a href="javascript:keywords(document.SCORE);" target="_self">$lt{'list'}</a> |
.'<fieldset><legend>'.$lt{'keyh'}.'</legend>' |
<a href="#" onmousedown="javascript:getSel(); return false" |
.&Apache::lonhtmlcommon::funclist_from_array( |
CLASS="page">$lt{'past'}</a> |
['<a href="javascript:keywords(document.SCORE);" target="_self">'.$lt{'list'}.'</a>', |
<a href="javascript:kwhighlight();" target="_self">$lt{'high'}</a><br /><br /> |
'<a href="#" onmousedown="javascript:getSel(); return false" |
KEYWORDS |
class="page">'.$lt{'past'}.'</a>', |
|
'<a href="javascript:kwhighlight();" target="_self">'.$lt{'high'}.'</a>'], |
|
{legend => $lt{'keyw'}}) |
|
.'</fieldset></div>' |
|
); |
|
|
# |
# |
# Load the other essays for similarity check |
# Load the other essays for similarity check |
# |
# |
Line 2078 KEYWORDS
|
Line 2112 KEYWORDS
|
if ($perm{'vgr'}) { |
if ($perm{'vgr'}) { |
$request->print( |
$request->print( |
&Apache::loncommon::track_student_link( |
&Apache::loncommon::track_student_link( |
&mt('View recent activity'), |
'View recent activity', |
$uname,$udom,'check') |
$uname,$udom,'check') |
.' ' |
.' ' |
); |
); |
Line 2137 KEYWORDS
|
Line 2171 KEYWORDS
|
$result.=$sub_result; |
$result.=$sub_result; |
} |
} |
$request->print($result."\n"); |
$request->print($result."\n"); |
|
|
# print student answer/submission |
# print student answer/submission |
# Options are (1) Handgraded submission only |
# Options are (1) Handgraded submission only |
# (2) Last submission, includes submission that is not handgraded |
# (2) Last submission, includes submission that is not handgraded |
# (for multi-response type part) |
# (for multi-response type part) |
# (3) Last submission plus the parts info |
# (3) Last submission plus the parts info |
# (4) The whole record for this student |
# (4) The whole record for this student |
if ($env{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) { |
|
my ($string,$timestamp)= &get_last_submission(\%record); |
my ($string,$timestamp)= &get_last_submission(\%record); |
|
|
my $lastsubonly; |
my $lastsubonly; |
|
|
if ($$timestamp eq '') { |
if ($$timestamp eq '') { |
$lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>'; |
$lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>'; |
} else { |
} else { |
$lastsubonly = |
$lastsubonly = |
'<div class="LC_grade_submissions_body">' |
'<div class="LC_grade_submissions_body">' |
.'<b>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n"; |
.'<b>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n"; |
|
|
my %seenparts; |
my %seenparts; |
my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id = &flatten_responseType($responseType); |
foreach my $part (@part_response_id) { |
foreach my $part (@part_response_id) { |
next if ($env{'form.lastSub'} eq 'hdgrade' |
next if ($env{'form.lastSub'} eq 'hdgrade' |
&& $$handgrade{$$part[0].'_'.$$part[1]} ne 'yes'); |
&& $$handgrade{$$part[0].'_'.$$part[1]} ne 'yes'); |
|
|
my ($partid,$respid) = @{ $part }; |
my ($partid,$respid) = @{ $part }; |
my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
if ($env{"form.$uname:$udom:$partid:submitted_by"}) { |
if ($env{"form.$uname:$udom:$partid:submitted_by"}) { |
if (exists($seenparts{$partid})) { next; } |
if (exists($seenparts{$partid})) { next; } |
$seenparts{$partid}=1; |
$seenparts{$partid}=1; |
my $submitby='<b>Part:</b> '.$display_part. |
$request->print( |
' <b>Collaborative submission by:</b> '. |
'<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
'<a href="javascript:viewSubmitter(\''. |
' <b>'.&mt('Collaborative submission by: [_1]', |
$env{"form.$uname:$udom:$partid:submitted_by"}. |
'<a href="javascript:viewSubmitter(\''. |
'\');" target="_self">'. |
$env{"form.$uname:$udom:$partid:submitted_by"}. |
$$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />'; |
'\');" target="_self">'. |
$request->print($submitby); |
$$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a>'). |
next; |
'<br />'); |
} |
next; |
my $responsetype = $responseType->{$partid}->{$respid}; |
} |
if (!exists($record{"resource.$partid.$respid.submission"})) { |
my $responsetype = $responseType->{$partid}->{$respid}; |
$lastsubonly.="\n".'<div class="LC_grade_submission_part">'. |
if (!exists($record{"resource.$partid.$respid.submission"})) { |
'<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
$lastsubonly.="\n".'<div class="LC_grade_submission_part">'. |
' <span class="LC_internal_info">'. |
'<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
'('.&mt('Response ID: [_1]',$respid).')'. |
' <span class="LC_internal_info">'. |
'</span> '. |
'('.&mt('Response ID: [_1]',$respid).')'. |
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>'; |
'</span> '. |
next; |
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>'; |
} |
next; |
foreach my $submission (@$string) { |
} |
my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/); |
foreach my $submission (@$string) { |
if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; } |
my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/); |
my ($ressub,$hide,$subval) = split(/:/,$submission,3); |
if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; } |
# Similarity check |
my ($ressub,$hide,$draft,$subval) = split(/:/,$submission,4); |
my $similar=''; |
# Similarity check |
my ($type,$trial,$rndseed); |
my $similar=''; |
if ($hide eq 'rand') { |
my ($type,$trial,$rndseed); |
$type = 'randomizetry'; |
if ($hide eq 'rand') { |
$trial = $record{"resource.$partid.tries"}; |
$type = 'randomizetry'; |
$rndseed = $record{"resource.$partid.rndseed"}; |
$trial = $record{"resource.$partid.tries"}; |
} |
$rndseed = $record{"resource.$partid.rndseed"}; |
if($env{'form.checkPlag'}){ |
} |
my ($oname,$odom,$ocrsid,$oessay,$osim)= |
if ($env{'form.checkPlag'}) { |
&most_similar($uname,$udom,$symb,$subval); |
my ($oname,$odom,$ocrsid,$oessay,$osim)= |
if ($osim) { |
&most_similar($uname,$udom,$symb,$subval); |
$osim=int($osim*100.0); |
if ($osim) { |
my %old_course_desc = |
$osim=int($osim*100.0); |
&Apache::lonnet::coursedescription($ocrsid, |
my %old_course_desc = |
{'one_time' => 1}); |
&Apache::lonnet::coursedescription($ocrsid, |
|
{'one_time' => 1}); |
if ($hide eq 'anon') { |
|
$similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'. |
if ($hide eq 'anon') { |
&mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />'; |
$similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'. |
} else { |
&mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />'; |
$similar="<hr /><h3><span class=\"LC_warning\">". |
} else { |
&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])', |
$similar="<hr /><h3><span class=\"LC_warning\">". |
$osim, |
&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])', |
&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')', |
$osim, |
|
&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')', |
$old_course_desc{'description'}, |
$old_course_desc{'description'}, |
$old_course_desc{'num'}, |
$old_course_desc{'num'}, |
$old_course_desc{'domain'}). |
$old_course_desc{'domain'}). |
'</span></h3><blockquote><i>'. |
'</span></h3><blockquote><i>'. |
&keywords_highlight($oessay). |
&keywords_highlight($oessay). |
'</i></blockquote><hr />'; |
'</i></blockquote><hr />'; |
} |
} |
} |
} |
} |
} |
my $order=&get_order($partid,$respid,$symb,$uname,$udom, |
my $order=&get_order($partid,$respid,$symb,$uname,$udom, |
undef,$type,$trial,$rndseed); |
undef,$type,$trial,$rndseed); |
if ($env{'form.lastSub'} eq 'lastonly' || |
if ($env{'form.lastSub'} eq 'lastonly' || $env{'form.lastSub'} eq 'datesub' || $env{'form.lastSub'} =~ /^(last|all)$/ || ($env{'form.lastSub'} eq 'hdgrade' && |
($env{'form.lastSub'} eq 'hdgrade' && |
|
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) { |
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) { |
my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
$lastsubonly.='<div class="LC_grade_submission_part">'. |
$lastsubonly.='<div class="LC_grade_submission_part">'. |
'<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
'<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
' <span class="LC_internal_info">'. |
' <span class="LC_internal_info">'. |
'('.&mt('Response ID: [_1]',$respid).')'. |
'('.&mt('Response ID: [_1]',$respid).')'. |
'</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 ($hide eq 'anon') { |
if (@$files) { |
$lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files})); |
|
} else { |
|
$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />'; |
|
foreach my $file (@$files) { |
|
&Apache::lonnet::allowuploaded('/adm/grades',$file); |
|
$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" /> '.$file.'</a>'; |
|
} |
|
} |
|
$lastsubonly.='<br />'; |
|
} |
|
if ($hide eq 'anon') { |
if ($hide eq 'anon') { |
$lastsubonly.='<b>'.&mt('Anonymous Survey').'</b>'; |
$lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files})); |
} else { |
} else { |
$lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'. |
$lastsubonly.='<br /><br />'.'<b>'.&mt('Submitted Files:').'</b>' |
&cleanRecord($subval,$responsetype,$symb,$partid, |
.'<br /><span class="LC_warning">'; |
$respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed); |
if(@$files == 1) { |
|
$lastsubonly .= &mt('Like all files provided by users, this file may contain viruses!'); |
|
} else { |
|
$lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!'); |
|
} |
|
$lastsubonly .= '</span>'; |
|
foreach my $file (@$files) { |
|
&Apache::lonnet::allowuploaded('/adm/grades',$file); |
|
$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" alt="" /> '.$file.'</a>'; |
|
} |
} |
} |
if ($similar) {$lastsubonly.="<br /><br />$similar\n";} |
$lastsubonly.='<br />'; |
$lastsubonly.='</div>'; |
} |
} |
if ($hide eq 'anon') { |
|
$lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>'; |
|
} else { |
|
$lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>'; |
|
if ($draft) { |
|
$lastsubonly.= ' <span class="LC_warning">'.&mt('Draft Copy').'</span>'; |
|
} |
|
$subval = |
|
&cleanRecord($subval,$responsetype,$symb,$partid, |
|
$respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed); |
|
if ($responsetype eq 'essay') { |
|
$subval =~ s{\n}{<br />}g; |
|
} |
|
$lastsubonly.=$subval."\n"; |
|
} |
|
if ($similar) {$lastsubonly.="<br /><br />$similar\n";} |
|
$lastsubonly.='</div>'; |
} |
} |
} |
} |
$lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body |
|
} |
} |
$request->print($lastsubonly); |
$lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body |
} elsif ($env{'form.lastSub'} eq 'datesub') { |
} |
|
$request->print($lastsubonly); |
|
if ($env{'form.lastSub'} eq 'datesub') { |
my ($parts,$handgrade,$responseType) = &response_type($symb,\$res_error); |
my ($parts,$handgrade,$responseType) = &response_type($symb,\$res_error); |
$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom)); |
$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom)); |
} elsif ($env{'form.lastSub'} =~ /^(last|all)$/) { |
|
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, |
} |
|
if ($env{'form.lastSub'} =~ /^(last|all)$/) { |
|
my $identifier = (&canmodify($usec)? $counter : ''); |
|
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, |
$env{'request.course.id'}, |
$env{'request.course.id'}, |
$last,'.submission', |
$last,'.submission', |
'Apache::grades::keywords_highlight')); |
'Apache::grades::keywords_highlight', |
|
$usec,$identifier)); |
} |
} |
$request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':' |
$request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':' |
.$udom.'" />'."\n"); |
.$udom.'" />'."\n"); |
Line 2300 KEYWORDS
|
Line 2354 KEYWORDS
|
'<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n"; |
'<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n"; |
$result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter. |
$result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter. |
',\''.$msgfor.'\');" target="_self">'. |
',\''.$msgfor.'\');" target="_self">'. |
&mt('Compose message to student').(scalar(@$col_fullnames) >= 1 ? 's' : '').'</a><label> ('. |
&mt('Compose message to student'.(scalar(@$col_fullnames) >= 1 ? 's' : '')).'</a><label> ('. |
&mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'. |
&mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'. |
'<img src="'.$request->dir_config('lonIconsURL'). |
' <img src="'.$request->dir_config('lonIconsURL'). |
'/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n". |
'/mailbkgrd.gif" width="14" height="10" alt="" name="mailicon'.$counter.'" />'."\n". |
'<br /> ('. |
'<br /> ('. |
&mt('Message will be sent when you click on Save & Next below.').")\n"; |
&mt('Message will be sent when you click on Save & Next below.').")\n"; |
$result.='</div></div>'; |
$result.='</div></div>'; |
Line 2498 sub get_last_submission {
|
Line 2552 sub get_last_submission {
|
} |
} |
} |
} |
my ($partid,$foo) = split(/submission$/,$key); |
my ($partid,$foo) = split(/submission$/,$key); |
my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ? |
my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ? 1 : 0; |
'<span class="LC_warning">Draft Copy</span> ' : ''; |
push(@string, join(':', $key, $hide, $draft, ( |
push(@string, join(':', $key, $hide, $draft.$lasthash{$key})); |
ref($lasthash{$key}) eq 'ARRAY' ? |
|
join(',', @{$lasthash{$key}}) : $lasthash{$key}) )); |
} |
} |
} |
} |
if (!@string) { |
if (!@string) { |
Line 2528 sub keywords_highlight {
|
Line 2583 sub keywords_highlight {
|
sub show_previous_task_version { |
sub show_previous_task_version { |
my ($request,$symb) = @_; |
my ($request,$symb) = @_; |
if ($symb eq '') { |
if ($symb eq '') { |
$request->print("Unable to handle ambiguous references."); |
$request->print( |
|
'<span class="LC_error">'. |
|
&mt('Unable to handle ambiguous references.'). |
|
'</span>'); |
return ''; |
return ''; |
} |
} |
my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'}); |
my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'}); |
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'}); |
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'}); |
if (!&canview($usec)) { |
if (!&canview($usec)) { |
$request->print('<span class="LC_warning">Unable to view previous version for requested student.('. |
$request->print( |
$uname.':'.$udom.' in section '.$usec.' in course id '. |
'<span class="LC_warning">'. |
$env{'request.course.id'}.')</span>'); |
&mt('Unable to view previous version for requested student.'). |
|
' '.&mt('([_1] in section [_2] in course id [_3])', |
|
$uname.':'.$udom,$usec,$env{'request.course.id'}). |
|
'</span>'); |
return; |
return; |
} |
} |
my $mode = 'both'; |
my $mode = 'both'; |
Line 2714 sub processHandGrade {
|
Line 2774 sub processHandGrade {
|
my $ctr = 0; |
my $ctr = 0; |
while ($ctr < $ngrade) { |
while ($ctr < $ngrade) { |
my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr}); |
my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr}); |
my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$symb,$uname,$udom,$ctr); |
my ($errorflag,$pts,$wgt,$numhidden) = |
|
&saveHandGrade($request,$symb,$uname,$udom,$ctr); |
if ($errorflag eq 'no_score') { |
if ($errorflag eq 'no_score') { |
$ctr++; |
$ctr++; |
next; |
next; |
} |
} |
if ($errorflag eq 'not_allowed') { |
if ($errorflag eq 'not_allowed') { |
$request->print("<span class=\"LC_warning\">Not allowed to modify grades for $uname:$udom</span>"); |
$request->print( |
|
'<span class="LC_error">' |
|
.&mt('Not allowed to modify grades for [_1]',"$uname:$udom") |
|
.'</span>'); |
$ctr++; |
$ctr++; |
next; |
next; |
} |
} |
|
if ($numhidden) { |
|
$request->print( |
|
'<span class="LC_info">' |
|
.&mt('For [_1]: [quant,_2,transaction] hidden',"$uname:$udom",$numhidden) |
|
.'</span><br />'); |
|
} |
my $includemsg = $env{'form.includemsg'.$ctr}; |
my $includemsg = $env{'form.includemsg'.$ctr}; |
my ($subject,$message,$msgstatus) = ('','',''); |
my ($subject,$message,$msgstatus) = ('','',''); |
my $restitle = &Apache::lonnet::gettitle($symb); |
my $restitle = &Apache::lonnet::gettitle($symb); |
Line 2945 sub saveHandGrade {
|
Line 3015 sub saveHandGrade {
|
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname); |
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname); |
my @parts_graded; |
my @parts_graded; |
my %newrecord = (); |
my %newrecord = (); |
my ($pts,$wgt) = ('',''); |
my ($pts,$wgt,$totchg) = ('','',0); |
my %aggregate = (); |
my %aggregate = (); |
my $aggregateflag = 0; |
my $aggregateflag = 0; |
|
if ($env{'form.HIDE'.$newflg}) { |
|
my $numchgs = &makehidden($newflg,\%record,$symb,$domain,$stuname); |
|
$totchg += $numchgs; |
|
} |
my @parts = split(/:/,$env{'form.partlist'.$newflg}); |
my @parts = split(/:/,$env{'form.partlist'.$newflg}); |
foreach my $new_part (@parts) { |
foreach my $new_part (@parts) { |
#collaborator ($submi may vary for different parts |
#collaborator ($submi may vary for different parts |
Line 3050 sub saveHandGrade {
|
Line 3124 sub saveHandGrade {
|
&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate, |
&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate, |
$cdom,$cnum); |
$cdom,$cnum); |
} |
} |
return ('',$pts,$wgt); |
return ('',$pts,$wgt,$totchg); |
|
} |
|
|
|
sub makehidden { |
|
my ($newflg,$record,$symb,$domain,$stuname) = @_; |
|
return unless (ref($record) eq 'HASH'); |
|
my %modified; |
|
my $numchanged = 0; |
|
my ($version,$parts) = split(/:/,$env{'form.HIDE'.$newflg},2); |
|
if (exists($record->{$version.':keys'})) { |
|
my $partsregexp = $parts; |
|
$partsregexp =~ s/,/|/g; |
|
foreach my $key (split(/\:/,$record->{$version.':keys'})) { |
|
if ($key =~ /^resource\.(?:$partsregexp)\.([^\.]+)$/) { |
|
my $item = $1; |
|
unless (($item eq 'solved') || ($item =~ /^award(|msg|ed)$/)) { |
|
$modified{$key} = $record->{$version.':'.$key}; |
|
} |
|
} elsif ($key =~ m{^(resource\.(?:$partsregexp)\.[^\.]+\.)(.+)$}) { |
|
$modified{$1.'hidden'.$2} = $record->{$version.':'.$key}; |
|
} elsif ($key =~ /^(ip|timestamp|host)$/) { |
|
$modified{$key} = $record->{$version.':'.$key}; |
|
} |
|
} |
|
if (keys(%modified)) { |
|
if (&Apache::lonnet::putstore($env{'request.course.id'},$symb,$version,\%modified, |
|
$domain,$stuname) eq 'ok') { |
|
$numchanged ++; |
|
} |
|
} |
|
} |
|
return $numchanged; |
} |
} |
|
|
sub check_and_remove_from_queue { |
sub check_and_remove_from_queue { |
Line 3101 sub handback_files {
|
Line 3206 sub handback_files {
|
&Apache::lonnet::dirlist($portfolio_root.$portfolio_path, |
&Apache::lonnet::dirlist($portfolio_root.$portfolio_path, |
$domain,$stuname,$getpropath); |
$domain,$stuname,$getpropath); |
my $version = &get_next_version($answer_name,$answer_ext,$dir_list); |
my $version = &get_next_version($answer_name,$answer_ext,$dir_list); |
# fix file name |
# fix filename |
my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/); |
my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/); |
my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain, |
my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain, |
$newflg.'_'.$part_resp.'_returndoc'.$counter, |
$newflg.'_'.$part_resp.'_returndoc'.$counter, |
Line 3120 sub handback_files {
|
Line 3225 sub handback_files {
|
$$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name; |
$$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name; |
$file_msg.= '<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />"; |
$file_msg.= '<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />"; |
} |
} |
$request->print('<br />'.&mt('[_1] will be the uploaded file name [_2]','<span class="LC_info">'.$fname.'</span>','<span class="LC_filename">'.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'</span>')); |
$request->print('<br />'.&mt('[_1] will be the uploaded filename [_2]','<span class="LC_info">'.$fname.'</span>','<span class="LC_filename">'.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'</span>')); |
} |
} |
} |
} |
} |
} |
Line 3584 sub viewgrades {
|
Line 3689 sub viewgrades {
|
$partid.'" size="4" '.'onchange="javascript:writePoint(\''. |
$partid.'" size="4" '.'onchange="javascript:writePoint(\''. |
$partid.'\','.$weight{$partid}.',\'textval\')" /> /'. |
$partid.'\','.$weight{$partid}.',\'textval\')" /> /'. |
$weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n"; |
$weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n"; |
$line.= '<td><b>'.&mt('Grade Status').':</b><select name="SELVAL_'.$partid.'"'. |
$line.= '<td><b>'.&mt('Grade Status').':</b>'. |
'onchange="javascript:writeRadText(\''.$partid.'\','. |
'<select name="SELVAL_'.$partid.'" '. |
$weight{$partid}.')"> '. |
'onchange="javascript:writeRadText(\''.$partid.'\','. |
|
$weight{$partid}.')"> '. |
'<option selected="selected"> </option>'. |
'<option selected="selected"> </option>'. |
'<option value="excused">'.&mt('excused').'</option>'. |
'<option value="excused">'.&mt('excused').'</option>'. |
'<option value="reset status">'.&mt('reset status').'</option>'. |
'<option value="reset status">'.&mt('reset status').'</option>'. |
Line 3635 sub viewgrades {
|
Line 3741 sub viewgrades {
|
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>'. |
&mt('Score Part: [_1]<br /> (weight = [_2])', |
&mt('Score Part: [_1][_2](weight = [_3])', |
$display_part,$weight{$partid}).'</th>'."\n"; |
$display_part,'<br />',$weight{$partid}).'</th>'."\n"; |
next; |
next; |
|
|
} else { |
} else { |
Line 4131 sub csvupload_fields {
|
Line 4237 sub csvupload_fields {
|
|
|
sub csvuploadmap_footer { |
sub csvuploadmap_footer { |
my ($request,$i,$keyfields) =@_; |
my ($request,$i,$keyfields) =@_; |
|
my $buttontext = &mt('Assign Grades'); |
$request->print(<<ENDPICK); |
$request->print(<<ENDPICK); |
</table> |
</table> |
<input type="hidden" name="nfields" value="$i" /> |
<input type="hidden" name="nfields" value="$i" /> |
<input type="hidden" name="keyfields" value="$keyfields" /> |
<input type="hidden" name="keyfields" value="$keyfields" /> |
<input type="button" onclick="javascript:verify(this.form)" value="Assign Grades" /><br /> |
<input type="button" onclick="javascript:verify(this.form)" value="$buttontext" /><br /> |
</form> |
</form> |
ENDPICK |
ENDPICK |
} |
} |
Line 4256 ENDPICK
|
Line 4363 ENDPICK
|
} |
} |
# FIXME do a check for any duplicated user ids... |
# FIXME do a check for any duplicated user ids... |
# FIXME do a check for any invalid user ids?... |
# FIXME do a check for any invalid user ids?... |
$request->print('<input type="submit" value="Assign Grades" /><br /> |
$request->print('<input type="submit" value="'.&mt('Assign Grades').'" /><br /> |
<hr /></form>'."\n"); |
<hr /></form>'."\n"); |
return ''; |
return ''; |
} |
} |
Line 4444 LISTJAVASCRIPT
|
Line 4551 LISTJAVASCRIPT
|
my ($curpage) =&Apache::lonnet::decode_symb($symb); |
my ($curpage) =&Apache::lonnet::decode_symb($symb); |
# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); |
# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); |
# my $type=($curpage =~ /\.(page|sequence)/); |
# my $type=($curpage =~ /\.(page|sequence)/); |
my $select = '<select name="selectpage">'."\n"; |
|
|
# Collection of hidden fields |
my $ctr=0; |
my $ctr=0; |
foreach (@$titles) { |
foreach (@$titles) { |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
$select.='<option value="'.$ctr.'" '. |
$result.='<input type="hidden" name="page'.$ctr.'" value="'.$$symbx{$_}.'" />'."\n"; |
($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : ''). |
$result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n"; |
'>'.$showtitle.'</option>'."\n"; |
$ctr++; |
$ctr++; |
|
} |
} |
$select.= '</select>'; |
$result.='<input type="hidden" name="page" />'."\n". |
$result.=' <b>'.&mt('Problems from').':</b> '.$select."<br />\n"; |
'<input type="hidden" name="title" />'."\n"; |
|
|
|
$result.=&build_section_inputs(); |
|
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
|
$result.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n". |
|
'<input type="hidden" name="command" value="displayPage" />'."\n". |
|
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n"; |
|
|
|
# Show grading options |
|
$result.=&Apache::lonhtmlcommon::start_pick_box(); |
|
my $select = '<select name="selectpage">'."\n"; |
$ctr=0; |
$ctr=0; |
foreach (@$titles) { |
foreach (@$titles) { |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
$result.='<input type="hidden" name="page'.$ctr.'" value="'.$$symbx{$_}.'" />'."\n"; |
$select.='<option value="'.$ctr.'"'. |
$result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n"; |
($$symbx{$_} =~ /$curpage$/ ? ' selected="selected"' : ''). |
|
'>'.$showtitle.'</option>'."\n"; |
$ctr++; |
$ctr++; |
} |
} |
$result.='<input type="hidden" name="page" />'."\n". |
$select.= '</select>'; |
'<input type="hidden" name="title" />'."\n"; |
|
|
|
my $options = |
$result.= |
'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n". |
&Apache::lonhtmlcommon::row_title(&mt('Problems from')) |
'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n"; |
.$select |
$result.=' <b>'.&mt('View Problem Text').': </b>'.$options; |
.&Apache::lonhtmlcommon::row_closure(); |
|
|
$options = |
$result.= |
'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n". |
&Apache::lonhtmlcommon::row_title(&mt('View Problem Text')) |
'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n". |
.'<label><input type="radio" name="vProb" value="no"' |
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n"; |
.' checked="checked" /> '.&mt('no').' </label>'."\n" |
$result.=' <b>'.&mt('Submissions').': </b>'.$options; |
.'<label><input type="radio" name="vProb" value="yes" />' |
|
.&mt('yes').'</label>'."\n" |
|
.&Apache::lonhtmlcommon::row_closure(); |
|
|
|
$result.= |
|
&Apache::lonhtmlcommon::row_title(&mt('View Submissions')) |
|
.'<label><input type="radio" name="lastSub" value="none" /> ' |
|
.&mt('none').' </label>'."\n" |
|
.'<label><input type="radio" name="lastSub" value="datesub"' |
|
.' checked="checked" /> '.&mt('all submissions').'</label>'."\n" |
|
.'<label><input type="radio" name="lastSub" value="all" /> ' |
|
.&mt('all submissions with details').' </label>' |
|
.&Apache::lonhtmlcommon::row_closure(); |
|
|
$result.=&build_section_inputs(); |
$result.= |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
&Apache::lonhtmlcommon::row_title(&mt('Use CODE')) |
$result.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n". |
.'<input type="text" name="CODE" value="" />' |
'<input type="hidden" name="command" value="displayPage" />'."\n". |
.&Apache::lonhtmlcommon::row_closure(1) |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."<br />\n"; |
.&Apache::lonhtmlcommon::end_pick_box(); |
|
|
$result.=' <b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n"; |
|
|
|
$result.=' <input type="button" '. |
# Show list of students to select for grading |
|
$result.='<br /><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 4580 sub displayPage {
|
Line 4707 sub displayPage {
|
&Apache::lonnet::clear_EXT_cache_status(); |
&Apache::lonnet::clear_EXT_cache_status(); |
|
|
if (!&canview($usec)) { |
if (!&canview($usec)) { |
$request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>'); |
$request->print( |
return; |
'<span class="LC_warning">'. |
|
&mt('Unable to view requested student. ([_1])', |
|
$env{'form.student'}). |
|
'</span>'); |
|
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> '.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)). |
$result.='<h3> '.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)). |
Line 4630 sub displayPage {
|
Line 4761 sub displayPage {
|
'</span>'."\n". |
'</span>'."\n". |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
'<th align="center"> Prob. </th>'. |
'<th>'.&mt('Prob.').'</th>'. |
'<th> '.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'. |
'<th> '.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'. |
&Apache::loncommon::end_data_table_header_row(); |
&Apache::loncommon::end_data_table_header_row(); |
|
|
Line 4692 sub displayPage {
|
Line 4823 sub displayPage {
|
} |
} |
} elsif ($env{'form.lastSub'} eq 'all') { |
} elsif ($env{'form.lastSub'} eq 'all') { |
my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : ''); |
my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : ''); |
|
my $identifier = (&canmodify($usec)? $prob : ''); |
$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom, |
$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom, |
$env{'request.course.id'}, |
$env{'request.course.id'}, |
'','.submission'); |
'','.submission',undef, |
|
$usec,$identifier); |
|
|
} |
} |
if (&canmodify($usec)) { |
if (&canmodify($usec)) { |
Line 4907 sub updateGradeByPage {
|
Line 5040 sub updateGradeByPage {
|
|
|
$iterator->next(); # skip the first BEGIN_MAP |
$iterator->next(); # skip the first BEGIN_MAP |
my $curRes = $iterator->next(); # for "current resource" |
my $curRes = $iterator->next(); # for "current resource" |
my ($depth,$question,$prob,$changeflag)= (1,1,1,0); |
my ($depth,$question,$prob,$changeflag,$hideflag)= (1,1,1,0,0); |
while ($depth > 0) { |
while ($depth > 0) { |
if($curRes == $iterator->BEGIN_MAP) { $depth++; } |
if($curRes == $iterator->BEGIN_MAP) { $depth++; } |
if($curRes == $iterator->END_MAP) { $depth--; } |
if($curRes == $iterator->END_MAP) { $depth--; } |
Line 4928 sub updateGradeByPage {
|
Line 5061 sub updateGradeByPage {
|
my @displayPts=(); |
my @displayPts=(); |
my %aggregate = (); |
my %aggregate = (); |
my $aggregateflag = 0; |
my $aggregateflag = 0; |
|
if ($env{'form.HIDE'.$prob}) { |
|
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); |
|
my $numchgs = &makehidden($prob,\%record,$symbx,$udom,$uname); |
|
$hideflag += $numchgs; |
|
} |
foreach my $partid (@{$parts}) { |
foreach my $partid (@{$parts}) { |
my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid}; |
my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid}; |
my $oldpts = $env{'form.oldpts'.$question.'_'.$partid}; |
my $oldpts = $env{'form.oldpts'.$question.'_'.$partid}; |
Line 5018 sub updateGradeByPage {
|
Line 5156 sub updateGradeByPage {
|
$studentTable.=&Apache::loncommon::end_data_table(); |
$studentTable.=&Apache::loncommon::end_data_table(); |
my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') : |
my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') : |
&mt('The scores were changed for [quant,_1,problem].', |
&mt('The scores were changed for [quant,_1,problem].', |
$changeflag)); |
$changeflag).'<br />'); |
$request->print($grademsg.$studentTable); |
my $hidemsg=($hideflag == 0 ? '' : |
|
&mt('Submissions were marked "hidden" for [quant,_1,transaction].', |
|
$hideflag).'<br />'); |
|
$request->print($hidemsg.$grademsg.$studentTable); |
|
|
return ''; |
return ''; |
} |
} |
Line 5054 like.
|
Line 5195 like.
|
Next each scanline is checked for any errors of either 'missing |
Next each scanline is checked for any errors of either 'missing |
bubbles' (it's an error because it may have been mis-scanned |
bubbles' (it's an error because it may have been mis-scanned |
because too light bubbling), 'double bubble' (each bubble line should |
because too light bubbling), 'double bubble' (each bubble line should |
have no more that one letter picked), invalid or duplicated CODE, |
have no more than one letter picked), invalid or duplicated CODE, |
invalid student/employee ID |
invalid student/employee ID |
|
|
If the CODE option is used that determines the randomization of the |
If the CODE option is used that determines the randomization of the |
Line 5142 my %subdivided_bubble_lines; # no.
|
Line 5283 my %subdivided_bubble_lines; # no.
|
|
|
my %responsetype_per_response; # responsetype for each response |
my %responsetype_per_response; # responsetype for each response |
|
|
|
my %masterseq_id_responsenum; # src_id (e.g., 12.3_0.11 etc.) for each |
|
# numbered response. Needed when randomorder |
|
# or randompick are in use. Key is ID, value |
|
# is response number. |
|
|
# Save and restore the bubble lines array to the form env. |
# Save and restore the bubble lines array to the form env. |
|
|
|
|
Line 5155 sub save_bubble_lines {
|
Line 5301 sub save_bubble_lines {
|
$env{"form.scantron.responsetype.$line"} = |
$env{"form.scantron.responsetype.$line"} = |
$responsetype_per_response{$line}; |
$responsetype_per_response{$line}; |
} |
} |
|
foreach my $resid (keys(%masterseq_id_responsenum)) { |
|
my $line = $masterseq_id_responsenum{$resid}; |
|
$env{"form.scantron.residpart.$line"} = $resid; |
|
} |
} |
} |
|
|
|
|
sub restore_bubble_lines { |
sub restore_bubble_lines { |
my $line = 0; |
my $line = 0; |
%bubble_lines_per_response = (); |
%bubble_lines_per_response = (); |
|
%masterseq_id_responsenum = (); |
while ($env{"form.scantron.bubblelines.$line"}) { |
while ($env{"form.scantron.bubblelines.$line"}) { |
my $value = $env{"form.scantron.bubblelines.$line"}; |
my $value = $env{"form.scantron.bubblelines.$line"}; |
$bubble_lines_per_response{$line} = $value; |
$bubble_lines_per_response{$line} = $value; |
Line 5170 sub restore_bubble_lines {
|
Line 5321 sub restore_bubble_lines {
|
$env{"form.scantron.sub_bubblelines.$line"}; |
$env{"form.scantron.sub_bubblelines.$line"}; |
$responsetype_per_response{$line} = |
$responsetype_per_response{$line} = |
$env{"form.scantron.responsetype.$line"}; |
$env{"form.scantron.responsetype.$line"}; |
|
my $id = $env{"form.scantron.residpart.$line"}; |
|
$masterseq_id_responsenum{$id} = $line; |
$line++; |
$line++; |
} |
} |
} |
} |
|
|
# Given the parsed scanline, get the response for |
|
# 'answer' number n: |
|
|
|
sub get_response_bubbles { |
|
my ($parsed_line, $response) = @_; |
|
|
|
my $bubble_line = $first_bubble_line{$response-1} +1; |
|
my $bubble_lines= $bubble_lines_per_response{$response-1}; |
|
|
|
my $selected = ""; |
|
|
|
for (my $bline = 0; $bline < $bubble_lines; $bline++) { |
|
$selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":"; |
|
$bubble_line++; |
|
} |
|
return $selected; |
|
} |
|
|
|
=pod |
=pod |
|
|
=item scantron_filenames |
=item scantron_filenames |
Line 5519 sub scantron_selectphase {
|
Line 5654 sub scantron_selectphase {
|
|
|
&Apache::lonpickcode::code_list($r,2); |
&Apache::lonpickcode::code_list($r,2); |
|
|
$r->print('<br /><form method="post" name="checkscantron">'. |
$r->print('<br /><form method="post" name="checkscantron" action="">'. |
$default_form_data."\n". |
$default_form_data."\n". |
&Apache::loncommon::start_data_table('LC_scantron_action')."\n". |
&Apache::loncommon::start_data_table('LC_scantron_action')."\n". |
&Apache::loncommon::start_data_table_header_row()."\n". |
&Apache::loncommon::start_data_table_header_row()."\n". |
Line 5558 sub scantron_selectphase {
|
Line 5693 sub scantron_selectphase {
|
|
|
=item get_scantron_config |
=item get_scantron_config |
|
|
Parse and return the scantron configuration line selected as a |
Parse and return the bubblesheet configuration line selected as a |
hash of configuration file fields. |
hash of configuration file fields. |
|
|
Arguments: |
Arguments: |
Line 5842 sub digits_to_letters {
|
Line 5977 sub digits_to_letters {
|
|
|
=item scantron_parse_scanline |
=item scantron_parse_scanline |
|
|
Decodes a scanline from the selected scantron file |
Decodes a scanline from the selected bubblesheet file |
|
|
Arguments: |
Arguments: |
line - The text of the scantron file line to process |
line - The text of the bubblesheet file line to process |
whichline - Line number |
whichline - Line number |
scantron_config - Hash describing the format of the scantron lines. |
scantron_config - Hash describing the format of the bubblesheet lines. |
scan_data - Hash of extra information about the scanline |
scan_data - Hash of extra information about the scanline |
(see scantron_getfile for more information) |
(see scantron_getfile for more information) |
just_header - True if should not process question answers but only |
just_header - True if should not process question answers but only |
the stuff to the left of the answers. |
the stuff to the left of the answers. |
|
randomorder - True if randomorder in use |
|
randompick - True if randompick in use |
|
sequence - Exam folder URL |
|
master_seq - Ref to array containing symbs in exam folder |
|
symb_to_resource - Ref to hash of symbs for resources in exam folder |
|
(corresponding values are resource objects) |
|
partids_by_symb - Ref to hash of symb -> array ref of partIDs |
|
orderedforcode - Ref to hash of arrays. keys are CODEs and values |
|
are refs to an array of resource objects, ordered |
|
according to order used for CODE, when randomorder |
|
and or randompick are in use. |
|
respnumlookup - Ref to hash mapping question numbers in bubble lines |
|
for current line to question number used for same question |
|
in "Master Sequence" (as seen by Course Coordinator). |
|
startline - Ref to hash where key is question number (0 is first) |
|
and value is number of first bubble line for current |
|
student or code-based randompick and/or randomorder. |
|
totalref - Ref of scalar used to score total number of bubble |
|
lines needed for responses in a scan line (used when |
|
randompick in use. |
|
|
Returns: |
Returns: |
Hash containing the result of parsing the scanline |
Hash containing the result of parsing the scanline |
|
|
Line 5896 sub digits_to_letters {
|
Line 6052 sub digits_to_letters {
|
=cut |
=cut |
|
|
sub scantron_parse_scanline { |
sub scantron_parse_scanline { |
my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_; |
my ($line,$whichline,$scantron_config,$scan_data,$just_header,$idmap, |
|
$randomorder,$randompick,$sequence,$master_seq,$symb_to_resource, |
|
$partids_by_symb,$orderedforcode,$respnumlookup,$startline,$totalref)=@_; |
|
|
my %record; |
my %record; |
my $lastpos = $env{'form.scantron_maxbubble'}*$$scantron_config{'Qlength'}; |
my $data=substr($line,0,$$scantron_config{'Qstart'}-1); # stuff before answers |
my $questions=substr($line,$$scantron_config{'Qstart'}-1,$lastpos); # Answers |
|
my $data=substr($line,0,$$scantron_config{'Qstart'}-1); # earlier stuff |
|
if (!($$scantron_config{'CODElocation'} eq 0 || |
if (!($$scantron_config{'CODElocation'} eq 0 || |
$$scantron_config{'CODElocation'} eq 'none')) { |
$$scantron_config{'CODElocation'} eq 'none')) { |
if ($$scantron_config{'CODElocation'} < 0 || |
if ($$scantron_config{'CODElocation'} < 0 || |
Line 5937 sub scantron_parse_scanline {
|
Line 6093 sub scantron_parse_scanline {
|
my $questnum=0; |
my $questnum=0; |
my $ansnum =1; # Multiple 'answer lines'/question. |
my $ansnum =1; # Multiple 'answer lines'/question. |
|
|
|
my $lastpos = $env{'form.scantron_maxbubble'}*$$scantron_config{'Qlength'}; |
|
if ($randompick || $randomorder) { |
|
my $total = &get_respnum_lookups($sequence,$scan_data,$idmap,$line,\%record, |
|
$master_seq,$symb_to_resource, |
|
$partids_by_symb,$orderedforcode, |
|
$respnumlookup,$startline); |
|
if ($total) { |
|
$lastpos = $total*$$scantron_config{'Qlength'}; |
|
} |
|
if (ref($totalref)) { |
|
$$totalref = $total; |
|
} |
|
} |
|
my $questions=substr($line,$$scantron_config{'Qstart'}-1,$lastpos); # Answers |
chomp($questions); # Get rid of any trailing \n. |
chomp($questions); # Get rid of any trailing \n. |
$questions =~ s/\r$//; # Get rid of trailing \r too (MAC or Win uploads). |
$questions =~ s/\r$//; # Get rid of trailing \r too (MAC or Win uploads). |
while (length($questions)) { |
while (length($questions)) { |
my $answers_needed = $bubble_lines_per_response{$questnum}; |
my $answers_needed; |
|
if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) { |
|
$answers_needed = $bubble_lines_per_response{$respnumlookup->{$questnum}}; |
|
} else { |
|
$answers_needed = $bubble_lines_per_response{$questnum}; |
|
} |
my $answer_length = ($$scantron_config{'Qlength'} * $answers_needed) |
my $answer_length = ($$scantron_config{'Qlength'} * $answers_needed) |
|| 1; |
|| 1; |
$questnum++; |
$questnum++; |
Line 5949 sub scantron_parse_scanline {
|
Line 6124 sub scantron_parse_scanline {
|
$questions = substr($questions,$answer_length); |
$questions = substr($questions,$answer_length); |
if (length($currentquest) < $answer_length) { next; } |
if (length($currentquest) < $answer_length) { next; } |
|
|
if ($subdivided_bubble_lines{$questnum-1} =~ /,/) { |
my $subdivided; |
|
if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) { |
|
$subdivided = $subdivided_bubble_lines{$respnumlookup->{$questnum-1}}; |
|
} else { |
|
$subdivided = $subdivided_bubble_lines{$questnum-1}; |
|
} |
|
if ($subdivided =~ /,/) { |
my $subquestnum = 1; |
my $subquestnum = 1; |
my $subquestions = $currentquest; |
my $subquestions = $currentquest; |
my @subanswers_needed = |
my @subanswers_needed = split(/,/,$subdivided); |
split(/,/,$subdivided_bubble_lines{$questnum-1}); |
|
foreach my $subans (@subanswers_needed) { |
foreach my $subans (@subanswers_needed) { |
my $subans_length = |
my $subans_length = |
($$scantron_config{'Qlength'} * $subans) || 1; |
($$scantron_config{'Qlength'} * $subans) || 1; |
Line 5964 sub scantron_parse_scanline {
|
Line 6144 sub scantron_parse_scanline {
|
($$scantron_config{'Qon'} eq 'number')) { |
($$scantron_config{'Qon'} eq 'number')) { |
$ansnum = &scantron_validator_lettnum($ansnum, |
$ansnum = &scantron_validator_lettnum($ansnum, |
$questnum,$quest_id,$subans,$currsubquest,$whichline, |
$questnum,$quest_id,$subans,$currsubquest,$whichline, |
\@alphabet,\%record,$scantron_config,$scan_data); |
\@alphabet,\%record,$scantron_config,$scan_data, |
|
$randomorder,$randompick,$respnumlookup); |
} else { |
} else { |
$ansnum = &scantron_validator_positional($ansnum, |
$ansnum = &scantron_validator_positional($ansnum, |
$questnum,$quest_id,$subans,$currsubquest,$whichline, \@alphabet,\%record,$scantron_config,$scan_data); |
$questnum,$quest_id,$subans,$currsubquest,$whichline, |
|
\@alphabet,\%record,$scantron_config,$scan_data, |
|
$randomorder,$randompick,$respnumlookup); |
} |
} |
$subquestnum ++; |
$subquestnum ++; |
} |
} |
Line 5976 sub scantron_parse_scanline {
|
Line 6159 sub scantron_parse_scanline {
|
($$scantron_config{'Qon'} eq 'number')) { |
($$scantron_config{'Qon'} eq 'number')) { |
$ansnum = &scantron_validator_lettnum($ansnum,$questnum, |
$ansnum = &scantron_validator_lettnum($ansnum,$questnum, |
$quest_id,$answers_needed,$currentquest,$whichline, |
$quest_id,$answers_needed,$currentquest,$whichline, |
\@alphabet,\%record,$scantron_config,$scan_data); |
\@alphabet,\%record,$scantron_config,$scan_data, |
|
$randomorder,$randompick,$respnumlookup); |
} else { |
} else { |
$ansnum = &scantron_validator_positional($ansnum,$questnum, |
$ansnum = &scantron_validator_positional($ansnum,$questnum, |
$quest_id,$answers_needed,$currentquest,$whichline, |
$quest_id,$answers_needed,$currentquest,$whichline, |
\@alphabet,\%record,$scantron_config,$scan_data); |
\@alphabet,\%record,$scantron_config,$scan_data, |
|
$randomorder,$randompick,$respnumlookup); |
} |
} |
} |
} |
} |
} |
Line 5988 sub scantron_parse_scanline {
|
Line 6173 sub scantron_parse_scanline {
|
return \%record; |
return \%record; |
} |
} |
|
|
|
sub get_master_seq { |
|
my ($resources,$master_seq,$symb_to_resource) = @_; |
|
return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') && |
|
(ref($symb_to_resource) eq 'HASH')); |
|
my $resource_error; |
|
foreach my $resource (@{$resources}) { |
|
my $ressymb; |
|
if (ref($resource)) { |
|
$ressymb = $resource->symb(); |
|
push(@{$master_seq},$ressymb); |
|
$symb_to_resource->{$ressymb} = $resource; |
|
} else { |
|
$resource_error = 1; |
|
last; |
|
} |
|
} |
|
return $resource_error; |
|
} |
|
|
|
sub get_respnum_lookups { |
|
my ($sequence,$scan_data,$idmap,$line,$record,$master_seq,$symb_to_resource, |
|
$partids_by_symb,$orderedforcode,$respnumlookup,$startline) = @_; |
|
return unless ((ref($record) eq 'HASH') && (ref($master_seq) eq 'ARRAY') && |
|
(ref($symb_to_resource) eq 'HASH') && (ref($partids_by_symb) eq 'HASH') && |
|
(ref($orderedforcode) eq 'HASH') && (ref($respnumlookup) eq 'HASH') && |
|
(ref($startline) eq 'HASH')); |
|
my ($user,$scancode); |
|
if ((exists($record->{'scantron.CODE'})) && |
|
(&Apache::lonnet::validCODE($record->{'scantron.CODE'}))) { |
|
$scancode = $record->{'scantron.CODE'}; |
|
} else { |
|
$user = &scantron_find_student($record,$scan_data,$idmap,$line); |
|
} |
|
my @mapresources = |
|
&users_order($user,$scancode,$sequence,$master_seq,$symb_to_resource, |
|
$orderedforcode); |
|
my $total = 0; |
|
my $count = 0; |
|
foreach my $resource (@mapresources) { |
|
my $id = $resource->id(); |
|
my $symb = $resource->symb(); |
|
if (ref($partids_by_symb->{$symb}) eq 'ARRAY') { |
|
foreach my $partid (@{$partids_by_symb->{$symb}}) { |
|
my $respnum = $masterseq_id_responsenum{$id.'_'.$partid}; |
|
if ($respnum ne '') { |
|
$respnumlookup->{$count} = $respnum; |
|
$startline->{$count} = $total; |
|
$total += $bubble_lines_per_response{$respnum}; |
|
$count ++; |
|
} |
|
} |
|
} |
|
} |
|
return $total; |
|
} |
|
|
sub scantron_validator_lettnum { |
sub scantron_validator_lettnum { |
my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,$whichline, |
my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,$whichline, |
$alphabet,$record,$scantron_config,$scan_data) = @_; |
$alphabet,$record,$scantron_config,$scan_data,$randomorder, |
|
$randompick,$respnumlookup) = @_; |
|
|
# Qon 'letter' implies for each slot in currquest we have: |
# Qon 'letter' implies for each slot in currquest we have: |
# ? or * for doubles, a letter in A-Z for a bubble, and |
# ? or * for doubles, a letter in A-Z for a bubble, and |
Line 6009 sub scantron_validator_lettnum {
|
Line 6251 sub scantron_validator_lettnum {
|
$matchon = '\d'; |
$matchon = '\d'; |
} |
} |
my $occurrences = 0; |
my $occurrences = 0; |
if (($responsetype_per_response{$questnum-1} eq 'essayresponse') || |
my $responsenum = $questnum-1; |
($responsetype_per_response{$questnum-1} eq 'formularesponse') || |
if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) { |
($responsetype_per_response{$questnum-1} eq 'stringresponse') || |
$responsenum = $respnumlookup->{$questnum-1} |
($responsetype_per_response{$questnum-1} eq 'imageresponse') || |
} |
($responsetype_per_response{$questnum-1} eq 'reactionresponse') || |
if (($responsetype_per_response{$responsenum} eq 'essayresponse') || |
($responsetype_per_response{$questnum-1} eq 'organicresponse')) { |
($responsetype_per_response{$responsenum} eq 'formularesponse') || |
|
($responsetype_per_response{$responsenum} eq 'stringresponse') || |
|
($responsetype_per_response{$responsenum} eq 'imageresponse') || |
|
($responsetype_per_response{$responsenum} eq 'reactionresponse') || |
|
($responsetype_per_response{$responsenum} eq 'organicresponse')) { |
my @singlelines = split('',$currquest); |
my @singlelines = split('',$currquest); |
foreach my $entry (@singlelines) { |
foreach my $entry (@singlelines) { |
$occurrences = &occurence_count($entry,$matchon); |
$occurrences = &occurence_count($entry,$matchon); |
if ($occurrences > 1) { |
if ($occurrences > 1) { |
last; |
last; |
} |
} |
} |
} |
} else { |
} else { |
$occurrences = &occurence_count($currquest,$matchon); |
$occurrences = &occurence_count($currquest,$matchon); |
} |
} |
Line 6069 sub scantron_validator_lettnum {
|
Line 6315 sub scantron_validator_lettnum {
|
|
|
sub scantron_validator_positional { |
sub scantron_validator_positional { |
my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest, |
my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest, |
$whichline,$alphabet,$record,$scantron_config,$scan_data) = @_; |
$whichline,$alphabet,$record,$scantron_config,$scan_data, |
|
$randomorder,$randompick,$respnumlookup) = @_; |
|
|
# Otherwise there's a positional notation; |
# Otherwise there's a positional notation; |
# each bubble line requires Qlength items, and there are filled in |
# each bubble line requires Qlength items, and there are filled in |
Line 6111 sub scantron_validator_positional {
|
Line 6358 sub scantron_validator_positional {
|
# record all the bubbles filled in as well as the |
# record all the bubbles filled in as well as the |
# fact this response consists of multiple bubbles. |
# fact this response consists of multiple bubbles. |
# |
# |
if (($responsetype_per_response{$questnum-1} eq 'essayresponse') || |
my $responsenum = $questnum-1; |
($responsetype_per_response{$questnum-1} eq 'formularesponse') || |
if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) { |
($responsetype_per_response{$questnum-1} eq 'stringresponse') || |
$responsenum = $respnumlookup->{$questnum-1} |
($responsetype_per_response{$questnum-1} eq 'imageresponse') || |
} |
($responsetype_per_response{$questnum-1} eq 'reactionresponse') || |
if (($responsetype_per_response{$responsenum} eq 'essayresponse') || |
($responsetype_per_response{$questnum-1} eq 'organicresponse')) { |
($responsetype_per_response{$responsenum} eq 'formularesponse') || |
|
($responsetype_per_response{$responsenum} eq 'stringresponse') || |
|
($responsetype_per_response{$responsenum} eq 'imageresponse') || |
|
($responsetype_per_response{$responsenum} eq 'reactionresponse') || |
|
($responsetype_per_response{$responsenum} eq 'organicresponse')) { |
my $doubleerror = 0; |
my $doubleerror = 0; |
while (($currquest >= $$scantron_config{'Qlength'}) && |
while (($currquest >= $$scantron_config{'Qlength'}) && |
(!$doubleerror)) { |
(!$doubleerror)) { |
Line 6298 sub scantron_process_corrections {
|
Line 6549 sub scantron_process_corrections {
|
} |
} |
} |
} |
if ($err) { |
if ($err) { |
$r->print("<span class=\"LC_warning\">Unable to accept last correction, an error occurred :$errmsg:</span>"); |
$r->print( |
|
'<p class="LC_error">' |
|
.&mt('Unable to accept last correction, an error occurred: [_1]', |
|
$errmsg) |
|
.'</p>'); |
} else { |
} else { |
&scantron_put_line($scanlines,$scan_data,$which,$line,$skip); |
&scantron_put_line($scanlines,$scan_data,$which,$line,$skip); |
&scantron_putfile($scanlines,$scan_data); |
&scantron_putfile($scanlines,$scan_data); |
Line 6420 sub scantron_warning_screen {
|
Line 6675 sub scantron_warning_screen {
|
$scantron_config{'CODEstart'} && |
$scantron_config{'CODEstart'} && |
$scantron_config{'CODElength'}) { |
$scantron_config{'CODElength'}) { |
$CODElist=$env{'form.scantron_CODElist'}; |
$CODElist=$env{'form.scantron_CODElist'}; |
if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; } |
if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">'.&mt('None').'</span>'; } |
$CODElist= |
$CODElist= |
'<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'. |
'<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'. |
$env{'form.scantron_CODElist'}.'</tt></td></tr>'; |
$env{'form.scantron_CODElist'}.'</tt></td></tr>'; |
Line 6434 sub scantron_warning_screen {
|
Line 6689 sub scantron_warning_screen {
|
return (' |
return (' |
<p> |
<p> |
<span class="LC_warning"> |
<span class="LC_warning"> |
'.&mt('Please double check the information below before clicking on \'[_1]\'',&mt($button_text)).'</span> |
'.&mt("Please double check the information below before clicking on '[_1]'",&mt($button_text)).'</span> |
</p> |
</p> |
<table> |
<table> |
<tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr> |
<tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr> |
Line 6521 SCANTRONFORM
|
Line 6776 SCANTRONFORM
|
'<input type="hidden" name="scantron.sub_bubblelines.'.$line.'" value="'.$env{"form.scantron.sub_bubblelines.$line"}.'" />'."\n"; |
'<input type="hidden" name="scantron.sub_bubblelines.'.$line.'" value="'.$env{"form.scantron.sub_bubblelines.$line"}.'" />'."\n"; |
$chunk .= |
$chunk .= |
'<input type="hidden" name="scantron.responsetype.'.$line.'" value="'.$env{"form.scantron.responsetype.$line"}.'" />'."\n"; |
'<input type="hidden" name="scantron.responsetype.'.$line.'" value="'.$env{"form.scantron.responsetype.$line"}.'" />'."\n"; |
|
$chunk .= |
|
'<input type="hidden" name="scantron.residpart.'.$line.'" value="'.$env{"form.scantron.residpart.$line"}.'" />'."\n"; |
$result .= $chunk; |
$result .= $chunk; |
$line++; |
$line++; |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
Line 6544 sub scantron_validate_file {
|
Line 6801 sub scantron_validate_file {
|
if (!$symb) {return '';} |
if (!$symb) {return '';} |
my $default_form_data=&defaultFormData($symb); |
my $default_form_data=&defaultFormData($symb); |
|
|
# do the detection of only doing skipped records first befroe we delete |
# do the detection of only doing skipped records first before we delete |
# them when doing the corrections reset |
# them when doing the corrections reset |
if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') { |
if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') { |
&reset_skipping_status(); |
&reset_skipping_status(); |
Line 6595 sub scantron_validate_file {
|
Line 6852 sub scantron_validate_file {
|
while (!$stop && $currentphase < scalar(@validate_phases)) { |
while (!$stop && $currentphase < scalar(@validate_phases)) { |
$r->print(&mt('Validating '.$validate_phases[$currentphase]).'<br />'); |
$r->print(&mt('Validating '.$validate_phases[$currentphase]).'<br />'); |
$r->rflush(); |
$r->rflush(); |
|
|
my $which="scantron_validate_".$validate_phases[$currentphase]; |
my $which="scantron_validate_".$validate_phases[$currentphase]; |
{ |
{ |
no strict 'refs'; |
no strict 'refs'; |
Line 7006 sub scantron_validate_sequence {
|
Line 7264 sub scantron_validate_sequence {
|
$r->print( |
$r->print( |
'<p class="LC_warning">' |
'<p class="LC_warning">' |
.&mt('Some resources in the sequence currently are not set to' |
.&mt('Some resources in the sequence currently are not set to' |
.' exam mode. Grading these resources currently may not' |
.' bubblesheet exam mode. Grading these resources currently may not' |
.' work correctly.') |
.' work correctly.') |
.'</p>' |
.'</p>' |
); |
); |
Line 7090 sub scantron_validate_ID {
|
Line 7348 sub scantron_validate_ID {
|
|
|
|
|
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, |
|
$randomorder,$randompick,$respnumlookup,$startline)=@_; |
#FIXME in the case of a duplicated ID the previous line, probably need |
#FIXME in the case of a duplicated ID the previous line, probably need |
#to show both the current line and the previous one and allow skipping |
#to show both the current line and the previous one and allow skipping |
#the previous one or the current one |
#the previous one or the current one |
Line 7140 sub scantron_get_correction {
|
Line 7399 sub scantron_get_correction {
|
$r->print(&Apache::loncommon::selectstudent_link('scantronupload', |
$r->print(&Apache::loncommon::selectstudent_link('scantronupload', |
'scantron_username','scantron_domain')); |
'scantron_username','scantron_domain')); |
$r->print(": <input type='text' name='scantron_username' value='' />"); |
$r->print(": <input type='text' name='scantron_username' value='' />"); |
$r->print("\n@". |
$r->print("\n:\n". |
&Apache::loncommon::select_dom_form($env{'request.role.domain'},'scantron_domain')); |
&Apache::loncommon::select_dom_form($env{'request.role.domain'},'scantron_domain')); |
|
|
$r->print('</li>'); |
$r->print('</li>'); |
Line 7224 ENDSCRIPT
|
Line 7483 ENDSCRIPT
|
# The form field scantron_questions is acutally a list of line numbers. |
# The form field scantron_questions is acutally a list of line numbers. |
# represented by this form so: |
# represented by this form so: |
|
|
my $line_list = &questions_to_line_list($arg); |
my $line_list = &questions_to_line_list($arg,$randomorder,$randompick, |
|
$respnumlookup,$startline); |
|
|
$r->print('<input type="hidden" name="scantron_questions" value="'. |
$r->print('<input type="hidden" name="scantron_questions" value="'. |
$line_list.'" />'); |
$line_list.'" />'); |
Line 7232 ENDSCRIPT
|
Line 7492 ENDSCRIPT
|
$r->print("<p>".&mt("Please indicate which bubble should be used for grading")."</p>"); |
$r->print("<p>".&mt("Please indicate which bubble should be used for grading")."</p>"); |
foreach my $question (@{$arg}) { |
foreach my $question (@{$arg}) { |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
$scan_record, $error); |
$scan_record, $error, |
|
$randomorder,$randompick, |
|
$respnumlookup,$startline); |
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)); |
Line 7245 ENDSCRIPT
|
Line 7507 ENDSCRIPT
|
# The form field scantron_questions is actually a list of line numbers not |
# The form field scantron_questions is actually a list of line numbers not |
# a list of question numbers. Therefore: |
# a list of question numbers. Therefore: |
# |
# |
|
|
my $line_list = &questions_to_line_list($arg); |
my $line_list = &questions_to_line_list($arg,$randomorder,$randompick, |
|
$respnumlookup,$startline); |
|
|
$r->print('<input type="hidden" name="scantron_questions" value="'. |
$r->print('<input type="hidden" name="scantron_questions" value="'. |
$line_list.'" />'); |
$line_list.'" />'); |
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, |
|
$randomorder,$randompick, |
|
$respnumlookup,$startline); |
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)); |
Line 7303 used to fill in the scantron_questions f
|
Line 7568 used to fill in the scantron_questions f
|
|
|
Arguments: |
Arguments: |
questions - Reference to an array of questions. |
questions - Reference to an array of questions. |
|
randomorder - True if randomorder in use. |
|
randompick - True if randompick in use. |
|
respnumlookup - Reference to HASH mapping question numbers in bubble lines |
|
for current line to question number used for same question |
|
in "Master Seqence" (as seen by Course Coordinator). |
|
startline - Reference to hash where key is question number (0 is first) |
|
and key is number of first bubble line for current student |
|
or code-based randompick and/or randomorder. |
|
|
=cut |
=cut |
|
|
|
|
sub questions_to_line_list { |
sub questions_to_line_list { |
my ($questions) = @_; |
my ($questions,$randomorder,$randompick,$respnumlookup,$startline) = @_; |
my @lines; |
my @lines; |
|
|
foreach my $item (@{$questions}) { |
foreach my $item (@{$questions}) { |
Line 7317 sub questions_to_line_list {
|
Line 7590 sub questions_to_line_list {
|
if ($item =~ /^(\d+)\.(\d+)$/) { |
if ($item =~ /^(\d+)\.(\d+)$/) { |
$question = $1; |
$question = $1; |
my $subquestion = $2; |
my $subquestion = $2; |
$first = $first_bubble_line{$question-1} + 1; |
my $responsenum = $question-1; |
my @subans = split(/,/,$subdivided_bubble_lines{$question-1}); |
if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) { |
|
$responsenum = $respnumlookup->{$question-1}; |
|
if (ref($startline) eq 'HASH') { |
|
$first = $startline->{$question-1} + 1; |
|
} |
|
} else { |
|
$first = $first_bubble_line{$responsenum} + 1; |
|
} |
|
my @subans = split(/,/,$subdivided_bubble_lines{$responsenum}); |
my $subcount = 1; |
my $subcount = 1; |
while ($subcount<$subquestion) { |
while ($subcount<$subquestion) { |
$first += $subans[$subcount-1]; |
$first += $subans[$subcount-1]; |
Line 7326 sub questions_to_line_list {
|
Line 7607 sub questions_to_line_list {
|
} |
} |
$count = $subans[$subquestion-1]; |
$count = $subans[$subquestion-1]; |
} else { |
} else { |
$first = $first_bubble_line{$question-1} + 1; |
my $responsenum = $question-1; |
$count = $bubble_lines_per_response{$question-1}; |
if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) { |
|
$responsenum = $respnumlookup->{$question-1}; |
|
if (ref($startline) eq 'HASH') { |
|
$first = $startline->{$question-1} + 1; |
|
} |
|
} else { |
|
$first = $first_bubble_line{$responsenum} + 1; |
|
} |
|
$count = $bubble_lines_per_response{$responsenum}; |
} |
} |
$last = $first+$count-1; |
$last = $first+$count-1; |
push(@lines, ($first..$last)); |
push(@lines, ($first..$last)); |
Line 7349 for multi and missing bubble cases).
|
Line 7638 for multi and missing bubble cases).
|
$scan_config - The scantron file configuration hash. |
$scan_config - The scantron file configuration hash. |
$scan_record - Reference to the hash that has the the parsed scanlines. |
$scan_record - Reference to the hash that has the the parsed scanlines. |
$error - Type of error |
$error - Type of error |
|
$randomorder - True if randomorder in use. |
|
$randompick - True if randompick in use. |
|
$respnumlookup - Reference to HASH mapping question numbers in bubble lines |
|
for current line to question number used for same question |
|
in "Master Seqence" (as seen by Course Coordinator). |
|
$startline - Reference to hash where key is question number (0 is first) |
|
and value is number of first bubble line for current student |
|
or code-based randompick and/or randomorder. |
|
|
|
|
Implicit inputs: |
Implicit inputs: |
%bubble_lines_per_response - Starting line numbers for each question. |
%bubble_lines_per_response - Starting line numbers for each question. |
Line 7373 for multi and missing bubble cases).
|
Line 7671 for multi and missing bubble cases).
|
=cut |
=cut |
|
|
sub prompt_for_corrections { |
sub prompt_for_corrections { |
my ($r, $question, $scan_config, $scan_record, $error) = @_; |
my ($r, $question, $scan_config, $scan_record, $error, $randomorder, |
|
$randompick, $respnumlookup, $startline) = @_; |
my ($current_line,$lines); |
my ($current_line,$lines); |
my @linenums; |
my @linenums; |
my $questionnum = $question; |
my $questionnum = $question; |
|
my ($first,$responsenum); |
if ($question =~ /^(\d+)\.(\d+)$/) { |
if ($question =~ /^(\d+)\.(\d+)$/) { |
$question = $1; |
$question = $1; |
$current_line = $first_bubble_line{$question-1} + 1 ; |
|
my $subquestion = $2; |
my $subquestion = $2; |
my @subans = split(/,/,$subdivided_bubble_lines{$question-1}); |
if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) { |
|
$responsenum = $respnumlookup->{$question-1}; |
|
if (ref($startline) eq 'HASH') { |
|
$first = $startline->{$question-1}; |
|
} |
|
} else { |
|
$responsenum = $question-1; |
|
$first = $first_bubble_line{$responsenum}; |
|
} |
|
$current_line = $first + 1 ; |
|
my @subans = split(/,/,$subdivided_bubble_lines{$responsenum}); |
my $subcount = 1; |
my $subcount = 1; |
while ($subcount<$subquestion) { |
while ($subcount<$subquestion) { |
$current_line += $subans[$subcount-1]; |
$current_line += $subans[$subcount-1]; |
Line 7389 sub prompt_for_corrections {
|
Line 7698 sub prompt_for_corrections {
|
} |
} |
$lines = $subans[$subquestion-1]; |
$lines = $subans[$subquestion-1]; |
} else { |
} else { |
$current_line = $first_bubble_line{$question-1} + 1 ; |
if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) { |
$lines = $bubble_lines_per_response{$question-1}; |
$responsenum = $respnumlookup->{$question-1}; |
|
if (ref($startline) eq 'HASH') { |
|
$first = $startline->{$question-1}; |
|
} |
|
} else { |
|
$responsenum = $question-1; |
|
$first = $first_bubble_line{$responsenum}; |
|
} |
|
$current_line = $first + 1; |
|
$lines = $bubble_lines_per_response{$responsenum}; |
} |
} |
if ($lines > 1) { |
if ($lines > 1) { |
$r->print(&mt('The group of bubble lines below responds to a single question.').'<br />'); |
$r->print(&mt('The group of bubble lines below responds to a single question.').'<br />'); |
if (($responsetype_per_response{$question-1} eq 'essayresponse') || |
if (($responsetype_per_response{$responsenum} eq 'essayresponse') || |
($responsetype_per_response{$question-1} eq 'formularesponse') || |
($responsetype_per_response{$responsenum} eq 'formularesponse') || |
($responsetype_per_response{$question-1} eq 'stringresponse') || |
($responsetype_per_response{$responsenum} eq 'stringresponse') || |
($responsetype_per_response{$question-1} eq 'imageresponse') || |
($responsetype_per_response{$responsenum} eq 'imageresponse') || |
($responsetype_per_response{$question-1} eq 'reactionresponse') || |
($responsetype_per_response{$responsenum} eq 'reactionresponse') || |
($responsetype_per_response{$question-1} eq 'organicresponse')) { |
($responsetype_per_response{$responsenum} eq 'organicresponse')) { |
$r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines).'<br /><br />'.&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.').'<br />'.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.').'<br />'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'<br /><br />'); |
$r->print( |
|
&mt("Although this particular question type requires handgrading, the instructions for this question in the bubblesheet exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines) |
|
.'<br /><br />' |
|
.&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.') |
|
.'<br />' |
|
.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.') |
|
.'<br />' |
|
.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.") |
|
.'<br /><br />' |
|
); |
} else { |
} else { |
$r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />"); |
$r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />"); |
} |
} |
} |
} |
for (my $i =0; $i < $lines; $i++) { |
for (my $i =0; $i < $lines; $i++) { |
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++; |
Line 7661 sub scantron_validate_doublebubble {
|
Line 7988 sub scantron_validate_doublebubble {
|
#get student info |
#get student info |
my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&Apache::loncoursedata::get_classlist(); |
my %idmap=&username_to_idmap($classlist); |
my %idmap=&username_to_idmap($classlist); |
|
my (undef,undef,$sequence)= |
|
&Apache::lonnet::decode_symb($env{'form.selectpage'}); |
|
|
#get scantron line setup |
#get scantron line setup |
my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
|
|
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
unless (ref($navmap)) { |
|
$r->print(&navmap_errormsg()); |
|
return(1,$currentphase); |
|
} |
|
my $map=$navmap->getResourceByUrl($sequence); |
|
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
|
my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb, |
|
%grader_randomlists_by_symb,%orderedforcode,%respnumlookup,%startline); |
|
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); |
|
|
my $nav_error; |
my $nav_error; |
|
if (ref($map)) { |
|
$randomorder = $map->randomorder(); |
|
$randompick = $map->randompick(); |
|
if ($randomorder || $randompick) { |
|
$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource); |
|
if ($nav_error) { |
|
$r->print(&navmap_errormsg()); |
|
return(1,$currentphase); |
|
} |
|
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
|
\%grader_randomlists_by_symb,$bubbles_per_row); |
|
} |
|
} else { |
|
$r->print(&navmap_errormsg()); |
|
return(1,$currentphase); |
|
} |
|
|
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the bubble line array. |
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the bubble line array. |
if ($nav_error) { |
if ($nav_error) { |
$r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
Line 7676 sub scantron_validate_doublebubble {
|
Line 8034 sub scantron_validate_doublebubble {
|
my $line=&scantron_get_line($scanlines,$scan_data,$i); |
my $line=&scantron_get_line($scanlines,$scan_data,$i); |
if ($line=~/^[\s\cz]*$/) { next; } |
if ($line=~/^[\s\cz]*$/) { next; } |
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
$scan_data); |
$scan_data,undef,\%idmap,$randomorder, |
|
$randompick,$sequence,\@master_seq, |
|
\%symb_to_resource,\%grader_partids_by_symb, |
|
\%orderedforcode,\%respnumlookup,\%startline); |
if (!defined($$scan_record{'scantron.doubleerror'})) { next; } |
if (!defined($$scan_record{'scantron.doubleerror'})) { next; } |
&scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line, |
&scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line, |
'doublebubble', |
'doublebubble', |
$$scan_record{'scantron.doubleerror'}); |
$$scan_record{'scantron.doubleerror'}, |
|
$randomorder,$randompick,\%respnumlookup,\%startline); |
return (1,$currentphase); |
return (1,$currentphase); |
} |
} |
return (0,$currentphase+1); |
return (0,$currentphase+1); |
Line 7719 sub scantron_get_maxbubble {
|
Line 8081 sub scantron_get_maxbubble {
|
%first_bubble_line = (); |
%first_bubble_line = (); |
%subdivided_bubble_lines = (); |
%subdivided_bubble_lines = (); |
%responsetype_per_response = (); |
%responsetype_per_response = (); |
|
%masterseq_id_responsenum = (); |
|
|
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 $resid = $resource->id(); |
my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname, |
my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname, |
$udom,undef,$bubbles_per_row); |
$udom,undef,$bubbles_per_row); |
if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) { |
if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) { |
Line 7773 sub scantron_get_maxbubble {
|
Line 8137 sub scantron_get_maxbubble {
|
$bubble_lines_per_response{$response_number} = $lines; |
$bubble_lines_per_response{$response_number} = $lines; |
$responsetype_per_response{$response_number} = |
$responsetype_per_response{$response_number} = |
$analysis->{$part_id.'.type'}; |
$analysis->{$part_id.'.type'}; |
|
$masterseq_id_responsenum{$resid.'_'.$part_id} = $response_number; |
$response_number++; |
$response_number++; |
|
|
$bubble_line += $lines; |
$bubble_line += $lines; |
Line 7805 sub scantron_validate_missingbubbles {
|
Line 8170 sub scantron_validate_missingbubbles {
|
#get student info |
#get student info |
my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&Apache::loncoursedata::get_classlist(); |
my %idmap=&username_to_idmap($classlist); |
my %idmap=&username_to_idmap($classlist); |
|
my (undef,undef,$sequence)= |
|
&Apache::lonnet::decode_symb($env{'form.selectpage'}); |
|
|
#get scantron line setup |
#get scantron line setup |
my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
|
|
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
unless (ref($navmap)) { |
|
$r->print(&navmap_errormsg()); |
|
return(1,$currentphase); |
|
} |
|
|
|
my $map=$navmap->getResourceByUrl($sequence); |
|
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
|
my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb, |
|
%grader_randomlists_by_symb,%orderedforcode,%respnumlookup,%startline); |
|
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); |
|
|
my $nav_error; |
my $nav_error; |
|
if (ref($map)) { |
|
$randomorder = $map->randomorder(); |
|
$randompick = $map->randompick(); |
|
if ($randomorder || $randompick) { |
|
$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource); |
|
if ($nav_error) { |
|
$r->print(&navmap_errormsg()); |
|
return(1,$currentphase); |
|
} |
|
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
|
\%grader_randomlists_by_symb,$bubbles_per_row); |
|
} |
|
} else { |
|
$r->print(&navmap_errormsg()); |
|
return(1,$currentphase); |
|
} |
|
|
|
|
my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config); |
my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config); |
if ($nav_error) { |
if ($nav_error) { |
|
$r->print(&navmap_errormsg()); |
return(1,$currentphase); |
return(1,$currentphase); |
} |
} |
|
|
if (!$max_bubble) { $max_bubble=2**31; } |
if (!$max_bubble) { $max_bubble=2**31; } |
for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
my $line=&scantron_get_line($scanlines,$scan_data,$i); |
my $line=&scantron_get_line($scanlines,$scan_data,$i); |
if ($line=~/^[\s\cz]*$/) { next; } |
if ($line=~/^[\s\cz]*$/) { next; } |
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
my $scan_record = |
$scan_data); |
&scantron_parse_scanline($line,$i,\%scantron_config,$scan_data,undef,\%idmap, |
|
$randomorder,$randompick,$sequence,\@master_seq, |
|
\%symb_to_resource,\%grader_partids_by_symb, |
|
\%orderedforcode,\%respnumlookup,\%startline); |
if (!defined($$scan_record{'scantron.missingerror'})) { next; } |
if (!defined($$scan_record{'scantron.missingerror'})) { next; } |
my @to_correct; |
my @to_correct; |
|
|
Line 7830 sub scantron_validate_missingbubbles {
|
Line 8233 sub scantron_validate_missingbubbles {
|
if ($missing =~ /^(\d+)\.(\d+)$/) { |
if ($missing =~ /^(\d+)\.(\d+)$/) { |
my $question = $1; |
my $question = $1; |
my $subquestion = $2; |
my $subquestion = $2; |
if (!defined($first_bubble_line{$question -1})) { next; } |
my ($first,$responsenum); |
my $first = $first_bubble_line{$question-1}; |
if ($randomorder || $randompick) { |
my @subans = split(/,/,$subdivided_bubble_lines{$question-1}); |
$responsenum = $respnumlookup{$question-1}; |
|
$first = $startline{$question-1}; |
|
} else { |
|
$responsenum = $question-1; |
|
$first = $first_bubble_line{$responsenum}; |
|
} |
|
if (!defined($first)) { next; } |
|
my @subans = split(/,/,$subdivided_bubble_lines{$responsenum}); |
my $subcount = 1; |
my $subcount = 1; |
while ($subcount<$subquestion) { |
while ($subcount<$subquestion) { |
$first += $subans[$subcount-1]; |
$first += $subans[$subcount-1]; |
Line 7841 sub scantron_validate_missingbubbles {
|
Line 8251 sub scantron_validate_missingbubbles {
|
my $count = $subans[$subquestion-1]; |
my $count = $subans[$subquestion-1]; |
$lastbubble = $first + $count; |
$lastbubble = $first + $count; |
} else { |
} else { |
if (!defined($first_bubble_line{$missing - 1})) { next; } |
my ($first,$responsenum); |
$lastbubble = $first_bubble_line{$missing - 1} + $bubble_lines_per_response{$missing - 1}; |
if ($randomorder || $randompick) { |
|
$responsenum = $respnumlookup{$missing-1}; |
|
$first = $startline{$missing-1}; |
|
} else { |
|
$responsenum = $missing-1; |
|
$first = $first_bubble_line{$responsenum}; |
|
} |
|
if (!defined($first)) { next; } |
|
$lastbubble = $first + $bubble_lines_per_response{$responsenum}; |
} |
} |
if ($lastbubble > $max_bubble) { next; } |
if ($lastbubble > $max_bubble) { next; } |
push(@to_correct,$missing); |
push(@to_correct,$missing); |
} |
} |
if (@to_correct) { |
if (@to_correct) { |
&scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
&scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
$line,'missingbubble',\@to_correct); |
$line,'missingbubble',\@to_correct, |
|
$randomorder,$randompick,\%respnumlookup, |
|
\%startline); |
return (1,$currentphase); |
return (1,$currentphase); |
} |
} |
|
|
Line 7888 sub hand_bubble_option {
|
Line 8308 sub hand_bubble_option {
|
return &mt('The sequence to be graded contains response types which are handgraded.').'<p>'. |
return &mt('The sequence to be graded contains response types which are handgraded.').'<p>'. |
&mt('If you have already graded these by bubbling sheets to indicate points awarded, [_1]what point value is assigned to a filled last bubble in each row?','<br />'). |
&mt('If you have already graded these by bubbling sheets to indicate points awarded, [_1]what point value is assigned to a filled last bubble in each row?','<br />'). |
'<label><input type="radio" name="scantron_lastbubblepoints" value="'.$bubbles_per_row.'" checked="checked" />'.&mt('[quant,_1,point]',$bubbles_per_row).'</label> '.&mt('or').' '. |
'<label><input type="radio" name="scantron_lastbubblepoints" value="'.$bubbles_per_row.'" checked="checked" />'.&mt('[quant,_1,point]',$bubbles_per_row).'</label> '.&mt('or').' '. |
'<label><input type="radio" name="scantron_lastbubblepoints" value="0"/>0 points</label></p>'; |
'<label><input type="radio" name="scantron_lastbubblepoints" value="0" />'.&mt('0 points').'</label></p>'; |
} |
} |
return; |
return; |
} |
} |
Line 7903 sub scantron_process_students {
|
Line 8323 sub scantron_process_students {
|
my $default_form_data=&defaultFormData($symb); |
my $default_form_data=&defaultFormData($symb); |
|
|
my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my $bubbles_per_row = |
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); |
&bubblesheet_bubbles_per_row(\%scantron_config); |
|
my ($scanlines,$scan_data)=&scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&Apache::loncoursedata::get_classlist(); |
my %idmap=&username_to_idmap($classlist); |
my %idmap=&username_to_idmap($classlist); |
Line 7912 sub scantron_process_students {
|
Line 8331 sub scantron_process_students {
|
unless (ref($navmap)) { |
unless (ref($navmap)) { |
$r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
return ''; |
return ''; |
} |
} |
my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
my $randomorder; |
my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb, |
|
%grader_randomlists_by_symb); |
if (ref($map)) { |
if (ref($map)) { |
$randomorder = $map->randomorder(); |
$randomorder = $map->randomorder(); |
|
$randompick = $map->randompick(); |
|
} else { |
|
$r->print(&navmap_errormsg()); |
|
return ''; |
} |
} |
|
my $nav_error; |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my (%grader_partids_by_symb,%grader_randomlists_by_symb,%ordered); |
if ($randomorder || $randompick) { |
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource); |
\%grader_randomlists_by_symb,$bubbles_per_row); |
if ($nav_error) { |
my ($resource_error,%symb_to_resource,@master_seq); |
$r->print(&navmap_errormsg()); |
foreach my $resource (@resources) { |
return ''; |
my $ressymb; |
|
if (ref($resource)) { |
|
$ressymb = $resource->symb(); |
|
push(@master_seq,$ressymb); |
|
$symb_to_resource{$ressymb} = $resource; |
|
} else { |
|
$resource_error = 1; |
|
last; |
|
} |
|
my ($analysis,$parts) = |
|
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
|
$env{'user.name'},$env{'user.domain'}, |
|
1,$bubbles_per_row); |
|
$grader_partids_by_symb{$ressymb} = $parts; |
|
if (ref($analysis) eq 'HASH') { |
|
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
|
$grader_randomlists_by_symb{$ressymb} = |
|
$analysis->{'parts_withrandomlist'}; |
|
} |
|
} |
} |
} |
} |
if ($resource_error) { |
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
$r->print(&navmap_errormsg()); |
\%grader_randomlists_by_symb,$bubbles_per_row); |
return ''; |
|
} |
|
|
|
my ($uname,$udom); |
my ($uname,$udom); |
my $result= <<SCANTRONFORM; |
my $result= <<SCANTRONFORM; |
Line 7970 SCANTRONFORM
|
Line 8374 SCANTRONFORM
|
my $i=-1; |
my $i=-1; |
my $started; |
my $started; |
|
|
my $nav_error; |
|
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse. |
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse. |
if ($nav_error) { |
if ($nav_error) { |
$r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
Line 7989 SCANTRONFORM
|
Line 8392 SCANTRONFORM
|
|
|
my %lettdig = &letter_to_digits(); |
my %lettdig = &letter_to_digits(); |
my $numletts = scalar(keys(%lettdig)); |
my $numletts = scalar(keys(%lettdig)); |
|
my %orderedforcode; |
|
|
while ($i<$scanlines->{'count'}) { |
while ($i<$scanlines->{'count'}) { |
($uname,$udom)=('',''); |
($uname,$udom)=('',''); |
Line 7999 SCANTRONFORM
|
Line 8403 SCANTRONFORM
|
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student'); |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student'); |
} |
} |
$started=1; |
$started=1; |
|
my %respnumlookup = (); |
|
my %startline = (); |
|
my $total; |
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
$scan_data); |
$scan_data,undef,\%idmap,$randomorder, |
|
$randompick,$sequence,\@master_seq, |
|
\%symb_to_resource,\%grader_partids_by_symb, |
|
\%orderedforcode,\%respnumlookup,\%startline, |
|
\$total); |
unless ($uname=&scantron_find_student($scan_record,$scan_data, |
unless ($uname=&scantron_find_student($scan_record,$scan_data, |
\%idmap,$i)) { |
\%idmap,$i)) { |
&scantron_add_delay(\@delayqueue,$line, |
&scantron_add_delay(\@delayqueue,$line, |
Line 8025 SCANTRONFORM
|
Line 8436 SCANTRONFORM
|
} |
} |
|
|
my @mapresources = @resources; |
my @mapresources = @resources; |
if ($randomorder) { |
if ($randomorder || $randompick) { |
@mapresources = |
@mapresources = |
&users_order($user,$scancode,$sequence,\@master_seq,\%ordered, |
&users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource, |
\%symb_to_resource); |
\%orderedforcode); |
} |
} |
my (%partids_by_symb,$res_error); |
my (%partids_by_symb,$res_error); |
foreach my $resource (@mapresources) { |
foreach my $resource (@mapresources) { |
Line 8065 SCANTRONFORM
|
Line 8476 SCANTRONFORM
|
|
|
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
\@mapresources,\%partids_by_symb, |
\@mapresources,\%partids_by_symb, |
$bubbles_per_row) eq 'ssi_error') { |
$bubbles_per_row,$randomorder,$randompick, |
|
\%respnumlookup,\%startline) |
|
eq 'ssi_error') { |
$ssi_error = 0; # So end of handler error message does not trigger. |
$ssi_error = 0; # So end of handler error message does not trigger. |
$r->print("</form>"); |
$r->print("</form>"); |
&ssi_print_error($r); |
&ssi_print_error($r); |
Line 8073 SCANTRONFORM
|
Line 8486 SCANTRONFORM
|
return ''; # Why return ''? Beats me. |
return ''; # Why return ''? Beats me. |
} |
} |
|
|
|
if (($scancode) && ($randomorder || $randompick)) { |
|
my $parmresult = |
|
&Apache::lonparmset::storeparm_by_symb($symb, |
|
'0_examcode',2,$scancode, |
|
'string_examcode',$uname, |
|
$udom); |
|
} |
$completedstudents{$uname}={'line'=>$line}; |
$completedstudents{$uname}={'line'=>$line}; |
if ($env{'form.verifyrecord'}) { |
if ($env{'form.verifyrecord'}) { |
my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'}; |
my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'}; |
|
if ($randompick) { |
|
if ($total) { |
|
$lastpos = $total*$scantron_config{'Qlength'}; |
|
} |
|
} |
|
|
my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos); |
my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos); |
chomp($studentdata); |
chomp($studentdata); |
$studentdata =~ s/\r$//; |
$studentdata =~ s/\r$//; |
Line 8086 SCANTRONFORM
|
Line 8512 SCANTRONFORM
|
($counter,my $recording) = |
($counter,my $recording) = |
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'}, |
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'}, |
$counter,$studentdata,$partids_by_symb{$ressymb}, |
$counter,$studentdata,$partids_by_symb{$ressymb}, |
\%scantron_config,\%lettdig,$numletts); |
\%scantron_config,\%lettdig,$numletts,$randomorder, |
|
$randompick,\%respnumlookup,\%startline); |
$studentrecord .= $recording; |
$studentrecord .= $recording; |
} |
} |
if ($studentrecord ne $studentdata) { |
if ($studentrecord ne $studentdata) { |
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonxml::clear_problem_counter(); |
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
\@mapresources,\%partids_by_symb, |
\@mapresources,\%partids_by_symb, |
$bubbles_per_row) eq 'ssi_error') { |
$bubbles_per_row,$randomorder,$randompick, |
|
\%respnumlookup,\%startline) |
|
eq 'ssi_error') { |
$ssi_error = 0; # So end of handler error message does not trigger. |
$ssi_error = 0; # So end of handler error message does not trigger. |
$r->print("</form>"); |
$r->print("</form>"); |
&ssi_print_error($r); |
&ssi_print_error($r); |
Line 8108 SCANTRONFORM
|
Line 8537 SCANTRONFORM
|
($counter,my $recording) = |
($counter,my $recording) = |
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'}, |
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'}, |
$counter,$studentdata,$partids_by_symb{$ressymb}, |
$counter,$studentdata,$partids_by_symb{$ressymb}, |
\%scantron_config,\%lettdig,$numletts); |
\%scantron_config,\%lettdig,$numletts, |
|
$randomorder,$randompick,\%respnumlookup, |
|
\%startline); |
$studentrecord .= $recording; |
$studentrecord .= $recording; |
} |
} |
if ($studentrecord ne $studentdata) { |
if ($studentrecord ne $studentdata) { |
Line 8126 SCANTRONFORM
|
Line 8557 SCANTRONFORM
|
&Apache::loncommon::end_data_table_header_row()."\n". |
&Apache::loncommon::end_data_table_header_row()."\n". |
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
'<td>'.&mt('Bubblesheet').'</td>'. |
'<td>'.&mt('Bubblesheet').'</td>'. |
'<td><span class="LC_nobreak"><tt>'.$studentdata.'</tt></span></td>'. |
'<td><span class="LC_nobreak" style="white-space: pre;"><tt>'.$studentdata.'</tt></span></td>'. |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
'<td>'.&mt('Stored submissions').'</td>'. |
'<td>'.&mt('Stored submissions').'</td>'. |
'<td><span class="LC_nobreak"><tt>'.$studentrecord.'</tt></span></td>'."\n". |
'<td><span class="LC_nobreak" style="white-space: pre;"><tt>'.$studentrecord.'</tt></span></td>'."\n". |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table().'</p>'); |
&Apache::loncommon::end_data_table().'</p>'); |
} else { |
} else { |
Line 8186 sub graders_resources_pass {
|
Line 8617 sub graders_resources_pass {
|
if this is a CODEd exam, or based on student's identity if this is a |
if this is a CODEd exam, or based on student's identity if this is a |
"NAMEd" exam. |
"NAMEd" exam. |
|
|
Should be used when randomorder applied when the corresponding exam was |
Should be used when randomorder and/or randompick applied when the |
printed, prior to students completing bubblesheets for the version of the |
corresponding exam was printed, prior to students completing bubblesheets |
exam the student received. |
for the version of the exam the student received. |
|
|
=cut |
=cut |
|
|
sub users_order { |
sub users_order { |
my ($user,$scancode,$mapurl,$master_seq,$ordered,$symb_to_resource) = @_; |
my ($user,$scancode,$mapurl,$master_seq,$symb_to_resource,$orderedforcode) = @_; |
my @mapresources; |
my @mapresources; |
unless ((ref($ordered) eq 'HASH') && (ref($symb_to_resource) eq 'HASH')) { |
unless ((ref($master_seq) eq 'ARRAY') && (ref($symb_to_resource) eq 'HASH')) { |
return @mapresources; |
return @mapresources; |
} |
} |
if (($scancode) && (ref($ordered->{$scancode}) eq 'ARRAY')) { |
if ($scancode) { |
@mapresources = @{$ordered->{$scancode}}; |
if ((ref($orderedforcode) eq 'HASH') && (ref($orderedforcode->{$scancode}) eq 'ARRAY')) { |
} elsif ($scancode) { |
@mapresources = @{$orderedforcode->{$scancode}}; |
$env{'form.CODE'} = $scancode; |
} else { |
my $actual_seq = |
$env{'form.CODE'} = $scancode; |
&Apache::lonprintout::master_seq_to_person_seq($mapurl, |
my $actual_seq = |
$master_seq, |
&Apache::lonprintout::master_seq_to_person_seq($mapurl, |
$user,$scancode); |
$master_seq, |
if (ref($actual_seq) eq 'ARRAY') { |
$user,$scancode,1); |
@{$ordered->{$scancode}} = |
if (ref($actual_seq) eq 'ARRAY') { |
map { $symb_to_resource->{$_}; } @{$actual_seq}; |
@mapresources = map { $symb_to_resource->{$_}; } @{$actual_seq}; |
@mapresources = @{$ordered->{$scancode}}; |
if (ref($orderedforcode) eq 'HASH') { |
|
if (@mapresources > 0) { |
|
$orderedforcode->{$scancode} = \@mapresources; |
|
} |
|
} |
|
} |
|
delete($env{'form.CODE'}); |
} |
} |
delete($env{'form.CODE'}); |
|
} else { |
} else { |
my $actual_seq = |
my $actual_seq = |
&Apache::lonprintout::master_seq_to_person_seq($mapurl, |
&Apache::lonprintout::master_seq_to_person_seq($mapurl, |
$master_seq, |
$master_seq, |
$user); |
$user,undef,1); |
if (ref($actual_seq) eq 'ARRAY') { |
if (ref($actual_seq) eq 'ARRAY') { |
@mapresources = |
@mapresources = |
map { $symb_to_resource->{$_}; } @{$actual_seq}; |
map { $symb_to_resource->{$_}; } @{$actual_seq}; |
} |
} |
} |
} |
return @mapresources; |
return @mapresources; |
} |
} |
|
|
sub grade_student_bubbles { |
sub grade_student_bubbles { |
my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts,$bubbles_per_row) = @_; |
my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts,$bubbles_per_row, |
|
$randomorder,$randompick,$respnumlookup,$startline) = @_; |
|
my $uselookup = 0; |
|
if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH') && |
|
(ref($startline) eq 'HASH')) { |
|
$uselookup = 1; |
|
} |
|
|
if (ref($resources) eq 'ARRAY') { |
if (ref($resources) eq 'ARRAY') { |
my $count = 0; |
my $count = 0; |
foreach my $resource (@{$resources}) { |
foreach my $resource (@{$resources}) { |
Line 8248 sub grade_student_bubbles {
|
Line 8691 sub grade_student_bubbles {
|
if (ref($parts) eq 'HASH') { |
if (ref($parts) eq 'HASH') { |
if (ref($parts->{$ressymb}) eq 'ARRAY') { |
if (ref($parts->{$ressymb}) eq 'ARRAY') { |
foreach my $part (@{$parts->{$ressymb}}) { |
foreach my $part (@{$parts->{$ressymb}}) { |
$form{'scantron_questnum_start.'.$part} = |
if ($uselookup) { |
1+$env{'form.scantron.first_bubble_line.'.$count}; |
$form{'scantron_questnum_start.'.$part} = $startline->{$count} + 1; |
|
} else { |
|
$form{'scantron_questnum_start.'.$part} = |
|
1+$env{'form.scantron.first_bubble_line.'.$count}; |
|
} |
$count++; |
$count++; |
} |
} |
} |
} |
Line 8349 sub scantron_upload_scantron_data_save {
|
Line 8796 sub scantron_upload_scantron_data_save {
|
} |
} |
my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'}); |
my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'}); |
my $uploadedfile; |
my $uploadedfile; |
$r->print('<h3>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</h3>'); |
$r->print('<p>'.&mt('Uploading file to [_1]','"'.$coursedata{'description'}.'"').'</p>'); |
if (length($env{'form.upfile'}) < 2) { |
if (length($env{'form.upfile'}) < 2) { |
$r->print(&mt('[_1]Error:[_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.','<span class="LC_error">','</span>','<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>')); |
$r->print( |
|
&Apache::lonhtmlcommon::confirm_success( |
|
&mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.', |
|
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'),1)); |
} else { |
} else { |
my $result = |
my $result = |
&Apache::lonnet::userfileupload('upfile','','scantron','','','', |
&Apache::lonnet::userfileupload('upfile','','scantron','','','', |
$env{'form.courseid'},$env{'form.domainid'}); |
$env{'form.courseid'},$env{'form.domainid'}); |
if ($result =~ m{^/uploaded/}) { |
if ($result =~ m{^/uploaded/}) { |
$r->print(&mt('[_1]Success:[_2] Successfully uploaded [_3] bytes of data into location: [_4]', |
$r->print( |
'<span class="LC_success">','</span>',(length($env{'form.upfile'})-1), |
&Apache::lonhtmlcommon::confirm_success(&mt('Upload successful')).'<br />'. |
'<span class="LC_filename">'.$result.'</span>')); |
&mt('Uploaded [_1] bytes of data into location: [_2]', |
|
(length($env{'form.upfile'})-1), |
|
'<span class="LC_filename">'.$result.'</span>')); |
($uploadedfile) = ($result =~ m{/([^/]+)$}); |
($uploadedfile) = ($result =~ m{/([^/]+)$}); |
$r->print(&validate_uploaded_scantron_file($env{'form.domainid'}, |
$r->print(&validate_uploaded_scantron_file($env{'form.domainid'}, |
$env{'form.courseid'},$uploadedfile)); |
$env{'form.courseid'},$uploadedfile)); |
} else { |
} else { |
$r->print(&mt('[_1]Error:[_2] An error ([_3]) occurred when attempting to upload the file, [_4]', |
$r->print( |
'<span class="LC_error">','</span>',$result, |
&Apache::lonhtmlcommon::confirm_success(&mt('Upload failed'),1).'<br />'. |
|
&mt('An error ([_1]) occurred when attempting to upload the file: [_2]', |
|
$result, |
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>')); |
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>')); |
} |
} |
} |
} |
Line 8387 sub validate_uploaded_scantron_file {
|
Line 8841 sub validate_uploaded_scantron_file {
|
my $output; |
my $output; |
if (@lines) { |
if (@lines) { |
my (%counts,$max_match_format); |
my (%counts,$max_match_format); |
my ($max_match_count,$max_match_pct) = (0,0); |
my ($found_match_count,$max_match_count,$max_match_pct) = (0,0,0); |
my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cname); |
my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cname); |
my %idmap = &username_to_idmap($classlist); |
my %idmap = &username_to_idmap($classlist); |
foreach my $key (keys(%idmap)) { |
foreach my $key (keys(%idmap)) { |
Line 8430 sub validate_uploaded_scantron_file {
|
Line 8884 sub validate_uploaded_scantron_file {
|
if (($max_match_format eq '') || ($percent_match > $max_match_pct)) { |
if (($max_match_format eq '') || ($percent_match > $max_match_pct)) { |
$max_match_pct = $percent_match; |
$max_match_pct = $percent_match; |
$max_match_format = $key; |
$max_match_format = $key; |
|
$found_match_count = $counts{$key}{'found'}; |
$max_match_count = $counts{$key}{'total'}; |
$max_match_count = $counts{$key}{'total'}; |
} |
} |
} |
} |
Line 8448 sub validate_uploaded_scantron_file {
|
Line 8903 sub validate_uploaded_scantron_file {
|
} |
} |
} |
} |
my $showpct = sprintf("%.0f",$max_match_pct).'%'; |
my $showpct = sprintf("%.0f",$max_match_pct).'%'; |
$output .= '<br />'.&mt('Comparison of student IDs in the uploaded file with the course roster found matches for [_1] of the [_2] entries in the file (for the format defined for [_3]).','<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs). |
$output .= '<br />'; |
'<br />'.&mt('A low percentage of matches results from one of the following:').'<ul>'. |
if ($found_match_count == $max_match_count) { |
'<li>'.&mt('The file was uploaded to the wrong course').'</li>'. |
# 100% matching entries |
'<li>'.&mt('The data are not in the format expected for the domain: [_1]', |
$output .= &Apache::lonhtmlcommon::confirm_success( |
'<i>'.$cdom.'</i>').'</li>'. |
&mt('Comparison of student IDs: [_1] matching ([quant,_2,entry,entries])', |
'<li>'.&mt('Students did not bubble their IDs, or mis-bubbled them').'</li>'. |
'<b>'.$showpct.'</b>',$found_match_count)).'<br />'. |
'<li>'.&mt('The course roster is not up to date').'</li>'. |
&mt('Comparison of student IDs in the uploaded file with'. |
'</ul>'; |
' the course roster found matches for [_1] of the [_2] entries'. |
|
' in the file (for the format defined for [_3]).', |
|
'<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs); |
|
} else { |
|
# Not all entries matching? -> Show warning and additional info |
|
$output .= |
|
&Apache::lonhtmlcommon::confirm_success( |
|
&mt('Comparison of student IDs: [_1] matching ([_2]/[quant,_3,entry,entries])', |
|
'<b>'.$showpct.'</b>',$found_match_count,$max_match_count).'<br />'. |
|
&mt('Not all entries could be matched!'),1).'<br />'. |
|
&mt('Comparison of student IDs in the uploaded file with'. |
|
' the course roster found matches for [_1] of the [_2] entries'. |
|
' in the file (for the format defined for [_3]).', |
|
'<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs). |
|
'<p class="LC_info">'. |
|
&mt('A low percentage of matches results from one of the following:'). |
|
'</p><ul>'. |
|
'<li>'.&mt('The file was uploaded to the wrong course.').'</li>'. |
|
'<li>'.&mt('The data is not in the format expected for the domain: [_1]', |
|
'<i>'.$cdom.'</i>').'</li>'. |
|
'<li>'.&mt('Students did not bubble their IDs, or mis-bubbled them').'</li>'. |
|
'<li>'.&mt('The course roster is not up to date.').'</li>'. |
|
'</ul>'; |
|
} |
} |
} |
} else { |
} else { |
$output = '<span class="LC_warning">'.&mt('Uploaded file contained no data').'</span>'; |
$output = '<p class="LC_warning">'.&mt('Uploaded file contained no data').'</p>'; |
} |
} |
return $output; |
return $output; |
} |
} |
Line 8480 sub scantron_download_scantron_data {
|
Line 8958 sub scantron_download_scantron_data {
|
if (! &valid_file($file)) { |
if (! &valid_file($file)) { |
$r->print(' |
$r->print(' |
<p> |
<p> |
'.&mt('The requested file name was invalid.').' |
'.&mt('The requested filename was invalid.').' |
</p> |
</p> |
'); |
'); |
return; |
return; |
Line 8493 sub scantron_download_scantron_data {
|
Line 8971 sub scantron_download_scantron_data {
|
&Apache::lonnet::allowuploaded('/adm/grades',$skipped); |
&Apache::lonnet::allowuploaded('/adm/grades',$skipped); |
$r->print(' |
$r->print(' |
<p> |
<p> |
'.&mt('[_1]Original[_2] file as uploaded by the scantron office.', |
'.&mt('[_1]Original[_2] file as uploaded by the bubblesheet scanning office.', |
'<a href="'.$orig.'">','</a>').' |
'<a href="'.$orig.'">','</a>').' |
</p> |
</p> |
<p> |
<p> |
Line 8530 sub checkscantron_results {
|
Line 9008 sub checkscantron_results {
|
return ''; |
return ''; |
} |
} |
my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
my ($randomorder,@master_seq,%symb_to_resource); |
my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb, |
|
%grader_randomlists_by_symb,%orderedforcode); |
if (ref($map)) { |
if (ref($map)) { |
$randomorder=$map->randomorder(); |
$randomorder=$map->randomorder(); |
|
$randompick=$map->randompick(); |
} |
} |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
foreach my $resource (@resources) { |
my $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource); |
if (ref($resource)) { |
if ($nav_error) { |
my $ressymb = $resource->symb(); |
$r->print(&navmap_errormsg()); |
push(@master_seq,$ressymb); |
return ''; |
$symb_to_resource{$ressymb} = $resource; |
|
} |
|
} |
} |
my (%grader_partids_by_symb,%grader_randomlists_by_symb); |
|
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
\%grader_randomlists_by_symb,$bubbles_per_row); |
\%grader_randomlists_by_symb,$bubbles_per_row); |
my ($uname,$udom); |
my ($uname,$udom); |
Line 8553 sub checkscantron_results {
|
Line 9030 sub checkscantron_results {
|
my @delayqueue; |
my @delayqueue; |
my %completedstudents; |
my %completedstudents; |
|
|
my $count=&Apache::grades::get_todo_count($scanlines,$scan_data); |
my $count=&get_todo_count($scanlines,$scan_data); |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count); |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count); |
my ($username,$domain,$started,%ordered); |
my ($username,$domain,$started); |
my $nav_error; |
|
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse. |
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse. |
if ($nav_error) { |
if ($nav_error) { |
$r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
Line 8579 sub checkscantron_results {
|
Line 9055 sub checkscantron_results {
|
my $scan_record= |
my $scan_record= |
&Apache::grades::scantron_parse_scanline($line,$i,\%scantron_config, |
&Apache::grades::scantron_parse_scanline($line,$i,\%scantron_config, |
$scan_data); |
$scan_data); |
unless ($uname=&Apache::grades::scantron_find_student($scan_record,$scan_data, |
unless ($uname=&scantron_find_student($scan_record,$scan_data, |
\%idmap,$i)) { |
\%idmap,$i)) { |
&Apache::grades::scantron_add_delay(\@delayqueue,$line, |
&Apache::grades::scantron_add_delay(\@delayqueue,$line, |
'Unable to find a student that matches',1); |
'Unable to find a student that matches',1); |
next; |
next; |
Line 8593 sub checkscantron_results {
|
Line 9069 sub checkscantron_results {
|
my $pid = $scan_record->{'scantron.ID'}; |
my $pid = $scan_record->{'scantron.ID'}; |
$lastname{$pid} = $scan_record->{'scantron.LastName'}; |
$lastname{$pid} = $scan_record->{'scantron.LastName'}; |
push(@{$bylast{$lastname{$pid}}},$pid); |
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$//; |
|
my $usec = $classlist->{$uname}->[&Apache::loncoursedata::CL_SECTION]; |
my $usec = $classlist->{$uname}->[&Apache::loncoursedata::CL_SECTION]; |
my $user = $uname.':'.$usec; |
my $user = $uname.':'.$usec; |
($username,$domain)=split(/:/,$uname); |
($username,$domain)=split(/:/,$uname); |
Line 8610 sub checkscantron_results {
|
Line 9082 sub checkscantron_results {
|
} |
} |
|
|
my @mapresources = @resources; |
my @mapresources = @resources; |
if ($randomorder) { |
my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'}; |
|
my %respnumlookup=(); |
|
my %startline=(); |
|
if ($randomorder || $randompick) { |
@mapresources = |
@mapresources = |
&users_order($user,$scancode,$sequence,\@master_seq,\%ordered, |
&users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource, |
\%symb_to_resource); |
\%orderedforcode); |
|
my $total = &get_respnum_lookups($sequence,$scan_data,\%idmap,$line, |
|
$scan_record,\@master_seq,\%symb_to_resource, |
|
\%grader_partids_by_symb,\%orderedforcode, |
|
\%respnumlookup,\%startline); |
|
if ($randompick && $total) { |
|
$lastpos = $total*$scantron_config{'Qlength'}; |
|
} |
} |
} |
|
$scandata{$pid} = substr($line,$scantron_config{'Qstart'}-1,$lastpos); |
|
chomp($scandata{$pid}); |
|
$scandata{$pid} =~ s/\r$//; |
|
|
my $counter = -1; |
my $counter = -1; |
foreach my $resource (@mapresources) { |
foreach my $resource (@mapresources) { |
my $parts; |
my $parts; |
Line 8631 sub checkscantron_results {
|
Line 9117 sub checkscantron_results {
|
($counter,my $recording) = |
($counter,my $recording) = |
&verify_scantron_grading($resource,$domain,$username,$cid,$counter, |
&verify_scantron_grading($resource,$domain,$username,$cid,$counter, |
$scandata{$pid},$parts, |
$scandata{$pid},$parts, |
\%scantron_config,\%lettdig,$numletts); |
\%scantron_config,\%lettdig,$numletts, |
|
$randomorder,$randompick, |
|
\%respnumlookup,\%startline); |
$record{$pid} .= $recording; |
$record{$pid} .= $recording; |
} |
} |
} |
} |
Line 8654 sub checkscantron_results {
|
Line 9142 sub checkscantron_results {
|
'<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
'<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
'</tr>'."\n". |
'</tr>'."\n". |
'<tr class="'.$css_class.'">'."\n". |
'<tr class="'.$css_class.'">'."\n". |
'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n"; |
'<td>'.&mt('Submissions').'</td><td>'.$showrecord.'</td></tr>'."\n"; |
$passed ++; |
$passed ++; |
} else { |
} else { |
my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row'; |
my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row'; |
$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
'</tr>'."\n". |
'</tr>'."\n". |
'<tr class="'.$css_class.'">'."\n". |
'<tr class="'.$css_class.'">'."\n". |
'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n". |
'<td>'.&mt('Submissions').'</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n". |
'</tr>'."\n"; |
'</tr>'."\n"; |
$failed ++; |
$failed ++; |
} |
} |
Line 8678 sub checkscantron_results {
|
Line 9166 sub checkscantron_results {
|
$env{'form.scantron_maxbubble'}) |
$env{'form.scantron_maxbubble'}) |
.'</p>' |
.'</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>'); |
$r->print('<p>' |
|
.&mt('Exact matches for [_1][quant,_2,student][_3].','<b>',$passed,'</b>') |
|
.'<br />' |
|
.&mt('Discrepancies detected for [_1][quant,_2,student][_3].','<b>',$failed,'</b>') |
|
.'</p>' |
|
); |
if ($passed) { |
if ($passed) { |
$r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'<br /><br />'); |
$r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'<br /><br />'); |
$r->print(&Apache::loncommon::start_data_table()."\n". |
$r->print(&Apache::loncommon::start_data_table()."\n". |
Line 8704 sub checkscantron_results {
|
Line 9197 sub checkscantron_results {
|
|
|
sub verify_scantron_grading { |
sub verify_scantron_grading { |
my ($resource,$domain,$username,$cid,$counter,$scandata,$partids, |
my ($resource,$domain,$username,$cid,$counter,$scandata,$partids, |
$scantron_config,$lettdig,$numletts) = @_; |
$scantron_config,$lettdig,$numletts,$randomorder,$randompick, |
|
$respnumlookup,$startline) = @_; |
my ($record,%expected,%startpos); |
my ($record,%expected,%startpos); |
return ($counter,$record) if (!ref($resource)); |
return ($counter,$record) if (!ref($resource)); |
return ($counter,$record) if (!$resource->is_problem()); |
return ($counter,$record) if (!$resource->is_problem()); |
Line 8713 sub verify_scantron_grading {
|
Line 9207 sub verify_scantron_grading {
|
foreach my $part_id (@{$partids}) { |
foreach my $part_id (@{$partids}) { |
$counter ++; |
$counter ++; |
$expected{$part_id} = 0; |
$expected{$part_id} = 0; |
if ($env{"form.scantron.sub_bubblelines.$counter"}) { |
my $respnum = $counter; |
my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$counter"}); |
if ($randomorder || $randompick) { |
|
$respnum = $respnumlookup->{$counter}; |
|
$startpos{$part_id} = $startline->{$counter} + 1; |
|
} else { |
|
$startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"}; |
|
} |
|
if ($env{"form.scantron.sub_bubblelines.$respnum"}) { |
|
my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$respnum"}); |
foreach my $item (@sub_lines) { |
foreach my $item (@sub_lines) { |
$expected{$part_id} += $item; |
$expected{$part_id} += $item; |
} |
} |
} else { |
} else { |
$expected{$part_id} = $env{"form.scantron.bubblelines.$counter"}; |
$expected{$part_id} = $env{"form.scantron.bubblelines.$respnum"}; |
} |
} |
$startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"}; |
|
} |
} |
if ($symb) { |
if ($symb) { |
my %recorded; |
my %recorded; |
Line 8817 sub verify_scantron_grading {
|
Line 9317 sub verify_scantron_grading {
|
return ($counter,$record); |
return ($counter,$record); |
} |
} |
|
|
sub letter_to_digits { |
sub letter_to_digits { |
my %lettdig = ( |
my %lettdig = ( |
A => 1, |
A => 1, |
B => 2, |
B => 2, |
Line 9351 sub process_clicker_file {
|
Line 9851 sub process_clicker_file {
|
$number++; |
$number++; |
} |
} |
$result.="</p>\n"; |
$result.="</p>\n"; |
if ($number==0) { |
if ($number==0) { |
$result.='<span class="LC_error">'.&mt('No IDs found to determine correct answer').'</span>'; |
$result .= |
return $result; |
&Apache::lonhtmlcommon::confirm_success( |
} |
&mt('No IDs found to determine correct answer'),1); |
|
return $result; |
|
} |
} |
} |
if (length($env{'form.upfile'}) < 2) { |
if (length($env{'form.upfile'}) < 2) { |
$result.=&mt('[_1] Error: [_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.', |
$result .= |
'<span class="LC_error">', |
&Apache::lonhtmlcommon::confirm_success( |
'</span>', |
&mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.', |
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'); |
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'),1); |
return $result; |
return $result; |
} |
} |
|
|
Line 9455 ENDHEADER
|
Line 9957 ENDHEADER
|
&mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count); |
&mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count); |
if (($env{'form.gradingmechanism'} ne 'attendance') && ($env{'form.gradingmechanism'} ne 'given')) { |
if (($env{'form.gradingmechanism'} ne 'attendance') && ($env{'form.gradingmechanism'} ne 'given')) { |
if ($correct_count==0) { |
if ($correct_count==0) { |
$errormsg.="Found no correct answers answers for grading!"; |
$errormsg.="Found no correct answers for grading!"; |
} elsif ($correct_count>1) { |
} elsif ($correct_count>1) { |
$result.='<br /><span class="LC_warning">'.&mt("Found [_1] entries for grading!",$correct_count).'</span>'; |
$result.='<br /><span class="LC_warning">'.&mt("Found [_1] entries for grading!",$correct_count).'</span>'; |
} |
} |
Line 9627 sub assign_clicker_grades {
|
Line 10129 sub assign_clicker_grades {
|
if ($user) { |
if ($user) { |
if ($users{$user}) { |
if ($users{$user}) { |
$result.='<br /><span class="LC_warning">'. |
$result.='<br /><span class="LC_warning">'. |
&mt("More than one entry found for <tt>[_1]</tt>!",$user). |
&mt('More than one entry found for [_1]!','<tt>'.$user.'</tt>'). |
'</span><br />'; |
'</span><br />'; |
} |
} |
$users{$user}=1; |
$users{$user}=1; |
Line 9743 sub handler {
|
Line 10245 sub handler {
|
} |
} |
} elsif (!%perm) { |
} elsif (!%perm) { |
$request->internal_redirect('/adm/quickgrades'); |
$request->internal_redirect('/adm/quickgrades'); |
|
return OK; |
} |
} |
&Apache::loncommon::content_type($request,'text/html'); |
&Apache::loncommon::content_type($request,'text/html'); |
$request->send_http_header; |
$request->send_http_header; |
Line 9957 described at http://www.lon-capa.org.
|
Line 10460 described at http://www.lon-capa.org.
|
=head1 OVERVIEW |
=head1 OVERVIEW |
|
|
Do an ssi with retries: |
Do an ssi with retries: |
While I'd love to factor out this with the vesrion in lonprintout, |
While I'd love to factor out this with the version 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 |
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). |
I'm not quite ready to invent (e.g. an ssi_with_retry object). |
|
|
Line 9968 At least the logic that drives this has
|
Line 10471 At least the logic that drives this has
|
ssi_with_retries - Does the server side include of a resource. |
ssi_with_retries - Does the server side include of a resource. |
if the ssi call returns an error we'll retry it up to |
if the ssi call returns an error we'll retry it up to |
the number of times requested by the caller. |
the number of times requested by the caller. |
If we still have a proble, no text is appended to the |
If we still have a problem, no text is appended to the |
output and we set some global variables. |
output and we set some global variables. |
to indicate to the caller an SSI error occurred. |
to indicate to the caller an SSI error occurred. |
All of this is supposed to deal with the issues described |
All of this is supposed to deal with the issues described |
in LonCAPA BZ 5631 see: |
in LON-CAPA BZ 5631 see: |
http://bugs.lon-capa.org/show_bug.cgi?id=5631 |
http://bugs.lon-capa.org/show_bug.cgi?id=5631 |
by informing the user that this happened. |
by informing the user that this happened. |
|
|
Line 10099 Side Effects: None.
|
Line 10602 Side Effects: None.
|
- missingbubble - array ref of the bubble lines that have missing |
- missingbubble - array ref of the bubble lines that have missing |
bubble errors |
bubble errors |
|
|
|
$randomorder - True if exam folder has randomorder set |
|
$randompick - True if exam folder has randompick set |
|
$respnumlookup - Reference to HASH mapping question numbers in bubble lines |
|
for current line to question number used for same question |
|
in "Master Seqence" (as seen by Course Coordinator). |
|
$startline - Reference to hash where key is question number (0 is first) |
|
and value is number of first bubble line for current student |
|
or code-based randompick and/or randomorder. |
|
|
|
|
|
|
=item scantron_get_maxbubble() : |
=item scantron_get_maxbubble() : |
|
|
Arguments: |
Arguments: |
Line 10119 Side Effects: None.
|
Line 10633 Side Effects: None.
|
$env{'form.scantron.bubble_lines.n'}, |
$env{'form.scantron.bubble_lines.n'}, |
$env{'form.scantron.first_bubble_line.n'} and |
$env{'form.scantron.first_bubble_line.n'} and |
$env{"form.scantron.sub_bubblelines.n"} |
$env{"form.scantron.sub_bubblelines.n"} |
which are the total number of bubble, lines, the number of bubble |
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, |
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 |
and a comma separated list of numbers of bubble lines for sub-questions |
(for optionresponse, matchresponse, and rankresponse items), for response n. |
(for optionresponse, matchresponse, and rankresponse items), for response n. |