|
version 1.645, 2011/02/07 19:16:28
|
version 1.663, 2011/11/14 03:08:01
|
|
Line 40 use Apache::lonhomework;
|
Line 40 use Apache::lonhomework;
|
| use Apache::lonpickcode; |
use Apache::lonpickcode; |
| use Apache::loncoursedata; |
use Apache::loncoursedata; |
| use Apache::lonmsg(); |
use Apache::lonmsg(); |
| use Apache::Constants qw(:common); |
use Apache::Constants qw(:common :http); |
| use Apache::lonlocal; |
use Apache::lonlocal; |
| use Apache::lonenc; |
use Apache::lonenc; |
| use Apache::lonstathelpers; |
use Apache::lonstathelpers; |
| use Apache::lonquickgrades; |
use Apache::lonquickgrades; |
| |
use Apache::bridgetask(); |
| use String::Similarity; |
use String::Similarity; |
| use LONCAPA; |
use LONCAPA; |
| |
|
|
Line 213 sub reset_caches {
|
Line 214 sub reset_caches {
|
| } |
} |
| |
|
| sub get_analyze { |
sub get_analyze { |
| my ($symb,$uname,$udom,$no_increment,$add_to_hash,$type,$trial,$rndseed)=@_; |
my ($symb,$uname,$udom,$no_increment,$add_to_hash,$type,$trial,$rndseed,$bubbles_per_row)=@_; |
| my $key = "$symb\0$uname\0$udom"; |
my $key = "$symb\0$uname\0$udom"; |
| if ($type eq 'randomizetry') { |
if ($type eq 'randomizetry') { |
| if ($trial ne '') { |
if ($trial ne '') { |
|
Line 247 sub reset_caches {
|
Line 248 sub reset_caches {
|
| 'grade_courseid' => $env{'request.course.id'}, |
'grade_courseid' => $env{'request.course.id'}, |
| 'grade_username' => $uname, |
'grade_username' => $uname, |
| 'grade_noincrement' => $no_increment); |
'grade_noincrement' => $no_increment); |
| |
if ($bubbles_per_row ne '') { |
| |
$form{'bubbles_per_row'} = $bubbles_per_row; |
| |
} |
| if ($type eq 'randomizetry') { |
if ($type eq 'randomizetry') { |
| $form{'grade_questiontype'} = $type; |
$form{'grade_questiontype'} = $type; |
| if ($rndseed ne '') { |
if ($rndseed ne '') { |
|
Line 287 sub reset_caches {
|
Line 291 sub reset_caches {
|
| } |
} |
| |
|
| sub scantron_partids_tograde { |
sub scantron_partids_tograde { |
| my ($resource,$cid,$uname,$udom,$check_for_randomlist) = @_; |
my ($resource,$cid,$uname,$udom,$check_for_randomlist,$bubbles_per_row) = @_; |
| my (%analysis,@parts); |
my (%analysis,@parts); |
| if (ref($resource)) { |
if (ref($resource)) { |
| my $symb = $resource->symb(); |
my $symb = $resource->symb(); |
|
Line 295 sub reset_caches {
|
Line 299 sub reset_caches {
|
| if ($check_for_randomlist) { |
if ($check_for_randomlist) { |
| $add_to_form = { 'check_parts_withrandomlist' => 1,}; |
$add_to_form = { 'check_parts_withrandomlist' => 1,}; |
| } |
} |
| my $analyze = &get_analyze($symb,$uname,$udom,undef,$add_to_form); |
my $analyze = |
| |
&get_analyze($symb,$uname,$udom,undef,$add_to_form, |
| |
undef,undef,undef,$bubbles_per_row); |
| if (ref($analyze) eq 'HASH') { |
if (ref($analyze) eq 'HASH') { |
| %analysis = %{$analyze}; |
%analysis = %{$analyze}; |
| } |
} |
|
Line 335 sub cleanRecord {
|
Line 341 sub cleanRecord {
|
| return '<blockquote><table border="1">'. |
return '<blockquote><table border="1">'. |
| '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'. |
'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'. |
| '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
| $grayFont.$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 %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
|
Line 357 sub cleanRecord {
|
Line 363 sub cleanRecord {
|
| '<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'. |
| $middlerow.'</tr>'. |
$middlerow.'</tr>'. |
| '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
| $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 ($toprow,$bottomrow); |
my ($toprow,$bottomrow); |
|
Line 378 sub cleanRecord {
|
Line 384 sub cleanRecord {
|
| return '<blockquote><table border="1">'. |
return '<blockquote><table border="1">'. |
| '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'. |
'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'. |
| '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
| $bottomrow.'</tr>'.'</table></blockquote>'; |
$bottomrow.'</tr></table></blockquote>'; |
| } elsif ($response eq 'essay') { |
} elsif ($response eq 'essay') { |
| if (! exists ($env{'form.'.$symb})) { |
if (! exists ($env{'form.'.$symb})) { |
| my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade', |
my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade', |
|
Line 1403 INNERJS
|
Line 1409 INNERJS
|
| |
|
| my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); |
my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); |
| $docopen=~s/^document\.//; |
$docopen=~s/^document\.//; |
| my $alertmsg = &mt('Please select a word or group of words from document and then click this link.'); |
my %lt = &Apache::lonlocal::texthash( |
| |
keyw => 'Keywords list, separated by a space. Add/delete to list if desired.', |
| |
plse => 'Please select a word or group of words from document and then click this link.', |
| |
adds => 'Add selection to keyword list? Edit if desired.', |
| |
comp => 'Compose Message for: ', |
| |
incl => 'Include', |
| |
type => 'Type', |
| |
subj => 'Subject', |
| |
mesa => 'Message', |
| |
new => 'New', |
| |
save => 'Save', |
| |
canc => 'Cancel', |
| |
kehi => 'Keyword Highlight Options', |
| |
txtc => 'Text Color', |
| |
font => 'Font Size', |
| |
fnst => 'Font Style', |
| |
); |
| $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT)); |
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT)); |
| |
|
| //===================== Show list of keywords ==================== |
//===================== Show list of keywords ==================== |
| function keywords(formname) { |
function keywords(formname) { |
| var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",formname.keywords.value); |
var nret = prompt("$lt{'keyw'}",formname.keywords.value); |
| if (nret==null) return; |
if (nret==null) return; |
| formname.keywords.value = nret; |
formname.keywords.value = nret; |
| |
|
|
Line 1435 INNERJS
|
Line 1457 INNERJS
|
| else return; |
else return; |
| var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," "); |
var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," "); |
| if (cleantxt=="") { |
if (cleantxt=="") { |
| alert("$alertmsg"); |
alert("$lt{'plse'}"); |
| return; |
return; |
| } |
} |
| var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt); |
var nret = prompt("$lt{'adds'}",cleantxt); |
| if (nret==null) return; |
if (nret==null) return; |
| document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret; |
document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret; |
| if (document.SCORE.keywords.value != "") { |
if (document.SCORE.keywords.value != "") { |
|
Line 1512 INNERJS
|
Line 1534 INNERJS
|
| var ypos = (screen.height-height)/2-30; |
var ypos = (screen.height-height)/2-30; |
| ypos = (ypos < 0) ? '0' : ypos; |
ypos = (ypos < 0) ? '0' : ypos; |
| |
|
| pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height); |
pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=700,height='+height); |
| pWin.focus(); |
pWin.focus(); |
| pDoc = pWin.document; |
pDoc = pWin.document; |
| pDoc.$docopen; |
pDoc.$docopen; |
|
Line 1520 INNERJS
|
Line 1542 INNERJS
|
| |
|
| pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">"); |
pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">"); |
| pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">"); |
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">"); |
| pDoc.write("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />"); |
pDoc.write("<h3><span class=\\"LC_info\\"> $lt{'comp'}\"+fullname+\"<\\/span><\\/h3><br /><br />"); |
| |
|
| pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
| pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
| pDoc.write("<td><b>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>"); |
pDoc.write("<td><b>$lt{'type'}<\\/b><\\/td><td><b>$lt{'incl'}<\\/b><\\/td><td><b>$lt{'mesa'}<\\/td><\\/tr>"); |
| } |
} |
| function displaySubject(msg,shwsel) { |
function displaySubject(msg,shwsel) { |
| pDoc = pWin.document; |
pDoc = pWin.document; |
| pDoc.write("<tr bgcolor=\\"#ffffdd\\">"); |
pDoc.write("<tr bgcolor=\\"#ffffdd\\">"); |
| pDoc.write("<td>Subject<\\/td>"); |
pDoc.write("<td>$lt{'subj'}<\\/td>"); |
| pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>"); |
pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>"); |
| pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>"); |
pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>"); |
| } |
} |
|
Line 1545 INNERJS
|
Line 1567 INNERJS
|
| function newMsg(newmsg,shwsel) { |
function newMsg(newmsg,shwsel) { |
| pDoc = pWin.document; |
pDoc = pWin.document; |
| pDoc.write("<tr bgcolor=\\"#ffffdd\\">"); |
pDoc.write("<tr bgcolor=\\"#ffffdd\\">"); |
| pDoc.write("<td align=\\"center\\">New<\\/td>"); |
pDoc.write("<td align=\\"center\\">$lt{'new'}<\\/td>"); |
| pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>"); |
pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>"); |
| pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>"); |
pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>"); |
| } |
} |
|
Line 1554 INNERJS
|
Line 1576 INNERJS
|
| pDoc = pWin.document; |
pDoc = pWin.document; |
| pDoc.write("<\\/table>"); |
pDoc.write("<\\/table>"); |
| pDoc.write("<\\/td><\\/tr><\\/table> "); |
pDoc.write("<\\/td><\\/tr><\\/table> "); |
| pDoc.write("<input type=\\"button\\" value=\\"Save\\" onclick=\\"javascript:checkInput()\\"> "); |
pDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:checkInput()\\"> "); |
| pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onclick=\\"self.close()\\"><br /><br />"); |
pDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />"); |
| pDoc.write("<\\/form>"); |
pDoc.write("<\\/form>"); |
| pDoc.write('$end_page_msg_central'); |
pDoc.write('$end_page_msg_central'); |
| pDoc.close(); |
pDoc.close(); |
|
Line 1605 INNERJS
|
Line 1627 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\\"> Keyword Highlight Options<\\/span><\\/h3><br /><br />"); |
hDoc.write("<h3><span class=\\"LC_info\\"> $lt{'kehi'}<\\/span><\\/h3><br /><br />"); |
| |
|
| hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
| hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
| hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/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) { |
|
Line 1628 INNERJS
|
Line 1650 INNERJS
|
| var hDoc = hwdWin.document; |
var hDoc = hwdWin.document; |
| hDoc.write("<\\/table>"); |
hDoc.write("<\\/table>"); |
| hDoc.write("<\\/td><\\/tr><\\/table> "); |
hDoc.write("<\\/td><\\/tr><\\/table> "); |
| hDoc.write("<input type=\\"button\\" value=\\"Save\\" onclick=\\"javascript:updateChoice(1)\\"> "); |
hDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\"> "); |
| hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" 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 1744 sub handback_box {
|
Line 1766 sub handback_box {
|
| my ($symb,$uname,$udom,$counter,$partid,$record,$res_error_pointer) = @_; |
my ($symb,$uname,$udom,$counter,$partid,$record,$res_error_pointer) = @_; |
| my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error_pointer); |
my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error_pointer); |
| my (@respids); |
my (@respids); |
| my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id = &flatten_responseType($responseType); |
| foreach my $part_response_id (@part_response_id) { |
foreach my $part_response_id (@part_response_id) { |
| my ($part,$resp) = @{ $part_response_id }; |
my ($part,$resp) = @{ $part_response_id }; |
| if ($part eq $partid) { |
if ($part eq $partid) { |
|
Line 1756 sub handback_box {
|
Line 1778 sub handback_box {
|
| my $prefix = $counter.'_'.$partid.'_'.$respid.'_'; |
my $prefix = $counter.'_'.$partid.'_'.$respid.'_'; |
| my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record); |
my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record); |
| next if (!@$files); |
next if (!@$files); |
| my $file_counter = 1; |
my $file_counter = 0; |
| foreach my $file (@$files) { |
foreach my $file (@$files) { |
| if ($file =~ /\/portfolio\//) { |
if ($file =~ /\/portfolio\//) { |
| |
$file_counter++; |
| my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|); |
my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|); |
| my ($name,$version,$ext) = &file_name_version_ext($file_disp); |
my ($name,$version,$ext) = &file_name_version_ext($file_disp); |
| $file_disp = "$name.$ext"; |
$file_disp = "$name.$ext"; |
|
Line 1766 sub handback_box {
|
Line 1789 sub handback_box {
|
| $result.=&mt('Return commented version of [_1] to student.', |
$result.=&mt('Return commented version of [_1] to student.', |
| '<span class="LC_filename">'.$file_disp.'</span>'); |
'<span class="LC_filename">'.$file_disp.'</span>'); |
| $result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n"; |
$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n"; |
| $result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />'; |
$result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />'."\n"; |
| $result.='('.&mt('File will be uploaded when you click on Save & Next below.').')<br />'; |
|
| $file_counter++; |
|
| } |
} |
| } |
} |
| |
if ($file_counter) { |
| |
$result .= '<input type="hidden" name="'.$prefix.'countreturndoc" value="'.$file_counter.'" />'."\n". |
| |
'<span class="LC_info">'. |
| |
'('.&mt('File(s) will be uploaded when you click on Save & Next below.',$file_counter).')</span><br /><br />'; |
| |
} |
| } |
} |
| return $result; |
return $result; |
| } |
} |
|
Line 1996 sub submission {
|
Line 2022 sub submission {
|
| |
|
| # if ($env{'form.handgrade'} eq 'yes') { |
# if ($env{'form.handgrade'} eq 'yes') { |
| if (1) { |
if (1) { |
| |
|
| |
my %lt = &Apache::lonlocal::texthash( |
| |
keyw => 'Keyword Options', |
| |
list => 'List', |
| |
past => 'Paste Selection to List', |
| |
high => 'Highlight Attribute', |
| |
); |
| # |
# |
| # Print out the keyword options line |
# Print out the keyword options line |
| # |
# |
| $request->print(<<KEYWORDS); |
$request->print(<<KEYWORDS); |
| <b>Keyword Options:</b> |
<br /><b>$lt{'keyw'}:</b> |
| <a href="javascript:keywords(document.SCORE);" target="_self">List</a> |
<a href="javascript:keywords(document.SCORE);" target="_self">$lt{'list'}</a> |
| <a href="#" onmousedown="javascript:getSel(); return false" |
<a href="#" onmousedown="javascript:getSel(); return false" |
| CLASS="page">Paste Selection to List</a> |
CLASS="page">$lt{'past'}</a> |
| <a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br /> |
<a href="javascript:kwhighlight();" target="_self">$lt{'high'}</a><br /><br /> |
| KEYWORDS |
KEYWORDS |
| # |
# |
| # Load the other essays for similarity check |
# Load the other essays for similarity check |
|
Line 2526 sub processHandGrade {
|
Line 2559 sub processHandGrade {
|
| undef,undef,$showsymb, |
undef,undef,$showsymb, |
| $restitle); |
$restitle); |
| $request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '. |
$request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '. |
| $msgstatus); |
$msgstatus.'<br />'); |
| } |
} |
| if ($env{'form.collaborator'.$ctr}) { |
if ($env{'form.collaborator'.$ctr}) { |
| my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr"); |
my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr"); |
|
Line 2704 sub processHandGrade {
|
Line 2737 sub processHandGrade {
|
| $ctr++; |
$ctr++; |
| } |
} |
| if ($total < 0) { |
if ($total < 0) { |
| my $the_end.=&mt('<b>Message: </b> No more students for this section or class.').'<br /><br />'."\n"; |
my $the_end.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\n"; |
| $request->print($the_end); |
$request->print($the_end); |
| } |
} |
| return ''; |
return ''; |
|
Line 2855 sub handback_files {
|
Line 2888 sub handback_files {
|
| $request->print('<br />'.&navmap_errormsg().'<br />'); |
$request->print('<br />'.&navmap_errormsg().'<br />'); |
| return; |
return; |
| } |
} |
| |
my @handedback; |
| |
my $file_msg; |
| my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id = &flatten_responseType($responseType); |
| foreach my $part_response_id (@part_response_id) { |
foreach my $part_response_id (@part_response_id) { |
| my ($part_id,$resp_id) = @{ $part_response_id }; |
my ($part_id,$resp_id) = @{ $part_response_id }; |
| my $part_resp = join('_',@{ $part_response_id }); |
my $part_resp = join('_',@{ $part_response_id }); |
| if (($env{'form.'.$newflg.'_'.$part_resp.'_returndoc1'}) && ($new_part == $part_id)) { |
if (($env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'} =~ /^\d+$/) & ($new_part eq $part_id)) { |
| # if multiple files are uploaded names will be 'returndoc2','returndoc3' |
for (my $counter=1; $counter<=$env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'}; $counter++) { |
| my $file_counter = 1; |
# if multiple files are uploaded names will be 'returndoc2','returndoc3' |
| my $file_msg; |
if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) { |
| while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) { |
my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter.'.filename'}; |
| my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'}; |
|
| my ($directory,$answer_file) = |
my ($directory,$answer_file) = |
| ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter} =~ /^(.*?)([^\/]*)$/); |
($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter} =~ /^(.*?)([^\/]*)$/); |
| my ($answer_name,$answer_ver,$answer_ext) = |
my ($answer_name,$answer_ver,$answer_ext) = |
| &file_name_version_ext($answer_file); |
&file_name_version_ext($answer_file); |
| my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/); |
my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/); |
| my $getpropath = 1; |
my $getpropath = 1; |
| my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$portfolio_path,$domain,$stuname,$getpropath); |
my ($dir_list,$listerror) = |
| my $version = &get_next_version($answer_name, $answer_ext, \@dir_list); |
&Apache::lonnet::dirlist($portfolio_root.$portfolio_path, |
| |
$domain,$stuname,$getpropath); |
| |
my $version = &get_next_version($answer_name,$answer_ext,$dir_list); |
| # fix file name |
# fix file name |
| 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'.$file_counter, |
$newflg.'_'.$part_resp.'_returndoc'.$counter, |
| $save_file_name); |
$save_file_name); |
| if ($result !~ m|^/uploaded/|) { |
if ($result !~ m|^/uploaded/|) { |
| $request->print('<br /><span class="LC_error">'. |
$request->print('<br /><span class="LC_error">'. |
| &mt('An error occurred ([_1]) while trying to upload [_2].', |
&mt('An error occurred ([_1]) while trying to upload [_2].', |
| $result,$newflg.'_'.$part_resp.'_returndoc'.$file_counter). |
$result,$newflg.'_'.$part_resp.'_returndoc'.$counter). |
| '</span>'); |
'</span>'); |
| } else { |
} else { |
| # mark the file as read only |
# mark the file as read only |
| my @files = ($save_file_name); |
push(@handedback,$save_file_name); |
| my @what = ($symb,$env{'request.course.id'},'handback'); |
|
| &Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what); |
|
| if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) { |
if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) { |
| $$newrecord{"resource.$new_part.$resp_id.handback"}.=','; |
$$newrecord{"resource.$new_part.$resp_id.handback"}.=','; |
| } |
} |
| $$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name; |
$$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name; |
| $file_msg.= "\n".'<br /><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 />".$fname." will be the uploaded file name"); |
$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(" ".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter}); |
|
| $file_counter++; |
|
| } |
} |
| my $subject = "File Handed Back by Instructor "; |
|
| my $message = "A file has been returned that was originally submitted in reponse to: <br />"; |
|
| $message .= "<strong>".&Apache::lonnet::gettitle($symb)."</strong><br />"; |
|
| $message .= ' The returned file(s) are named: '. $file_msg; |
|
| $message .= " and can be found in your portfolio space."; |
|
| my ($feedurl,$showsymb) = |
|
| &get_feedurl_and_symb($symb,$domain,$stuname); |
|
| my $restitle = &Apache::lonnet::gettitle($symb); |
|
| my $msgstatus = |
|
| &Apache::lonmsg::user_normal_msg($stuname,$domain,$subject. |
|
| ' (File Returned) ['.$restitle.']',$message,undef, |
|
| $feedurl,undef,undef,undef,$showsymb,$restitle); |
|
| } |
} |
| } |
} |
| |
} |
| |
if (@handedback > 0) { |
| |
$request->print('<br />'); |
| |
my @what = ($symb,$env{'request.course.id'},'handback'); |
| |
&Apache::lonnet::mark_as_readonly($domain,$stuname,\@handedback,\@what); |
| |
my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'}); |
| |
my ($subject,$message); |
| |
if (scalar(@handedback) == 1) { |
| |
$subject = &mt_user($user_lh,'File Handed Back by Instructor'); |
| |
$message = &mt_user($user_lh,'A file has been returned that was originally submitted in response to: '); |
| |
} else { |
| |
$subject = &mt_user($user_lh,'Files Handed Back by Instructor'); |
| |
$message = &mt_user($user_lh,'Files have been returned that were originally submitted in response to: '); |
| |
} |
| |
$message .= "<p><strong>".&Apache::lonnet::gettitle($symb)." </strong></p>"; |
| |
$message .= &mt_user($user_lh,'The returned file(s) are named: [_1]',"<br />$file_msg <br />"). |
| |
&mt_user($user_lh,'The file(s) can be found in your [_1]portfolio[_2].','<a href="/adm/portfolio">','</a>'); |
| |
my ($feedurl,$showsymb) = |
| |
&get_feedurl_and_symb($symb,$domain,$stuname); |
| |
my $restitle = &Apache::lonnet::gettitle($symb); |
| |
$subject .= ' '.&mt_user($user_lh,'(File Returned)').' ['.$restitle.']'; |
| |
my $msgstatus = |
| |
&Apache::lonmsg::user_normal_msg($stuname,$domain,$subject, |
| |
$message,undef,$feedurl,undef,undef,undef,$showsymb, |
| |
$restitle); |
| |
if ($msgstatus) { |
| |
$request->print(&mt('Notification message status: [_1]','<span class="LC_info">'.$msgstatus.'</span>').'<br />'); |
| |
} |
| |
} |
| return; |
return; |
| } |
} |
| |
|
|
Line 3021 sub version_portfiles {
|
Line 3069 sub version_portfiles {
|
| my ($answer_name,$answer_ver,$answer_ext) = |
my ($answer_name,$answer_ver,$answer_ext) = |
| &file_name_version_ext($answer_file); |
&file_name_version_ext($answer_file); |
| my $getpropath = 1; |
my $getpropath = 1; |
| my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,$stu_name,$getpropath); |
my ($dir_list,$listerror) = |
| my $version = &get_next_version($answer_name, $answer_ext, \@dir_list); |
&Apache::lonnet::dirlist($portfolio_root.$directory,$domain, |
| |
$stu_name,$getpropath); |
| |
my $version = &get_next_version($answer_name,$answer_ext,$dir_list); |
| my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version); |
my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version); |
| if ($new_answer ne 'problem getting file') { |
if ($new_answer ne 'problem getting file') { |
| push(@versioned_portfiles, $directory.$new_answer); |
push(@versioned_portfiles, $directory.$new_answer); |
|
Line 3041 sub version_portfiles {
|
Line 3091 sub version_portfiles {
|
| sub get_next_version { |
sub get_next_version { |
| my ($answer_name, $answer_ext, $dir_list) = @_; |
my ($answer_name, $answer_ext, $dir_list) = @_; |
| my $version; |
my $version; |
| foreach my $row (@$dir_list) { |
if (ref($dir_list) eq 'ARRAY') { |
| my ($file) = split(/\&/,$row,2); |
foreach my $row (@{$dir_list}) { |
| my ($file_name,$file_version,$file_ext) = |
my ($file) = split(/\&/,$row,2); |
| &file_name_version_ext($file); |
my ($file_name,$file_version,$file_ext) = |
| if (($file_name eq $answer_name) && |
&file_name_version_ext($file); |
| ($file_ext eq $answer_ext)) { |
if (($file_name eq $answer_name) && |
| # gets here if filename and extension match, regardless of version |
($file_ext eq $answer_ext)) { |
| |
# gets here if filename and extension match, |
| |
# regardless of version |
| if ($file_version ne '') { |
if ($file_version ne '') { |
| # a versioned file is found so save it for later |
# a versioned file is found so save it for later |
| if ($file_version > $version) { |
if ($file_version > $version) { |
| $version = $file_version; |
$version = $file_version; |
| } |
} |
| |
} |
| } |
} |
| } |
} |
| } |
} |
| $version ++; |
$version ++; |
| return($version); |
return($version); |
| } |
} |
|
Line 4044 sub csvuploadassign {
|
Line 4097 sub csvuploadassign {
|
| my ($classlist) = &getclasslist('all',0); |
my ($classlist) = &getclasslist('all',0); |
| my @notallowed; |
my @notallowed; |
| my @skipped; |
my @skipped; |
| |
my @warnings; |
| my $countdone=0; |
my $countdone=0; |
| foreach my $grade (@gradedata) { |
foreach my $grade (@gradedata) { |
| my %entries=&Apache::loncommon::record_sep($grade); |
my %entries=&Apache::loncommon::record_sep($grade); |
|
Line 4093 sub csvuploadassign {
|
Line 4147 sub csvuploadassign {
|
| my $award=($pcr == 0) ? 'incorrect_by_override' |
my $award=($pcr == 0) ? 'incorrect_by_override' |
| : 'correct_by_override'; |
: 'correct_by_override'; |
| if ($pcr>1) { |
if ($pcr>1) { |
| push(@skipped,&mt("[_1]: point value larger than weight","$username:$domain")); |
push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain")); |
| } |
} |
| $grades{"resource.$part.awarded"}=$pcr; |
$grades{"resource.$part.awarded"}=$pcr; |
| $grades{"resource.$part.solved"}=$award; |
$grades{"resource.$part.solved"}=$award; |
|
Line 4139 sub csvuploadassign {
|
Line 4193 sub csvuploadassign {
|
| } |
} |
| } |
} |
| $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0)); |
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0)); |
| |
if (@warnings) { |
| |
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('Warnings generated for the following saved scores:'),1).'<br />'); |
| |
$request->print(join(', ',@warnings)); |
| |
} |
| if (@skipped) { |
if (@skipped) { |
| $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />'); |
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />'); |
| $request->print(join(', ',@skipped)); |
$request->print(join(', ',@skipped)); |
|
Line 4786 sub updateGradeByPage {
|
Line 4844 sub updateGradeByPage {
|
| from the file that we are parsing that represents one entire sheet |
from the file that we are parsing that represents one entire sheet |
| |
|
| 'bubble line' refers to the data |
'bubble line' refers to the data |
| representing the line of bubbles that are on the physical bubble sheet |
representing the line of bubbles that are on the physical bubblesheet |
| |
|
| |
|
| The overall process is that a scanned in bubble sheet data is uploaded |
The overall process is that a scanned in bubblesheet data is uploaded |
| into a course. When a user wants to grade, they select a |
into a course. When a user wants to grade, they select a |
| sequence/folder of resources, a file of bubble sheet info, and pick |
sequence/folder of resources, a file of bubblesheet info, and pick |
| one of the predefined configurations for what each scanline looks |
one of the predefined configurations for what each scanline looks |
| like. |
like. |
| |
|
|
Line 4807 username:domain.
|
Line 4865 username:domain.
|
| |
|
| During the validation phase the instructor can choose to skip scanlines. |
During the validation phase the instructor can choose to skip scanlines. |
| |
|
| After the validation phase, there are now 3 bubble sheet files |
After the validation phase, there are now 3 bubblesheet files |
| |
|
| scantron_original_filename (unmodified original file) |
scantron_original_filename (unmodified original file) |
| scantron_corrected_filename (file where the corrected information has replaced the original information) |
scantron_corrected_filename (file where the corrected information has replaced the original information) |
| scantron_skipped_filename (contains the exact text of scanlines that where skipped) |
scantron_skipped_filename (contains the exact text of scanlines that where skipped) |
| |
|
| Also there is a separate hash nohist_scantrondata that contains extra |
Also there is a separate hash nohist_scantrondata that contains extra |
| correction information that isn't representable in the bubble sheet |
correction information that isn't representable in the bubblesheet |
| file (see &scantron_getfile() for more information) |
file (see &scantron_getfile() for more information) |
| |
|
| After all scanlines are either valid, marked as valid or skipped, then |
After all scanlines are either valid, marked as valid or skipped, then |
|
Line 4948 sub scantron_filenames {
|
Line 5006 sub scantron_filenames {
|
| my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
| my $cname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
| my $getpropath = 1; |
my $getpropath = 1; |
| my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname, |
my ($dirlist,$listerror) = &Apache::lonnet::dirlist('userfiles',$cdom, |
| $getpropath); |
$cname,$getpropath); |
| my @possiblenames; |
my @possiblenames; |
| foreach my $filename (sort(@files)) { |
if (ref($dirlist) eq 'ARRAY') { |
| ($filename)=split(/&/,$filename); |
foreach my $filename (sort(@{$dirlist})) { |
| if ($filename!~/^scantron_orig_/) { next ; } |
($filename)=split(/&/,$filename); |
| $filename=~s/^scantron_orig_//; |
if ($filename!~/^scantron_orig_/) { next ; } |
| push(@possiblenames,$filename); |
$filename=~s/^scantron_orig_//; |
| |
push(@possiblenames,$filename); |
| |
} |
| } |
} |
| return @possiblenames; |
return @possiblenames; |
| } |
} |
|
Line 5109 sub scantron_CODEunique {
|
Line 5169 sub scantron_CODEunique {
|
| |
|
| =item scantron_selectphase |
=item scantron_selectphase |
| |
|
| Generates the initial screen to start the bubble sheet process. |
Generates the initial screen to start the bubblesheet process. |
| Allows for - starting a grading run. |
Allows for - starting a grading run. |
| - downloading existing scan data (original, corrected |
- downloading existing scan data (original, corrected |
| or skipped info) |
or skipped info) |
|
Line 5350 sub scantron_selectphase {
|
Line 5410 sub scantron_selectphase {
|
| |
|
| LastName - column that the last name starts in |
LastName - column that the last name starts in |
| LastNameLength - number of columns that the last name spans |
LastNameLength - number of columns that the last name spans |
| |
BubblesPerRow - number of bubbles available in each row used to |
| |
bubble an answer. (If not specified, 10 assumed). |
| =cut |
=cut |
| |
|
| sub get_scantron_config { |
sub get_scantron_config { |
|
Line 5380 sub get_scantron_config {
|
Line 5441 sub get_scantron_config {
|
| $config{'FirstNamelength'}=$config[14]; |
$config{'FirstNamelength'}=$config[14]; |
| $config{'LastName'}=$config[15]; |
$config{'LastName'}=$config[15]; |
| $config{'LastNamelength'}=$config[16]; |
$config{'LastNamelength'}=$config[16]; |
| |
$config{'BubblesPerRow'}=$config[17]; |
| last; |
last; |
| } |
} |
| return %config; |
return %config; |
|
Line 6129 sub remember_current_skipped {
|
Line 6191 sub remember_current_skipped {
|
| =item check_for_error |
=item check_for_error |
| |
|
| Checks if there was an error when attempting to remove a specific |
Checks if there was an error when attempting to remove a specific |
| scantron_.. bubble sheet data file. Prints out an error if |
scantron_.. bubblesheet data file. Prints out an error if |
| something went wrong. |
something went wrong. |
| |
|
| =cut |
=cut |
|
Line 6151 sub check_for_error {
|
Line 6213 sub check_for_error {
|
| =cut |
=cut |
| |
|
| sub scantron_warning_screen { |
sub scantron_warning_screen { |
| my ($button_text)=@_; |
my ($button_text,$symb)=@_; |
| my $title=&Apache::lonnet::gettitle($env{'form.selectpage'}); |
my $title=&Apache::lonnet::gettitle($env{'form.selectpage'}); |
| my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
| my $CODElist; |
my $CODElist; |
|
Line 6164 sub scantron_warning_screen {
|
Line 6226 sub scantron_warning_screen {
|
| '<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>'; |
| } |
} |
| |
my $lastbubblepoints; |
| |
if ($env{'form.scantron_lastbubblepoints'} ne '') { |
| |
$lastbubblepoints = |
| |
'<tr><td><b>'.&mt('Hand-graded items: points from last bubble in row').'</b></td><td><tt>'. |
| |
$env{'form.scantron_lastbubblepoints'}.'</tt></td></tr>'; |
| |
} |
| return (' |
return (' |
| <p> |
<p> |
| <span class="LC_warning"> |
<span class="LC_warning"> |
|
Line 6172 sub scantron_warning_screen {
|
Line 6240 sub scantron_warning_screen {
|
| <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> |
| <tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr> |
<tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr> |
| '.$CODElist.' |
'.$CODElist.$lastbubblepoints.' |
| </table> |
</table> |
| <br /> |
<p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'<br /> |
| <p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p> |
'.&mt('If something is incorrect, please return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p> |
| <p> '.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').'</p> |
|
| |
|
| <br /> |
<br /> |
| '); |
'); |
|
Line 6210 sub scantron_do_warning {
|
Line 6277 sub scantron_do_warning {
|
| $r->print('<p><span class="LC_error">'.&mt("You have not selected the format of the student's response data.").'</span></p>'); |
$r->print('<p><span class="LC_error">'.&mt("You have not selected the format of the student's response data.").'</span></p>'); |
| } |
} |
| } else { |
} else { |
| my $warning=&scantron_warning_screen('Grading: Validate Records'); |
my $warning=&scantron_warning_screen('Grading: Validate Records',$symb); |
| |
my $bubbledbyhand=&hand_bubble_option(); |
| $r->print(' |
$r->print(' |
| '.$warning.' |
'.$warning.$bubbledbyhand.' |
| <input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" /> |
<input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" /> |
| <input type="hidden" name="command" value="scantron_validate" /> |
<input type="hidden" name="command" value="scantron_validate" /> |
| '); |
'); |
|
Line 6264 SCANTRONFORM
|
Line 6332 SCANTRONFORM
|
| |
|
| =item scantron_validate_file |
=item scantron_validate_file |
| |
|
| Dispatch routine for doing validation of a bubble sheet data file. |
Dispatch routine for doing validation of a bubblesheet data file. |
| |
|
| Also processes any necessary information resets that need to |
Also processes any necessary information resets that need to |
| occur before validation begins (ignore previous corrections, |
occur before validation begins (ignore previous corrections, |
|
Line 6301 sub scantron_validate_file {
|
Line 6369 sub scantron_validate_file {
|
| #get the student pick code ready |
#get the student pick code ready |
| $r->print(&Apache::loncommon::studentbrowser_javascript()); |
$r->print(&Apache::loncommon::studentbrowser_javascript()); |
| my $nav_error; |
my $nav_error; |
| my $max_bubble=&scantron_get_maxbubble(\$nav_error); |
my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
| |
my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config); |
| if ($nav_error) { |
if ($nav_error) { |
| $r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
| return ''; |
return ''; |
| } |
} |
| my $result=&scantron_form_start($max_bubble).$default_form_data; |
my $result=&scantron_form_start($max_bubble).$default_form_data; |
| |
if ($env{'form.scantron_lastbubblepoints'} ne '') { |
| |
$result .= '<input type="hidden" name="scantron_lastbubblepoints" value="'.$env{'form.scantron_lastbubblepoints'}.'" />'; |
| |
} |
| $r->print($result); |
$r->print($result); |
| |
|
| my @validate_phases=( 'sequence', |
my @validate_phases=( 'sequence', |
|
Line 6331 sub scantron_validate_file {
|
Line 6403 sub scantron_validate_file {
|
| } |
} |
| } |
} |
| if (!$stop) { |
if (!$stop) { |
| my $warning=&scantron_warning_screen('Start Grading'); |
my $warning=&scantron_warning_screen('Start Grading',$symb); |
| $r->print(&mt('Validation process complete.').'<br />'. |
$r->print(&mt('Validation process complete.').'<br />'. |
| $warning. |
$warning. |
| &mt('Perform verification for each student after storage of submissions?'). |
&mt('Perform verification for each student after storage of submissions?'). |
|
Line 6341 sub scantron_validate_file {
|
Line 6413 sub scantron_validate_file {
|
| '<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No'). |
'<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No'). |
| '</label></span><br />'. |
'</label></span><br />'. |
| &mt('Grading will take longer if you use verification.').'<br />'. |
&mt('Grading will take longer if you use verification.').'<br />'. |
| &mt("Alternatively, the 'Review bubblesheet data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'. |
&mt('Otherwise, Grade/Manage/Review Bubblesheets [_1] Review bubblesheet data can be used once grading is complete.','»').'<br /><br />'. |
| '<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'. |
'<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'. |
| '<input type="hidden" name="command" value="scantron_process" />'."\n"); |
'<input type="hidden" name="command" value="scantron_process" />'."\n"); |
| } else { |
} else { |
|
Line 6353 sub scantron_validate_file {
|
Line 6425 sub scantron_validate_file {
|
| $r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' → " />'); |
$r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' → " />'); |
| $r->print(' '.&mt('this error').' <br />'); |
$r->print(' '.&mt('this error').' <br />'); |
| |
|
| $r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>"); |
$r->print('<p>'.&mt('Or return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p>'); |
| } else { |
} else { |
| if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') { |
if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') { |
| $r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' →" onclick="javascript:verify_bubble_radio(this.form)" />'); |
$r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' →" onclick="javascript:verify_bubble_radio(this.form)" />'); |
|
Line 6374 sub scantron_validate_file {
|
Line 6446 sub scantron_validate_file {
|
| |
|
| =item scantron_remove_file |
=item scantron_remove_file |
| |
|
| Removes the requested bubble sheet data file, makes sure that |
Removes the requested bubblesheet data file, makes sure that |
| scantron_original_<filename> is never removed |
scantron_original_<filename> is never removed |
| |
|
| |
|
|
Line 6399 sub scantron_remove_file {
|
Line 6471 sub scantron_remove_file {
|
| |
|
| =item scantron_remove_scan_data |
=item scantron_remove_scan_data |
| |
|
| Removes all scan_data correction for the requested bubble sheet |
Removes all scan_data correction for the requested bubblesheet |
| data file. (In the case that both the are doing skipped records we need |
data file. (In the case that both the are doing skipped records we need |
| to remember the old skipped lines for the time being so that element |
to remember the old skipped lines for the time being so that element |
| persists for a while.) |
persists for a while.) |
|
Line 6436 sub scantron_remove_scan_data {
|
Line 6508 sub scantron_remove_scan_data {
|
| |
|
| =item scantron_getfile |
=item scantron_getfile |
| |
|
| Fetches the requested bubble sheet data file (all 3 versions), and |
Fetches the requested bubblesheet data file (all 3 versions), and |
| the scan_data hash |
the scan_data hash |
| |
|
| Arguments: |
Arguments: |
|
Line 6536 sub lonnet_putfile {
|
Line 6608 sub lonnet_putfile {
|
| |
|
| =item scantron_putfile |
=item scantron_putfile |
| |
|
| Stores the current version of the bubble sheet data files, and the |
Stores the current version of the bubblesheet data files, and the |
| scan_data hash. (Does not modify the original version only the |
scan_data hash. (Does not modify the original version only the |
| corrected and skipped versions. |
corrected and skipped versions. |
| |
|
|
Line 6630 sub get_todo_count {
|
Line 6702 sub get_todo_count {
|
| |
|
| =item scantron_put_line |
=item scantron_put_line |
| |
|
| Updates the 'corrected' or 'skipped' versions of the bubble sheet |
Updates the 'corrected' or 'skipped' versions of the bubblesheet |
| data file. |
data file. |
| |
|
| Arguments: |
Arguments: |
|
Line 6754 sub scantron_validate_ID {
|
Line 6826 sub scantron_validate_ID {
|
| my ($scanlines,$scan_data)=&scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
| |
|
| my $nav_error; |
my $nav_error; |
| &scantron_get_maxbubble(\$nav_error); # parse needs the bubble_lines.. array. |
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the bubble_lines.. array. |
| if ($nav_error) { |
if ($nav_error) { |
| $r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
| return(1,$currentphase); |
return(1,$currentphase); |
|
Line 6819 sub scantron_get_correction {
|
Line 6891 sub scantron_get_correction {
|
| #the previous one or the current one |
#the previous one or the current one |
| |
|
| if ( $$scan_record{'scantron.PaperID'} =~ /\S/) { |
if ( $$scan_record{'scantron.PaperID'} =~ /\S/) { |
| $r->print("<p>".&mt("<b>An error was detected ($error)</b>". |
$r->print( |
| " for PaperID <tt>[_1]</tt>", |
'<p class="LC_warning">' |
| $$scan_record{'scantron.PaperID'})."</p> \n"); |
.&mt('An error was detected ([_1]) for PaperID [_2]', |
| |
"<b>$error</b>", |
| |
'<tt>'.$$scan_record{'scantron.PaperID'}.'</tt>') |
| |
."</p> \n"); |
| } else { |
} else { |
| $r->print("<p>".&mt("<b>An error was detected ($error)</b>". |
$r->print( |
| " in scanline [_1] <pre>[_2]</pre>", |
'<p class="LC_warning">' |
| $i,$line)."</p> \n"); |
.&mt('An error was detected ([_1]) in scanline [_2] [_3]', |
| } |
"<b>$error</b>", $i, "<pre>$line</pre>") |
| my $message="<p>".&mt("The ID on the form is <tt>[_1]</tt><br />". |
."</p> \n"); |
| "The name on the paper is [_2],[_3]", |
} |
| $$scan_record{'scantron.ID'}, |
my $message = |
| $$scan_record{'scantron.LastName'}, |
'<p>' |
| $$scan_record{'scantron.FirstName'})."</p>"; |
.&mt('The ID on the form is [_1]', |
| |
"<tt>$$scan_record{'scantron.ID'}</tt>") |
| |
.'<br />' |
| |
.&mt('The name on the paper is [_2], [_3]', |
| |
$$scan_record{'scantron.LastName'}, |
| |
$$scan_record{'scantron.FirstName'}) |
| |
.'</p>'; |
| |
|
| $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n"); |
$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n"); |
| $r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n"); |
$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n"); |
|
Line 6841 sub scantron_get_correction {
|
Line 6922 sub scantron_get_correction {
|
| |
|
| if ($error =~ /ID$/) { |
if ($error =~ /ID$/) { |
| if ($error eq 'incorrectID') { |
if ($error eq 'incorrectID') { |
| $r->print("<p>".&mt("The encoded ID is not in the classlist"). |
$r->print('<p class="LC_warning">'.&mt("The encoded ID is not in the classlist"). |
| "</p>\n"); |
"</p>\n"); |
| } elsif ($error eq 'duplicateID') { |
} elsif ($error eq 'duplicateID') { |
| $r->print("<p>".&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n"); |
| } |
} |
| $r->print($message); |
$r->print($message); |
| $r->print("<p>".&mt("How should I handle this?")." <br /> \n"); |
$r->print("<p>".&mt("How should I handle this?")." <br /> \n"); |
|
Line 6860 sub scantron_get_correction {
|
Line 6941 sub scantron_get_correction {
|
| $r->print('</li>'); |
$r->print('</li>'); |
| } elsif ($error =~ /CODE$/) { |
} elsif ($error =~ /CODE$/) { |
| if ($error eq 'incorrectCODE') { |
if ($error eq 'incorrectCODE') { |
| $r->print("<p>".&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n"); |
| } elsif ($error eq 'duplicateCODE') { |
} elsif ($error eq 'duplicateCODE') { |
| $r->print("<p>".&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n"); |
| } |
} |
| $r->print("<p>".&mt("The CODE on the form is <tt>'[_1]'</tt>", |
$r->print("<p>".&mt('The CODE on the form is [_1]', |
| $$scan_record{'scantron.CODE'})."<br />\n"); |
"<tt>'$$scan_record{'scantron.CODE'}'</tt>") |
| |
."</p>\n"); |
| $r->print($message); |
$r->print($message); |
| $r->print("<p>".&mt("How should I handle this?")." <br /> \n"); |
$r->print("<p>".&mt("How should I handle this?")."</p>\n"); |
| $r->print("\n<br /> "); |
$r->print("\n<br /> "); |
| my $i=0; |
my $i=0; |
| if ($error eq 'incorrectCODE' |
if ($error eq 'incorrectCODE' |
|
Line 6894 sub scantron_get_correction {
|
Line 6976 sub scantron_get_correction {
|
| $r->print(" |
$r->print(" |
| <label> |
<label> |
| <input type='radio' name='scantron_CODE_resolution' value='use_unfound'$checked /> |
<input type='radio' name='scantron_CODE_resolution' value='use_unfound'$checked /> |
| ".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.", |
".&mt("Use the CODE [_1] that was on the paper, ignoring the error.", |
| "<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")." |
"<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")." |
| </label>"); |
</label>"); |
| $r->print("\n<br />"); |
$r->print("\n<br />"); |
|
Line 6932 ENDSCRIPT
|
Line 7014 ENDSCRIPT
|
| "</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />")); |
"</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />")); |
| $r->print("\n<br /><br />"); |
$r->print("\n<br /><br />"); |
| } elsif ($error eq 'doublebubble') { |
} elsif ($error eq 'doublebubble') { |
| $r->print("<p>".&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n"); |
| |
|
| # 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: |
|
Line 6950 ENDSCRIPT
|
Line 7032 ENDSCRIPT
|
| } |
} |
| $r->print(&verify_bubbles_checked(@lines_to_correct)); |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
| } elsif ($error eq 'missingbubble') { |
} elsif ($error eq 'missingbubble') { |
| $r->print("<p>".&mt("There have been <b>no</b> bubbles scanned for some question(s)")."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("There have been [_1]no[_2] bubbles scanned for some question(s)",'<b>','</b>')."</p>\n"); |
| $r->print($message); |
$r->print($message); |
| $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>"); |
| $r->print(&mt("Some questions have no scanned bubbles.")."\n"); |
$r->print(&mt("Some questions have no scanned bubbles.")."\n"); |
|
Line 7153 sub scantron_bubble_selector {
|
Line 7235 sub scantron_bubble_selector {
|
| my $max=$$scan_config{'Qlength'}; |
my $max=$$scan_config{'Qlength'}; |
| |
|
| my $scmode=$$scan_config{'Qon'}; |
my $scmode=$$scan_config{'Qon'}; |
| if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; } |
if ($scmode eq 'number' || $scmode eq 'letter') { |
| |
if (($$scan_config{'BubblesPerRow'} =~ /^\d+$/) && |
| |
($$scan_config{'BubblesPerRow'} > 0)) { |
| |
$max=$$scan_config{'BubblesPerRow'}; |
| |
if (($scmode eq 'number') && ($max > 10)) { |
| |
$max = 10; |
| |
} elsif (($scmode eq 'letter') && $max > 26) { |
| |
$max = 26; |
| |
} |
| |
} else { |
| |
$max = 10; |
| |
} |
| |
} |
| |
|
| my @alphabet=('A'..'Z'); |
my @alphabet=('A'..'Z'); |
| $r->print(&Apache::loncommon::start_data_table(). |
$r->print(&Apache::loncommon::start_data_table(). |
|
Line 7308 sub scantron_validate_CODE {
|
Line 7402 sub scantron_validate_CODE {
|
| my %allcodes=&get_codes(); |
my %allcodes=&get_codes(); |
| |
|
| my $nav_error; |
my $nav_error; |
| &scantron_get_maxbubble(\$nav_error); # parse needs the lines per response array. |
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the lines per response array. |
| if ($nav_error) { |
if ($nav_error) { |
| $r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
| return(1,$currentphase); |
return(1,$currentphase); |
|
Line 7367 sub scantron_validate_doublebubble {
|
Line 7461 sub scantron_validate_doublebubble {
|
| my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
| my ($scanlines,$scan_data)=&scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
| my $nav_error; |
my $nav_error; |
| &scantron_get_maxbubble(\$nav_error); # 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()); |
| return(1,$currentphase); |
return(1,$currentphase); |
|
Line 7389 sub scantron_validate_doublebubble {
|
Line 7483 sub scantron_validate_doublebubble {
|
| |
|
| |
|
| sub scantron_get_maxbubble { |
sub scantron_get_maxbubble { |
| my ($nav_error) = @_; |
my ($nav_error,$scantron_config) = @_; |
| if (defined($env{'form.scantron_maxbubble'}) && |
if (defined($env{'form.scantron_maxbubble'}) && |
| $env{'form.scantron_maxbubble'}) { |
$env{'form.scantron_maxbubble'}) { |
| &restore_bubble_lines(); |
&restore_bubble_lines(); |
|
Line 7408 sub scantron_get_maxbubble {
|
Line 7502 sub scantron_get_maxbubble {
|
| } |
} |
| my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
| my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
| |
my $bubbles_per_row = &bubblesheet_bubbles_per_row($scantron_config); |
| |
|
| &Apache::lonxml::clear_problem_counter(); |
&Apache::lonxml::clear_problem_counter(); |
| |
|
|
Line 7423 sub scantron_get_maxbubble {
|
Line 7518 sub scantron_get_maxbubble {
|
| my $response_number = 0; |
my $response_number = 0; |
| my $bubble_line = 0; |
my $bubble_line = 0; |
| foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
| my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom); |
my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom,undef,$bubbles_per_row); |
| if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) { |
if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) { |
| foreach my $part_id (@{$parts}) { |
foreach my $part_id (@{$parts}) { |
| my $lines; |
my $lines; |
|
Line 7452 sub scantron_get_maxbubble {
|
Line 7547 sub scantron_get_maxbubble {
|
| if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') { |
if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') { |
| $numshown = scalar(@{$analysis->{$part_id.'.shown'}}); |
$numshown = scalar(@{$analysis->{$part_id.'.shown'}}); |
| } |
} |
| my $bubbles_per_line = 10; |
my $bubbles_per_row = |
| my $inner_bubble_lines = int($numbub/$bubbles_per_line); |
&bubblesheet_bubbles_per_row($scantron_config); |
| if (($numbub % $bubbles_per_line) != 0) { |
my $inner_bubble_lines = int($numbub/$bubbles_per_row); |
| |
if (($numbub % $bubbles_per_row) != 0) { |
| $inner_bubble_lines++; |
$inner_bubble_lines++; |
| } |
} |
| for (my $i=0; $i<$numshown; $i++) { |
for (my $i=0; $i<$numshown; $i++) { |
|
Line 7465 sub scantron_get_maxbubble {
|
Line 7561 sub scantron_get_maxbubble {
|
| $lines = $numshown * $inner_bubble_lines; |
$lines = $numshown * $inner_bubble_lines; |
| } else { |
} else { |
| $lines = $analysis->{"$part_id.bubble_lines"}; |
$lines = $analysis->{"$part_id.bubble_lines"}; |
| } |
} |
| |
|
| $first_bubble_line{$response_number} = $bubble_line; |
$first_bubble_line{$response_number} = $bubble_line; |
| $bubble_lines_per_response{$response_number} = $lines; |
$bubble_lines_per_response{$response_number} = $lines; |
|
Line 7486 sub scantron_get_maxbubble {
|
Line 7582 sub scantron_get_maxbubble {
|
| return $env{'form.scantron_maxbubble'}; |
return $env{'form.scantron_maxbubble'}; |
| } |
} |
| |
|
| |
sub bubblesheet_bubbles_per_row { |
| |
my ($scantron_config) = @_; |
| |
my $bubbles_per_row; |
| |
if (ref($scantron_config) eq 'HASH') { |
| |
$bubbles_per_row = $scantron_config->{'BubblesPerRow'}; |
| |
} |
| |
if ((!$bubbles_per_row) || ($bubbles_per_row < 1)) { |
| |
$bubbles_per_row = 10; |
| |
} |
| |
return $bubbles_per_row; |
| |
} |
| |
|
| sub scantron_validate_missingbubbles { |
sub scantron_validate_missingbubbles { |
| my ($r,$currentphase) = @_; |
my ($r,$currentphase) = @_; |
| #get student info |
#get student info |
|
Line 7496 sub scantron_validate_missingbubbles {
|
Line 7604 sub scantron_validate_missingbubbles {
|
| 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 $nav_error; |
my $nav_error; |
| my $max_bubble=&scantron_get_maxbubble(\$nav_error); |
my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config); |
| if ($nav_error) { |
if ($nav_error) { |
| return(1,$currentphase); |
return(1,$currentphase); |
| } |
} |
|
Line 7543 sub scantron_validate_missingbubbles {
|
Line 7651 sub scantron_validate_missingbubbles {
|
| return (0,$currentphase+1); |
return (0,$currentphase+1); |
| } |
} |
| |
|
| |
sub hand_bubble_option { |
| |
my (undef, undef, $sequence) = |
| |
&Apache::lonnet::decode_symb($env{'form.selectpage'}); |
| |
return if ($sequence eq ''); |
| |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
unless (ref($navmap)) { |
| |
return; |
| |
} |
| |
my $needs_hand_bubbles; |
| |
my $map=$navmap->getResourceByUrl($sequence); |
| |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
| |
foreach my $res (@resources) { |
| |
if (ref($res)) { |
| |
if ($res->is_problem()) { |
| |
my $partlist = $res->parts(); |
| |
foreach my $part (@{ $partlist }) { |
| |
my @types = $res->responseType($part); |
| |
if (grep(/^(chem|essay|image|formula|math|string|functionplot)$/,@types)) { |
| |
$needs_hand_bubbles = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($needs_hand_bubbles) { |
| |
my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
| |
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); |
| |
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 />'). |
| |
'<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>'; |
| |
} |
| |
return; |
| |
} |
| |
|
| sub scantron_process_students { |
sub scantron_process_students { |
| my ($r,$symb) = @_; |
my ($r,$symb) = @_; |
|
Line 7554 sub scantron_process_students {
|
Line 7697 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 = |
| |
&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 7566 sub scantron_process_students {
|
Line 7711 sub scantron_process_students {
|
| 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); |
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); |
\%grader_randomlists_by_symb,$bubbles_per_row); |
| my $resource_error; |
my $resource_error; |
| foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
| my $ressymb; |
my $ressymb; |
|
Line 7578 sub scantron_process_students {
|
Line 7723 sub scantron_process_students {
|
| } |
} |
| my ($analysis,$parts) = |
my ($analysis,$parts) = |
| &scantron_partids_tograde($resource,$env{'request.course.id'}, |
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
| $env{'user.name'},$env{'user.domain'},1); |
$env{'user.name'},$env{'user.domain'},1,$bubbles_per_row); |
| $grader_partids_by_symb{$ressymb} = $parts; |
$grader_partids_by_symb{$ressymb} = $parts; |
| if (ref($analysis) eq 'HASH') { |
if (ref($analysis) eq 'HASH') { |
| if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
|
Line 7616 SCANTRONFORM
|
Line 7761 SCANTRONFORM
|
| my $started; |
my $started; |
| |
|
| my $nav_error; |
my $nav_error; |
| &scantron_get_maxbubble(\$nav_error); # 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()); |
| return ''; |
return ''; |
|
Line 7672 SCANTRONFORM
|
Line 7817 SCANTRONFORM
|
| if ((exists($grader_randomlists_by_symb{$ressymb})) || |
if ((exists($grader_randomlists_by_symb{$ressymb})) || |
| (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
| my ($analysis,$parts) = |
my ($analysis,$parts) = |
| &scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom); |
&scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom,undef,$bubbles_per_row); |
| $partids_by_symb{$ressymb} = $parts; |
$partids_by_symb{$ressymb} = $parts; |
| } else { |
} else { |
| $partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb}; |
$partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb}; |
|
Line 7701 SCANTRONFORM
|
Line 7846 SCANTRONFORM
|
| } |
} |
| |
|
| if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
| \@resources,\%partids_by_symb) eq 'ssi_error') { |
\@resources,\%partids_by_symb, |
| |
$bubbles_per_row) 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 7728 SCANTRONFORM
|
Line 7874 SCANTRONFORM
|
| 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, |
| \@resources,\%partids_by_symb) eq 'ssi_error') { |
\@resources,\%partids_by_symb, |
| |
$bubbles_per_row) 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 7747 SCANTRONFORM
|
Line 7894 SCANTRONFORM
|
| $studentrecord .= $recording; |
$studentrecord .= $recording; |
| } |
} |
| if ($studentrecord ne $studentdata) { |
if ($studentrecord ne $studentdata) { |
| $r->print('<p><span class="LC_error">'); |
$r->print('<p><span class="LC_warning">'); |
| if ($scancode eq '') { |
if ($scancode eq '') { |
| $r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2].', |
$r->print(&mt('Mismatch grading bubblesheet for user: [_1] with ID: [_2].', |
| $uname.':'.$udom,$scan_record->{'scantron.ID'})); |
$uname.':'.$udom,$scan_record->{'scantron.ID'})); |
| } else { |
} else { |
| $r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2] and CODE: [_3].', |
$r->print(&mt('Mismatch grading bubblesheet for user: [_1] with ID: [_2] and CODE: [_3].', |
| $uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode)); |
$uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode)); |
| } |
} |
| $r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n". |
$r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n". |
|
Line 7760 SCANTRONFORM
|
Line 7907 SCANTRONFORM
|
| '<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'. |
'<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'. |
| &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('Bubble Sheet').'</td>'. |
'<td>'.&mt('Bubblesheet').'</td>'. |
| '<td><span class="LC_nobreak">'.$studentdata.'</span></td>'. |
'<td><span class="LC_nobreak"><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>Stored submissions</td>'. |
'<td>'.&mt('Stored submissions').'</td>'. |
| '<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n". |
'<td><span class="LC_nobreak"><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 7791 SCANTRONFORM
|
Line 7938 SCANTRONFORM
|
| } |
} |
| |
|
| sub graders_resources_pass { |
sub graders_resources_pass { |
| my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb) = @_; |
my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb, |
| |
$bubbles_per_row) = @_; |
| if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) && |
if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) && |
| (ref($grader_randomlists_by_symb) eq 'HASH')) { |
(ref($grader_randomlists_by_symb) eq 'HASH')) { |
| foreach my $resource (@{$resources}) { |
foreach my $resource (@{$resources}) { |
| my $ressymb = $resource->symb(); |
my $ressymb = $resource->symb(); |
| my ($analysis,$parts) = |
my ($analysis,$parts) = |
| &scantron_partids_tograde($resource,$env{'request.course.id'}, |
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
| $env{'user.name'},$env{'user.domain'},1); |
$env{'user.name'},$env{'user.domain'},1,$bubbles_per_row); |
| $grader_partids_by_symb->{$ressymb} = $parts; |
$grader_partids_by_symb->{$ressymb} = $parts; |
| if (ref($analysis) eq 'HASH') { |
if (ref($analysis) eq 'HASH') { |
| if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
|
Line 7812 sub graders_resources_pass {
|
Line 7960 sub graders_resources_pass {
|
| } |
} |
| |
|
| sub grade_student_bubbles { |
sub grade_student_bubbles { |
| my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts) = @_; |
my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts,$bubbles_per_row) = @_; |
| |
# Walk folder as student here to get resources in order student sees. |
| 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 7825 sub grade_student_bubbles {
|
Line 7974 sub grade_student_bubbles {
|
| 'grade_symb' => $ressymb, |
'grade_symb' => $ressymb, |
| 'CODE' => $scancode |
'CODE' => $scancode |
| ); |
); |
| |
if ($bubbles_per_row ne '') { |
| |
$form{'bubbles_per_row'} = $bubbles_per_row; |
| |
} |
| |
if ($env{'form.scantron_lastbubblepoints'} ne '') { |
| |
$form{'scantron_lastbubblepoints'} = $env{'form.scantron_lastbubblepoints'}; |
| |
} |
| 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}}) { |
|
Line 7884 sub scantron_upload_scantron_data {
|
Line 8039 sub scantron_upload_scantron_data {
|
| |
|
| ')); |
')); |
| $r->print(' |
$r->print(' |
| <h3>'.&mt('Send scanned bubblesheet data to a course').'</h3> |
<h3>'.&mt('Send bubblesheet data to a course').'</h3> |
| |
|
| <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
| '.$default_form_data. |
'.$default_form_data. |
|
Line 8100 sub checkscantron_results {
|
Line 8255 sub checkscantron_results {
|
| my %record; |
my %record; |
| my %scantron_config = |
my %scantron_config = |
| &Apache::grades::get_scantron_config($env{'form.scantron_format'}); |
&Apache::grades::get_scantron_config($env{'form.scantron_format'}); |
| |
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); |
| my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile(); |
my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile(); |
| my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&Apache::loncoursedata::get_classlist(); |
| my %idmap=&Apache::grades::username_to_idmap($classlist); |
my %idmap=&Apache::grades::username_to_idmap($classlist); |
|
Line 8127 sub checkscantron_results {
|
Line 8283 sub checkscantron_results {
|
| 'inline',undef,'checkscantron'); |
'inline',undef,'checkscantron'); |
| my ($username,$domain,$started); |
my ($username,$domain,$started); |
| my $nav_error; |
my $nav_error; |
| &scantron_get_maxbubble(\$nav_error); # 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()); |
| return ''; |
return ''; |
|
Line 8177 sub checkscantron_results {
|
Line 8333 sub checkscantron_results {
|
| if ((exists($grader_randomlists_by_symb{$ressymb})) || |
if ((exists($grader_randomlists_by_symb{$ressymb})) || |
| (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
| (my $analysis,$parts) = |
(my $analysis,$parts) = |
| &scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain); |
&scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain,undef,$bubbles_per_row); |
| } else { |
} else { |
| $parts = $grader_partids_by_symb{$ressymb}; |
$parts = $grader_partids_by_symb{$ressymb}; |
| } |
} |
|
Line 8222 sub checkscantron_results {
|
Line 8378 sub checkscantron_results {
|
| } |
} |
| } |
} |
| } |
} |
| $r->print('<p>'.&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b> ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>'); |
$r->print( |
| |
'<p>' |
| |
.&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).', |
| |
'<b>', |
| |
$numstudents, |
| |
'</b>', |
| |
$env{'form.scantron_maxbubble'}) |
| |
.'</p>' |
| |
); |
| $r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>'); |
$r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>'); |
| if ($passed) { |
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 />'); |
|
Line 8477 sub grading_menu {
|
Line 8641 sub grading_menu {
|
| url => $url4, |
url => $url4, |
| permission => 'F', |
permission => 'F', |
| icon => 'bubblesheet.png', |
icon => 'bubblesheet.png', |
| linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.' |
linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.' |
| }, |
}, |
| { linktext => 'Verify Receipt Number', |
{ linktext => 'Verify Receipt Number', |
| url => $url5, |
url => $url5, |
|
Line 9217 sub select_problem {
|
Line 9381 sub select_problem {
|
| sub handler { |
sub handler { |
| my $request=$_[0]; |
my $request=$_[0]; |
| &reset_caches(); |
&reset_caches(); |
| if ($env{'browser.mathml'}) { |
if ($request->header_only) { |
| &Apache::loncommon::content_type($request,'text/xml'); |
&Apache::loncommon::content_type($request,'text/html'); |
| } else { |
$request->send_http_header; |
| &Apache::loncommon::content_type($request,'text/html'); |
return OK; |
| } |
} |
| $request->send_http_header; |
|
| return '' if $request->header_only; |
|
| &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); |
| |
|
| |
&init_perm(); |
| |
if (!$env{'request.course.id'}) { |
| |
# Not in a course. |
| |
$env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context"; |
| |
return HTTP_NOT_ACCEPTABLE; |
| |
} elsif (!%perm) { |
| |
$request->internal_redirect('/adm/quickgrades'); |
| |
} |
| |
&Apache::loncommon::content_type($request,'text/html'); |
| |
$request->send_http_header; |
| |
|
| |
|
| # see what command we need to execute |
# see what command we need to execute |
| |
|
| my @commands=&Apache::loncommon::get_env_multiple('form.command'); |
my @commands=&Apache::loncommon::get_env_multiple('form.command'); |
|
Line 9242 sub handler {
|
Line 9416 sub handler {
|
| (my $url=$env{'form.url'}) =~ s-^https*://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; |
(my $url=$env{'form.url'}) =~ s-^https*://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; |
| $symb=&Apache::lonnet::symbread($url); |
$symb=&Apache::lonnet::symbread($url); |
| } |
} |
| &Apache::lonenc::check_decrypt(\$symb); |
&Apache::lonenc::check_decrypt(\$symb); |
| |
|
| $ssi_error = 0; |
$ssi_error = 0; |
| if (($symb eq '' || $command eq '') && ($env{'request.course.id'})) { |
if (($symb eq '' || $command eq '') && ($env{'request.course.id'})) { |
|
Line 9252 sub handler {
|
Line 9426 sub handler {
|
| &startpage($request,undef,[],1,1); |
&startpage($request,undef,[],1,1); |
| &select_problem($request); |
&select_problem($request); |
| } else { |
} else { |
| &init_perm(); |
|
| if ($command eq 'submission' && $perm{'vgr'}) { |
if ($command eq 'submission' && $perm{'vgr'}) { |
| &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}]); |
&startpage($request,$symb,[{href=>"", text=>"Student Submissions"}]); |
| ($env{'form.student'} eq '' ? &listStudents($request,$symb) : &submission($request,0,0,$symb)); |
($env{'form.student'} eq '' ? &listStudents($request,$symb) : &submission($request,0,0,$symb)); |
|
Line 9396 sub handler {
|
Line 9569 sub handler {
|
| &Apache::lonquickgrades::endGradeScreen($request); |
&Apache::lonquickgrades::endGradeScreen($request); |
| $request->print(&Apache::loncommon::end_page()); |
$request->print(&Apache::loncommon::end_page()); |
| &reset_caches(); |
&reset_caches(); |
| return ''; |
return OK; |
| } |
} |
| |
|
| 1; |
1; |
|
Line 9500 ssi_with_retries()
|
Line 9673 ssi_with_retries()
|
| calling routine should trap the error condition and display the warning |
calling routine should trap the error condition and display the warning |
| found in &navmap_errormsg(). |
found in &navmap_errormsg(). |
| |
|
| |
$scantron_config - Reference to bubblesheet format configuration hash. |
| |
|
| Returns the maximum number of bubble lines that are expected to |
Returns the maximum number of bubble lines that are expected to |
| occur. Does this by walking the selected sequence rendering the |
occur. Does this by walking the selected sequence rendering the |
| resource and then checking &Apache::lonxml::get_problem_counter() |
resource and then checking &Apache::lonxml::get_problem_counter() |
|
Line 9523 ssi_with_retries()
|
Line 9698 ssi_with_retries()
|
| |
|
| =item scantron_process_students() : |
=item scantron_process_students() : |
| |
|
| Routine that does the actual grading of the bubble sheet information. |
Routine that does the actual grading of the bubblesheet information. |
| |
|
| The parsed scanline hash is added to %env |
The parsed scanline hash is added to %env |
| |
|
|
Line 9543 ssi_with_retries()
|
Line 9718 ssi_with_retries()
|
| |
|
| =item scantron_upload_scantron_data() : |
=item scantron_upload_scantron_data() : |
| |
|
| Creates the screen for adding a new bubble sheet data file to a course. |
Creates the screen for adding a new bubblesheet data file to a course. |
| |
|
| =item scantron_upload_scantron_data_save() : |
=item scantron_upload_scantron_data_save() : |
| |
|
|
Line 9557 ssi_with_retries()
|
Line 9732 ssi_with_retries()
|
| =item scantron_download_scantron_data() : |
=item scantron_download_scantron_data() : |
| |
|
| Shows a list of the three internal files (original, corrected, |
Shows a list of the three internal files (original, corrected, |
| skipped) for a specific bubble sheet data file that exists in the |
skipped) for a specific bubblesheet data file that exists in the |
| course. |
course. |
| |
|
| =item scantron_validate_ID() : |
=item scantron_validate_ID() : |
![[BACK]](/icons/back.gif){kind=icon}
Return to grades.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / homework