version 1.574.2.7, 2010/01/27 05:12:15
|
version 1.574.2.12, 2010/05/22 01:01:03
|
Line 771 sub verifyreceipt {
|
Line 771 sub verifyreceipt {
|
|
|
my $title.= |
my $title.= |
'<h3><span class="LC_info">'. |
'<h3><span class="LC_info">'. |
&mt('Verifying Receipt No. [_1]',$receipt). |
&mt('Verifying Receipt No. [_1]',$receipt). |
'</span></h3>'."\n". |
'</span></h3>'."\n". |
'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}). |
'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}). |
'</h4>'."\n"; |
'</h4>'."\n"; |
Line 831 sub verifyreceipt {
|
Line 831 sub verifyreceipt {
|
} |
} |
} |
} |
if ($matches == 0) { |
if ($matches == 0) { |
$string = $title.&mt('No match found for the above receipt.'); |
$string = $title.&mt('No match found for the above receipt number.'); |
} else { |
} else { |
$string = &jscriptNform($symb).$title. |
$string = &jscriptNform($symb).$title. |
'<p>'. |
'<p>'. |
&mt('The above receipt matches the following [numerate,_1,student].',$matches). |
&mt('The above receipt number matches the following [numerate,_1,student].',$matches). |
'</p>'. |
'</p>'. |
$header. |
$header. |
$contents. |
$contents. |
Line 1754 sub gradeBox {
|
Line 1754 sub gradeBox {
|
} |
} |
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n"; |
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n"; |
|
|
|
|
#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line); |
|
$result .= |
$result .= |
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'; |
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'; |
$result.='</tr></table>'."\n"; |
$result.='</tr></table>'."\n"; |
Line 3853 ENDPICK
|
Line 3851 ENDPICK
|
} |
} |
|
|
sub csvupload_fields { |
sub csvupload_fields { |
my ($symb) = @_; |
|
my ($symb,$errorref) = @_; |
my ($symb,$errorref) = @_; |
my (@parts) = &getpartlist($symb,$errorref); |
my (@parts) = &getpartlist($symb,$errorref); |
if (ref($errorref)) { |
if (ref($errorref)) { |
Line 7416 sub scantron_get_maxbubble {
|
Line 7413 sub scantron_get_maxbubble {
|
if (ref($nav_error)) { |
if (ref($nav_error)) { |
$$nav_error = 1; |
$$nav_error = 1; |
} |
} |
|
return; |
} |
} |
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); |
Line 7579 sub scantron_process_students {
|
Line 7577 sub scantron_process_students {
|
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); |
|
my $resource_error; |
foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
my $ressymb = $resource->symb(); |
my $ressymb; |
|
if (ref($resource)) { |
|
$ressymb = $resource->symb(); |
|
} else { |
|
$resource_error = 1; |
|
last; |
|
} |
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); |
Line 7592 sub scantron_process_students {
|
Line 7597 sub scantron_process_students {
|
} |
} |
} |
} |
} |
} |
|
if ($resource_error) { |
|
$r->print(&navmap_errormsg()); |
|
return ''; |
|
} |
|
|
my ($uname,$udom); |
my ($uname,$udom); |
my $result= <<SCANTRONFORM; |
my $result= <<SCANTRONFORM; |
Line 7662 SCANTRONFORM
|
Line 7671 SCANTRONFORM
|
} |
} |
($uname,$udom)=split(/:/,$uname); |
($uname,$udom)=split(/:/,$uname); |
|
|
my %partids_by_symb; |
my (%partids_by_symb,$res_error); |
foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
my $ressymb = $resource->symb(); |
my $ressymb; |
|
if (ref($resource)) { |
|
$ressymb = $resource->symb(); |
|
} else { |
|
$res_error = 1; |
|
last; |
|
} |
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) = |
Line 7675 SCANTRONFORM
|
Line 7690 SCANTRONFORM
|
} |
} |
} |
} |
|
|
|
if ($res_error) { |
|
&scantron_add_delay(\@delayqueue,$line, |
|
'An error occurred while grading student '.$uname,2); |
|
next; |
|
} |
|
|
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonnet::appenv($scan_record); |
&Apache::lonnet::appenv($scan_record); |
|
|
Line 8448 sub grading_menu {
|
Line 8469 sub grading_menu {
|
push(@menu, { url => $url, |
push(@menu, { url => $url, |
name => &mt('Grade/Manage/Review Bubblesheets'), |
name => &mt('Grade/Manage/Review Bubblesheets'), |
short_description => |
short_description => |
&mt('Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.')}); |
&mt('Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.')}); |
$fields{'command'} = 'verify'; |
$fields{'command'} = 'verify'; |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
push(@menu, { url => "", |
push(@menu, { url => "", |
name => &mt('Verify Receipt'), |
name => &mt('Verify Receipt No.'), |
short_description => |
short_description => |
&mt('')}); |
&mt('')}); |
# Create the menu |
# Create the menu |
Line 8467 sub grading_menu {
|
Line 8488 sub grading_menu {
|
'<input type="hidden" name="gradingMenu" value="1" />'."\n". |
'<input type="hidden" name="gradingMenu" value="1" />'."\n". |
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
foreach my $menudata (@menu) { |
foreach my $menudata (@menu) { |
if ($menudata->{'name'} ne &mt('Verify Receipt')) { |
if ($menudata->{'name'} ne &mt('Verify Receipt No.')) { |
$Str .=' <h3><a '. |
$Str .=' <h3><a '. |
$menudata->{'jscript'}. |
$menudata->{'jscript'}. |
' href="'. |
' href="'. |
$menudata->{'url'}.'" >'. |
$menudata->{'url'}.'" >'. |
$menudata->{'name'}."</a></h3>\n"; |
$menudata->{'name'}."</a></h3>\n"; |
} else { |
} else { |
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '. |
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '. |
$menudata->{'jscript'}. |
$menudata->{'jscript'}. |
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
' /> '. |
' /> '. |