version 1.472, 2007/10/30 01:04:31
|
version 1.519, 2008/05/01 16:03:34
|
Line 47 use LONCAPA;
|
Line 47 use LONCAPA;
|
use POSIX qw(floor); |
use POSIX qw(floor); |
|
|
|
|
my %perm=(); |
|
my %bubble_lines_per_response = (); # no. bubble lines for each response. |
|
# index is "symb.part_id" |
|
|
|
my %first_bubble_line = (); # First bubble line no. for each bubble. |
|
|
|
# Save and restore the bubble lines array to the form env. |
|
|
|
|
|
sub save_bubble_lines { |
|
foreach my $line (keys(%bubble_lines_per_response)) { |
|
$env{"form.scantron.bubblelines.$line"} = $bubble_lines_per_response{$line}; |
|
$env{"form.scantron.first_bubble_line.$line"} = |
|
$first_bubble_line{$line}; |
|
} |
|
} |
|
|
|
|
|
sub restore_bubble_lines { |
my %perm=(); |
my $line = 0; |
|
%bubble_lines_per_response = (); |
|
while ($env{"form.scantron.bubblelines.$line"}) { |
|
my $value = $env{"form.scantron.bubblelines.$line"}; |
|
$bubble_lines_per_response{$line} = $value; |
|
$first_bubble_line{$line} = |
|
$env{"form.scantron.first_bubble_line.$line"}; |
|
$line++; |
|
} |
|
|
|
} |
# These variables are used to recover from ssi errors |
|
|
# Given the parsed scanline, get the response for |
my $ssi_retries = 5; |
# 'answer' number n: |
my $ssi_error; |
|
my $ssi_error_resource; |
|
my $ssi_error_message; |
|
|
sub get_response_bubbles { |
|
my ($parsed_line, $response) = @_; |
|
|
|
|
# Do an ssi with retries: |
|
# While I'd love to factor out this with the vesrion in lonprintout, |
|
# that would either require a data coupling between modules, which I refuse to perpetuate |
|
# (there's quite enough of that already), or would require the invention of another infrastructure |
|
# I'm not quite ready to invent (e.g. an ssi_with_retry object). |
|
# |
|
# At least the logic that drives this has been pulled out into loncommon. |
|
|
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"}.":"; |
# ssi_with_retries - Does the server side include of a resource. |
$bubble_line++; |
# if the ssi call returns an error we'll retry it up to |
|
# the number of times requested by the caller. |
|
# If we still have a proble, no text is appended to the |
|
# output and we set some global variables. |
|
# to indicate to the caller an SSI error occurred. |
|
# All of this is supposed to deal with the issues described |
|
# in LonCAPA BZ 5631 see: |
|
# http://bugs.lon-capa.org/show_bug.cgi?id=5631 |
|
# by informing the user that this happened. |
|
# |
|
# Parameters: |
|
# resource - The resource to include. This is passed directly, without |
|
# interpretation to lonnet::ssi. |
|
# form - The form hash parameters that guide the interpretation of the resource |
|
# |
|
# retries - Number of retries allowed before giving up completely. |
|
# Returns: |
|
# On success, returns the rendered resource identified by the resource parameter. |
|
# Side Effects: |
|
# The following global variables can be set: |
|
# ssi_error - If an unrecoverable error occurred this becomes true. |
|
# It is up to the caller to initialize this to false |
|
# if desired. |
|
# ssi_error_resource - If an unrecoverable error occurred, this is the value |
|
# of the resource that could not be rendered by the ssi |
|
# call. |
|
# ssi_error_message - The error string fetched from the ssi response |
|
# in the event of an error. |
|
# |
|
sub ssi_with_retries { |
|
my ($resource, $retries, %form) = @_; |
|
my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form); |
|
if ($response->is_error) { |
|
$ssi_error = 1; |
|
$ssi_error_resource = $resource; |
|
$ssi_error_message = $response->code . " " . $response->message; |
} |
} |
return $selected; |
|
} |
|
|
|
|
return $content; |
|
|
# ----- These first few routines are general use routines.---- |
|
|
|
# Return the number of occurences of a pattern in a string. |
|
|
|
sub occurence_count { |
|
my ($string, $pattern) = @_; |
|
|
|
my @matches = ($string =~ /$pattern/g); |
|
|
|
return scalar(@matches); |
|
} |
} |
|
# |
|
# Prodcuces an ssi retry failure error message to the user: |
|
# |
|
|
|
sub ssi_print_error { |
# Take a string known to have digits and convert all the |
my ($r) = @_; |
# digits into letters in the range J,A..I. |
my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk'); |
|
$r->print(' |
sub digits_to_letters { |
<br /> |
my ($input) = @_; |
<h2>'.&mt('An unrecoverable network error occurred:').'</h2> |
|
<p> |
my @alphabet = ('J', 'A'..'I'); |
'.&mt('Unable to retrieve a resource from a server:').'<br /> |
|
'.&mt('Resource:').' '.$ssi_error_resource.'<br /> |
my @input = split(//, $input); |
'.&mt('Error:').' '.$ssi_error_message.' |
my $output =''; |
</p> |
for (my $i = 0; $i < scalar(@input); $i++) { |
<p>'. |
if ($input[$i] =~ /\d/) { |
&mt('It is recommended that you try again later, as this error may mean the server was just temporarily unavailable, or is down for maintenance.').'<br />'. |
$output .= $alphabet[$input[$i]]; |
&mt('If the error persists, please contact the [_1] for assistance.',$helpurl). |
} else { |
'</p>'); |
$output .= $input[$i]; |
return; |
} |
|
} |
|
return $output; |
|
} |
} |
|
|
# |
# |
Line 171 sub get_symb {
|
Line 172 sub get_symb {
|
sub nameUserString { |
sub nameUserString { |
my ($type,$fullname,$uname,$udom) = @_; |
my ($type,$fullname,$uname,$udom) = @_; |
if ($type eq 'header') { |
if ($type eq 'header') { |
return '<b> Fullname </b><span class="LC_internal_info">(Username)</span>'; |
return '<b> '.&mt('Fullname').' </b><span class="LC_internal_info">('.&mt('Username').')</span>'; |
} else { |
} else { |
return ' '.$fullname.'<span class="LC_internal_info"> ('.$uname. |
return ' '.$fullname.'<span class="LC_internal_info"> ('.$uname. |
($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>'; |
($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>'; |
Line 254 sub showResourceInfo {
|
Line 255 sub showResourceInfo {
|
$partsseen{$partID}=1; |
$partsseen{$partID}=1; |
} |
} |
my $display_part=&get_display_part($partID,$symb); |
my $display_part=&get_display_part($partID,$symb); |
$result.='<td><b>Part: </b>'.$display_part.' <span class="LC_internal_info">'. |
$result.='<td>'.&mt('<b>Part: </b>[_1]',$display_part).' <span class="LC_internal_info">'. |
$resID.'</span></td>'. |
$resID.'</span></td>'. |
'<td><b>Type: </b>'.$responsetype.'</td></tr>'; |
'<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>'; |
# '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>'; |
# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>'; |
} |
} |
} |
} |
$result.='</table>'."\n"; |
$result.='</table>'."\n"; |
Line 283 sub reset_caches {
|
Line 284 sub reset_caches {
|
|
|
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
$url=&Apache::lonnet::clutter($url); |
$url=&Apache::lonnet::clutter($url); |
my $subresult=&Apache::lonnet::ssi($url, |
my $subresult=&ssi_with_retries($url, $ssi_retries, |
('grade_target' => 'analyze'), |
('grade_target' => 'analyze', |
('grade_domain' => $udom), |
'grade_domain' => $udom, |
('grade_symb' => $symb), |
'grade_symb' => $symb, |
('grade_courseid' => |
'grade_courseid' => |
$env{'request.course.id'}), |
$env{'request.course.id'}, |
('grade_username' => $uname)); |
'grade_username' => $uname)); |
(undef,$subresult)=split(/_HASH_REF__/,$subresult,2); |
(undef,$subresult)=split(/_HASH_REF__/,$subresult,2); |
my %analyze=&Apache::lonnet::str2hash($subresult); |
my %analyze=&Apache::lonnet::str2hash($subresult); |
return $analyze_cache{$key} = \%analyze; |
return $analyze_cache{$key} = \%analyze; |
Line 733 sub verifyreceipt {
|
Line 734 sub verifyreceipt {
|
$receipt =~ s/[^\-\d]//g; |
$receipt =~ s/[^\-\d]//g; |
my ($symb) = &get_symb($request); |
my ($symb) = &get_symb($request); |
|
|
my $title.='<h3><span class="LC_info">Verifying Submission Receipt '. |
my $title.= |
$receipt.'</h3></span>'."\n". |
'<h3><span class="LC_info">'. |
'<h4><b>Resource: </b>'.$env{'form.probTitle'}.'</h4><br /><br />'."\n"; |
&mt('Verifying Submission Receipt [_1]',$receipt). |
|
'</span></h3>'."\n". |
|
'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}). |
|
'</h4>'."\n"; |
|
|
my ($string,$contents,$matches) = ('','',0); |
my ($string,$contents,$matches) = ('','',0); |
my (undef,undef,$fullname) = &getclasslist('all','0'); |
my (undef,undef,$fullname) = &getclasslist('all','0'); |
Line 745 sub verifyreceipt {
|
Line 749 sub verifyreceipt {
|
$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; } |
$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; } |
my $parts=['0']; |
my $parts=['0']; |
if ($receiptparts) { ($parts)=&response_type($symb); } |
if ($receiptparts) { ($parts)=&response_type($symb); } |
|
|
|
my $header = |
|
&Apache::loncommon::start_data_table(). |
|
&Apache::loncommon::start_data_table_header_row(). |
|
'<th> '.&mt('Fullname').' </th>'."\n". |
|
'<th> '.&mt('Username').' </th>'."\n". |
|
'<th> '.&mt('Domain').' </th>'; |
|
if ($receiptparts) { |
|
$header.='<th> '.&mt('Problem Part').' </th>'; |
|
} |
|
$header.= |
|
&Apache::loncommon::end_data_table_header_row(); |
|
|
foreach (sort |
foreach (sort |
{ |
{ |
if (lc($$fullname{$a}) ne lc($$fullname{$b})) { |
if (lc($$fullname{$a}) ne lc($$fullname{$b})) { |
Line 755 sub verifyreceipt {
|
Line 772 sub verifyreceipt {
|
my ($uname,$udom)=split(/\:/); |
my ($uname,$udom)=split(/\:/); |
foreach my $part (@$parts) { |
foreach my $part (@$parts) { |
if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) { |
if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) { |
$contents.='<tr bgcolor="#ffffe6"><td> '."\n". |
$contents.= |
|
&Apache::loncommon::start_data_table_row(). |
|
'<td> '."\n". |
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom. |
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom. |
'\');" target="_self">'.$$fullname{$_}.'</a> </td>'."\n". |
'\');" target="_self">'.$$fullname{$_}.'</a> </td>'."\n". |
'<td> '.$uname.' </td>'. |
'<td> '.$uname.' </td>'. |
Line 763 sub verifyreceipt {
|
Line 782 sub verifyreceipt {
|
if ($receiptparts) { |
if ($receiptparts) { |
$contents.='<td> '.$part.' </td>'; |
$contents.='<td> '.$part.' </td>'; |
} |
} |
$contents.='</tr>'."\n"; |
$contents.= |
|
&Apache::loncommon::end_data_table_row()."\n"; |
|
|
$matches++; |
$matches++; |
} |
} |
} |
} |
} |
} |
if ($matches == 0) { |
if ($matches == 0) { |
$string = $title.'No match found for the above receipt.'; |
$string = $title.&mt('No match found for the above receipt.'); |
} else { |
} else { |
$string = &jscriptNform($symb).$title. |
$string = &jscriptNform($symb).$title. |
'The above receipt matches the following student'. |
'<p>'. |
($matches <= 1 ? '.' : 's.')."\n". |
&mt('The above receipt matches the following [numerate,_1,student].',$matches). |
'<table border="0"><tr><td bgcolor="#777777">'."\n". |
'</p>'. |
'<table border="0"><tr bgcolor="#e6ffff">'."\n". |
$header. |
'<td><b> Fullname </b></td>'."\n". |
$contents. |
'<td><b> Username </b></td>'."\n". |
&Apache::loncommon::end_data_table()."\n"; |
'<td><b> Domain </b></td>'; |
|
if ($receiptparts) { |
|
$string.='<td> Problem Part </td>'; |
|
} |
|
$string.='</tr>'."\n".$contents. |
|
'</table></td></tr></table>'."\n"; |
|
} |
} |
return $string.&show_grading_menu_form($symb); |
return $string.&show_grading_menu_form($symb); |
} |
} |
Line 806 sub listStudents {
|
Line 820 sub listStudents {
|
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? |
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? |
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; |
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; |
|
|
my $result='<h3><span class="LC_info"> '.$viewgrade. |
my $result='<h3><span class="LC_info"> '. |
' Submissions for a Student or a Group of Students</span></h3>'; |
&mt($viewgrade.' Submissions for a Student or a Group of Students') |
|
.'</span></h3>'; |
|
|
my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes')); |
my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes')); |
|
|
|
my %lt = ( 'multiple' => |
|
"Please select a student or group of students before clicking on the Next button.", |
|
'single' => |
|
"Please select the student before clicking on the Next button.", |
|
); |
|
%lt = &Apache::lonlocal::texthash(%lt); |
$request->print(<<LISTJAVASCRIPT); |
$request->print(<<LISTJAVASCRIPT); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
function checkSelect(checkBox) { |
function checkSelect(checkBox) { |
Line 822 sub listStudents {
|
Line 843 sub listStudents {
|
ctr++; |
ctr++; |
} |
} |
} |
} |
sense = "a student or group of students"; |
sense = '$lt{'multiple'}'; |
} else { |
} else { |
if (checkBox.checked) { |
if (checkBox.checked) { |
ctr = 1; |
ctr = 1; |
} |
} |
sense = "the student"; |
sense = '$lt{'single'}'; |
} |
} |
if (ctr == 0) { |
if (ctr == 0) { |
alert("Please select "+sense+" before clicking on the Next button."); |
alert(sense); |
return false; |
return false; |
} |
} |
document.gradesub.submit(); |
document.gradesub.submit(); |
Line 850 LISTJAVASCRIPT
|
Line 871 LISTJAVASCRIPT
|
my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : ''; |
my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : ''; |
my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : ''; |
my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : ''; |
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'. |
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'. |
"\n".$table. |
"\n".$table; |
' <b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n". |
|
'<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n". |
$gradeTable .= |
'<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n". |
' '. |
' <b>View Answer: </b><label><input type="radio" name="vAns" value="no" /> no </label>'."\n". |
&mt('<b>View Problem Text: </b>[_1]', |
'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n". |
'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n". |
'<label><input type="radio" name="vAns" value="all" checked="checked" /> all students </label><br />'."\n". |
'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n". |
' <b>Submissions: </b>'."\n"; |
'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label>').'<br />'."\n"; |
|
$gradeTable .= |
|
' '. |
|
&mt('<b>View Answer: </b>[_1]', |
|
'<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n". |
|
'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n". |
|
'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label>').'<br />'."\n"; |
|
|
|
my $submission_options; |
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) { |
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) { |
$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n"; |
$submission_options.= |
|
'<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> '.&mt('essay part only').' </label>'."\n"; |
} |
} |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status; |
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status; |
$env{'form.Status'} = $saveStatus; |
$env{'form.Status'} = $saveStatus; |
$gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n". |
$submission_options.= |
'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n". |
'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.&mt('last submission only').' </label>'."\n". |
'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n". |
'<label><input type="radio" name="lastSub" value="last" /> '.&mt('last submission & parts info').' </label>'."\n". |
'<label><input type="radio" name="lastSub" value="all" /> all details</label><br />'."\n". |
'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n". |
' <b>Grading Increments:</b> <select name="increment">'. |
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>'; |
'<option value="1">Whole Points</option>'. |
$gradeTable .= |
'<option value=".5">Half Points</option>'. |
' '. |
'<option value=".25">Quarter Points</option>'. |
&mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n"; |
'<option value=".1">Tenths of a Point</option>'. |
|
'</select>'. |
$gradeTable .= |
|
' '. |
|
&mt('<b>Grading Increments:</b> [_1]', |
|
'<select name="increment">'. |
|
'<option value="1">'.&mt('Whole Points').'</option>'. |
|
'<option value=".5">'.&mt('Half Points').'</option>'. |
|
'<option value=".25">'.&mt('Quarter Points').'</option>'. |
|
'<option value=".1">'.&mt('Tenths of a Point').'</option>'. |
|
'</select>'); |
|
|
|
$gradeTable .= |
&build_section_inputs(). |
&build_section_inputs(). |
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n". |
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n". |
'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n". |
'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n". |
Line 886 LISTJAVASCRIPT
|
Line 926 LISTJAVASCRIPT
|
if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) { |
if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) { |
$gradeTable.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n"; |
$gradeTable.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n"; |
} else { |
} else { |
$gradeTable.='<b>Student Status:</b> '. |
$gradeTable.=&mt('<b>Student Status:</b> [_1]', |
&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />'; |
&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />'; |
} |
} |
|
|
$gradeTable.='To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '. |
$gradeTable.=&mt('To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '. |
'next to the student\'s name(s). Then click on the Next button.<br />'."\n". |
'next to the student\'s name(s). Then click on the Next button.').'<br />'."\n". |
'<input type="hidden" name="command" value="processGroup" />'."\n"; |
'<input type="hidden" name="command" value="processGroup" />'."\n"; |
|
|
# checkall buttons |
# checkall buttons |
$gradeTable.=&check_script('gradesub', 'stuinfo'); |
$gradeTable.=&check_script('gradesub', 'stuinfo'); |
$gradeTable.='<input type="button" '."\n". |
$gradeTable.='<input type="button" '."\n". |
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n". |
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n". |
'value="Next->" /> <br />'."\n"; |
'value="'.&mt('Next->').'" /> <br />'."\n"; |
$gradeTable.=&check_buttons(); |
$gradeTable.=&check_buttons(); |
$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />Check For Plagiarism</label>'; |
$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />'.&mt('Check For Plagiarism').'</label>'; |
my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup); |
my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup); |
$gradeTable.='<table border="0"><tr><td bgcolor="#777777">'. |
$gradeTable.= &Apache::loncommon::start_data_table(). |
'<table border="0"><tr bgcolor="#e6ffff">'; |
&Apache::loncommon::start_data_table_header_row(); |
my $loop = 0; |
my $loop = 0; |
while ($loop < 2) { |
while ($loop < 2) { |
$gradeTable.='<td><b> No.</b> </td><td><b> Select </b></td>'. |
$gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'. |
'<td>'.&nameUserString('header').' Section/Group</td>'; |
'<th>'.&nameUserString('header').' '.&mt('Section/Group').'</th>'; |
if ($env{'form.showgrading'} eq 'yes' |
if ($env{'form.showgrading'} eq 'yes' |
&& $submitonly ne 'queued' |
&& $submitonly ne 'queued' |
&& $submitonly ne 'all') { |
&& $submitonly ne 'all') { |
foreach (sort(@$partlist)) { |
foreach my $part (sort(@$partlist)) { |
my $display_part=&get_display_part((split(/_/))[0],$symb); |
my $display_part= |
$gradeTable.='<td><b> Part: '.$display_part. |
&get_display_part((split(/_/,$part))[0],$symb); |
' Status </b></td>'; |
$gradeTable.= |
|
'<th>'.&mt('Part: [_1] Status',$display_part).'</th>'; |
} |
} |
} elsif ($submitonly eq 'queued') { |
} elsif ($submitonly eq 'queued') { |
$gradeTable.='<td><b> '.&mt('Queue Status').' </b></td>'; |
$gradeTable.='<th>'.&mt('Queue Status').' </th>'; |
} |
} |
$loop++; |
$loop++; |
# $gradeTable.='<td></td>' if ($loop%2 ==1); |
# $gradeTable.='<td></td>' if ($loop%2 ==1); |
} |
} |
$gradeTable.='</tr>'."\n"; |
$gradeTable.=&Apache::loncommon::end_data_table_header_row()."\n"; |
|
|
my $ctr = 0; |
my $ctr = 0; |
foreach my $student (sort |
foreach my $student (sort |
Line 978 LISTJAVASCRIPT
|
Line 1019 LISTJAVASCRIPT
|
my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()]; |
my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()]; |
my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()]; |
my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()]; |
if ( $perm{'vgr'} eq 'F' ) { |
if ( $perm{'vgr'} eq 'F' ) { |
$gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1); |
if ($ctr%2 ==1) { |
|
$gradeTable.= &Apache::loncommon::start_data_table_row(); |
|
} |
$gradeTable.='<td align="right">'.$ctr.' </td>'. |
$gradeTable.='<td align="right">'.$ctr.' </td>'. |
'<td align="center"><label><input type=checkbox name="stuinfo" value="'. |
'<td align="center"><label><input type=checkbox name="stuinfo" value="'. |
$student.':'.$$fullname{$student}.':::SECTION'.$section. |
$student.':'.$$fullname{$student}.':::SECTION'.$section. |
') " /> </label></td>'."\n".'<td>'. |
') " /> </label></td>'."\n".'<td>'. |
&nameUserString(undef,$$fullname{$student},$uname,$udom). |
&nameUserString(undef,$$fullname{$student},$uname,$udom). |
' '.$section.'/'.$group.'</td>'."\n"; |
' '.$section.($group ne '' ?'/'.$group:'').'</td>'."\n"; |
|
|
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
foreach (sort keys(%status)) { |
foreach (sort keys(%status)) { |
next if (/^resource.*?submitted_by$/); |
next if ($_ =~ /^resource.*?submitted_by$/); |
$gradeTable.='<td align="center"> '.$status{$_}.' </td>'."\n"; |
$gradeTable.='<td align="center"> '.&mt($status{$_}).' </td>'."\n"; |
} |
} |
} |
} |
# $gradeTable.='<td></td>' if ($ctr%2 ==1); |
# $gradeTable.='<td></td>' if ($ctr%2 ==1); |
$gradeTable.='</tr>'."\n" if ($ctr%2 ==0); |
if ($ctr%2 ==0) { |
|
$gradeTable.=&Apache::loncommon::end_data_table_row()."\n"; |
|
} |
} |
} |
} |
} |
if ($ctr%2 ==1) { |
if ($ctr%2 ==1) { |
Line 1007 LISTJAVASCRIPT
|
Line 1052 LISTJAVASCRIPT
|
} elsif ($submitonly eq 'queued') { |
} elsif ($submitonly eq 'queued') { |
$gradeTable.='<td> </td>'; |
$gradeTable.='<td> </td>'; |
} |
} |
$gradeTable.='</tr>'; |
$gradeTable.=&Apache::loncommon::end_data_table_row(); |
} |
} |
|
|
$gradeTable.='</table></td></tr></table>'."\n". |
$gradeTable.=&Apache::loncommon::end_data_table()."\n". |
'<input type="button" '. |
'<input type="button" '. |
'onClick="javascript:checkSelect(this.form.stuinfo);" '. |
'onClick="javascript:checkSelect(this.form.stuinfo);" '. |
'value="Next->" /></form>'."\n"; |
'value="'.&mt('Next->').'" /></form>'."\n"; |
if ($ctr == 0) { |
if ($ctr == 0) { |
my $num_students=(scalar(keys(%$fullname))); |
my $num_students=(scalar(keys(%$fullname))); |
if ($num_students eq 0) { |
if ($num_students eq 0) { |
$gradeTable='<br /> <span class="LC_warning">There are no students currently enrolled.</span>'; |
$gradeTable='<br /> <span class="LC_warning">'.&mt('There are no students currently enrolled.').'</span>'; |
} else { |
} else { |
my $submissions='submissions'; |
my $submissions='submissions'; |
if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; } |
if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; } |
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">'. |
'No '.$submissions.' found for this resource for any students. ('.$num_students. |
&mt('No '.$submissions.' found for this resource for any students. ([_1] students checked for '.$submissions.')', |
' students checked for '.$submissions.')</span><br />'; |
$num_students). |
|
'</span><br />'; |
} |
} |
} elsif ($ctr == 1) { |
} elsif ($ctr == 1) { |
$gradeTable =~ s/type=checkbox/type=checkbox checked/; |
$gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/; |
} |
} |
$gradeTable.=&show_grading_menu_form($symb); |
$gradeTable.=&show_grading_menu_form($symb); |
$request->print($gradeTable); |
$request->print($gradeTable); |
Line 1075 sub check_script {
|
Line 1121 sub check_script {
|
} |
} |
|
|
sub check_buttons { |
sub check_buttons { |
my $buttons.='<input type="button" onclick="checkall()" value="Check All" />'; |
my $buttons.='<input type="button" onclick="checkall()" value="'.&mt('Check All').'" />'; |
$buttons.='<input type="button" onclick="uncheckall()" value="Uncheck All" /> '; |
$buttons.='<input type="button" onclick="uncheckall()" value="'.&mt('Uncheck All').'" /> '; |
$buttons.='<input type="button" onclick="checksec()" value="Check Section/Group" />'; |
$buttons.='<input type="button" onclick="checksec()" value="'.&mt('Check Section/Group').'" />'; |
$buttons.='<input type="text" size="5" name="chksec" /> '; |
$buttons.='<input type="text" size="5" name="chksec" /> '; |
return $buttons; |
return $buttons; |
} |
} |
Line 1612 sub get_increment {
|
Line 1658 sub get_increment {
|
sub gradeBox { |
sub gradeBox { |
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_; |
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_; |
my $checkIcon = '<img alt="'.&mt('Check Mark'). |
my $checkIcon = '<img alt="'.&mt('Check Mark'). |
'" src="'.$request->dir_config('lonIconsURL'). |
'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />'; |
'/check.gif" height="16" border="0" />'; |
|
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname); |
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname); |
my $wgtmsg = ($wgt > 0) ? &mt('(problem weight)') |
my $wgtmsg = ($wgt > 0) ? &mt('(problem weight)') |
: '<span class="LC_info">'.&mt('problem weight assigned by computer').'</span>'; |
: '<span class="LC_info">'.&mt('problem weight assigned by computer').'</span>'; |
Line 1628 sub gradeBox {
|
Line 1673 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.='<table border="0"><tr><td>'. |
$result.='<table border="0"><tr>'; |
'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n"; |
|
my $ctr = 0; |
my $ctr = 0; |
my $thisweight = 0; |
my $thisweight = 0; |
my $increment = &get_increment(); |
my $increment = &get_increment(); |
$result.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across |
|
|
my $radio.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across |
while ($thisweight<=$wgt) { |
while ($thisweight<=$wgt) { |
$result.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '. |
$radio.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '. |
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','. |
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','. |
$thisweight.')" value="'.$thisweight.'" '. |
$thisweight.')" value="'.$thisweight.'" '. |
($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n"; |
($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n"; |
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : ''); |
$radio.=(($ctr+1)%10 == 0 ? '</tr><tr>' : ''); |
$thisweight += $increment; |
$thisweight += $increment; |
$ctr++; |
$ctr++; |
} |
} |
$result.='</tr></table>'; |
$radio.='</tr></table>'; |
$result.='</td><td> <b>or</b> </td>'."\n"; |
|
$result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'. |
my $line.='<input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'. |
($score ne ''? ' value = "'.$score.'"':'').' size="4" '. |
($score ne ''? ' value = "'.$score.'"':'').' size="4" '. |
'onChange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','. |
'onChange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','. |
$wgt.')" /></td>'."\n"; |
$wgt.')" /></td>'."\n"; |
$result.='<td>/'.$wgt.' '.$wgtmsg. |
$line.='<td>/'.$wgt.' '.$wgtmsg. |
($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : ''). |
($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : ''). |
' </td><td>'."\n"; |
' </td><td>'."\n"; |
$result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '. |
$line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '. |
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n"; |
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n"; |
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') { |
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') { |
$result.='<option></option>'. |
$line.='<option></option>'. |
'<option selected="selected">excused</option>'; |
'<option value="excused" selected="selected">'.&mt('excused').'</option>'; |
} else { |
} else { |
$result.='<option selected="selected"></option>'. |
$line.='<option selected="selected"></option>'. |
'<option>excused</option>'; |
'<option value="excused" >'.&mt('excused').'</option>'; |
} |
} |
$result.='<option>reset status</option></select>'."\n"; |
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n"; |
$result.=" \n"; |
|
|
|
|
$result .= |
|
&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line); |
|
|
|
|
|
$result.='</tr></table>'."\n"; |
$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 1671 sub gradeBox {
|
Line 1722 sub gradeBox {
|
$$record{'resource.'.$partid.'.tries'}.'" />'."\n". |
$$record{'resource.'.$partid.'.tries'}.'" />'."\n". |
'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'. |
'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'. |
$aggtries.'" />'."\n"; |
$aggtries.'" />'."\n"; |
$result.='</td></tr></table>'."\n"; |
|
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record); |
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record); |
return $result; |
return $result; |
} |
} |
Line 1703 sub handback_box {
|
Line 1753 sub handback_box {
|
'<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 />'; |
$result.='(File will be uploaded when you click on Save & Next below.)<br />'; |
$result.='('.&mt('File will be uploaded when you click on Save & Next below.').')<br />'; |
$file_counter++; |
$file_counter++; |
} |
} |
} |
} |
Line 1792 sub download_all_link {
|
Line 1842 sub download_all_link {
|
join("\n",&Apache::loncommon::get_env_multiple('form.vPart')); |
join("\n",&Apache::loncommon::get_env_multiple('form.vPart')); |
|
|
my $identifier = &Apache::loncommon::get_cgi_id(); |
my $identifier = &Apache::loncommon::get_cgi_id(); |
&Apache::lonnet::appenv('cgi.'.$identifier.'.students' => $all_students, |
&Apache::lonnet::appenv({'cgi.'.$identifier.'.students' => $all_students, |
'cgi.'.$identifier.'.symb' => $symb, |
'cgi.'.$identifier.'.symb' => $symb, |
'cgi.'.$identifier.'.parts' => $parts,); |
'cgi.'.$identifier.'.parts' => $parts,}); |
$r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'. |
$r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'. |
&mt('Download All Submitted Documents').'</a>'); |
&mt('Download All Submitted Documents').'</a>'); |
return |
return |
Line 1849 sub submission {
|
Line 1899 sub submission {
|
if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) { |
if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) { |
&download_all_link($request, $symb); |
&download_all_link($request, $symb); |
} |
} |
$request->print('<h3> <span class="LC_info">Submission Record</span></h3>'."\n". |
$request->print('<h3> <span class="LC_info">'.&mt('Submission Record').'</span></h3>'."\n". |
'<h4> <b>Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n"); |
'<h4> '.&mt('<b>Resource: </b> [_1]',$env{'form.probTitle'}).'</h4>'."\n"); |
|
|
# option to display problem, only once else it cause problems |
# option to display problem, only once else it cause problems |
# with the form later since the problem has a form. |
# with the form later since the problem has a form. |
Line 1969 KEYWORDS
|
Line 2019 KEYWORDS
|
$mode='answer'; |
$mode='answer'; |
} |
} |
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonxml::clear_problem_counter(); |
$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode)); |
$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode,{'request.prefix' => 'ctr'.$counter})); |
} |
} |
|
|
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname); |
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname); |
Line 2215 KEYWORDS
|
Line 2265 KEYWORDS
|
# print end of form |
# print end of form |
if ($counter == $total) { |
if ($counter == $total) { |
my $endform='<table border="0"><tr><td>'."\n"; |
my $endform='<table border="0"><tr><td>'."\n"; |
$endform.='<input type="button" value="Save & Next" '. |
$endform.='<input type="button" value="'.&mt('Save & Next').'" '. |
'onClick="javascript:checksubmit(this.form,\'Save & Next\','. |
'onClick="javascript:checksubmit(this.form,\'Save & Next\','. |
$total.','.scalar(@partlist).');" target="_self" /> '."\n"; |
$total.','.scalar(@partlist).');" target="_self" /> '."\n"; |
my $ntstu ='<select name="NTSTU">'. |
my $ntstu ='<select name="NTSTU">'. |
Line 2224 KEYWORDS
|
Line 2274 KEYWORDS
|
'<option>7</option><option>10</option></select>'."\n"; |
'<option>7</option><option>10</option></select>'."\n"; |
my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1'); |
my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1'); |
$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</; |
$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</; |
$endform.=$ntstu.'student(s) '; |
$endform.=&mt('[_1]student(s)',$ntstu); |
$endform.='<input type="button" value="Previous" '. |
$endform.=' <input type="button" value="'.&mt('Previous').'" '. |
'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> '."\n". |
'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> '."\n". |
'<input type="button" value="Next" '. |
'<input type="button" value="'.&mt('Next').'" '. |
'onClick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> '; |
'onClick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> '; |
$endform.='(Next and Previous (student) do not save the scores.)'."\n" ; |
$endform.=&mt('(Next and Previous (student) do not save the scores.)')."\n" ; |
$endform.="<input type='hidden' value='".&get_increment(). |
$endform.="<input type='hidden' value='".&get_increment(). |
"' name='increment' />"; |
"' name='increment' />"; |
$endform.='</td><tr></table></form>'; |
$endform.='</td></tr></table></form>'; |
$endform.=&show_grading_menu_form($symb); |
$endform.=&show_grading_menu_form($symb); |
$request->print($endform); |
$request->print($endform); |
} |
} |
Line 2571 sub processHandGrade {
|
Line 2621 sub processHandGrade {
|
$ctr++; |
$ctr++; |
} |
} |
if ($total < 0) { |
if ($total < 0) { |
my $the_end = '<h3><span class="LC_info">LON-CAPA User Message</span></h3><br />'."\n"; |
my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n"; |
$the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n"; |
$the_end.=&mt('<b>Message: </b> No more students for this section or class.').'<br /><br />'."\n"; |
$the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n"; |
$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n"; |
$the_end.=&show_grading_menu_form($symb); |
$the_end.=&show_grading_menu_form($symb); |
$request->print($the_end); |
$request->print($the_end); |
} |
} |
Line 2718 sub check_and_remove_from_queue {
|
Line 2768 sub check_and_remove_from_queue {
|
|
|
sub handback_files { |
sub handback_files { |
my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_; |
my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_; |
my $portfolio_root = &propath($domain,$stuname).'/userfiles/portfolio'; |
my $portfolio_root = '/userfiles/portfolio'; |
my ($partlist,$handgrade,$responseType) = &response_type($symb); |
my ($partlist,$handgrade,$responseType) = &response_type($symb); |
|
|
my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id = &flatten_responseType($responseType); |
Line 2736 sub handback_files {
|
Line 2786 sub handback_files {
|
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 @dir_list = &Apache::lonnet::dirlist($portfolio_path,$domain,$stuname,$portfolio_root); |
my $getpropath = 1; |
|
my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$portfolio_path,$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 file name |
my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/); |
my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/); |
Line 2872 sub version_portfiles {
|
Line 2923 sub version_portfiles {
|
my $version_parts = join('|',@$v_flag); |
my $version_parts = join('|',@$v_flag); |
my @returned_keys; |
my @returned_keys; |
my $parts = join('|', @$parts_graded); |
my $parts = join('|', @$parts_graded); |
my $portfolio_root = &propath($domain,$stu_name). |
my $portfolio_root = '/userfiles/portfolio'; |
'/userfiles/portfolio'; |
|
foreach my $key (keys(%$record)) { |
foreach my $key (keys(%$record)) { |
my $new_portfiles; |
my $new_portfiles; |
if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) { |
if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) { |
Line 2884 sub version_portfiles {
|
Line 2934 sub version_portfiles {
|
my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/); |
my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/); |
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 @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stu_name,$portfolio_root); |
my $getpropath = 1; |
|
my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,$stu_name,$getpropath); |
my $version = &get_next_version($answer_name, $answer_ext, \@dir_list); |
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') { |
Line 3144 sub viewgrades {
|
Line 3195 sub viewgrades {
|
&Apache::lonnet::clear_EXT_cache_status(); |
&Apache::lonnet::clear_EXT_cache_status(); |
|
|
my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>'; |
my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>'; |
$result.='<h4><b>Current Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n"; |
$result.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n"; |
|
|
#view individual student submission form - called using Javascript viewOneStudent |
#view individual student submission form - called using Javascript viewOneStudent |
$result.=&jscriptNform($symb); |
$result.=&jscriptNform($symb); |
Line 3162 sub viewgrades {
|
Line 3213 sub viewgrades {
|
my $sectionClass; |
my $sectionClass; |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
if ($env{'form.section'} eq 'all') { |
if ($env{'form.section'} eq 'all') { |
$sectionClass='Class </h3>'; |
$sectionClass='Class'; |
} elsif ($env{'form.section'} eq 'none') { |
} elsif ($env{'form.section'} eq 'none') { |
$sectionClass=&mt('Students in no Section').'</h3>'; |
$sectionClass='Students in no Section'; |
} else { |
} else { |
$sectionClass=&mt('Students in Section(s) [_1]',$section_display).'</h3>'; |
$sectionClass='Students in Section(s) [_1]'; |
} |
} |
$result.='<h3>'.&mt('Assign Common Grade To [_1]',$sectionClass); |
$result.= |
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n". |
'<h3>'. |
'<table border=0><tr bgcolor="#ffffdd"><td>'; |
&mt("Assign Common Grade To $sectionClass",$section_display).'</h3>'; |
|
$result.= &Apache::loncommon::start_data_table(); |
#radio buttons/text box for assigning points for a section or class. |
#radio buttons/text box for assigning points for a section or class. |
#handles different parts of a problem |
#handles different parts of a problem |
my ($partlist,$handgrade,$responseType) = &response_type($symb); |
my ($partlist,$handgrade,$responseType) = &response_type($symb); |
my %weight = (); |
my %weight = (); |
my $ctsparts = 0; |
my $ctsparts = 0; |
$result.='<table border="0">'; |
|
my %seen = (); |
my %seen = (); |
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) { |
Line 3188 sub viewgrades {
|
Line 3239 sub viewgrades {
|
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb); |
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb); |
$weight{$partid} = $wgt eq '' ? '1' : $wgt; |
$weight{$partid} = $wgt eq '' ? '1' : $wgt; |
|
|
$result.='<input type="hidden" name="partid_'. |
|
$ctsparts.'" value="'.$partid.'" />'."\n"; |
|
$result.='<input type="hidden" name="weight_'. |
|
$partid.'" value="'.$weight{$partid}.'" />'."\n"; |
|
my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
$result.='<tr><td><b>Part:</b> '.$display_part.' <b>Point:</b> </td><td>'; |
my $radio.='<table border="0"><tr>'; |
$result.='<table border="0"><tr>'; |
|
my $ctr = 0; |
my $ctr = 0; |
while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across |
while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across |
$result.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '. |
$radio.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '. |
'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}. |
'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}. |
','.$ctr.')" />'.$ctr."</label></td>\n"; |
','.$ctr.')" />'.$ctr."</label></td>\n"; |
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : ''); |
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : ''); |
$ctr++; |
$ctr++; |
} |
} |
$result.='</tr></table>'; |
$radio.='</tr></table>'; |
$result.= '</td><td><b> or </b><input type="text" name="TEXTVAL_'. |
my $line = '<input type="text" name="TEXTVAL_'. |
$partid.'" size="4" '.'onChange="javascript:writePoint(\''. |
$partid.'" size="4" '.'onChange="javascript:writePoint(\''. |
$partid.'\','.$weight{$partid}.',\'textval\')" /> /'. |
$partid.'\','.$weight{$partid}.',\'textval\')" /> /'. |
$weight{$partid}.' (problem weight)</td>'."\n"; |
$weight{$partid}.' (problem weight)</td>'."\n"; |
$result.= '</td><td><select name="SELVAL_'.$partid.'"'. |
$line.= '<td><select name="SELVAL_'.$partid.'"'. |
'onChange="javascript:writeRadText(\''.$partid.'\','. |
'onChange="javascript:writeRadText(\''.$partid.'\','. |
$weight{$partid}.')"> '. |
$weight{$partid}.')"> '. |
'<option selected="selected"> </option>'. |
'<option selected="selected"> </option>'. |
'<option>excused</option>'. |
'<option value="excused">'.&mt('excused').'</option>'. |
'<option>reset status</option></select></td>'. |
'<option value="reset status">'.&mt('reset status').'</option>'. |
'<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n"; |
'</select></td>'. |
|
'<td><label><input type="checkbox" name="FORCE_'.$partid.'" />'.&mt('Override "Correct"').'</label>'; |
|
$line.='<input type="hidden" name="partid_'. |
|
$ctsparts.'" value="'.$partid.'" />'."\n"; |
|
$line.='<input type="hidden" name="weight_'. |
|
$partid.'" value="'.$weight{$partid}.'" />'."\n"; |
|
|
|
$result.= |
|
&Apache::loncommon::start_data_table_row()."\n". |
|
&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line). |
|
&Apache::loncommon::end_data_table_row()."\n"; |
$ctsparts++; |
$ctsparts++; |
} |
} |
$result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n". |
$result.=&Apache::loncommon::end_data_table()."\n". |
'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />'; |
'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />'; |
$result.='<input type="button" value="Revert to Default" '. |
$result.='<input type="button" value="'.&mt('Revert to Default').'" '. |
'onClick="javascript:resetEntry('.$ctsparts.');" target="_self" />'; |
'onClick="javascript:resetEntry('.$ctsparts.');" />'; |
|
|
#table listing all the students in a section/class |
#table listing all the students in a section/class |
#header of table |
#header of table |
$result.= '<h3>Assign Grade to Specific Students in '.$sectionClass; |
$result.= '<h3>'.&mt('Assign Grade to Specific Students in '.$sectionClass, |
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n". |
$section_display).'</h3>'; |
'<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'. |
$result.= &Apache::loncommon::start_data_table(). |
'<td>'.&nameUserString('header')."</td>\n"; |
&Apache::loncommon::start_data_table_header_row(). |
|
'<th>'.&mt('No.').'</th>'. |
|
'<th>'.&nameUserString('header')."</th>\n"; |
my (@parts) = sort(&getpartlist($symb)); |
my (@parts) = sort(&getpartlist($symb)); |
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
my @partids = (); |
my @partids = (); |
Line 3239 sub viewgrades {
|
Line 3297 sub viewgrades {
|
push(@partids, $partid); |
push(@partids, $partid); |
my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
if ($display =~ /^Partial Credit Factor/) { |
if ($display =~ /^Partial Credit Factor/) { |
$result.='<td><b>Score Part:</b> '.$display_part. |
$result.='<th>'. |
' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n"; |
&mt('Score Part: [_1]<br /> (weight = [_2])', |
|
$display_part,$weight{$partid}).'</th>'."\n"; |
next; |
next; |
|
|
} else { |
} else { |
$display =~s/\[Part: \Q$partid\E\]/Part:<\/b> $display_part/; |
if ($display =~ /Problem Status/) { |
|
my $grade_status_mt = &mt('Grade Status'); |
|
$display =~ s{Problem Status}{$grade_status_mt<br />}; |
|
} |
|
my $part_mt = &mt('Part:'); |
|
$display =~s{\[Part: \Q$partid\E\]}{$part_mt $display_part}; |
} |
} |
$display =~ s|Problem Status|Grade Status<br />|; |
|
$result.='<td><b>'.$display.'</td>'."\n"; |
$result.='<th>'.$display.'</th>'."\n"; |
} |
} |
$result.='</tr>'; |
$result.=&Apache::loncommon::end_data_table_header_row(); |
|
|
my %last_resets = |
my %last_resets = |
&get_last_resets($symb,$env{'request.course.id'},\@partids); |
&get_last_resets($symb,$env{'request.course.id'},\@partids); |
Line 3268 sub viewgrades {
|
Line 3333 sub viewgrades {
|
$result.=&viewstudentgrade($symb,$env{'request.course.id'}, |
$result.=&viewstudentgrade($symb,$env{'request.course.id'}, |
$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets); |
$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets); |
} |
} |
$result.='</table></td></tr></table>'; |
$result.=&Apache::loncommon::end_data_table(); |
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n"; |
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n"; |
$result.='<input type="button" value="Save" '. |
$result.='<input type="button" value="'.&mt('Save').'" '. |
'onClick="javascript:submit();" target="_self" /></form>'."\n"; |
'onClick="javascript:submit();" target="_self" /></form>'."\n"; |
if (scalar(%$fullname) eq 0) { |
if (scalar(%$fullname) eq 0) { |
my $colspan=3+scalar(@parts); |
my $colspan=3+scalar(@parts); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status')); |
my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status')); |
$result='<span class="LC_warning">'. |
$result='<span class="LC_warning">'. |
&mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade', |
&mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.', |
$section_display, $stu_status). |
$section_display, $stu_status). |
'</span>'; |
'</span>'; |
} |
} |
Line 3291 sub viewstudentgrade {
|
Line 3356 sub viewstudentgrade {
|
my ($uname,$udom) = split(/:/,$student); |
my ($uname,$udom) = split(/:/,$student); |
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname); |
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname); |
my %aggregates = (); |
my %aggregates = (); |
my $result='<tr bgcolor="#ffffdd"><td align="right">'. |
my $result=&Apache::loncommon::start_data_table_row().'<td align="right">'. |
'<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'. |
'<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'. |
"\n".$ctr.' </td><td> '. |
"\n".$ctr.' </td><td> '. |
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom. |
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom. |
Line 3333 sub viewstudentgrade {
|
Line 3398 sub viewstudentgrade {
|
$result.=' <select name="'. |
$result.=' <select name="'. |
'GD_'.$student.'_'.$part.'_solved" '. |
'GD_'.$student.'_'.$part.'_solved" '. |
'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n"; |
'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n"; |
$result.= (($status eq 'excused') ? '<option> </option><option selected="selected">excused</option>' |
$result.= (($status eq 'excused') ? '<option> </option><option selected="selected" value="excused">'.&mt('excused').'</option>' |
: '<option selected="selected"> </option><option>excused</option>')."\n"; |
: '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n"; |
$result.='<option>reset status</option>'; |
$result.='<option value="reset status">'.&mt('reset status').'</option>'; |
$result.="</select> </td>\n"; |
$result.="</select> </td>\n"; |
} else { |
} else { |
$result.='<input type="hidden" name="'. |
$result.='<input type="hidden" name="'. |
Line 3346 sub viewstudentgrade {
|
Line 3411 sub viewstudentgrade {
|
'value="'.$score.'" size="4" /></td>'."\n"; |
'value="'.$score.'" size="4" /></td>'."\n"; |
} |
} |
} |
} |
$result.='</tr>'; |
$result.=&Apache::loncommon::end_data_table_row(); |
return $result; |
return $result; |
} |
} |
|
|
Line 3357 sub editgrades {
|
Line 3422 sub editgrades {
|
|
|
my $symb=&get_symb($request); |
my $symb=&get_symb($request); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $title='<h3><span class="LC_info">'.&mt('Current Grade Status').'</span></h3>'; |
my $title='<h2>'.&mt('Current Grade Status').'</h2>'; |
$title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4><br />'."\n"; |
$title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n"; |
$title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n"; |
$title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n"; |
|
|
my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n"; |
my $result= &Apache::loncommon::start_data_table(). |
$result.= '<table border="0"><tr bgcolor="#deffff">'. |
&Apache::loncommon::start_data_table_header_row(). |
'<td rowspan=2 valign="center"> <b>No.</b> </td>'. |
'<th rowspan="2" valign="middle">'.&mt('No.').'</th>'. |
'<td rowspan=2 valign="center">'.&nameUserString('header')."</td>\n"; |
'<th rowspan="2" valign="middle">'.&nameUserString('header')."</th>\n"; |
|
|
my %scoreptr = ( |
my %scoreptr = ( |
'correct' =>'correct_by_override', |
'correct' =>'correct_by_override', |
'incorrect'=>'incorrect_by_override', |
'incorrect'=>'incorrect_by_override', |
Line 3390 sub editgrades {
|
Line 3454 sub editgrades {
|
} |
} |
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); |
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); |
foreach my $partid (@partid) { |
foreach my $partid (@partid) { |
$header .= '<td align="center"> <b>Old Score</b> </td>'. |
$header .= '<th align="center">'.&mt('Old Score').'</th>'. |
'<td align="center"> <b>New Score</b> </td>'; |
'<th align="center">'.&mt('New Score').'</th>'; |
$columns{$partid}=2; |
$columns{$partid}=2; |
foreach my $stores (@parts) { |
foreach my $stores (@parts) { |
my ($part,$type) = &split_part_type($stores); |
my ($part,$type) = &split_part_type($stores); |
Line 3400 sub editgrades {
|
Line 3464 sub editgrades {
|
my $display=&Apache::lonnet::metadata($url,$stores.'.display'); |
my $display=&Apache::lonnet::metadata($url,$stores.'.display'); |
$display =~ s/\[Part: (\w)+\]//; |
$display =~ s/\[Part: (\w)+\]//; |
$display =~ s/Number of Attempts/Tries/; |
$display =~ s/Number of Attempts/Tries/; |
$header .= '<td align="center"> <b>Old '.$display.'</b> </td>'. |
$header .= '<th align="center">'.&mt('Old '.$display).'</th>'. |
'<td align="center"> <b>New '.$display.'</b> </td>'; |
'<th align="center">'.&mt('New '.$display).'</th>'; |
$columns{$partid}+=2; |
$columns{$partid}+=2; |
} |
} |
} |
} |
foreach my $partid (@partid) { |
foreach my $partid (@partid) { |
my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
$result .= '<td colspan="'.$columns{$partid}. |
$result .= '<th colspan="'.$columns{$partid}.'" align="center">'. |
'" align="center"><b>Part:</b> '.$display_part. |
&mt('Part: [_1] (Weight = [_2])',$display_part,$weight{$partid}). |
' (Weight = '.$weight{$partid}.')</td>'; |
'</th>'; |
|
|
} |
} |
$result .= '</tr><tr bgcolor="#deffff">'; |
$result .= &Apache::loncommon::end_data_table_header_row(). |
$result .= $header; |
&Apache::loncommon::start_data_table_header_row(). |
$result .= '</tr>'."\n"; |
$header. |
my $noupdate; |
&Apache::loncommon::end_data_table_header_row(); |
|
my @noupdate; |
my ($updateCtr,$noupdateCtr) = (1,1); |
my ($updateCtr,$noupdateCtr) = (1,1); |
for ($i=0; $i<$env{'form.total'}; $i++) { |
for ($i=0; $i<$env{'form.total'}; $i++) { |
my $line; |
my $line; |
Line 3427 sub editgrades {
|
Line 3492 sub editgrades {
|
my $usec=$classlist->{"$uname:$udom"}[5]; |
my $usec=$classlist->{"$uname:$udom"}[5]; |
if (!&canmodify($usec)) { |
if (!&canmodify($usec)) { |
my $numcols=scalar(@partid)*4+2; |
my $numcols=scalar(@partid)*4+2; |
$noupdate.=$line."<td colspan=\"$numcols\"><span class=\"LC_warning\">Not allowed to modify student</span></td></tr>"; |
push(@noupdate, |
|
$line."<td colspan=\"$numcols\"><span class=\"LC_warning\">". |
|
&mt('Not allowed to modify student')."</span></td></tr>"); |
next; |
next; |
} |
} |
my %aggregate = (); |
my %aggregate = (); |
Line 3496 sub editgrades {
|
Line 3563 sub editgrades {
|
'<td align="center">'.$awarded.' </td>'; |
'<td align="center">'.$awarded.' </td>'; |
} |
} |
} |
} |
$line.='</tr>'."\n"; |
$line.="\n"; |
|
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
Line 3529 sub editgrades {
|
Line 3596 sub editgrades {
|
} |
} |
} |
} |
|
|
$result.='<tr bgcolor="#ffffde"><td align="right"> '.$updateCtr.' </td>'.$line; |
$result.=&Apache::loncommon::start_data_table_row(). |
|
'<td align="right"> '.$updateCtr.' </td>'.$line. |
|
&Apache::loncommon::end_data_table_row(); |
$updateCtr++; |
$updateCtr++; |
} else { |
} else { |
$noupdate.='<tr bgcolor="#ffffde"><td align="right"> '.$noupdateCtr.' </td>'.$line; |
push(@noupdate, |
|
'<td align="right"> '.$noupdateCtr.' </td>'.$line); |
$noupdateCtr++; |
$noupdateCtr++; |
} |
} |
if ($aggregateflag) { |
if ($aggregateflag) { |
Line 3540 sub editgrades {
|
Line 3610 sub editgrades {
|
$cdom,$cnum); |
$cdom,$cnum); |
} |
} |
} |
} |
if ($noupdate) { |
if (@noupdate) { |
# my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3; |
# my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3; |
my $numcols=scalar(@partid)*4+2; |
my $numcols=scalar(@partid)*4+2; |
$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr><tr bgcolor="#ffffde">'.$noupdate; |
$result .= &Apache::loncommon::start_data_table_row('LC_empty_row'). |
|
'<td align="center" colspan="'.$numcols.'">'. |
|
&mt('No Changes Occurred For the Students Below'). |
|
'</td>'. |
|
&Apache::loncommon::end_data_table_row(); |
|
foreach my $line (@noupdate) { |
|
$result.= |
|
&Apache::loncommon::start_data_table_row(). |
|
$line. |
|
&Apache::loncommon::end_data_table_row(); |
|
} |
} |
} |
$result .= '</table></td></tr></table>'."\n". |
$result .= &Apache::loncommon::end_data_table(). |
&show_grading_menu_form ($symb); |
&show_grading_menu_form($symb); |
my $msg = '<br /><b>Number of records updated = '.$rec_update. |
my $msg = '<p><b>'. |
' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'. |
&mt('Number of records updated = [_1] for [quant,_2,student].', |
'<b>Total number of students = '.$env{'form.total'}.'</b><br />'; |
$rec_update,$count).'</b><br />'. |
|
'<b>'.&mt('Total number of students = [_1]',$env{'form.total'}). |
|
'</b></p>'; |
return $title.$msg.$result; |
return $title.$msg.$result; |
} |
} |
|
|
Line 3962 sub csvuploadassign {
|
Line 4044 sub csvuploadassign {
|
$grades{$store_key}=$entries{$fields{$dest}}; |
$grades{$store_key}=$entries{$fields{$dest}}; |
} |
} |
} |
} |
if (! %grades) { push(@skipped,"$username:$domain no data to save"); } |
if (! %grades) { |
$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}"; |
push(@skipped,&mt("[_1]: no data to save","$username:$domain")); |
my $result=&Apache::lonnet::cstore(\%grades,$symb, |
} else { |
|
$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}"; |
|
my $result=&Apache::lonnet::cstore(\%grades,$symb, |
$env{'request.course.id'}, |
$env{'request.course.id'}, |
$domain,$username); |
$domain,$username); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$request->print('.'); |
$request->print('.'); |
} else { |
} else { |
$request->print("<p> |
$request->print("<p><span class=\"LC_error\">". |
<span class=\"LC_error\"> |
&mt("Failed to save data for student [_1]. Message when trying to save was: [_2]", |
Failed to save student $username:$domain. |
"$username:$domain",$result)."</span></p>"); |
Message when trying to save was ($result) |
} |
</span> |
$request->rflush(); |
</p>" ); |
$countdone++; |
} |
} |
$request->rflush(); |
|
$countdone++; |
|
} |
} |
$request->print("<br />Saved $countdone students\n"); |
$request->print('<br /><span class="LC_info">'.&mt("Saved [_1] students",$countdone)."</span>\n"); |
if (@skipped) { |
if (@skipped) { |
$request->print('<p><h4><b>Skipped Students</b></h4></p>'); |
$request->print('<p><span class="LC_warning">'.&mt('Skipped Students').'</span></p>'); |
foreach my $student (@skipped) { $request->print("$student<br />\n"); } |
foreach my $student (@skipped) { $request->print("$student<br />\n"); } |
} |
} |
if (@notallowed) { |
if (@notallowed) { |
$request->print('<p><span class="LC_error">Students Not Allowed to Modify</span></p>'); |
$request->print('<p><span class="LC_error">'.&mt('Students Not Allowed to Modify').'</span></p>'); |
foreach my $student (@notallowed) { $request->print("$student<br />\n"); } |
foreach my $student (@notallowed) { $request->print("$student<br />\n"); } |
} |
} |
$request->print("<br />\n"); |
$request->print("<br />\n"); |
Line 4026 LISTJAVASCRIPT
|
Line 4108 LISTJAVASCRIPT
|
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; |
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; |
|
|
my $result='<h3><span class="LC_info"> '. |
my $result='<h3><span class="LC_info"> '. |
'Manual Grading by Page or Sequence</span></h3>'; |
&mt('Manual Grading by Page or Sequence').'</span></h3>'; |
|
|
$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n"; |
$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n"; |
$result.=' <b>Problems from:</b> <select name="selectpage">'."\n"; |
|
my ($titles,$symbx) = &getSymbMap(); |
my ($titles,$symbx) = &getSymbMap(); |
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"; |
my $ctr=0; |
my $ctr=0; |
foreach (@$titles) { |
foreach (@$titles) { |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
$result.='<option value="'.$ctr.'" '. |
$select.='<option value="'.$ctr.'" '. |
($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : ''). |
($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : ''). |
'>'.$showtitle.'</option>'."\n"; |
'>'.$showtitle.'</option>'."\n"; |
$ctr++; |
$ctr++; |
} |
} |
$result.= '</select>'."<br />\n"; |
$select.= '</select>'; |
|
$result.=&mt(' <b>Problems from:</b> [_1]',$select)."<br />\n"; |
|
|
$ctr=0; |
$ctr=0; |
foreach (@$titles) { |
foreach (@$titles) { |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
Line 4053 LISTJAVASCRIPT
|
Line 4137 LISTJAVASCRIPT
|
$result.='<input type="hidden" name="page" />'."\n". |
$result.='<input type="hidden" name="page" />'."\n". |
'<input type="hidden" name="title" />'."\n"; |
'<input type="hidden" name="title" />'."\n"; |
|
|
$result.=' <b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n". |
my $options = |
'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n"; |
'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n". |
|
'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n"; |
$result.=' <b>Submission Details: </b>'. |
$result.=' '.&mt('<b>View Problems Text: </b> [_1]',$options); |
'<label><input type="radio" name="lastSub" value="none" /> none</label>'."\n". |
|
'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> by dates and submissions</label>'."\n". |
$options = |
'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n"; |
'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n". |
|
'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n". |
|
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n"; |
|
$result.=' '.&mt('<b>Submission Details: </b>[_1]',$options); |
|
|
$result.=&build_section_inputs(); |
$result.=&build_section_inputs(); |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
Line 4068 LISTJAVASCRIPT
|
Line 4155 LISTJAVASCRIPT
|
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n"; |
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n"; |
|
|
$result.=' <b>'.&mt('Use CODE:').' </b>'. |
$result.=' '.&mt('<b>Use CODE: [_1] </b>', |
'<input type="text" name="CODE" value="" /><br />'."\n"; |
'<input type="text" name="CODE" value="" />'). |
|
'<br />'."\n"; |
|
|
$result.=' <input type="button" '. |
$result.=' <input type="button" '. |
'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n"; |
'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next->').'" /><br />'."\n"; |
|
|
$request->print($result); |
$request->print($result); |
|
|
my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</b><br />'. |
my $studentTable.=' <b>'.&mt('Select a student you wish to grade and then click on the Next button.').'</b><br />'. |
'<table border="0"><tr><td bgcolor="#777777">'. |
&Apache::loncommon::start_data_table(). |
'<table border="0"><tr bgcolor="#e6ffff">'. |
&Apache::loncommon::start_data_table_header_row(). |
'<td align="right"> <b>No.</b></td>'. |
'<th align="right"> '.&mt('No.').'</th>'. |
'<td>'.&nameUserString('header').'</td>'. |
'<th>'.&nameUserString('header').'</th>'. |
'<td align="right"> <b>No.</b></td>'. |
'<th align="right"> '.&mt('No.').'</th>'. |
'<td>'.&nameUserString('header').'</td></tr>'; |
'<th>'.&nameUserString('header').'</th>'. |
|
&Apache::loncommon::end_data_table_header_row(); |
|
|
my (undef,undef,$fullname) = &getclasslist($getsec,'1'); |
my (undef,undef,$fullname) = &getclasslist($getsec,'1'); |
my $ptr = 1; |
my $ptr = 1; |
Line 4094 LISTJAVASCRIPT
|
Line 4183 LISTJAVASCRIPT
|
return $a cmp $b; |
return $a cmp $b; |
} (keys(%$fullname))) { |
} (keys(%$fullname))) { |
my ($uname,$udom) = split(/:/,$student); |
my ($uname,$udom) = split(/:/,$student); |
$studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>'); |
$studentTable.=($ptr%2==1 ? &Apache::loncommon::start_data_table_row() |
|
: '</td>'); |
$studentTable.='<td align="right">'.$ptr.' </td>'; |
$studentTable.='<td align="right">'.$ptr.' </td>'; |
$studentTable.='<td> <label><input type="radio" name="student" value="'.$student.'" /> ' |
$studentTable.='<td> <label><input type="radio" name="student" value="'.$student.'" /> ' |
.&nameUserString(undef,$$fullname{$student},$uname,$udom)."</label>\n"; |
.&nameUserString(undef,$$fullname{$student},$uname,$udom)."</label>\n"; |
$studentTable.=($ptr%2 == 0 ? '</td></tr>' : ''); |
$studentTable.= |
|
($ptr%2 == 0 ? '</td>'.&Apache::loncommon::end_data_table_row() |
|
: ''); |
$ptr++; |
$ptr++; |
} |
} |
$studentTable.='</td><td> </td><td> </td></tr>' if ($ptr%2 == 0); |
if ($ptr%2 == 0) { |
$studentTable.='</table></td></tr></table>'."\n"; |
$studentTable.='</td><td> </td><td> </td>'. |
|
&Apache::loncommon::end_data_table_row(); |
|
} |
|
$studentTable.=&Apache::loncommon::end_data_table()."\n"; |
$studentTable.='<input type="button" '. |
$studentTable.='<input type="button" '. |
'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n"; |
'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next->').'" /></form>'."\n"; |
|
|
$studentTable.=&show_grading_menu_form($symb); |
$studentTable.=&show_grading_menu_form($symb); |
$request->print($studentTable); |
$request->print($studentTable); |
Line 4156 sub displayPage {
|
Line 4251 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">Unable to view requested student.('.$env{'form.student'}.')</span>'); |
$request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>'); |
$request->print(&show_grading_menu_form($symb)); |
$request->print(&show_grading_menu_form($symb)); |
return; |
return; |
} |
} |
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>'; |
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>'; |
$result.='<h3> Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom). |
$result.='<h3> '.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)). |
'</h3>'."\n"; |
'</h3>'."\n"; |
if (&Apache::lonnet::validCODE($env{'form.CODE'})) { |
$env{'form.CODE'} = uc($env{'form.CODE'}); |
$result.='<h3> CODE: '.$env{'form.CODE'}.'</h3>'."\n"; |
if (&Apache::lonnet::validCODE(uc($env{'form.CODE'}))) { |
|
$result.='<h3> '.&mt('CODE: [_1]',$env{'form.CODE'}).'</h3>'."\n"; |
} else { |
} else { |
delete($env{'form.CODE'}); |
delete($env{'form.CODE'}); |
} |
} |
Line 4175 sub displayPage {
|
Line 4271 sub displayPage {
|
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'}); |
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'}); |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
if (!$map) { |
if (!$map) { |
$request->print('<span class="LC_warning">Unable to view requested sequence. ('.$resUrl.')</span>'); |
$request->print('<span class="LC_warning">'.&mt('Unable to view requested sequence. ([_1])',$resUrl).'</span>'); |
$request->print(&show_grading_menu_form($symb)); |
$request->print(&show_grading_menu_form($symb)); |
return; |
return; |
} |
} |
Line 4197 sub displayPage {
|
Line 4293 sub displayPage {
|
'<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n"; |
'<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n"; |
} |
} |
my $checkIcon = '<img alt="'.&mt('Check Mark'). |
my $checkIcon = '<img alt="'.&mt('Check Mark'). |
'" src="'.$request->dir_config('lonIconsURL'). |
'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />'; |
'/check.gif" height="16" border="0" />'; |
|
|
|
$studentTable.=' <b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon. |
$studentTable.=' '.&mt('<b>Note:</b> Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon)."\n". |
' symbol.'."\n". |
&Apache::loncommon::start_data_table(). |
'<table border="0"><tr><td bgcolor="#777777">'. |
&Apache::loncommon::start_data_table_header_row(). |
'<table border="0"><tr bgcolor="#e6ffff">'. |
'<th align="center"> Prob. </th>'. |
'<td align="center"><b> Prob. </b></td>'. |
'<th> '.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'. |
'<td><b> '.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>'; |
&Apache::loncommon::end_data_table_header_row(); |
|
|
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonxml::clear_problem_counter(); |
my ($depth,$question,$prob) = (1,1,1); |
my ($depth,$question,$prob) = (1,1,1); |
Line 4219 sub displayPage {
|
Line 4314 sub displayPage {
|
my $parts = $curRes->parts(); |
my $parts = $curRes->parts(); |
my $title = $curRes->compTitle(); |
my $title = $curRes->compTitle(); |
my $symbx = $curRes->symb(); |
my $symbx = $curRes->symb(); |
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob. |
$studentTable.= |
(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>'; |
&Apache::loncommon::start_data_table_row(). |
|
'<td align="center" valign="top" >'.$prob. |
|
(scalar(@{$parts}) == 1 ? '' |
|
: '<br />('.&mt('[_1] parts)', |
|
scalar(@{$parts})) |
|
). |
|
'</td>'; |
$studentTable.='<td valign="top">'; |
$studentTable.='<td valign="top">'; |
my %form = ('CODE' => $env{'form.CODE'},); |
my %form = ('CODE' => $env{'form.CODE'},); |
if ($env{'form.vProb'} eq 'yes' ) { |
if ($env{'form.vProb'} eq 'yes' ) { |
Line 4235 sub displayPage {
|
Line 4336 sub displayPage {
|
# $request->print('match='.$1."<br />\n"); |
# $request->print('match='.$1."<br />\n"); |
# } |
# } |
# $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g; |
# $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g; |
$studentTable.=' <b>'.$title.'</b> <br /> <b>Correct answer:</b><br />'.$companswer; |
$studentTable.=' <b>'.$title.'</b> <br /> '.&mt('<b>Correct answer:</b><br />[_1]',$companswer); |
} |
} |
|
|
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); |
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); |
|
|
if ($env{'form.lastSub'} eq 'datesub') { |
if ($env{'form.lastSub'} eq 'datesub') { |
if ($record{'version'} eq '') { |
if ($record{'version'} eq '') { |
$studentTable.='<br /> <span class="LC_warning">No recorded submission for this problem</span><br />'; |
$studentTable.='<br /> <span class="LC_warning">'.&mt('No recorded submission for this problem.').'</span><br />'; |
} else { |
} else { |
my %responseType = (); |
my %responseType = (); |
foreach my $partid (@{$parts}) { |
foreach my $partid (@{$parts}) { |
Line 4278 sub displayPage {
|
Line 4379 sub displayPage {
|
$curRes = $iterator->next(); |
$curRes = $iterator->next(); |
} |
} |
|
|
$studentTable.='</table></td></tr></table>'."\n". |
$studentTable.='</table>'."\n". |
'<input type="button" value="Save" '. |
'<input type="button" value="'.&mt('Save').'" '. |
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'. |
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'. |
'</form>'."\n"; |
'</form>'."\n"; |
$studentTable.=&show_grading_menu_form($symb); |
$studentTable.=&show_grading_menu_form($symb); |
Line 4359 sub displaySubByDates {
|
Line 4460 sub displaySubByDates {
|
} |
} |
} |
} |
if (exists($$record{"$where.$partid.checkedin"})) { |
if (exists($$record{"$where.$partid.checkedin"})) { |
$displaySub[1].='Checked in by '. |
$displaySub[1].=&mt('Checked in by [_1] into slot [_2]', |
$$record{"$where.$partid.checkedin"}.' into slot '. |
$$record{"$where.$partid.checkedin"}, |
$$record{"$where.$partid.checkedin.slot"}. |
$$record{"$where.$partid.checkedin.slot"}). |
'<br />'; |
'<br />'; |
} |
} |
if (exists $$record{"$where.$partid.award"}) { |
if (exists $$record{"$where.$partid.award"}) { |
$displaySub[1].='<b>Part:</b> '.$display_part.' '. |
$displaySub[1].='<b>'.&mt('Part:').'</b> '.$display_part.' '. |
lc($$record{"$where.$partid.award"}).' '. |
lc($$record{"$where.$partid.award"}).' '. |
$mark{$$record{"$where.$partid.solved"}}. |
$mark{$$record{"$where.$partid.solved"}}. |
'<br />'; |
'<br />'; |
Line 4427 sub updateGradeByPage {
|
Line 4528 sub updateGradeByPage {
|
my $iterator = $navmap->getIterator($map->map_start(), |
my $iterator = $navmap->getIterator($map->map_start(), |
$map->map_finish()); |
$map->map_finish()); |
|
|
my $studentTable='<table border="0"><tr><td bgcolor="#777777">'. |
my $studentTable= |
'<table border="0"><tr bgcolor="#e6ffff">'. |
&Apache::loncommon::start_data_table(). |
'<td align="center"><b> Prob. </b></td>'. |
&Apache::loncommon::start_data_table_header_row(). |
'<td><b> Title </b></td>'. |
'<th align="center"> '.&mt('Prob.').' </th>'. |
'<td><b> Previous Score </b></td>'. |
'<th> '.&mt('Title').' </th>'. |
'<td><b> New Score </b></td></tr>'; |
'<th> '.&mt('Previous Score').' </th>'. |
|
'<th> '.&mt('New Score').' </th>'. |
|
&Apache::loncommon::end_data_table_header_row(); |
|
|
$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" |
Line 4445 sub updateGradeByPage {
|
Line 4548 sub updateGradeByPage {
|
my $parts = $curRes->parts(); |
my $parts = $curRes->parts(); |
my $title = $curRes->compTitle(); |
my $title = $curRes->compTitle(); |
my $symbx = $curRes->symb(); |
my $symbx = $curRes->symb(); |
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob. |
$studentTable.= |
(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>'; |
&Apache::loncommon::start_data_table_row(). |
|
'<td align="center" valign="top" >'.$prob. |
|
(scalar(@{$parts}) == 1 ? '' |
|
: '<br />('.&mt('[quant,_1, parts]',scalar(@{$parts})) |
|
).')</td>'; |
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>'; |
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>'; |
|
|
my %newrecord=(); |
my %newrecord=(); |
Line 4533 sub updateGradeByPage {
|
Line 4640 sub updateGradeByPage {
|
|
|
$studentTable.='<td valign="top">'.$displayPts[0].'</td>'. |
$studentTable.='<td valign="top">'.$displayPts[0].'</td>'. |
'<td valign="top">'.$displayPts[1].'</td>'. |
'<td valign="top">'.$displayPts[1].'</td>'. |
'</tr>'; |
&Apache::loncommon::end_data_table_row(); |
|
|
$prob++; |
$prob++; |
} |
} |
$curRes = $iterator->next(); |
$curRes = $iterator->next(); |
} |
} |
|
|
$studentTable.='</td></tr></table></td></tr></table>'; |
$studentTable.=&Apache::loncommon::end_data_table(); |
$studentTable.=&show_grading_menu_form($env{'form.symb'}); |
$studentTable.=&show_grading_menu_form($env{'form.symb'}); |
my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' : |
my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' : |
'The scores were changed for '. |
'The scores were changed for '. |
Line 4653 sub getSequenceDropDown {
|
Line 4760 sub getSequenceDropDown {
|
return $result; |
return $result; |
} |
} |
|
|
|
my %bubble_lines_per_response; # no. bubble lines for each response. |
|
# index is "symb.part_id" |
|
|
|
my %first_bubble_line; # First bubble line no. for each bubble. |
|
|
|
my %subdivided_bubble_lines; # no. bubble lines for optionresponse, |
|
# matchresponse or rankresponse, where |
|
# an individual response can have multiple |
|
# lines |
|
|
|
my %responsetype_per_response; # responsetype for each response |
|
|
|
# Save and restore the bubble lines array to the form env. |
|
|
|
|
|
sub save_bubble_lines { |
|
foreach my $line (keys(%bubble_lines_per_response)) { |
|
$env{"form.scantron.bubblelines.$line"} = $bubble_lines_per_response{$line}; |
|
$env{"form.scantron.first_bubble_line.$line"} = |
|
$first_bubble_line{$line}; |
|
$env{"form.scantron.sub_bubblelines.$line"} = |
|
$subdivided_bubble_lines{$line}; |
|
$env{"form.scantron.responsetype.$line"} = |
|
$responsetype_per_response{$line}; |
|
} |
|
} |
|
|
|
|
|
sub restore_bubble_lines { |
|
my $line = 0; |
|
%bubble_lines_per_response = (); |
|
while ($env{"form.scantron.bubblelines.$line"}) { |
|
my $value = $env{"form.scantron.bubblelines.$line"}; |
|
$bubble_lines_per_response{$line} = $value; |
|
$first_bubble_line{$line} = |
|
$env{"form.scantron.first_bubble_line.$line"}; |
|
$subdivided_bubble_lines{$line} = |
|
$env{"form.scantron.sub_bubblelines.$line"}; |
|
$responsetype_per_response{$line} = |
|
$env{"form.scantron.responsetype.$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 |
|
|
Line 4665 sub getSequenceDropDown {
|
Line 4835 sub getSequenceDropDown {
|
sub scantron_filenames { |
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 @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname, |
my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname, |
&propath($cdom,$cname)); |
$getpropath); |
my @possiblenames; |
my @possiblenames; |
foreach my $filename (sort(@files)) { |
foreach my $filename (sort(@files)) { |
($filename)=split(/&/,$filename); |
($filename)=split(/&/,$filename); |
Line 4709 sub scantron_uploads {
|
Line 4880 sub scantron_uploads {
|
=cut |
=cut |
|
|
sub scantron_scantab { |
sub scantron_scantab { |
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); |
|
my $result='<select name="scantron_format">'."\n"; |
my $result='<select name="scantron_format">'."\n"; |
$result.='<option></option>'."\n"; |
$result.='<option></option>'."\n"; |
foreach my $line (<$fh>) { |
my @lines = &get_scantronformat_file(); |
my ($name,$descrip)=split(/:/,$line); |
if (@lines > 0) { |
if ($name =~ /^\#/) { next; } |
foreach my $line (@lines) { |
$result.='<option value="'.$name.'">'.$descrip.'</option>'."\n"; |
next if (($line =~ /^\#/) || ($line eq '')); |
|
my ($name,$descrip)=split(/:/,$line); |
|
$result.='<option value="'.$name.'">'.$descrip.'</option>'."\n"; |
|
} |
} |
} |
$result.='</select>'."\n"; |
$result.='</select>'."\n"; |
|
|
return $result; |
return $result; |
} |
} |
|
|
|
=pod |
|
|
|
=item get_scantronformat_file |
|
|
|
Returns an array containing lines from the scantron format file for |
|
the domain of the course. |
|
|
|
If a url for a custom.tab file is listed in domain's configuration.db, |
|
lines are from this file. |
|
|
|
Otherwise, if a default.tab has been published in RES space by the |
|
domainconfig user, lines are from this file. |
|
|
|
Otherwise, fall back to getting lines from the legacy file on the |
|
local server: /home/httpd/lonTabs/default_scantronformat.tab |
|
|
|
=cut |
|
|
|
sub get_scantronformat_file { |
|
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$cdom); |
|
my $gottab = 0; |
|
my @lines; |
|
if (ref($domconfig{'scantron'}) eq 'HASH') { |
|
if ($domconfig{'scantron'}{'scantronformat'} ne '') { |
|
my $formatfile = &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.$domconfig{'scantron'}{'scantronformat'}); |
|
if ($formatfile ne '-1') { |
|
@lines = split("\n",$formatfile,-1); |
|
$gottab = 1; |
|
} |
|
} |
|
} |
|
if (!$gottab) { |
|
my $confname = $cdom.'-domainconfig'; |
|
my $default = $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cdom.'/'.$confname.'/default.tab'; |
|
my $formatfile = &Apache::lonnet::getfile($default); |
|
if ($formatfile ne '-1') { |
|
@lines = split("\n",$formatfile,-1); |
|
$gottab = 1; |
|
} |
|
} |
|
if (!$gottab) { |
|
my @domains = &Apache::lonnet::current_machine_domains(); |
|
if (grep(/^\Q$cdom\E$/,@domains)) { |
|
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); |
|
@lines = <$fh>; |
|
close($fh); |
|
} else { |
|
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab'); |
|
@lines = <$fh>; |
|
close($fh); |
|
} |
|
} |
|
return @lines; |
|
} |
|
|
=pod |
=pod |
|
|
=item scantron_CODElist |
=item scantron_CODElist |
Line 4795 sub scantron_selectphase {
|
Line 5023 sub scantron_selectphase {
|
my $CODE_unique=&scantron_CODEunique(); |
my $CODE_unique=&scantron_CODEunique(); |
my $result; |
my $result; |
|
|
|
$ssi_error = 0; |
|
|
# Chunk of form to prompt for a file to grade and how: |
# Chunk of form to prompt for a file to grade and how: |
|
|
$result.= <<SCANTRONFORM; |
$result.= ' |
<table width="100%" border="0"> |
<br /> |
<tr> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process"> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process"> |
<input type="hidden" name="command" value="scantron_warning" /> |
<td bgcolor="#777777"> |
'.$default_form_data.' |
<input type="hidden" name="command" value="scantron_warning" /> |
'.&Apache::loncommon::start_data_table('LC_scantron_action').' |
$default_form_data |
'.&Apache::loncommon::start_data_table_header_row().' |
<table width="100%" border="0"> |
<th colspan="2"> |
<tr bgcolor="#e6ffff"> |
'.&mt('Specify file and which Folder/Sequence to grade').' |
<td colspan="2"> |
</th> |
<b>Specify file and which Folder/Sequence to grade</b> |
'.&Apache::loncommon::end_data_table_header_row().' |
</td> |
'.&Apache::loncommon::start_data_table_row().' |
</tr> |
<td> '.&mt('Sequence to grade:').' </td><td> '.$sequence_selector.' </td> |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::end_data_table_row().' |
<td> Sequence to grade: </td><td> $sequence_selector </td> |
'.&Apache::loncommon::start_data_table_row().' |
</tr> |
<td> '.&mt('Filename of scoring office file:').' </td><td> '.$file_selector.' </td> |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::end_data_table_row().' |
<td> Filename of scoring office file: </td><td> $file_selector </td> |
'.&Apache::loncommon::start_data_table_row().' |
</tr> |
<td> '.&mt('Format of data file:').' </td><td> '.$format_selector.' </td> |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::end_data_table_row().' |
<td> Format of data file: </td><td> $format_selector </td> |
'.&Apache::loncommon::start_data_table_row().' |
</tr> |
<td> '.&mt('Saved CODEs to validate against:').' </td><td> '.$CODE_selector.' </td> |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::end_data_table_row().' |
<td> Saved CODEs to validate against: </td><td> $CODE_selector</td> |
'.&Apache::loncommon::start_data_table_row().' |
</tr> |
<td> '.&mt('Each CODE is only to be used once:').'</td><td> '.$CODE_unique.' </td> |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::end_data_table_row().' |
<td> Each CODE is only to be used once:</td><td> $CODE_unique </td> |
'.&Apache::loncommon::start_data_table_row().' |
</tr> |
<td> '.&mt('Options:').' </td> |
<tr bgcolor="#ffffe6"> |
|
<td> Options: </td> |
|
<td> |
<td> |
<label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br /> |
<label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> '.&mt('Do only previously skipped records').'</label> <br /> |
<label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all existing corrections</label> <br /> |
<label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> '.&mt('Remove all existing corrections').'</label> <br /> |
<label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> Skip hidden resources when grading</label> |
<label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> '.&mt('Skip hidden resources when grading').'</label> |
</td> |
</td> |
</tr> |
'.&Apache::loncommon::end_data_table_row().' |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::start_data_table_row().' |
<td colspan="2"> |
<td colspan="2"> |
<input type="submit" value="Grading: Validate Scantron Records" /> |
<input type="submit" value="'.&mt('Grading: Validate Scantron Records').'" /> |
</td> |
</td> |
</tr> |
'.&Apache::loncommon::end_data_table_row().' |
</table> |
'.&Apache::loncommon::end_data_table().' |
</td> |
</form> |
</form> |
'; |
</tr> |
|
SCANTRONFORM |
|
|
|
$r->print($result); |
$r->print($result); |
|
|
Line 4851 SCANTRONFORM
|
Line 5077 SCANTRONFORM
|
|
|
# Chunk of form to prompt for a scantron file upload. |
# Chunk of form to prompt for a scantron file upload. |
|
|
$r->print(<<SCANTRONFORM); |
$r->print(' |
<tr> |
<br /> |
<td bgcolor="#777777"> |
'.&Apache::loncommon::start_data_table('LC_scantron_action').' |
<table width="100%" border="0"> |
'.&Apache::loncommon::start_data_table_header_row().' |
<tr bgcolor="#e6ffff"> |
<th> |
|
'.&mt('Specify a Scantron data file to upload.').' |
|
</th> |
|
'.&Apache::loncommon::end_data_table_header_row().' |
|
'.&Apache::loncommon::start_data_table_row().' |
<td> |
<td> |
<b>Specify a Scantron data file to upload.</b> |
'); |
</td> |
|
</tr> |
|
<tr bgcolor="#ffffe6"> |
|
<td> |
|
SCANTRONFORM |
|
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'}; |
$r->print(<<UPLOAD); |
$r->print(' |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
function checkUpload(formname) { |
function checkUpload(formname) { |
if (formname.upfile.value == "") { |
if (formname.upfile.value == "") { |
alert("Please use the browse button to select a file from your local directory."); |
alert("'.&mt('Please use the browse button to select a file from your local directory.').'"); |
return false; |
return false; |
} |
} |
formname.submit(); |
formname.submit(); |
} |
} |
</script> |
</script> |
|
|
<form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'> |
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
$default_form_data |
'.$default_form_data.' |
<input name='courseid' type='hidden' value='$cnum' /> |
<input name="courseid" type="hidden" value="'.$cnum.'" /> |
<input name='domainid' type='hidden' value='$cdom' /> |
<input name="domainid" type="hidden" value="'.$cdom.'" /> |
<input name='command' value='scantronupload_save' type='hidden' /> |
<input name="command" value="scantronupload_save" type="hidden" /> |
File to upload:<input type="file" name="upfile" size="50" /> |
'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').' |
<br /> |
<br /> |
<input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" /> |
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" /> |
</form> |
</form> |
UPLOAD |
'); |
|
|
$r->print(<<SCANTRONFORM); |
$r->print(' |
</td> |
</td> |
</tr> |
'.&Apache::loncommon::end_data_table_row().' |
</table> |
'.&Apache::loncommon::end_data_table().' |
</td> |
'); |
</tr> |
|
SCANTRONFORM |
|
} |
} |
|
|
# Chunk of the form that prompts to view a scoring office file, |
# Chunk of the form that prompts to view a scoring office file, |
# corrected file, skipped records in a file. |
# corrected file, skipped records in a file. |
|
|
$r->print(<<SCANTRONFORM); |
$r->print(' |
<tr> |
<br /> |
<form action='/adm/grades' name='scantron_download'> |
<form action="/adm/grades" name="scantron_download"> |
<td bgcolor="#777777"> |
'.$default_form_data.' |
$default_form_data |
<input type="hidden" name="command" value="scantron_download" /> |
<input type="hidden" name="command" value="scantron_download" /> |
'.&Apache::loncommon::start_data_table('LC_scantron_action').' |
<table width="100%" border="0"> |
'.&Apache::loncommon::start_data_table_header_row().' |
<tr bgcolor="#e6ffff"> |
<th> |
<td colspan="2"> |
'.&mt('Download a scoring office file').' |
<b>Download a scoring office file</b> |
</th> |
</td> |
'.&Apache::loncommon::end_data_table_header_row().' |
</tr> |
'.&Apache::loncommon::start_data_table_row().' |
<tr bgcolor="#ffffe6"> |
<td> '.&mt('Filename of scoring office file: [_1]',$file_selector).' |
<td> Filename of scoring office file: </td><td> $file_selector </td> |
<br /> |
</tr> |
<input type="submit" value="'.&mt('Download: Show List of Associated Files').'" /> |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::end_data_table_row().' |
<td colspan="2"> |
'.&Apache::loncommon::end_data_table().' |
<input type="submit" value="Download: Show List of Associated Files" /> |
</form> |
</td> |
<br /> |
</tr> |
'); |
</table> |
|
</td> |
|
</form> |
|
</tr> |
|
SCANTRONFORM |
|
|
|
$r->print('<tr><td bgcolor="#777777">'); |
|
&Apache::lonpickcode::code_list($r,2); |
&Apache::lonpickcode::code_list($r,2); |
$r->print('</td></tr></table>'); |
|
$r->print($grading_menu_button); |
$r->print($grading_menu_button); |
return |
return |
} |
} |
Line 4992 SCANTRONFORM
|
Line 5208 SCANTRONFORM
|
|
|
sub get_scantron_config { |
sub get_scantron_config { |
my ($which) = @_; |
my ($which) = @_; |
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); |
my @lines = &get_scantronformat_file(); |
my %config; |
my %config; |
#FIXME probably should move to XML it has already gotten a bit much now |
#FIXME probably should move to XML it has already gotten a bit much now |
foreach my $line (<$fh>) { |
foreach my $line (@lines) { |
my ($name,$descrip)=split(/:/,$line); |
my ($name,$descrip)=split(/:/,$line); |
if ($name ne $which ) { next; } |
if ($name ne $which ) { next; } |
chomp($line); |
chomp($line); |
Line 5008 sub get_scantron_config {
|
Line 5224 sub get_scantron_config {
|
$config{'IDstart'}=$config[5]; |
$config{'IDstart'}=$config[5]; |
$config{'IDlength'}=$config[6]; |
$config{'IDlength'}=$config[6]; |
$config{'Qstart'}=$config[7]; |
$config{'Qstart'}=$config[7]; |
$config{'Qlength'}=$config[8]; |
$config{'Qlength'}=$config[8]; |
$config{'Qoff'}=$config[9]; |
$config{'Qoff'}=$config[9]; |
$config{'Qon'}=$config[10]; |
$config{'Qon'}=$config[10]; |
$config{'PaperID'}=$config[11]; |
$config{'PaperID'}=$config[11]; |
Line 5082 sub username_to_idmap {
|
Line 5298 sub username_to_idmap {
|
- 'answer' |
- 'answer' |
'response' - new answer or 'none' if blank |
'response' - new answer or 'none' if blank |
'question' - the bubble line to change |
'question' - the bubble line to change |
|
'questionnum' - the question identifier, |
|
may include subquestion. |
|
|
Returns: |
Returns: |
$line - the modified scanline |
$line - the modified scanline |
Line 5094 sub username_to_idmap {
|
Line 5312 sub username_to_idmap {
|
|
|
sub scantron_fixup_scanline { |
sub scantron_fixup_scanline { |
my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_; |
my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_; |
|
|
if ($field eq 'ID') { |
if ($field eq 'ID') { |
if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) { |
if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) { |
return ($line,1,'New value too large'); |
return ($line,1,'New value too large'); |
Line 5131 sub scantron_fixup_scanline {
|
Line 5348 sub scantron_fixup_scanline {
|
my $answer=${off}x$length; |
my $answer=${off}x$length; |
if ($args->{'response'} eq 'none') { |
if ($args->{'response'} eq 'none') { |
&scan_data($scan_data, |
&scan_data($scan_data, |
"$whichline.no_bubble.".$args->{'question'},'1'); |
"$whichline.no_bubble.".$args->{'questionnum'},'1'); |
} else { |
} else { |
if ($on eq 'letter') { |
if ($on eq 'letter') { |
my @alphabet=('A'..'Z'); |
my @alphabet=('A'..'Z'); |
Line 5143 sub scantron_fixup_scanline {
|
Line 5360 sub scantron_fixup_scanline {
|
substr($answer,$args->{'response'},1)=$on; |
substr($answer,$args->{'response'},1)=$on; |
} |
} |
&scan_data($scan_data, |
&scan_data($scan_data, |
"$whichline.no_bubble.".$args->{'question'},undef,'1'); |
"$whichline.no_bubble.".$args->{'questionnum'},undef,'1'); |
} |
} |
my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'}; |
my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'}; |
substr($line,$where-1,$length)=$answer; |
substr($line,$where-1,$length)=$answer; |
Line 5180 sub scan_data {
|
Line 5397 sub scan_data {
|
return $scan_data->{$filename.'_'.$key}; |
return $scan_data->{$filename.'_'.$key}; |
} |
} |
|
|
|
# ----- These first few routines are general use routines.---- |
|
|
|
# Return the number of occurences of a pattern in a string. |
|
|
|
sub occurence_count { |
|
my ($string, $pattern) = @_; |
|
|
|
my @matches = ($string =~ /$pattern/g); |
|
|
|
return scalar(@matches); |
|
} |
|
|
|
|
|
# Take a string known to have digits and convert all the |
|
# digits into letters in the range J,A..I. |
|
|
|
sub digits_to_letters { |
|
my ($input) = @_; |
|
|
|
my @alphabet = ('J', 'A'..'I'); |
|
|
|
my @input = split(//, $input); |
|
my $output =''; |
|
for (my $i = 0; $i < scalar(@input); $i++) { |
|
if ($input[$i] =~ /\d/) { |
|
$output .= $alphabet[$input[$i]]; |
|
} else { |
|
$output .= $input[$i]; |
|
} |
|
} |
|
return $output; |
|
} |
|
|
=pod |
=pod |
|
|
=item scantron_parse_scanline |
=item scantron_parse_scanline |
Line 5282 sub scantron_parse_scanline {
|
Line 5532 sub scantron_parse_scanline {
|
$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 = $bubble_lines_per_response{$questnum}; |
my $answer_length = $$scantron_config{'Qlength'} * $answers_needed; |
my $answer_length = ($$scantron_config{'Qlength'} * $answers_needed) |
|
|| 1; |
|
$questnum++; |
|
my $quest_id = $questnum; |
$questnum++; |
my $currentquest = substr($questions,0,$answer_length); |
my $currentquest = substr($questions,0,$answer_length); |
$questions = substr($questions,$answer_length); |
$questions = substr($questions,0,$answer_length)=''; |
if (length($currentquest) < $answer_length) { next; } |
if (length($currentquest) < $answer_length) { next; } |
|
|
if ($subdivided_bubble_lines{$questnum-1} =~ /,/) { |
# Qon letter implies for each slot in currentquest we have: |
my $subquestnum = 1; |
# ? or * for doubles a letter in A-Z for a bubble and |
my $subquestions = $currentquest; |
# about anything else (esp. a value of Qoff for missing |
my @subanswers_needed = |
# bubbles. |
split(/,/,$subdivided_bubble_lines{$questnum-1}); |
|
foreach my $subans (@subanswers_needed) { |
|
my $subans_length = |
if ($$scantron_config{'Qon'} eq 'letter') { |
($$scantron_config{'Qlength'} * $subans) || 1; |
|
my $currsubquest = substr($subquestions,0,$subans_length); |
if ($currentquest =~ /\?/ |
$subquestions = substr($subquestions,$subans_length); |
|| $currentquest =~ /\*/ |
$quest_id = "$questnum.$subquestnum"; |
|| (&occurence_count($currentquest, "[A-Z]") > 1)) { |
if (($$scantron_config{'Qon'} eq 'letter') || |
push(@{$record{'scantron.doubleerror'}},$questnum); |
($$scantron_config{'Qon'} eq 'number')) { |
for (my $ans = 0; $ans < $answers_needed; $ans++) { |
$ansnum = &scantron_validator_lettnum($ansnum, |
my $bubble = substr($currentquest, $ans, 1); |
$questnum,$quest_id,$subans,$currsubquest,$whichline, |
if ($bubble =~ /[A-Z]/ ) { |
\@alphabet,\%record,$scantron_config,$scan_data); |
$record{"scantron.$ansnum.answer"} = $bubble; |
} else { |
} else { |
$ansnum = &scantron_validator_positional($ansnum, |
$record{"scantron.$ansnum.answer"}=''; |
$questnum,$quest_id,$subans,$currsubquest,$whichline, \@alphabet,\%record,$scantron_config,$scan_data); |
} |
} |
$ansnum++; |
$subquestnum ++; |
} |
} |
|
} else { |
} elsif (!defined($currentquest) |
if (($$scantron_config{'Qon'} eq 'letter') || |
|| (&occurence_count($currentquest, $$scantron_config{'Qoff'}) == length($currentquest)) |
($$scantron_config{'Qon'} eq 'number')) { |
|| (&occurence_count($currentquest, "[A-Z]") == 0)) { |
$ansnum = &scantron_validator_lettnum($ansnum,$questnum, |
for (my $ans = 0; $ans < $answers_needed; $ans++ ) { |
$quest_id,$answers_needed,$currentquest,$whichline, |
$record{"scantron.$ansnum.answer"}=''; |
\@alphabet,\%record,$scantron_config,$scan_data); |
$ansnum++; |
} else { |
|
$ansnum = &scantron_validator_positional($ansnum,$questnum, |
} |
$quest_id,$answers_needed,$currentquest,$whichline, |
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) { |
\@alphabet,\%record,$scantron_config,$scan_data); |
push(@{$record{"scantron.missingerror"}},$questnum); |
} |
# $ansnum += $answers_needed; |
} |
} |
} |
} else { |
$record{'scantron.maxquest'}=$questnum; |
for (my $ans = 0; $ans < $answers_needed; $ans++) { |
return \%record; |
$record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1); |
} |
$ansnum++; |
|
} |
|
} |
|
|
|
# Qon 'number' implies each slot gives a digit that indexes the |
|
# the bubbles filled or Qoff or a non number for unbubbled lines. |
|
# and *? for double bubbles on a line. |
|
# these answers are also stored as letters. |
|
|
|
} elsif ($$scantron_config{'Qon'} eq 'number') { |
|
if ($currentquest =~ /\?/ |
|
|| $currentquest =~ /\*/ |
|
|| (&occurence_count($currentquest, '\d') > 1)) { |
|
push(@{$record{'scantron.doubleerror'}},$questnum); |
|
for (my $ans = 0; $ans < $answers_needed; $ans++) { |
|
my $bubble = substr($currentquest, $ans, 1); |
|
if ($bubble =~ /\d/) { |
|
$record{"scantron.$ansnum.answer"} = $alphabet[$bubble]; |
|
} else { |
|
$record{"scantron.$ansnum.answer"}=' '; |
|
} |
|
$ansnum++; |
|
} |
|
|
|
} elsif (!defined($currentquest) |
|
|| (&occurence_count($currentquest,$$scantron_config{'Qoff'}) == length($currentquest)) |
|
|| (&occurence_count($currentquest, '\d') == 0)) { |
|
for (my $ans = 0; $ans < $answers_needed; $ans++ ) { |
|
$record{"scantron.$ansnum.answer"}=''; |
|
$ansnum++; |
|
|
|
} |
sub scantron_validator_lettnum { |
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) { |
my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,$whichline, |
push(@{$record{"scantron.missingerror"}},$questnum); |
$alphabet,$record,$scantron_config,$scan_data) = @_; |
$ansnum += $answers_needed; |
|
} |
# Qon 'letter' implies for each slot in currquest we have: |
|
# ? or * for doubles, a letter in A-Z for a bubble, and |
|
# about anything else (esp. a value of Qoff) for missing |
|
# bubbles. |
|
# |
|
# Qon 'number' implies each slot gives a digit that indexes the |
|
# bubbles filled, or Qoff, or a non-number for unbubbled lines, |
|
# and * or ? for double bubbles on a single line. |
|
# |
|
|
} else { |
my $matchon; |
$currentquest = &digits_to_letters($currentquest); |
if ($$scantron_config{'Qon'} eq 'letter') { |
for (my $ans =0; $ans < $answers_needed; $ans++) { |
$matchon = '[A-Z]'; |
$record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1); |
} elsif ($$scantron_config{'Qon'} eq 'number') { |
$ansnum++; |
$matchon = '\d'; |
} |
} |
} |
my $occurrences = 0; |
} else { |
if (($responsetype_per_response{$questnum-1} eq 'essayresponse') || |
|
($responsetype_per_response{$questnum-1} eq 'formularesponse') || |
|
($responsetype_per_response{$questnum-1} eq 'stringresponse') || |
|
($responsetype_per_response{$questnum-1} eq 'imageresponse') || |
|
($responsetype_per_response{$questnum-1} eq 'reactionresponse') || |
|
($responsetype_per_response{$questnum-1} eq 'organicresponse')) { |
|
my @singlelines = split('',$currquest); |
|
foreach my $entry (@singlelines) { |
|
$occurrences = &occurence_count($entry,$matchon); |
|
if ($occurrences > 1) { |
|
last; |
|
} |
|
} |
|
} else { |
|
$occurrences = &occurence_count($currquest,$matchon); |
|
} |
|
if (($currquest =~ /\?/ || $currquest =~ /\*/) || ($occurrences > 1)) { |
|
push(@{$record->{'scantron.doubleerror'}},$quest_id); |
|
for (my $ans=0; $ans<$answers_needed; $ans++) { |
|
my $bubble = substr($currquest,$ans,1); |
|
if ($bubble =~ /$matchon/ ) { |
|
if ($$scantron_config{'Qon'} eq 'number') { |
|
if ($bubble == 0) { |
|
$bubble = 10; |
|
} |
|
$record->{"scantron.$ansnum.answer"} = |
|
$alphabet->[$bubble-1]; |
|
} else { |
|
$record->{"scantron.$ansnum.answer"} = $bubble; |
|
} |
|
} else { |
|
$record->{"scantron.$ansnum.answer"}=''; |
|
} |
|
$ansnum++; |
|
} |
|
} elsif (!defined($currquest) |
|
|| (&occurence_count($currquest, $$scantron_config{'Qoff'}) == length($currquest)) |
|
|| (&occurence_count($currquest,$matchon) == 0)) { |
|
for (my $ans=0; $ans<$answers_needed; $ans++ ) { |
|
$record->{"scantron.$ansnum.answer"}=''; |
|
$ansnum++; |
|
} |
|
if (!&scan_data($scan_data,"$whichline.no_bubble.$quest_id")) { |
|
push(@{$record->{'scantron.missingerror'}},$quest_id); |
|
} |
|
} else { |
|
if ($$scantron_config{'Qon'} eq 'number') { |
|
$currquest = &digits_to_letters($currquest); |
|
} |
|
for (my $ans=0; $ans<$answers_needed; $ans++) { |
|
my $bubble = substr($currquest,$ans,1); |
|
$record->{"scantron.$ansnum.answer"} = $bubble; |
|
$ansnum++; |
|
} |
|
} |
|
return $ansnum; |
|
} |
|
|
# Otherwise there's a positional notation; |
sub scantron_validator_positional { |
# each bubble line requires Qlength items, and there are filled in |
my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest, |
# bubbles for each case where there 'Qon' characters. |
$whichline,$alphabet,$record,$scantron_config,$scan_data) = @_; |
# |
|
|
|
my @array=split($$scantron_config{'Qon'},$currentquest,-1); |
# Otherwise there's a positional notation; |
|
# each bubble line requires Qlength items, and there are filled in |
|
# bubbles for each case where there 'Qon' characters. |
|
# |
|
|
# If the split only giveas us one element.. the full length of the |
my @array=split($$scantron_config{'Qon'},$currquest,-1); |
# answser string, no bubbles are filled in: |
|
|
|
if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) { |
# If the split only gives us one element.. the full length of the |
for (my $ans = 0; $ans < $answers_needed; $ans++ ) { |
# answer string, no bubbles are filled in: |
$record{"scantron.$ansnum.answer"}=''; |
|
$ansnum++; |
|
|
|
} |
if ($answers_needed eq '') { |
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) { |
return; |
push(@{$record{"scantron.missingerror"}},$questnum); |
} |
} |
|
} elsif (scalar(@array) lt 2) { |
|
|
|
my $location = length($array[0]); |
if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) { |
my $line_num = $location / $$scantron_config{'Qlength'}; |
for (my $ans=0; $ans<$answers_needed; $ans++ ) { |
my $bubble = $alphabet[$location % $$scantron_config{'Qlength'}]; |
$record->{"scantron.$ansnum.answer"}=''; |
|
$ansnum++; |
|
} |
|
if (!&scan_data($scan_data,"$whichline.no_bubble.$quest_id")) { |
|
push(@{$record->{"scantron.missingerror"}},$quest_id); |
|
} |
|
} elsif (scalar(@array) == 2) { |
|
my $location = length($array[0]); |
|
my $line_num = int($location / $$scantron_config{'Qlength'}); |
|
my $bubble = $alphabet->[$location % $$scantron_config{'Qlength'}]; |
|
for (my $ans=0; $ans<$answers_needed; $ans++) { |
|
if ($ans eq $line_num) { |
|
$record->{"scantron.$ansnum.answer"} = $bubble; |
|
} else { |
|
$record->{"scantron.$ansnum.answer"} = ' '; |
|
} |
|
$ansnum++; |
|
} |
|
} else { |
|
# If there's more than one instance of a bubble character |
|
# That's a double bubble; with positional notation we can |
|
# record all the bubbles filled in as well as the |
|
# fact this response consists of multiple bubbles. |
|
# |
|
if (($responsetype_per_response{$questnum-1} eq 'essayresponse') || |
|
($responsetype_per_response{$questnum-1} eq 'formularesponse') || |
|
($responsetype_per_response{$questnum-1} eq 'stringresponse') || |
|
($responsetype_per_response{$questnum-1} eq 'imageresponse') || |
|
($responsetype_per_response{$questnum-1} eq 'reactionresponse') || |
|
($responsetype_per_response{$questnum-1} eq 'organicresponse')) { |
|
my $doubleerror = 0; |
|
while (($currquest >= $$scantron_config{'Qlength'}) && |
|
(!$doubleerror)) { |
|
my $currline = substr($currquest,0,$$scantron_config{'Qlength'}); |
|
$currquest = substr($currquest,$$scantron_config{'Qlength'}); |
|
my @currarray = split($$scantron_config{'Qon'},$currline,-1); |
|
if (length(@currarray) > 2) { |
|
$doubleerror = 1; |
|
} |
|
} |
|
if ($doubleerror) { |
|
push(@{$record->{'scantron.doubleerror'}},$quest_id); |
|
} |
|
} else { |
|
push(@{$record->{'scantron.doubleerror'}},$quest_id); |
|
} |
|
my $item = $ansnum; |
|
for (my $ans=0; $ans<$answers_needed; $ans++) { |
|
$record->{"scantron.$item.answer"} = ''; |
|
$item ++; |
|
} |
|
|
for (my $ans = 0; $ans < $answers_needed; $ans++) { |
my @ans=@array; |
if ($ans eq $line_num) { |
my $i=0; |
$record{"scantron.$ansnum.answer"} = $bubble; |
my $increment = 0; |
} else { |
while ($#ans) { |
$record{"scantron.$ansnum.answer"} = ' '; |
$i+=length($ans[0]) + $increment; |
} |
my $line = int($i/$$scantron_config{'Qlength'} + $ansnum); |
$ansnum++; |
my $bubble = $i%$$scantron_config{'Qlength'}; |
} |
$record->{"scantron.$line.answer"}.=$alphabet->[$bubble]; |
} |
shift(@ans); |
# If there's more than one instance of a bubble character |
$increment = 1; |
# That's a double bubble; with positional notation we can |
} |
# record all the bubbles filled in as well as the |
$ansnum += $answers_needed; |
# fact this response consists of multiple bubbles. |
|
# |
|
else { |
|
push(@{$record{'scantron.doubleerror'}},$questnum); |
|
|
|
my $first_answer = $ansnum; |
|
for (my $ans =0; $ans < $answers_needed; $ans++) { |
|
my $item = $first_answer+$ans; |
|
$record{"scantron.$item.answer"} = ''; |
|
} |
|
|
|
my @ans=@array; |
|
my $i=0; |
|
my $increment = 0; |
|
while ($#ans) { |
|
$i+=length($ans[0]) + $increment; |
|
my $line = int($i/$$scantron_config{'Qlength'} + $first_answer); |
|
my $bubble = $i%$$scantron_config{'Qlength'}; |
|
$record{"scantron.$line.answer"}.=$alphabet[$bubble]; |
|
shift(@ans); |
|
$increment = 1; |
|
} |
|
$ansnum += $answers_needed; |
|
} |
|
} |
|
} |
} |
$record{'scantron.maxquest'}=$questnum; |
return $ansnum; |
return \%record; |
|
} |
} |
|
|
=pod |
=pod |
Line 5578 sub scantron_process_corrections {
|
Line 5883 sub scantron_process_corrections {
|
&scantron_fixup_scanline(\%scantron_config,$scan_data,$line, |
&scantron_fixup_scanline(\%scantron_config,$scan_data,$line, |
$which,'answer', |
$which,'answer', |
{ 'question'=>$question, |
{ 'question'=>$question, |
'response'=>$env{"form.scantron_correct_Q_$question"}}); |
'response'=>$env{"form.scantron_correct_Q_$question"}, |
|
'questionnum'=>$env{"form.scantron_questionnum_Q_$question"}}); |
if ($err) { last; } |
if ($err) { last; } |
} |
} |
} |
} |
Line 5683 sub remember_current_skipped {
|
Line 5989 sub remember_current_skipped {
|
sub check_for_error { |
sub check_for_error { |
my ($r,$result)=@_; |
my ($r,$result)=@_; |
if ($result ne 'ok' && $result ne 'not_found' ) { |
if ($result ne 'ok' && $result ne 'not_found' ) { |
$r->print("An error occurred ($result) when trying to Remove the existing corrections."); |
$r->print(&mt("An error occurred ([_1]) when trying to remove the existing corrections.",$result)); |
} |
} |
} |
} |
|
|
Line 5707 sub scantron_warning_screen {
|
Line 6013 sub scantron_warning_screen {
|
$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">None</span>'; } |
$CODElist= |
$CODElist= |
'<tr><td><b>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>'; |
} |
} |
return (<<STUFF); |
return (' |
<p> |
<p> |
<span class="LC_warning">Please double check the information |
<span class="LC_warning"> |
below before clicking on '$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>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>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.' |
</table> |
</table> |
<br /> |
<br /> |
<p> If this information is correct, please click on '$button_text'.</p> |
<p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p> |
<p> If something is incorrect, please click the 'Grading Menu' button to start over.</p> |
<p> '.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').'</p> |
|
|
<br /> |
<br /> |
STUFF |
'); |
} |
} |
|
|
=pod |
=pod |
Line 5746 sub scantron_do_warning {
|
Line 6052 sub scantron_do_warning {
|
if ( $env{'form.selectpage'} eq '' || |
if ( $env{'form.selectpage'} eq '' || |
$env{'form.scantron_selectfile'} eq '' || |
$env{'form.scantron_selectfile'} eq '' || |
$env{'form.scantron_format'} eq '' ) { |
$env{'form.scantron_format'} eq '' ) { |
$r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>"); |
$r->print("<p>".&mt('You have forgetten to specify some information. Please go Back and try again.')."</p>"); |
if ( $env{'form.selectpage'} eq '') { |
if ( $env{'form.selectpage'} eq '') { |
$r->print('<p><span class="LC_error">You have not selected a Sequence to grade</span></p>'); |
$r->print('<p><span class="LC_error">'.&mt('You have not selected a Sequence to grade').'</span></p>'); |
} |
} |
if ( $env{'form.scantron_selectfile'} eq '') { |
if ( $env{'form.scantron_selectfile'} eq '') { |
$r->print('<p><span class="LC_error">You have not selected a file that contains the student\'s response data.</span></p>'); |
$r->print('<p><span class="LC_error">'.&mt('You have not selected a file that contains the student\'s response data.').'</span></p>'); |
} |
} |
if ( $env{'form.scantron_format'} eq '') { |
if ( $env{'form.scantron_format'} eq '') { |
$r->print('<p><span class="LC_error">You have not selected a the format of the student\'s response data.</span></p>'); |
$r->print('<p><span class="LC_error">'.&mt('You have not selected a 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'); |
$r->print(<<STUFF); |
$r->print(' |
$warning |
'.$warning.' |
<input type="submit" name="submit" value="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" /> |
STUFF |
'); |
} |
} |
$r->print("</form><br />".&show_grading_menu_form($symb)); |
$r->print("</form><br />".&show_grading_menu_form($symb)); |
return ''; |
return ''; |
Line 5797 SCANTRONFORM
|
Line 6103 SCANTRONFORM
|
'<input type="hidden" name="scantron.bubblelines.'.$line.'" value="'.$env{"form.scantron.bubblelines.$line"}.'" />'."\n"; |
'<input type="hidden" name="scantron.bubblelines.'.$line.'" value="'.$env{"form.scantron.bubblelines.$line"}.'" />'."\n"; |
$chunk .= |
$chunk .= |
'<input type="hidden" name="scantron.first_bubble_line.'.$line.'" value="'.$env{"form.scantron.first_bubble_line.$line"}.'" />'."\n"; |
'<input type="hidden" name="scantron.first_bubble_line.'.$line.'" value="'.$env{"form.scantron.first_bubble_line.$line"}.'" />'."\n"; |
|
$chunk .= |
|
'<input type="hidden" name="scantron.sub_bubblelines.'.$line.'" value="'.$env{"form.scantron.sub_bubblelines.$line"}.'" />'."\n"; |
|
$chunk .= |
|
'<input type="hidden" name="scantron.responsetype.'.$line.'" value="'.$env{"form.scantron.responsetype.$line"}.'" />'."\n"; |
$result .= $chunk; |
$result .= $chunk; |
$line++; |
$line++; |
} |
} |
Line 5841 sub scantron_validate_file {
|
Line 6151 sub scantron_validate_file {
|
if ($env{'form.scantron_corrections'}) { |
if ($env{'form.scantron_corrections'}) { |
&scantron_process_corrections($r); |
&scantron_process_corrections($r); |
} |
} |
$r->print("<p>Gathering necessary info.</p>");$r->rflush(); |
$r->print('<p>'.&mt('Gathering necessary information.').'</p>');$r->rflush(); |
#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 $max_bubble=&scantron_get_maxbubble(); |
my $max_bubble=&scantron_get_maxbubble(); |
Line 5861 sub scantron_validate_file {
|
Line 6171 sub scantron_validate_file {
|
|
|
my $stop=0; |
my $stop=0; |
while (!$stop && $currentphase < scalar(@validate_phases)) { |
while (!$stop && $currentphase < scalar(@validate_phases)) { |
$r->print("<p> Validating ".$validate_phases[$currentphase]."</p>"); |
$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]; |
{ |
{ |
Line 5871 sub scantron_validate_file {
|
Line 6181 sub scantron_validate_file {
|
} |
} |
if (!$stop) { |
if (!$stop) { |
my $warning=&scantron_warning_screen('Start Grading'); |
my $warning=&scantron_warning_screen('Start Grading'); |
$r->print(<<STUFF); |
$r->print(&mt('Validation process complete.').'<br /> |
Validation process complete.<br /> |
'.$warning.' |
$warning |
<input type="submit" name="submit" value="'.&mt('Start Grading').'" /> |
<input type="submit" name="submit" value="Start Grading" /> |
|
<input type="hidden" name="command" value="scantron_process" /> |
<input type="hidden" name="command" value="scantron_process" /> |
STUFF |
'); |
|
|
} else { |
} else { |
$r->print('<input type="hidden" name="command" value="scantron_validate" />'); |
$r->print('<input type="hidden" name="command" value="scantron_validate" />'); |
Line 5884 STUFF
|
Line 6193 STUFF
|
} |
} |
if ($stop) { |
if ($stop) { |
if ($validate_phases[$currentphase] eq 'sequence') { |
if ($validate_phases[$currentphase] eq 'sequence') { |
$r->print('<input type="submit" name="submit" value="Ignore -> " />'); |
$r->print('<input type="submit" name="submit" value="'.&mt('Ignore ->').' " />'); |
$r->print(' this error <br />'); |
$r->print(' '.&mt('this error').' <br />'); |
|
|
$r->print(" <p>Or click the 'Grading Menu' button to start over.</p>"); |
$r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>"); |
} else { |
} else { |
$r->print('<input type="submit" name="submit" value="Continue ->" />'); |
if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') { |
$r->print(' using corrected info <br />'); |
$r->print('<input type="button" name="submitbutton" value="'.&mt('Continue ->').'" onclick="javascript:verify_bubble_radio(this.form)" />'); |
$r->print("<input type='submit' value='Skip' name='scantron_skip_record' />"); |
} else { |
$r->print(" this scanline saving it for later."); |
$r->print('<input type="submit" name="submit" value="'.&mt('Continue ->').'" />'); |
|
} |
|
$r->print(' '.&mt('using corrected info').' <br />'); |
|
$r->print("<input type='submit' value='".&mt("Skip")."' name='scantron_skip_record' />"); |
|
$r->print(" ".&mt("this scanline saving it for later.")); |
} |
} |
} |
} |
$r->print(" </form><br />".&show_grading_menu_form($symb)); |
$r->print(" </form><br />".&show_grading_menu_form($symb)); |
Line 5953 sub scantron_remove_scan_data {
|
Line 6266 sub scantron_remove_scan_data {
|
} |
} |
my $result; |
my $result; |
if (@todelete) { |
if (@todelete) { |
$result=&Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname); |
$result = &Apache::lonnet::del('nohist_scantrondata', |
|
\@todelete,$cdom,$cname); |
|
} else { |
|
$result = 'ok'; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 6368 sub scantron_validate_ID {
|
Line 6684 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)=@_; |
|
|
#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 |
|
|
$r->print("<p><b>An error was detected ($error)</b>"); |
|
if ( $$scan_record{'scantron.PaperID'} =~ /\S/) { |
if ( $$scan_record{'scantron.PaperID'} =~ /\S/) { |
$r->print(" for PaperID <tt>". |
$r->print("<p>".&mt("<b>An error was detected ($error)</b>". |
$$scan_record{'scantron.PaperID'}."</tt> \n"); |
" for PaperID <tt>[_1]</tt>", |
|
$$scan_record{'scantron.PaperID'})."</p> \n"); |
} else { |
} else { |
$r->print(" in scanline $i <pre>". |
$r->print("<p>".&mt("<b>An error was detected ($error)</b>". |
$line."</pre> \n"); |
" in scanline [_1] <pre>[_2]</pre>", |
} |
$i,$line)."</p> \n"); |
my $message="<p>The ID on the form is <tt>". |
} |
$$scan_record{'scantron.ID'}."</tt><br />\n". |
my $message="<p>".&mt("The ID on the form is <tt>[_1]</tt><br />". |
"The name on the paper is ". |
"The name on the paper is [_2],[_3]", |
$$scan_record{'scantron.LastName'}.",". |
$$scan_record{'scantron.ID'}, |
$$scan_record{'scantron.FirstName'}."</p>"; |
$$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"); |
|
# Array populated for doublebubble or |
|
my @lines_to_correct; # missingbubble errors to build javascript |
|
# to validate radio button checking |
|
|
if ($error =~ /ID$/) { |
if ($error =~ /ID$/) { |
if ($error eq 'incorrectID') { |
if ($error eq 'incorrectID') { |
$r->print("The encoded ID is not in the classlist</p>\n"); |
$r->print("<p>".&mt("The encoded ID is not in the classlist"). |
|
"</p>\n"); |
} elsif ($error eq 'duplicateID') { |
} elsif ($error eq 'duplicateID') { |
$r->print("The encoded ID has also been used by a previous paper $arg</p>\n"); |
$r->print("<p>".&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>How should I handle this? <br /> \n"); |
$r->print("<p>".&mt("How should I handle this?")." <br /> \n"); |
$r->print("\n<ul><li> "); |
$r->print("\n<ul><li> "); |
#FIXME it would be nice if this sent back the user ID and |
#FIXME it would be nice if this sent back the user ID and |
#could do partial userID matches |
#could do partial userID matches |
Line 6409 sub scantron_get_correction {
|
Line 6730 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><p>The encoded CODE is not in the list of possible CODEs</p>\n"); |
$r->print("<p>".&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><p>The encoded CODE has also been used by a previous paper ".join(', ',@{$arg}).", and CODEs are supposed to be unique</p>\n"); |
$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>The CODE on the form is <tt>'". |
$r->print("<p>".&mt("The CODE on the form is <tt>'[_1]'</tt>", |
$$scan_record{'scantron.CODE'}."'</tt><br />\n"); |
$$scan_record{'scantron.CODE'})."<br />\n"); |
$r->print($message); |
$r->print($message); |
$r->print("<p>How should I handle this? <br /> \n"); |
$r->print("<p>".&mt("How should I handle this?")." <br /> \n"); |
$r->print("\n<br /> "); |
$r->print("\n<br /> "); |
my $i=0; |
my $i=0; |
if ($error eq 'incorrectCODE' |
if ($error eq 'incorrectCODE' |
Line 6426 sub scantron_get_correction {
|
Line 6747 sub scantron_get_correction {
|
foreach my $testcode (@{$closest}) { |
foreach my $testcode (@{$closest}) { |
my $checked=''; |
my $checked=''; |
if (!$i) { $checked=' checked="checked" '; } |
if (!$i) { $checked=' checked="checked" '; } |
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />"); |
$r->print(" |
|
<label> |
|
<input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> |
|
".&mt("Use the similar CODE [_1] instead.", |
|
"<b><tt>".$testcode."</tt></b>")." |
|
</label> |
|
<input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />"); |
$r->print("\n<br />"); |
$r->print("\n<br />"); |
$i++; |
$i++; |
} |
} |
Line 6434 sub scantron_get_correction {
|
Line 6761 sub scantron_get_correction {
|
} |
} |
if ($$scan_record{'scantron.CODE'}=~/\S/ ) { |
if ($$scan_record{'scantron.CODE'}=~/\S/ ) { |
my $checked; if (!$i) { $checked=' checked="checked" '; } |
my $checked; if (!$i) { $checked=' checked="checked" '; } |
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.</label>"); |
$r->print(" |
|
<label> |
|
<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.", |
|
"<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")." |
|
</label>"); |
$r->print("\n<br />"); |
$r->print("\n<br />"); |
} |
} |
|
|
Line 6456 ENDSCRIPT
|
Line 6788 ENDSCRIPT
|
"&curCODE=".&escape($$scan_record{'scantron.CODE'}). |
"&curCODE=".&escape($$scan_record{'scantron.CODE'}). |
"&scantron_selectfile=".&escape($env{'form.scantron_selectfile'}); |
"&scantron_selectfile=".&escape($env{'form.scantron_selectfile'}); |
if ($env{'form.scantron_CODElist'} =~ /\S/) { |
if ($env{'form.scantron_CODElist'} =~ /\S/) { |
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />"); |
$r->print(" |
|
<label> |
|
<input type='radio' name='scantron_CODE_resolution' value='use_found' /> |
|
".&mt("[_1]Select[_2] a CODE from the list of all CODEs and use it.", |
|
"<a target='_blank' href='$href'>","</a>")." |
|
</label> |
|
".&mt("Selected CODE is [_1]","<input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />")); |
$r->print("\n<br />"); |
$r->print("\n<br />"); |
} |
} |
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use </label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" /> as the CODE."); |
$r->print(" |
|
<label> |
|
<input type='radio' name='scantron_CODE_resolution' value='use_typed' /> |
|
".&mt("Use [_1] as the CODE.", |
|
"</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>There have been multiple bubbles scanned for a some question(s)</p>\n"); |
$r->print("<p>".&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. |
|
# represented by this form so: |
|
|
|
my $line_list = &questions_to_line_list($arg); |
|
|
$r->print('<input type="hidden" name="scantron_questions" value="'. |
$r->print('<input type="hidden" name="scantron_questions" value="'. |
join(',',@{$arg}).'" />'); |
$line_list.'" />'); |
$r->print($message); |
$r->print($message); |
$r->print("<p>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 $selected = &get_response_bubbles($scan_record, $question); |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
my @select_array = split(/:/,$selected); |
$scan_record, $error); |
&scantron_bubble_selector($r,$scan_config,$question, |
push (@lines_to_correct,@linenums); |
@select_array); |
|
} |
} |
|
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
} elsif ($error eq 'missingbubble') { |
} elsif ($error eq 'missingbubble') { |
$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n"); |
$r->print("<p>".&mt("There have been <b>no</b> bubbles scanned for some question(s)")."</p>\n"); |
$r->print($message); |
$r->print($message); |
$r->print("<p>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("Some questions have no scanned bubbles\n"); |
$r->print(&mt("Some questions have no scanned bubbles.")."\n"); |
|
|
|
# The form field scantron_questions is actually a list of line numbers not |
|
# a list of question numbers. Therefore: |
|
# |
|
|
|
my $line_list = &questions_to_line_list($arg); |
|
|
$r->print('<input type="hidden" name="scantron_questions" value="'. |
$r->print('<input type="hidden" name="scantron_questions" value="'. |
join(',',@{$arg}).'" />'); |
$line_list.'" />'); |
foreach my $question (@{$arg}) { |
foreach my $question (@{$arg}) { |
my $selected = &get_response_bubbles($scan_record, $question); |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
my @select_array = split(/:/,$selected); # ought to be an array of empties. |
$scan_record, $error); |
&scantron_bubble_selector($r,$scan_config,$question, @select_array); |
push (@lines_to_correct,@linenums); |
} |
} |
|
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
} else { |
} else { |
$r->print("\n<ul>"); |
$r->print("\n<ul>"); |
} |
} |
$r->print("\n</li></ul>"); |
$r->print("\n</li></ul>"); |
|
} |
|
|
|
sub verify_bubbles_checked { |
|
my (@ansnums) = @_; |
|
my $ansnumstr = join('","',@ansnums); |
|
my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines."); |
|
my $output = (<<ENDSCRIPT); |
|
<script type="text/javascript"> |
|
function verify_bubble_radio(form) { |
|
var ansnumArray = new Array ("$ansnumstr"); |
|
var need_bubble_count = 0; |
|
for (var i=0; i<ansnumArray.length; i++) { |
|
if (form.elements["scantron_correct_Q_"+ansnumArray[i]].length > 1) { |
|
var bubble_picked = 0; |
|
for (var j=0; j<form.elements["scantron_correct_Q_"+ansnumArray[i]].length; j++) { |
|
if (form.elements["scantron_correct_Q_"+ansnumArray[i]][j].checked == true) { |
|
bubble_picked = 1; |
|
} |
|
} |
|
if (bubble_picked == 0) { |
|
need_bubble_count ++; |
|
} |
|
} |
|
} |
|
if (need_bubble_count) { |
|
alert("$warning"); |
|
return; |
|
} |
|
form.submit(); |
|
} |
|
</script> |
|
ENDSCRIPT |
|
return $output; |
} |
} |
|
|
=pod |
=pod |
|
|
=item scantron_bubble_selector |
=item questions_to_line_list |
|
|
Generates the html radiobuttons to correct a single bubble line |
|
possibly showing the existing the selected bubbles if known |
|
|
|
Arguments: |
Converts a list of questions into a string of comma separated |
$r - Apache request object |
line numbers in the answer sheet used by the questions. This is |
$scan_config - hash from &get_scantron_config() |
used to fill in the scantron_questions form field. |
$quest - number of the bubble line to make a corrector for |
|
@lines - array of answer lines. |
Arguments: |
|
questions - Reference to an array of questions. |
|
|
=cut |
=cut |
|
|
sub scantron_bubble_selector { |
|
my ($r,$scan_config,$quest,@lines)=@_; |
|
my $max=$$scan_config{'Qlength'}; |
|
|
|
|
sub questions_to_line_list { |
|
my ($questions) = @_; |
|
my @lines; |
|
|
|
foreach my $item (@{$questions}) { |
|
my $question = $item; |
|
my ($first,$count,$last); |
|
if ($item =~ /^(\d+)\.(\d+)$/) { |
|
$question = $1; |
|
my $subquestion = $2; |
|
$first = $first_bubble_line{$question-1} + 1; |
|
my @subans = split(/,/,$subdivided_bubble_lines{$question-1}); |
|
my $subcount = 1; |
|
while ($subcount<$subquestion) { |
|
$first += $subans[$subcount-1]; |
|
$subcount ++; |
|
} |
|
$count = $subans[$subquestion-1]; |
|
} else { |
|
$first = $first_bubble_line{$question-1} + 1; |
|
$count = $bubble_lines_per_response{$question-1}; |
|
} |
|
$last = $first+$count-1; |
|
push(@lines, ($first..$last)); |
|
} |
|
return join(',', @lines); |
|
} |
|
|
my $scmode=$$scan_config{'Qon'}; |
=pod |
|
|
my $bubble_length = scalar(@lines); |
=item prompt_for_corrections |
|
|
|
Prompts for a potentially multiline correction to the |
|
user's bubbling (factors out common code from scantron_get_correction |
|
for multi and missing bubble cases). |
|
|
if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; } |
Arguments: |
|
$r - Apache request object. |
|
$question - The question number to prompt for. |
|
$scan_config - The scantron file configuration hash. |
|
$scan_record - Reference to the hash that has the the parsed scanlines. |
|
$error - Type of error |
|
|
|
Implicit inputs: |
|
%bubble_lines_per_response - Starting line numbers for each question. |
|
Numbered from 0 (but question numbers are from |
|
1. |
|
%first_bubble_line - Starting bubble line for each question. |
|
%subdivided_bubble_lines - optionresponse, matchresponse and rankresponse |
|
type problems render as separate sub-questions, |
|
in exam mode. This hash contains a |
|
comma-separated list of the lines per |
|
sub-question. |
|
%responsetype_per_response - essayresponse, formularesponse, |
|
stringresponse, imageresponse, reactionresponse, |
|
and organicresponse type problem parts can have |
|
multiple lines per response if the weight |
|
assigned exceeds 10. In this case, only |
|
one bubble per line is permitted, but more |
|
than one line might contain bubbles, e.g. |
|
bubbling of: line 1 - J, line 2 - J, |
|
line 3 - B would assign 22 points. |
|
|
my $response = $quest-1; |
=cut |
my $lines = $bubble_lines_per_response{$response}; |
|
|
|
my $total_lines = $lines*2; |
sub prompt_for_corrections { |
my @alphabet=('A'..'Z'); |
my ($r, $question, $scan_config, $scan_record, $error) = @_; |
$r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>"); |
my ($current_line,$lines); |
|
my @linenums; |
|
my $questionnum = $question; |
|
if ($question =~ /^(\d+)\.(\d+)$/) { |
|
$question = $1; |
|
$current_line = $first_bubble_line{$question-1} + 1 ; |
|
my $subquestion = $2; |
|
my @subans = split(/,/,$subdivided_bubble_lines{$question-1}); |
|
my $subcount = 1; |
|
while ($subcount<$subquestion) { |
|
$current_line += $subans[$subcount-1]; |
|
$subcount ++; |
|
} |
|
$lines = $subans[$subquestion-1]; |
|
} else { |
|
$current_line = $first_bubble_line{$question-1} + 1 ; |
|
$lines = $bubble_lines_per_response{$question-1}; |
|
} |
|
if ($lines > 1) { |
|
$r->print(&mt('The group of bubble lines below responds to a single question.').'<br />'); |
|
if (($responsetype_per_response{$question-1} eq 'essayresponse') || |
|
($responsetype_per_response{$question-1} eq 'formularesponse') || |
|
($responsetype_per_response{$question-1} eq 'stringresponse') || |
|
($responsetype_per_response{$question-1} eq 'imageresponse') || |
|
($responsetype_per_response{$question-1} eq 'reactionresponse') || |
|
($responsetype_per_response{$question-1} 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 scantron sheets.",$lines).'<br /><br />'.&mt('A non-zero score can be assigned to the student during scantron 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 { |
|
$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++) { |
|
my $selected = $$scan_record{"scantron.$current_line.answer"}; |
|
&scantron_bubble_selector($r,$scan_config,$current_line, |
|
$questionnum,$error,split('', $selected)); |
|
push (@linenums,$current_line); |
|
$current_line++; |
|
} |
|
if ($lines > 1) { |
|
$r->print("<hr /><br />"); |
|
} |
|
return @linenums; |
|
} |
|
|
for (my $l = 0; $l < $lines; $l++) { |
=pod |
if ($l != 0) { |
|
$r->print('<tr>'); |
|
} |
|
my @selected = split(//,$lines[$l]); |
|
for (my $i=0;$i<$max;$i++) { |
|
$r->print("\n".'<td align="center">'); |
|
if ($selected[0] eq $alphabet[$i]) { |
|
$r->print('X'); |
|
shift(@selected) ; |
|
} else { |
|
$r->print(' '); |
|
} |
|
$r->print('</td>'); |
|
|
|
} |
|
|
|
if ($l == 0) { |
=item scantron_bubble_selector |
my $lspan = $total_lines * 2; # 2 table rows per bubble line. |
|
|
Generates the html radiobuttons to correct a single bubble line |
|
possibly showing the existing the selected bubbles if known |
|
|
$r->print('<td rowspan='.$lspan.'><label><input type="radio" name="scantron_correct_Q_'. |
Arguments: |
$quest.'" value="none" /> No bubble </label></td>'); |
$r - Apache request object |
|
$scan_config - hash from &get_scantron_config() |
} |
$line - Number of the line being displayed. |
|
$questionnum - Question number (may include subquestion) |
|
$error - Type of error. |
|
@selected - Array of bubbles picked on this line. |
|
|
$r->print('</tr><tr>'); |
=cut |
|
|
# FIXME: This may have to be a bit more clever for |
sub scantron_bubble_selector { |
# multiline questions (different values e.g..). |
my ($r,$scan_config,$line,$questionnum,$error,@selected)=@_; |
|
my $max=$$scan_config{'Qlength'}; |
|
|
for (my $i=0;$i<$max;$i++) { |
my $scmode=$$scan_config{'Qon'}; |
$r->print("\n". |
if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; } |
'<td><label><input type="radio" name="scantron_correct_Q_'. |
|
$quest.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>"); |
|
} |
|
$r->print('</tr>'); |
|
|
|
|
my @alphabet=('A'..'Z'); |
} |
$r->print(&Apache::loncommon::start_data_table(). |
$r->print('</table>'); |
&Apache::loncommon::start_data_table_row()); |
|
$r->print('<td rowspan="2" class="LC_leftcol_header">'.$line.'</td>'); |
|
for (my $i=0;$i<$max+1;$i++) { |
|
$r->print("\n".'<td align="center">'); |
|
if ($selected[0] eq $alphabet[$i]) { $r->print('X'); shift(@selected) } |
|
else { $r->print(' '); } |
|
$r->print('</td>'); |
|
} |
|
$r->print(&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::start_data_table_row()); |
|
for (my $i=0;$i<$max;$i++) { |
|
$r->print("\n". |
|
'<td><label><input type="radio" name="scantron_correct_Q_'. |
|
$line.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>"); |
|
} |
|
my $nobub_checked = ' '; |
|
if ($error eq 'missingbubble') { |
|
$nobub_checked = ' checked = "checked" '; |
|
} |
|
$r->print("\n".'<td><label><input type="radio" name="scantron_correct_Q_'. |
|
$line.'" value="none"'.$nobub_checked.'/>'.&mt('No bubble'). |
|
'</label>'."\n".'<input type="hidden" name="scantron_questionnum_Q_'. |
|
$line.'" value="'.$questionnum.'" /></td>'); |
|
$r->print(&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::end_data_table()); |
} |
} |
|
|
=pod |
=pod |
Line 6745 sub scantron_validate_doublebubble {
|
Line 7235 sub scantron_validate_doublebubble {
|
#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(); |
|
|
&scantron_get_maxbubble(); # parse needs the bubble line array. |
&scantron_get_maxbubble(); # parse needs the bubble line array. |
|
|
for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
Line 6772 sub scantron_validate_doublebubble {
|
Line 7261 sub scantron_validate_doublebubble {
|
for what the current value of the problem counter is. |
for what the current value of the problem counter is. |
|
|
Caches the results to $env{'form.scantron_maxbubble'}, |
Caches the results to $env{'form.scantron_maxbubble'}, |
$env{'form.scantron.bubble_lines.n'} and |
$env{'form.scantron.bubble_lines.n'}, |
$env{'form.scantron.first_bubble_line.n'} |
$env{'form.scantron.first_bubble_line.n'} and |
|
$env{"form.scantron.sub_bubblelines.n"} |
which are the total number of bubble, lines, the number of bubble |
which are the total number of bubble, lines, the number of bubble |
lines for reponse 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 |
|
(for optionresponse, matchresponse, and rankresponse items), for response n. |
|
|
=cut |
=cut |
|
|
sub scantron_get_maxbubble { |
sub scantron_get_maxbubble { |
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 6801 sub scantron_get_maxbubble {
|
Line 7293 sub scantron_get_maxbubble {
|
my $total_lines = 0; |
my $total_lines = 0; |
%bubble_lines_per_response = (); |
%bubble_lines_per_response = (); |
%first_bubble_line = (); |
%first_bubble_line = (); |
|
%subdivided_bubble_lines = (); |
|
%responsetype_per_response = (); |
|
|
my $response_number = 0; |
my $response_number = 0; |
my $bubble_line = 0; |
my $bubble_line = 0; |
foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
my $symb = $resource->symb(); |
my $symb = $resource->symb(); |
&Apache::lonxml::clear_bubble_lines_for_part(); |
# Need to retrieve part IDs and response IDs because essayresponse, |
my $result=&Apache::lonnet::ssi($resource->src(), |
# reactionresponse and organicresponse items are not included in |
('symb' => $resource->symb()), |
# $analysis{'parts'} from lonnet::ssi. |
('grade_target' => 'analyze'), |
my %possible_part_ids; |
('grade_courseid' => $cid), |
if (ref($resource->parts()) eq 'ARRAY') { |
('grade_domain' => $udom), |
foreach my $part (@{$resource->parts()}) { |
('grade_username' => $uname)); |
if (!&Apache::loncommon::check_if_partid_hidden($part,$symb,$udom,$uname)) { |
|
my @resp_ids = $resource->responseIds($part); |
|
foreach my $id (@resp_ids) { |
|
$possible_part_ids{$part.'.'.$id} = 1; |
|
} |
|
} |
|
} |
|
} |
|
my $result=&ssi_with_retries($resource->src(), $ssi_retries, |
|
('symb' => $symb, |
|
'grade_target' => 'analyze', |
|
'grade_courseid' => $cid, |
|
'grade_domain' => $udom, |
|
'grade_username' => $uname)); |
my (undef, $an) = |
my (undef, $an) = |
split(/_HASH_REF__/,$result, 2); |
split(/_HASH_REF__/,$result, 2); |
|
|
my %analysis = &Apache::lonnet::str2hash($an); |
my @parts; |
|
|
|
|
|
|
foreach my $part_id (@{$analysis{'parts'}}) { |
my %analysis = &Apache::lonnet::str2hash($an); |
|
|
|
if (ref($analysis{'parts'}) eq 'ARRAY') { |
|
foreach my $part (@{$analysis{'parts'}}) { |
|
my ($id,$respid) = split(/\./,$part); |
|
if (!&Apache::loncommon::check_if_partid_hidden($id,$symb,$udom,$uname)) { |
|
push(@parts,$part); |
|
} |
|
} |
|
} |
|
# Add part_ids for any essayresponse items. |
|
foreach my $part_id (keys(%possible_part_ids)) { |
|
if (($analysis{$part_id.'.type'} eq 'essayresponse') || |
|
($analysis{$part_id.'.type'} eq 'reactionresponse') || |
|
($analysis{$part_id.'.type'} eq 'organicresponse')) { |
|
if (!grep(/^\Q$part_id\E$/,@parts)) { |
|
push (@parts,$part_id); |
|
} |
|
} |
|
} |
|
|
my $lines = $analysis{"$part_id.bubble_lines"};; |
foreach my $part_id (@parts) { |
|
my $lines = $analysis{"$part_id.bubble_lines"}; |
|
|
# TODO - make this a persistent hash not an array. |
# TODO - make this a persistent hash not an array. |
|
|
|
# optionresponse, matchresponse and rankresponse type items |
|
# render as separate sub-questions in exam mode. |
|
if (($analysis{$part_id.'.type'} eq 'optionresponse') || |
|
($analysis{$part_id.'.type'} eq 'matchresponse') || |
|
($analysis{$part_id.'.type'} eq 'rankresponse')) { |
|
my ($numbub,$numshown); |
|
if ($analysis{$part_id.'.type'} eq 'optionresponse') { |
|
if (ref($analysis{$part_id.'.options'}) eq 'ARRAY') { |
|
$numbub = scalar(@{$analysis{$part_id.'.options'}}); |
|
} |
|
} elsif ($analysis{$part_id.'.type'} eq 'matchresponse') { |
|
if (ref($analysis{$part_id.'.items'}) eq 'ARRAY') { |
|
$numbub = scalar(@{$analysis{$part_id.'.items'}}); |
|
} |
|
} elsif ($analysis{$part_id.'.type'} eq 'rankresponse') { |
|
if (ref($analysis{$part_id.'.foils'}) eq 'ARRAY') { |
|
$numbub = scalar(@{$analysis{$part_id.'.foils'}}); |
|
} |
|
} |
|
if (ref($analysis{$part_id.'.shown'}) eq 'ARRAY') { |
|
$numshown = scalar(@{$analysis{$part_id.'.shown'}}); |
|
} |
|
my $bubbles_per_line = 10; |
|
my $inner_bubble_lines = int($numshown/$bubbles_per_line); |
|
if (($numshown % $bubbles_per_line) != 0) { |
|
$inner_bubble_lines++; |
|
} |
|
for (my $i=0; $i<$numshown; $i++) { |
|
$subdivided_bubble_lines{$response_number} .= |
|
$inner_bubble_lines.','; |
|
} |
|
$subdivided_bubble_lines{$response_number} =~ s/,$//; |
|
} |
|
|
$first_bubble_line{$response_number} = $bubble_line; |
$first_bubble_line{$response_number} = $bubble_line; |
$bubble_lines_per_response{$response_number} = $lines; |
$bubble_lines_per_response{$response_number} = $lines; |
|
$responsetype_per_response{$response_number} = |
|
$analysis{$part_id.'.type'}; |
$response_number++; |
$response_number++; |
|
|
$bubble_line += $lines; |
$bubble_line += $lines; |
Line 6878 sub scantron_validate_missingbubbles {
|
Line 7436 sub scantron_validate_missingbubbles {
|
# Probably here's where the error is... |
# Probably here's where the error is... |
|
|
foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) { |
foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) { |
if ($missing > $max_bubble) { next; } |
my $lastbubble; |
|
if ($missing =~ /^(\d+)\.(\d+)$/) { |
|
my $question = $1; |
|
my $subquestion = $2; |
|
if (!defined($first_bubble_line{$question -1})) { next; } |
|
my $first = $first_bubble_line{$question-1}; |
|
my @subans = split(/,/,$subdivided_bubble_lines{$question-1}); |
|
my $subcount = 1; |
|
while ($subcount<$subquestion) { |
|
$first += $subans[$subcount-1]; |
|
$subcount ++; |
|
} |
|
my $count = $subans[$subquestion-1]; |
|
$lastbubble = $first + $count; |
|
} else { |
|
if (!defined($first_bubble_line{$missing - 1})) { next; } |
|
$lastbubble = $first_bubble_line{$missing - 1} + $bubble_lines_per_response{$missing - 1}; |
|
} |
|
if ($lastbubble > $max_bubble) { next; } |
push(@to_correct,$missing); |
push(@to_correct,$missing); |
} |
} |
if (@to_correct) { |
if (@to_correct) { |
Line 6917 sub scantron_validate_missingbubbles {
|
Line 7493 sub scantron_validate_missingbubbles {
|
|
|
sub scantron_process_students { |
sub scantron_process_students { |
my ($r) = @_; |
my ($r) = @_; |
|
|
my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'}); |
my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'}); |
my ($symb)=&get_symb($r); |
my ($symb)=&get_symb($r); |
if (!$symb) {return '';} |
if (!$symb) { |
|
return ''; |
|
} |
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'}); |
Line 6951 SCANTRONFORM
|
Line 7530 SCANTRONFORM
|
my ($uname,$udom,$started); |
my ($uname,$udom,$started); |
|
|
&scantron_get_maxbubble(); # Need the bubble lines array to parse. |
&scantron_get_maxbubble(); # Need the bubble lines array to parse. |
|
|
|
|
|
# If an ssi failed in scantron_get_maxbubble, put an error message out to |
|
# the user and return. |
|
|
|
if ($ssi_error) { |
|
$r->print("</form>"); |
|
&ssi_print_error($r); |
|
$r->print(&show_grading_menu_form($symb)); |
|
return ''; # Dunno why the other returns return '' rather than just returning. |
|
} |
|
|
while ($i<$scanlines->{'count'}) { |
while ($i<$scanlines->{'count'}) { |
($uname,$udom)=('',''); |
($uname,$udom)=('',''); |
Line 6978 SCANTRONFORM
|
Line 7568 SCANTRONFORM
|
($uname,$udom)=split(/:/,$uname); |
($uname,$udom)=split(/:/,$uname); |
|
|
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonnet::appenv(%$scan_record); |
&Apache::lonnet::appenv($scan_record); |
|
|
if (&scantron_clear_skip($scanlines,$scan_data,$i)) { |
if (&scantron_clear_skip($scanlines,$scan_data,$i)) { |
&scantron_putfile($scanlines,$scan_data); |
&scantron_putfile($scanlines,$scan_data); |
Line 6999 SCANTRONFORM
|
Line 7589 SCANTRONFORM
|
$form{'CODE'}=$scan_record->{'scantron.CODE'}; |
$form{'CODE'}=$scan_record->{'scantron.CODE'}; |
} else { |
} else { |
$form{'CODE'}=''; |
$form{'CODE'}=''; |
|
} |
|
my $result=&ssi_with_retries($resource->src(), $ssi_retries, %form); |
|
if ($ssi_error) { |
|
$ssi_error = 0; # So end of handler error message does not trigger. |
|
$r->print("</form>"); |
|
&ssi_print_error($r); |
|
$r->print(&show_grading_menu_form($symb)); |
|
return ''; # Why return ''? Beats me. |
} |
} |
my $result=&Apache::lonnet::ssi($resource->src(),%form); |
|
if ($result ne '') { |
|
} |
|
if (&Apache::loncommon::connection_aborted($r)) { last; } |
if (&Apache::loncommon::connection_aborted($r)) { last; } |
} |
} |
$completedstudents{$uname}={'line'=>$line}; |
$completedstudents{$uname}={'line'=>$line}; |
Line 7037 sub scantron_upload_scantron_data {
|
Line 7633 sub scantron_upload_scantron_data {
|
my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'}, |
my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'}, |
'domainid'); |
'domainid'); |
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
$r->print(<<UPLOAD); |
$r->print(' |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
function checkUpload(formname) { |
function checkUpload(formname) { |
if (formname.upfile.value == "") { |
if (formname.upfile.value == "") { |
Line 7048 sub scantron_upload_scantron_data {
|
Line 7644 sub scantron_upload_scantron_data {
|
} |
} |
</script> |
</script> |
|
|
<form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'> |
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
$default_form_data |
'.$default_form_data.' |
<table> |
<table> |
<tr><td>$select_link </td></tr> |
<tr><td>'.$select_link.' </td></tr> |
<tr><td>Course ID: </td><td><input name='courseid' type='text' /> </td></tr> |
<tr><td>'.&mt('Course ID:').' </td> |
<tr><td>Course Name: </td><td><input name='coursename' type='text' /></td></tr> |
<td><input name="courseid" type="text" /> </td></tr> |
<tr><td>Domain: </td><td>$domsel </td></tr> |
<tr><td>'.&mt('Course Name:').' </td> |
<tr><td>File to upload:</td><td><input type="file" name="upfile" size="50" /></td></tr> |
<td><input name="coursename" type="text" /> </td></tr> |
|
<tr><td>'.&mt('Domain:').' </td> |
|
<td>'.$domsel.' </td></tr> |
|
<tr><td>'.&mt('File to upload:').'</td> |
|
<td><input type="file" name="upfile" size="50" /></td></tr> |
</table> |
</table> |
<input name='command' value='scantronupload_save' type='hidden' /> |
<input name="command" value="scantronupload_save" type="hidden" /> |
<input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" /> |
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" /> |
</form> |
</form> |
UPLOAD |
'); |
return ''; |
return ''; |
} |
} |
|
|
Line 7079 sub scantron_upload_scantron_data_save {
|
Line 7679 sub scantron_upload_scantron_data_save {
|
my $doanotherupload= |
my $doanotherupload= |
'<br /><form action="/adm/grades" method="post">'."\n". |
'<br /><form action="/adm/grades" method="post">'."\n". |
'<input type="hidden" name="command" value="scantronupload" />'."\n". |
'<input type="hidden" name="command" value="scantronupload" />'."\n". |
'<input type="submit" name="submit" value="Do Another Upload" />'."\n". |
'<input type="submit" name="submit" value="'.&mt('Do Another Upload').'" />'."\n". |
'</form>'."\n"; |
'</form>'."\n"; |
if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) && |
if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) && |
!&Apache::lonnet::allowed('usc', |
!&Apache::lonnet::allowed('usc', |
$env{'form.domainid'}.'_'.$env{'form.courseid'})) { |
$env{'form.domainid'}.'_'.$env{'form.courseid'})) { |
$r->print("You are not allowed to upload Scantron data to the requested course.<br />"); |
$r->print(&mt("You are not allowed to upload Scantron data to the requested course.")."<br />"); |
if ($symb) { |
if ($symb) { |
$r->print(&show_grading_menu_form($symb)); |
$r->print(&show_grading_menu_form($symb)); |
} else { |
} else { |
Line 7093 sub scantron_upload_scantron_data_save {
|
Line 7693 sub scantron_upload_scantron_data_save {
|
return ''; |
return ''; |
} |
} |
my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'}); |
my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'}); |
$r->print("Doing upload to ".$coursedata{'description'}." <br />"); |
$r->print(&mt("Doing upload to [_1]",$coursedata{'description'})." <br />"); |
my $fname=$env{'form.upfile.filename'}; |
my $fname=$env{'form.upfile.filename'}; |
#FIXME |
#FIXME |
#copied from lonnet::userfileupload() |
#copied from lonnet::userfileupload() |
Line 7111 sub scantron_upload_scantron_data_save {
|
Line 7711 sub scantron_upload_scantron_data_save {
|
my $uploadedfile=$fname; |
my $uploadedfile=$fname; |
$fname='scantron_orig_'.$fname; |
$fname='scantron_orig_'.$fname; |
if (length($env{'form.upfile'}) < 2) { |
if (length($env{'form.upfile'}) < 2) { |
$r->print("<span class=\"LC_error\">Error:</span> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename."); |
$r->print(&mt("<span class=\"LC_error\">Error:</span> The file you attempted to upload, [_1] contained no information. Please check that you entered the correct filename.",'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>")); |
} else { |
} else { |
my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname); |
my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname); |
if ($result =~ m|^/uploaded/|) { |
if ($result =~ m|^/uploaded/|) { |
$r->print("<span class=\"LC_success\">Success:</span> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>"); |
$r->print(&mt("<span class=\"LC_success\">Success:</span> Successfully uploaded [_1] bytes of data into location [_2]", |
|
(length($env{'form.upfile'})-1), |
|
'<span class="LC_filename">'.$result."</span>")); |
} else { |
} else { |
$r->print("<span class=\"LC_error\">Error:</span> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>"); |
$r->print(&mt("<span class=\"LC_error\">Error:</span> An error ([_1]) occurred when attempting to upload the file, [_2]", |
|
$result, |
|
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>")); |
|
|
} |
} |
} |
} |
if ($symb) { |
if ($symb) { |
Line 7161 sub scantron_download_scantron_data {
|
Line 7766 sub scantron_download_scantron_data {
|
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $file=$env{'form.scantron_selectfile'}; |
my $file=$env{'form.scantron_selectfile'}; |
if (! &valid_file($file)) { |
if (! &valid_file($file)) { |
$r->print(<<ERROR); |
$r->print(' |
<p> |
<p> |
The requested file name was invalid. |
'.&mt('The requested file name was invalid.').' |
</p> |
</p> |
ERROR |
'); |
$r->print(&show_grading_menu_form(&get_symb($r,1))); |
$r->print(&show_grading_menu_form(&get_symb($r,1))); |
return; |
return; |
} |
} |
Line 7175 ERROR
|
Line 7780 ERROR
|
&Apache::lonnet::allowuploaded('/adm/grades',$orig); |
&Apache::lonnet::allowuploaded('/adm/grades',$orig); |
&Apache::lonnet::allowuploaded('/adm/grades',$corrected); |
&Apache::lonnet::allowuploaded('/adm/grades',$corrected); |
&Apache::lonnet::allowuploaded('/adm/grades',$skipped); |
&Apache::lonnet::allowuploaded('/adm/grades',$skipped); |
$r->print(<<DOWNLOAD); |
$r->print(' |
<p> |
<p> |
<a href="$orig">Original</a> file as uploaded by the scantron office. |
'.&mt('[_1]Original[_2] file as uploaded by the scantron office.', |
|
'<a href="'.$orig.'">','</a>').' |
</p> |
</p> |
<p> |
<p> |
<a href="$corrected">Corrections</a>, a file of corrected records that were used in grading. |
'.&mt('[_1]Corrections[_2], a file of corrected records that were used in grading.', |
|
'<a href="'.$corrected.'">','</a>').' |
</p> |
</p> |
<p> |
<p> |
<a href="$skipped">Skipped</a>, a file of records that were skipped. |
'.&mt('[_1]Skipped[_2], a file of records that were skipped.', |
|
'<a href="'.$skipped.'">','</a>').' |
</p> |
</p> |
DOWNLOAD |
'); |
$r->print(&show_grading_menu_form(&get_symb($r,1))); |
$r->print(&show_grading_menu_form(&get_symb($r,1))); |
return ''; |
return ''; |
} |
} |
Line 7209 sub show_grading_menu_form {
|
Line 7817 sub show_grading_menu_form {
|
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n". |
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n". |
'<input type="hidden" name="command" value="gradingmenu" />'."\n". |
'<input type="hidden" name="command" value="gradingmenu" />'."\n". |
'<input type="submit" name="submit" value="Grading Menu" />'."\n". |
'<input type="submit" name="submit" value="'.&mt('Grading Menu').'" />'."\n". |
'</form>'."\n"; |
'</form>'."\n"; |
return $result; |
return $result; |
} |
} |
Line 7279 sub grading_menu {
|
Line 7887 sub grading_menu {
|
$Str .= '<input type="hidden" name="command" value="" />'. |
$Str .= '<input type="hidden" name="command" value="" />'. |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n". |
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n". |
'<input type="hidden" name="probTitle" value="'.$probTitle.'" ue="" />'."\n". |
'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n". |
'<input type="hidden" name="saveState" value="" />'."\n". |
'<input type="hidden" name="saveState" value="" />'."\n". |
'<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"; |
Line 7292 sub grading_menu {
|
Line 7900 sub grading_menu {
|
$menudata->{'url'}.'" >'. |
$menudata->{'url'}.'" >'. |
$menudata->{'name'}."</a></h3>\n"; |
$menudata->{'name'}."</a></h3>\n"; |
} else { |
} else { |
$Str .=' <h3><input type="button" value="Verify Receipt" '. |
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '. |
$menudata->{'jscript'}. |
$menudata->{'jscript'}. |
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
' /></h3>'; |
' /> '. |
$Str .= (' 'x8). |
&Apache::lonnet::recprefix($env{'request.course.id'}). |
' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}). |
|
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'; |
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'; |
} |
} |
$Str .= ' '.(' 'x8).$menudata->{'short_description'}. |
$Str .= ' '.(' 'x8).$menudata->{'short_description'}. |
"\n"; |
"\n"; |
} |
} |
$Str .="</dl>\n"; |
|
$Str .="</form>\n"; |
$Str .="</form>\n"; |
$request->print(<<GRADINGMENUJS); |
$request->print(<<GRADINGMENUJS); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
Line 7390 sub submit_options {
|
Line 7996 sub submit_options {
|
</script> |
</script> |
GRADINGMENUJS |
GRADINGMENUJS |
&commonJSfunctions($request); |
&commonJSfunctions($request); |
my $result='<h3> <span class="LC_info">Manual Grading/View Submission</span></h3>'; |
|
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle); |
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle); |
$result.=$table; |
my $result; |
my (undef,$sections) = &getclasslist('all','0'); |
my (undef,$sections) = &getclasslist('all','0'); |
my $savedState = &savedState(); |
my $savedState = &savedState(); |
my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'}); |
my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'}); |
Line 7411 GRADINGMENUJS
|
Line 8016 GRADINGMENUJS
|
|
|
$result.=' |
$result.=' |
<div class="LC_grade_select_mode"> |
<div class="LC_grade_select_mode"> |
<div class="LC_grade_select_mode_header"> |
<div class="LC_grade_select_mode_current"> |
'.&mt('Select a Grading/Viewing Option').' |
<h2> |
</div> |
'.&mt('Grade Current Resource').' |
<div class="LC_grade_select_mode_body"> |
</h2> |
<div class="LC_grade_select_mode_selector"> |
<div class="LC_grade_select_mode_body"> |
<div class="LC_grade_select_mode_selector_header"> |
<div class="LC_grades_resource_info"> |
'.&mt('Sections').' |
'.$table.' |
</div> |
</div> |
<div class="LC_grade_select_mode_selector_body"> |
<div class="LC_grade_select_mode_selector"> |
<select name="section" multiple="multiple" size="5">'."\n"; |
<div class="LC_grade_select_mode_selector_header"> |
|
'.&mt('Sections').' |
|
</div> |
|
<div class="LC_grade_select_mode_selector_body"> |
|
<select name="section" multiple="multiple" size="5">'."\n"; |
if (ref($sections)) { |
if (ref($sections)) { |
foreach my $section (sort (@$sections)) { |
foreach my $section (sort (@$sections)) { |
$result.='<option value="'.$section.'" '. |
$result.='<option value="'.$section.'" '. |
Line 7429 GRADINGMENUJS
|
Line 8038 GRADINGMENUJS
|
} |
} |
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> '; |
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> '; |
$result.=' |
$result.=' |
</div> |
</div> |
</div> |
</div> |
<div class="LC_grade_select_mode_selector"> |
<div class="LC_grade_select_mode_selector"> |
<div class="LC_grade_select_mode_selector_header"> |
<div class="LC_grade_select_mode_selector_header"> |
'.&mt('Groups').' |
'.&mt('Groups').' |
</div> |
</div> |
<div class="LC_grade_select_mode_selector_body"> |
<div class="LC_grade_select_mode_selector_body"> |
'.&Apache::lonstatistics::GroupSelect('group','multiple',5).' |
'.&Apache::lonstatistics::GroupSelect('group','multiple',5).' |
</div> |
</div> |
</div> |
|
<div class="LC_grade_select_mode_selector"> |
|
<div class="LC_grade_select_mode_selector_header"> |
|
'.&mt('Access Status').' |
|
</div> |
|
<div class="LC_grade_select_mode_selector_body"> |
|
'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').' |
|
</div> |
|
</div> |
|
<div class="LC_grade_select_mode_selector"> |
|
<div class="LC_grade_select_mode_selector_header"> |
|
'.&mt('Submission Status').' |
|
</div> |
|
<div class="LC_grade_select_mode_selector_body"> |
|
<select name="submitonly" size="5"> |
|
<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option> |
|
<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option> |
|
<option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option> |
|
<option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option> |
|
<option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option> |
|
</select> |
|
</div> |
|
</div> |
|
<div class="LC_grade_select_mode_type_body"> |
|
<div class="LC_grade_select_mode_type"> |
|
<label> |
|
<input type="radio" name="radioChoice" value="submission" '. |
|
($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.&mt('<b>Current Resource:</b> For one or more students').' |
|
</label> |
|
</div> |
</div> |
<div class="LC_grade_select_mode_type"> |
<div class="LC_grade_select_mode_selector"> |
<label> |
<div class="LC_grade_select_mode_selector_header"> |
<input type="radio" name="radioChoice" value="viewgrades" '. |
'.&mt('Access Status').' |
($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '. |
</div> |
&mt('<b>Current Resource:</b> For all students in selected section or course').' |
<div class="LC_grade_select_mode_selector_body"> |
</label> |
'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').' |
|
</div> |
</div> |
</div> |
<div class="LC_grade_select_mode_type"> |
<div class="LC_grade_select_mode_selector"> |
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" /> |
<div class="LC_grade_select_mode_selector_header"> |
|
'.&mt('Submission Status').' |
|
</div> |
|
<div class="LC_grade_select_mode_selector_body"> |
|
<select name="submitonly" size="5"> |
|
<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option> |
|
<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option> |
|
<option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option> |
|
<option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option> |
|
<option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option> |
|
</select> |
|
</div> |
</div> |
</div> |
<div class="LC_grade_select_mode_type"> |
<div class="LC_grade_select_mode_type_body"> |
<label> |
<div class="LC_grade_select_mode_type"> |
<input type="radio" name="radioChoice" value="pickStudentPage" '. |
<label> |
($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '. |
<input type="radio" name="radioChoice" value="submission" '. |
&mt('The <b>complete</b> set/page/sequence/folder: For one student').' |
($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '. |
</label> |
&mt('Select individual students to grade and view submissions.').' |
|
</label> |
|
</div> |
|
<div class="LC_grade_select_mode_type"> |
|
<label> |
|
<input type="radio" name="radioChoice" value="viewgrades" '. |
|
($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '. |
|
&mt('Grade all selected students in a grading table.').' |
|
</label> |
|
</div> |
|
<div class="LC_grade_select_mode_type"> |
|
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" /> |
|
</div> |
</div> |
</div> |
<div class="LC_grade_select_mode_type"> |
</div> |
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" /> |
</div> |
|
<div class="LC_grade_select_mode_page"> |
|
<h2> |
|
'.&mt('Grade Complete Folder for One Student').' |
|
</h2> |
|
<div class="LC_grades_select_mode_body"> |
|
<div class="LC_grade_select_mode_type_body"> |
|
<div class="LC_grade_select_mode_type"> |
|
<label> |
|
<input type="radio" name="radioChoice" value="pickStudentPage" '. |
|
($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '. |
|
&mt('The <b>complete</b> page/sequence/folder: For one student').' |
|
</label> |
|
</div> |
|
<div class="LC_grade_select_mode_type"> |
|
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" /> |
|
</div> |
</div> |
</div> |
</div> |
</div> |
</div> |
</div> |
</div> |
</div> |
</form>'; |
</form>'; |
|
$result .= &show_grading_menu_form($symb); |
return $result; |
return $result; |
} |
} |
|
|
Line 7770 ENDHEADER
|
Line 8391 ENDHEADER
|
} |
} |
$result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'. |
$result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'. |
'<input type="hidden" name="number" value="'.$number.'" />'. |
'<input type="hidden" name="number" value="'.$number.'" />'. |
&mt('Awarding [_1] percent for corrion(s)',$number).'<br />'. |
|
'<input type="hidden" name="number" value="'.$number.'" />'. |
|
&mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses', |
&mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses', |
$env{'form.pcorrect'},$env{'form.pincorrect'}). |
$env{'form.pcorrect'},$env{'form.pincorrect'}). |
'<br />'; |
'<br />'; |
Line 8019 sub handler {
|
Line 8638 sub handler {
|
&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands)); |
&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands)); |
} |
} |
|
|
|
$ssi_error = 0; |
$request->print(&Apache::loncommon::start_page('Grading')); |
$request->print(&Apache::loncommon::start_page('Grading')); |
if ($symb eq '' && $command eq '') { |
if ($symb eq '' && $command eq '') { |
if ($env{'user.adv'}) { |
if ($env{'user.adv'}) { |
Line 8032 sub handler {
|
Line 8651 sub handler {
|
if ($tsymb) { |
if ($tsymb) { |
my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb); |
my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb); |
if (&Apache::lonnet::allowed('mgr',$tcrsid)) { |
if (&Apache::lonnet::allowed('mgr',$tcrsid)) { |
$request->print(&Apache::lonnet::ssi_body('/res/'.$url, |
$request->print(&ssi_with_retries('/res/'.$url, $ssi_retries, |
('grade_username' => $tuname, |
('grade_username' => $tuname, |
'grade_domain' => $tudom, |
'grade_domain' => $tudom, |
'grade_courseid' => $tcrsid, |
'grade_courseid' => $tcrsid, |
Line 8119 sub handler {
|
Line 8738 sub handler {
|
$request->print("Access Denied ($command)"); |
$request->print("Access Denied ($command)"); |
} |
} |
} |
} |
|
if ($ssi_error) { |
|
&ssi_print_error($request); |
|
} |
$request->print(&Apache::loncommon::end_page()); |
$request->print(&Apache::loncommon::end_page()); |
&reset_caches(); |
&reset_caches(); |
return ''; |
return ''; |