|
version 1.566, 2009/05/01 14:16:13
|
version 1.574.2.12, 2010/05/22 01:01:03
|
|
Line 97 sub ssi_print_error {
|
Line 97 sub ssi_print_error {
|
| # |
# |
| # --- Retrieve the parts from the metadata file.--- |
# --- Retrieve the parts from the metadata file.--- |
| sub getpartlist { |
sub getpartlist { |
| my ($symb) = @_; |
my ($symb,$errorref) = @_; |
| |
|
| my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
unless (ref($navmap)) { |
| |
if (ref($errorref)) { |
| |
$$errorref = 'navmap'; |
| |
return; |
| |
} |
| |
} |
| my $res = $navmap->getBySymb($symb); |
my $res = $navmap->getBySymb($symb); |
| my $partlist = $res->parts(); |
my $partlist = $res->parts(); |
| my $url = $res->src(); |
my $url = $res->src(); |
|
Line 144 sub nameUserString {
|
Line 150 sub nameUserString {
|
| #--- Get the partlist and the response type for a given problem. --- |
#--- Get the partlist and the response type for a given problem. --- |
| #--- Indicate if a response type is coded handgraded or not. --- |
#--- Indicate if a response type is coded handgraded or not. --- |
| sub response_type { |
sub response_type { |
| my ($symb) = shift; |
my ($symb,$response_error) = @_; |
| |
|
| my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
unless (ref($navmap)) { |
| |
if (ref($response_error)) { |
| |
$$response_error = 1; |
| |
} |
| |
return; |
| |
} |
| my $res = $navmap->getBySymb($symb); |
my $res = $navmap->getBySymb($symb); |
| my $partlist = $res->parts(); |
my $partlist = $res->parts(); |
| my %vPart = |
my %vPart = |
|
Line 193 sub get_display_part {
|
Line 205 sub get_display_part {
|
| #--- Show resource title |
#--- Show resource title |
| #--- and parts and response type |
#--- and parts and response type |
| sub showResourceInfo { |
sub showResourceInfo { |
| my ($symb,$probTitle,$checkboxes) = @_; |
my ($symb,$probTitle,$checkboxes,$res_error) = @_; |
| my $col=3; |
my $col=3; |
| if ($checkboxes) { $col=4; } |
if ($checkboxes) { $col=4; } |
| my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n"; |
my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n"; |
| |
my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error); |
| |
if (ref($res_error)) { |
| |
if ($$res_error) { |
| |
return; |
| |
} |
| |
} |
| $result .='<table border="0">'; |
$result .='<table border="0">'; |
| my ($partlist,$handgrade,$responseType) = &response_type($symb); |
|
| my %resptype = (); |
my %resptype = (); |
| my $hdgrade='no'; |
my $hdgrade='no'; |
| my %partsseen; |
my %partsseen; |
|
Line 754 sub verifyreceipt {
|
Line 771 sub verifyreceipt {
|
| |
|
| my $title.= |
my $title.= |
| '<h3><span class="LC_info">'. |
'<h3><span class="LC_info">'. |
| &mt('Verifying Receipt No. [_1]',$receipt). |
&mt('Verifying Receipt No. [_1]',$receipt). |
| '</span></h3>'."\n". |
'</span></h3>'."\n". |
| '<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}). |
'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}). |
| '</h4>'."\n"; |
'</h4>'."\n"; |
|
Line 766 sub verifyreceipt {
|
Line 783 sub verifyreceipt {
|
| if ($env{"course.$courseid.receiptalg"} eq 'receipt2' || |
if ($env{"course.$courseid.receiptalg"} eq 'receipt2' || |
| $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) { |
| |
my $res_error; |
| |
($parts)=&response_type($symb,\$res_error); |
| |
if ($res_error) { |
| |
return &navmap_errormsg(); |
| |
} |
| |
} |
| |
|
| my $header = |
my $header = |
| &Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
|
Line 808 sub verifyreceipt {
|
Line 831 sub verifyreceipt {
|
| } |
} |
| } |
} |
| if ($matches == 0) { |
if ($matches == 0) { |
| $string = $title.&mt('No match found for the above receipt.'); |
$string = $title.&mt('No match found for the above receipt number.'); |
| } else { |
} else { |
| $string = &jscriptNform($symb).$title. |
$string = &jscriptNform($symb).$title. |
| '<p>'. |
'<p>'. |
| &mt('The above receipt matches the following [numerate,_1,student].',$matches). |
&mt('The above receipt number matches the following [numerate,_1,student].',$matches). |
| '</p>'. |
'</p>'. |
| $header. |
$header. |
| $contents. |
$contents. |
|
Line 1731 sub gradeBox {
|
Line 1754 sub gradeBox {
|
| } |
} |
| $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n"; |
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n"; |
| |
|
| |
|
| #&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line); |
|
| $result .= |
$result .= |
| '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'. |
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'; |
| |
|
| $result.='</tr></table>'."\n"; |
$result.='</tr></table>'."\n"; |
| $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". |
|
Line 1745 sub gradeBox {
|
Line 1765 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.=&handback_box($symb,$uname,$udom,$counter,$partid,$record); |
my $res_error; |
| |
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error); |
| |
if ($res_error) { |
| |
return &navmap_errormsg(); |
| |
} |
| return $result; |
return $result; |
| } |
} |
| |
|
| sub handback_box { |
sub handback_box { |
| my ($symb,$uname,$udom,$counter,$partid,$record) = @_; |
my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_; |
| my ($partlist,$handgrade,$responseType) = &response_type($symb); |
my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error); |
| my (@respids); |
my (@respids); |
| my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id = &flatten_responseType($responseType); |
| foreach my $part_response_id (@part_response_id) { |
foreach my $part_response_id (@part_response_id) { |
| my ($part,$resp) = @{ $part_response_id }; |
my ($part,$resp) = @{ $part_response_id }; |
| if ($part eq $partid) { |
if ($part eq $partid) { |
|
Line 2046 KEYWORDS
|
Line 2070 KEYWORDS
|
| } |
} |
| |
|
| my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname); |
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname); |
| my ($partlist,$handgrade,$responseType) = &response_type($symb); |
my $res_error; |
| |
my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error); |
| |
if ($res_error) { |
| |
$request->print(&navmap_errormsg()); |
| |
return; |
| |
} |
| |
|
| # Display student info |
# Display student info |
| $request->print(($counter == 0 ? '' : '<br />')); |
$request->print(($counter == 0 ? '' : '<br />')); |
|
Line 2135 KEYWORDS
|
Line 2164 KEYWORDS
|
| {'one_time' => 1}); |
{'one_time' => 1}); |
| |
|
| $similar="<hr /><h3><span class=\"LC_warning\">". |
$similar="<hr /><h3><span class=\"LC_warning\">". |
| &mt('Essay is [_1]% similar to an essay by [_2] ([_3]:[_4]) in course [_5] (course id [_6]:[_7])', |
&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])', |
| $osim, |
$osim, |
| &Apache::loncommon::plainname($oname,$odom), |
&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')', |
| $oname,$odom, |
|
| $old_course_desc{'description'}, |
$old_course_desc{'description'}, |
| $old_course_desc{'num'}, |
$old_course_desc{'num'}, |
| $old_course_desc{'domain'}). |
$old_course_desc{'domain'}). |
|
Line 2297 KEYWORDS
|
Line 2325 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.=&mt('[quant,_1,student]',$ntstu); |
$endform.=&mt('[_1]student(s)',$ntstu); |
| $endform.=' <input type="button" value="'.&mt('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="'.&mt('Next').'" '. |
'<input type="button" value="'.&mt('Next').'" '. |
|
Line 2463 sub processHandGrade {
|
Line 2491 sub processHandGrade {
|
| undef,$feedurl,undef, |
undef,$feedurl,undef, |
| undef,undef,$showsymb, |
undef,undef,$showsymb, |
| $restitle); |
$restitle); |
| $request->print('<br />'.&mt('Sending message to [_1]:[_2]',$uname,$udom).': '. |
$request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '. |
| $msgstatus); |
$msgstatus); |
| } |
} |
| if ($env{'form.collaborator'.$ctr}) { |
if ($env{'form.collaborator'.$ctr}) { |
|
Line 2594 sub processHandGrade {
|
Line 2622 sub processHandGrade {
|
| } |
} |
| $ctr = 0; |
$ctr = 0; |
| @parsedlist = reverse @parsedlist if ($button eq 'Previous'); |
@parsedlist = reverse @parsedlist if ($button eq 'Previous'); |
| my ($partlist) = &response_type($symb); |
my $res_error; |
| |
my ($partlist) = &response_type($symb,\$res_error); |
| |
if ($res_error) { |
| |
$request->print(&navmap_errormsg()); |
| |
return; |
| |
} |
| foreach my $student (@parsedlist) { |
foreach my $student (@parsedlist) { |
| my $submitonly=$env{'form.submitonly'}; |
my $submitonly=$env{'form.submitonly'}; |
| my ($uname,$udom) = split(/:/,$student); |
my ($uname,$udom) = split(/:/,$student); |
|
Line 2792 sub check_and_remove_from_queue {
|
Line 2825 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 = '/userfiles/portfolio'; |
my $portfolio_root = '/userfiles/portfolio'; |
| my ($partlist,$handgrade,$responseType) = &response_type($symb); |
my $res_error; |
| |
my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error); |
| |
if ($res_error) { |
| |
$request->print('<br />'.&navmap_errormsg().'<br />'); |
| |
return; |
| |
} |
| my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id = &flatten_responseType($responseType); |
| foreach my $part_response_id (@part_response_id) { |
foreach my $part_response_id (@part_response_id) { |
| my ($part_id,$resp_id) = @{ $part_response_id }; |
my ($part_id,$resp_id) = @{ $part_response_id }; |
|
Line 3251 sub viewgrades {
|
Line 3288 sub viewgrades {
|
| $result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table(); |
$result.= '<h3>'.$common_header.'</h3>'.&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 $res_error; |
| |
my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error); |
| |
if ($res_error) { |
| |
return &navmap_errormsg(); |
| |
} |
| my %weight = (); |
my %weight = (); |
| my $ctsparts = 0; |
my $ctsparts = 0; |
| my %seen = (); |
my %seen = (); |
|
Line 3311 sub viewgrades {
|
Line 3352 sub viewgrades {
|
| &Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
| '<th>'.&mt('No.').'</th>'. |
'<th>'.&mt('No.').'</th>'. |
| '<th>'.&nameUserString('header')."</th>\n"; |
'<th>'.&nameUserString('header')."</th>\n"; |
| my (@parts) = sort(&getpartlist($symb)); |
my $partserror; |
| |
my (@parts) = sort(&getpartlist($symb,\$partserror)); |
| |
if ($partserror) { |
| |
return &navmap_errormsg(); |
| |
} |
| my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
| my @partids = (); |
my @partids = (); |
| foreach my $part (@parts) { |
foreach my $part (@parts) { |
|
Line 3470 sub editgrades {
|
Line 3515 sub editgrades {
|
| my %columns = (); |
my %columns = (); |
| my ($i,$ctr,$count,$rec_update) = (0,0,0,0); |
my ($i,$ctr,$count,$rec_update) = (0,0,0,0); |
| |
|
| my (@parts) = sort(&getpartlist($symb)); |
my $partserror; |
| |
my (@parts) = sort(&getpartlist($symb,\$partserror)); |
| |
if ($partserror) { |
| |
return &navmap_errormsg(); |
| |
} |
| my $header; |
my $header; |
| while ($ctr < $env{'form.totalparts'}) { |
while ($ctr < $env{'form.totalparts'}) { |
| my $partid = $env{'form.partid_'.$ctr}; |
my $partid = $env{'form.partid_'.$ctr}; |
|
Line 3681 sub split_part_type {
|
Line 3730 sub split_part_type {
|
| # |
# |
| #--- Javascript to handle csv upload |
#--- Javascript to handle csv upload |
| sub csvupload_javascript_reverse_associate { |
sub csvupload_javascript_reverse_associate { |
| my $error1=&mt('You need to specify the username or ID'); |
my $error1=&mt('You need to specify the username or the student/employee ID'); |
| my $error2=&mt('You need to specify at least one grading field'); |
my $error2=&mt('You need to specify at least one grading field'); |
| return(<<ENDPICK); |
return(<<ENDPICK); |
| function verify(vf) { |
function verify(vf) { |
|
Line 3721 ENDPICK
|
Line 3770 ENDPICK
|
| } |
} |
| |
|
| sub csvupload_javascript_forward_associate { |
sub csvupload_javascript_forward_associate { |
| my $error1=&mt('You need to specify the username or ID'); |
my $error1=&mt('You need to specify the username or the student/employee ID'); |
| my $error2=&mt('You need to specify at least one grading field'); |
my $error2=&mt('You need to specify at least one grading field'); |
| return(<<ENDPICK); |
return(<<ENDPICK); |
| function verify(vf) { |
function verify(vf) { |
|
Line 3802 ENDPICK
|
Line 3851 ENDPICK
|
| } |
} |
| |
|
| sub csvupload_fields { |
sub csvupload_fields { |
| my ($symb) = @_; |
my ($symb,$errorref) = @_; |
| my (@parts) = &getpartlist($symb); |
my (@parts) = &getpartlist($symb,$errorref); |
| |
if (ref($errorref)) { |
| |
if ($$errorref) { |
| |
return; |
| |
} |
| |
} |
| |
|
| my @fields=(['ID','Student/Employee ID'], |
my @fields=(['ID','Student/Employee ID'], |
| ['username','Student Username'], |
['username','Student Username'], |
| ['domain','Student Domain']); |
['domain','Student Domain']); |
|
Line 3903 sub csvuploadmap {
|
Line 3958 sub csvuploadmap {
|
| &csvuploadmap_header($request,$symb,$datatoken,$#records+1); |
&csvuploadmap_header($request,$symb,$datatoken,$#records+1); |
| my ($i,$keyfields); |
my ($i,$keyfields); |
| if (@records) { |
if (@records) { |
| my @fields=&csvupload_fields($symb); |
my $fieldserror; |
| |
my @fields=&csvupload_fields($symb,\$fieldserror); |
| |
if ($fieldserror) { |
| |
$request->print(&navmap_errormsg()); |
| |
return; |
| |
} |
| if ($env{'form.upfile_associate'} eq 'reverse') { |
if ($env{'form.upfile_associate'} eq 'reverse') { |
| &Apache::loncommon::csv_print_samples($request,\@records); |
&Apache::loncommon::csv_print_samples($request,\@records); |
| $i=&Apache::loncommon::csv_print_select_table($request,\@records, |
$i=&Apache::loncommon::csv_print_select_table($request,\@records, |
|
Line 4090 sub csvuploadassign {
|
Line 4149 sub csvuploadassign {
|
| $countdone++; |
$countdone++; |
| } |
} |
| } |
} |
| $request->print('<br /><span class="LC_info">'.&mt("Saved [_1] students",$countdone)."</span>\n"); |
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0)); |
| if (@skipped) { |
if (@skipped) { |
| $request->print('<p><span class="LC_warning">'.&mt('Skipped Students').'</span></p>'); |
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />'); |
| foreach my $student (@skipped) { $request->print("$student<br />\n"); } |
$request->print(join(', ',@skipped)); |
| } |
} |
| if (@notallowed) { |
if (@notallowed) { |
| $request->print('<p><span class="LC_error">'.&mt('Students Not Allowed to Modify').'</span></p>'); |
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('Modification of scores not allowed for the following username(s):'),1).'<br />'); |
| foreach my $student (@notallowed) { $request->print("$student<br />\n"); } |
$request->print(join(', ',@notallowed)); |
| } |
} |
| $request->print("<br />\n"); |
$request->print("<br />\n"); |
| $request->print(&show_grading_menu_form($symb)); |
$request->print(&show_grading_menu_form($symb)); |
|
Line 4140 LISTJAVASCRIPT
|
Line 4199 LISTJAVASCRIPT
|
| &mt('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"; |
| my ($titles,$symbx) = &getSymbMap(); |
my $map_error; |
| |
my ($titles,$symbx) = &getSymbMap($map_error); |
| |
if ($map_error) { |
| |
$request->print(&navmap_errormsg()); |
| |
return; |
| |
} |
| 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)/); |
|
Line 4235 LISTJAVASCRIPT
|
Line 4299 LISTJAVASCRIPT
|
| } |
} |
| |
|
| sub getSymbMap { |
sub getSymbMap { |
| |
my ($map_error) = @_; |
| my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
unless (ref($navmap)) { |
| |
if (ref($map_error)) { |
| |
$$map_error = 'navmap'; |
| |
} |
| |
return; |
| |
} |
| my %symbx = (); |
my %symbx = (); |
| my @titles = (); |
my @titles = (); |
| my $minder = 0; |
my $minder = 0; |
|
Line 4295 sub displayPage {
|
Line 4365 sub displayPage {
|
| $request->print($result); |
$request->print($result); |
| |
|
| my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
unless (ref($navmap)) { |
| |
$request->print(&navmap_errormsg()); |
| |
$request->print(&show_grading_menu_form($symb)); |
| |
return; |
| |
} |
| 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) { |
|
Line 4546 sub updateGradeByPage {
|
Line 4621 sub updateGradeByPage {
|
| $request->print($result); |
$request->print($result); |
| |
|
| my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
unless (ref($navmap)) { |
| |
$request->print(&navmap_errormsg()); |
| |
return; |
| |
} |
| 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) { |
|
Line 4690 sub updateGradeByPage {
|
Line 4769 sub updateGradeByPage {
|
| # |
# |
| #------------------------------------------------------------------- |
#------------------------------------------------------------------- |
| |
|
| #--------------------Scantron Grading----------------------------------- |
#--------------------Bubblesheet (Scantron) Grading----------------------------------- |
| # |
# |
| #------ start of section for handling grading by page/sequence --------- |
#------ start of section for handling grading by page/sequence --------- |
| |
|
|
Line 4749 the homework problem.
|
Line 4828 the homework problem.
|
| Returns html hidden inputs used to hold context/default values. |
Returns html hidden inputs used to hold context/default values. |
| |
|
| Arguments: |
Arguments: |
| $symb - $symb of the current resource |
$symb - $symb of the current resource |
| |
$map_error - ref to scalar which will container error if |
| |
$navmap object is unavailable in &getSymbMap(). |
| |
|
| =cut |
=cut |
| |
|
|
Line 4773 sub defaultFormData {
|
Line 4854 sub defaultFormData {
|
| =cut |
=cut |
| |
|
| sub getSequenceDropDown { |
sub getSequenceDropDown { |
| my ($symb)=@_; |
my ($symb,$map_error)=@_; |
| my $result='<select name="selectpage">'."\n"; |
my $result='<select name="selectpage">'."\n"; |
| my ($titles,$symbx) = &getSymbMap(); |
my ($titles,$symbx) = &getSymbMap($map_error); |
| |
if (ref($map_error)) { |
| |
return if ($$map_error); |
| |
} |
| my ($curpage)=&Apache::lonnet::decode_symb($symb); |
my ($curpage)=&Apache::lonnet::decode_symb($symb); |
| my $ctr=0; |
my $ctr=0; |
| foreach (@$titles) { |
foreach (@$titles) { |
|
Line 5041 sub scantron_selectphase {
|
Line 5125 sub scantron_selectphase {
|
| my ($r,$file2grade) = @_; |
my ($r,$file2grade) = @_; |
| my ($symb)=&get_symb($r); |
my ($symb)=&get_symb($r); |
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| my $sequence_selector=&getSequenceDropDown($symb); |
my $map_error; |
| |
my $sequence_selector=&getSequenceDropDown($symb,\$map_error); |
| |
if ($map_error) { |
| |
$r->print('<br />'.&navmap_errormsg().'<br />'); |
| |
return; |
| |
} |
| my $default_form_data=&defaultFormData($symb); |
my $default_form_data=&defaultFormData($symb); |
| my $grading_menu_button=&show_grading_menu_form($symb); |
my $grading_menu_button=&show_grading_menu_form($symb); |
| my $file_selector=&scantron_uploads($file2grade); |
my $file_selector=&scantron_uploads($file2grade); |
|
Line 5069 sub scantron_selectphase {
|
Line 5158 sub scantron_selectphase {
|
| <td> '.&mt('Sequence to grade:').' </td><td> '.$sequence_selector.' </td> |
<td> '.&mt('Sequence to grade:').' </td><td> '.$sequence_selector.' </td> |
| '.&Apache::loncommon::end_data_table_row().' |
'.&Apache::loncommon::end_data_table_row().' |
| '.&Apache::loncommon::start_data_table_row().' |
'.&Apache::loncommon::start_data_table_row().' |
| <td> '.&mt('Filename of scoring office file:').' </td><td> '.$file_selector.' </td> |
<td> '.&mt('Filename of bubblesheet data file:').' </td><td> '.$file_selector.' </td> |
| '.&Apache::loncommon::end_data_table_row().' |
'.&Apache::loncommon::end_data_table_row().' |
| '.&Apache::loncommon::start_data_table_row().' |
'.&Apache::loncommon::start_data_table_row().' |
| <td> '.&mt('Format of data file:').' </td><td> '.$format_selector.' </td> |
<td> '.&mt('Format of bubblesheet data file:').' </td><td> '.$format_selector.' </td> |
| '.&Apache::loncommon::end_data_table_row().' |
'.&Apache::loncommon::end_data_table_row().' |
| '.&Apache::loncommon::start_data_table_row().' |
'.&Apache::loncommon::start_data_table_row().' |
| <td> '.&mt('Saved CODEs to validate against:').' </td><td> '.$CODE_selector.' </td> |
<td> '.&mt('Saved CODEs to validate against:').' </td><td> '.$CODE_selector.' </td> |
|
Line 5090 sub scantron_selectphase {
|
Line 5179 sub scantron_selectphase {
|
| '.&Apache::loncommon::end_data_table_row().' |
'.&Apache::loncommon::end_data_table_row().' |
| '.&Apache::loncommon::start_data_table_row().' |
'.&Apache::loncommon::start_data_table_row().' |
| <td colspan="2"> |
<td colspan="2"> |
| <input type="submit" value="'.&mt('Grading: Validate Scantron Records').'" /> |
<input type="submit" value="'.&mt('Grading: Validate Bubblesheet Records').'" /> |
| </td> |
</td> |
| '.&Apache::loncommon::end_data_table_row().' |
'.&Apache::loncommon::end_data_table_row().' |
| '.&Apache::loncommon::end_data_table().' |
'.&Apache::loncommon::end_data_table().' |
|
Line 5109 sub scantron_selectphase {
|
Line 5198 sub scantron_selectphase {
|
| '.&Apache::loncommon::start_data_table('LC_scantron_action').' |
'.&Apache::loncommon::start_data_table('LC_scantron_action').' |
| '.&Apache::loncommon::start_data_table_header_row().' |
'.&Apache::loncommon::start_data_table_header_row().' |
| <th> |
<th> |
| '.&mt('Specify a Scantron data file to upload.').' |
'.&mt('Specify a bubblesheet data file to upload.').' |
| </th> |
</th> |
| '.&Apache::loncommon::end_data_table_header_row().' |
'.&Apache::loncommon::end_data_table_header_row().' |
| '.&Apache::loncommon::start_data_table_row().' |
'.&Apache::loncommon::start_data_table_row().' |
|
Line 5136 sub scantron_selectphase {
|
Line 5225 sub scantron_selectphase {
|
| <input name="command" value="scantronupload_save" type="hidden" /> |
<input name="command" value="scantronupload_save" type="hidden" /> |
| '.&mt('File to upload: [_1]','<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="'.&mt('Upload Scantron Data').'" /> |
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" /> |
| </form> |
</form> |
| '); |
'); |
| |
|
|
Line 5178 sub scantron_selectphase {
|
Line 5267 sub scantron_selectphase {
|
| &Apache::loncommon::start_data_table('LC_scantron_action')."\n". |
&Apache::loncommon::start_data_table('LC_scantron_action')."\n". |
| &Apache::loncommon::start_data_table_header_row()."\n". |
&Apache::loncommon::start_data_table_header_row()."\n". |
| '<th colspan="2"> |
'<th colspan="2"> |
| '.&mt('Review scantron data and submissions for a previously graded folder/sequence')."\n". |
'.&mt('Review bubblesheet data and submissions for a previously graded folder/sequence')."\n". |
| '</th>'."\n". |
'</th>'."\n". |
| &Apache::loncommon::end_data_table_header_row()."\n". |
&Apache::loncommon::end_data_table_header_row()."\n". |
| &Apache::loncommon::start_data_table_row()."\n". |
&Apache::loncommon::start_data_table_row()."\n". |
|
Line 5200 sub scantron_selectphase {
|
Line 5289 sub scantron_selectphase {
|
| &Apache::loncommon::start_data_table_row()."\n". |
&Apache::loncommon::start_data_table_row()."\n". |
| '<td colspan="2">'."\n". |
'<td colspan="2">'."\n". |
| '<input type="hidden" name="command" value="checksubmissions" />'."\n". |
'<input type="hidden" name="command" value="checksubmissions" />'."\n". |
| '<input type="submit" value="'.&mt('Review Scantron Data and Submission Records').'" />'."\n". |
'<input type="submit" value="'.&mt('Review Bubblesheet Data and Submission Records').'" />'."\n". |
| '</td>'."\n". |
'</td>'."\n". |
| &Apache::loncommon::end_data_table_row()."\n". |
&Apache::loncommon::end_data_table_row()."\n". |
| &Apache::loncommon::end_data_table()."\n". |
&Apache::loncommon::end_data_table()."\n". |
|
Line 5241 sub scantron_selectphase {
|
Line 5330 sub scantron_selectphase {
|
| CODEstart - (only matter if a CODE exists) column in the line where |
CODEstart - (only matter if a CODE exists) column in the line where |
| the CODE starts |
the CODE starts |
| CODElength - length of the CODE |
CODElength - length of the CODE |
| IDstart - column where the student/employee ID number starts |
IDstart - column where the student/employee ID starts |
| IDlength - length of the student/employee ID info |
IDlength - length of the student/employee ID info |
| Qstart - column where the information from the bubbled |
Qstart - column where the information from the bubbled |
| 'questions' start |
'questions' start |
|
Line 5341 sub username_to_idmap {
|
Line 5430 sub username_to_idmap {
|
| $whichline - line number of the passed in scanline |
$whichline - line number of the passed in scanline |
| $field - type of change to process |
$field - type of change to process |
| (either |
(either |
| 'ID' -> correct the student/employee ID number |
'ID' -> correct the student/employee ID |
| 'CODE' -> correct the CODE |
'CODE' -> correct the CODE |
| 'answer' -> fixup the submitted answers) |
'answer' -> fixup the submitted answers) |
| |
|
|
Line 6215 sub scantron_validate_file {
|
Line 6304 sub scantron_validate_file {
|
| $r->print('<p>'.&mt('Gathering necessary information.').'</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 $nav_error; |
| |
my $max_bubble=&scantron_get_maxbubble(\$nav_error); |
| |
if ($nav_error) { |
| |
$r->print(&navmap_errormsg()); |
| |
return ''; |
| |
} |
| my $result=&scantron_form_start($max_bubble).$default_form_data; |
my $result=&scantron_form_start($max_bubble).$default_form_data; |
| $r->print($result); |
$r->print($result); |
| |
|
|
Line 6251 sub scantron_validate_file {
|
Line 6345 sub scantron_validate_file {
|
| '<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No'). |
'<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No'). |
| '</label></span><br />'. |
'</label></span><br />'. |
| &mt('Grading will take longer if you use verification.').'<br />'. |
&mt('Grading will take longer if you use verification.').'<br />'. |
| &mt("Alternatively, the 'Review scantron data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'. |
&mt("Alternatively, the 'Review bubblesheet data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'. |
| '<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'. |
'<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'. |
| '<input type="hidden" name="command" value="scantron_process" />'."\n"); |
'<input type="hidden" name="command" value="scantron_process" />'."\n"); |
| } else { |
} else { |
|
Line 6627 sub scantron_validate_sequence {
|
Line 6721 sub scantron_validate_sequence {
|
| my ($r,$currentphase) = @_; |
my ($r,$currentphase) = @_; |
| |
|
| my $navmap=Apache::lonnavmaps::navmap->new(); |
my $navmap=Apache::lonnavmaps::navmap->new(); |
| |
unless (ref($navmap)) { |
| |
$r->print(&navmap_errormsg()); |
| |
return (1,$currentphase); |
| |
} |
| my (undef,undef,$sequence)= |
my (undef,undef,$sequence)= |
| &Apache::lonnet::decode_symb($env{'form.selectpage'}); |
&Apache::lonnet::decode_symb($env{'form.selectpage'}); |
| |
|
|
Line 6659 sub scantron_validate_ID {
|
Line 6757 sub scantron_validate_ID {
|
| 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_lines.. array. |
my $nav_error; |
| |
&scantron_get_maxbubble(\$nav_error); # parse needs the bubble_lines.. array. |
| |
if ($nav_error) { |
| |
$r->print(&navmap_errormsg()); |
| |
return(1,$currentphase); |
| |
} |
| |
|
| my %found=('ids'=>{},'usernames'=>{}); |
my %found=('ids'=>{},'usernames'=>{}); |
| for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
|
Line 6777 sub scantron_get_correction {
|
Line 6880 sub scantron_get_correction {
|
| if ($closest > 0) { |
if ($closest > 0) { |
| foreach my $testcode (@{$closest}) { |
foreach my $testcode (@{$closest}) { |
| my $checked=''; |
my $checked=''; |
| if (!$i) { $checked=' checked="checked" '; } |
if (!$i) { $checked=' checked="checked"'; } |
| $r->print(" |
$r->print(" |
| <label> |
<label> |
| <input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> |
<input type='radio' name='scantron_CODE_resolution' value='use_closest_$i'$checked /> |
| ".&mt("Use the similar CODE [_1] instead.", |
".&mt("Use the similar CODE [_1] instead.", |
| "<b><tt>".$testcode."</tt></b>")." |
"<b><tt>".$testcode."</tt></b>")." |
| </label> |
</label> |
|
Line 6791 sub scantron_get_correction {
|
Line 6894 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(" |
$r->print(" |
| <label> |
<label> |
| <input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> |
<input type='radio' name='scantron_CODE_resolution' value='use_unfound'$checked /> |
| ".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.", |
".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.", |
| "<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")." |
"<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")." |
| </label>"); |
</label>"); |
|
Line 7018 sub prompt_for_corrections {
|
Line 7121 sub prompt_for_corrections {
|
| ($responsetype_per_response{$question-1} eq 'imageresponse') || |
($responsetype_per_response{$question-1} eq 'imageresponse') || |
| ($responsetype_per_response{$question-1} eq 'reactionresponse') || |
($responsetype_per_response{$question-1} eq 'reactionresponse') || |
| ($responsetype_per_response{$question-1} eq 'organicresponse')) { |
($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 />'); |
$r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines).'<br /><br />'.&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.').'<br />'.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.').'<br />'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'<br /><br />'); |
| } else { |
} else { |
| $r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />"); |
$r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />"); |
| } |
} |
|
Line 7212 sub scantron_validate_CODE {
|
Line 7315 sub scantron_validate_CODE {
|
| |
|
| my %allcodes=&get_codes(); |
my %allcodes=&get_codes(); |
| |
|
| &scantron_get_maxbubble(); # parse needs the lines per response array. |
my $nav_error; |
| |
&scantron_get_maxbubble(\$nav_error); # parse needs the lines per response array. |
| |
if ($nav_error) { |
| |
$r->print(&navmap_errormsg()); |
| |
return(1,$currentphase); |
| |
} |
| |
|
| my ($scanlines,$scan_data)=&scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
| for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
|
Line 7266 sub scantron_validate_doublebubble {
|
Line 7374 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. |
my $nav_error; |
| |
&scantron_get_maxbubble(\$nav_error); # parse needs the bubble line array. |
| |
if ($nav_error) { |
| |
$r->print(&navmap_errormsg()); |
| |
return(1,$currentphase); |
| |
} |
| |
|
| for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
| my $line=&scantron_get_line($scanlines,$scan_data,$i); |
my $line=&scantron_get_line($scanlines,$scan_data,$i); |
|
Line 7284 sub scantron_validate_doublebubble {
|
Line 7397 sub scantron_validate_doublebubble {
|
| |
|
| |
|
| sub scantron_get_maxbubble { |
sub scantron_get_maxbubble { |
| |
my ($nav_error) = @_; |
| |
|
| 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 7294 sub scantron_get_maxbubble {
|
Line 7409 sub scantron_get_maxbubble {
|
| &Apache::lonnet::decode_symb($env{'form.selectpage'}); |
&Apache::lonnet::decode_symb($env{'form.selectpage'}); |
| |
|
| my $navmap=Apache::lonnavmaps::navmap->new(); |
my $navmap=Apache::lonnavmaps::navmap->new(); |
| |
unless (ref($navmap)) { |
| |
if (ref($nav_error)) { |
| |
$$nav_error = 1; |
| |
} |
| |
return; |
| |
} |
| my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
| my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
| |
|
|
Line 7383 sub scantron_validate_missingbubbles {
|
Line 7504 sub scantron_validate_missingbubbles {
|
| #get scantron line setup |
#get scantron line setup |
| my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
| my ($scanlines,$scan_data)=&scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
| my $max_bubble=&scantron_get_maxbubble(); |
my $nav_error; |
| |
my $max_bubble=&scantron_get_maxbubble(\$nav_error); |
| |
if ($nav_error) { |
| |
return(1,$currentphase); |
| |
} |
| if (!$max_bubble) { $max_bubble=2**31; } |
if (!$max_bubble) { $max_bubble=2**31; } |
| for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
| my $line=&scantron_get_line($scanlines,$scan_data,$i); |
my $line=&scantron_get_line($scanlines,$scan_data,$i); |
|
Line 7443 sub scantron_process_students {
|
Line 7568 sub scantron_process_students {
|
| my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&Apache::loncoursedata::get_classlist(); |
| my %idmap=&username_to_idmap($classlist); |
my %idmap=&username_to_idmap($classlist); |
| my $navmap=Apache::lonnavmaps::navmap->new(); |
my $navmap=Apache::lonnavmaps::navmap->new(); |
| |
unless (ref($navmap)) { |
| |
$r->print(&navmap_errormsg()); |
| |
return ''; |
| |
} |
| my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
| my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
| my (%grader_partids_by_symb,%grader_randomlists_by_symb); |
my (%grader_partids_by_symb,%grader_randomlists_by_symb); |
| &graders_resources_pass(\@resources,\%grader_partids_by_symb, |
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
| \%grader_randomlists_by_symb); |
\%grader_randomlists_by_symb); |
| |
my $resource_error; |
| foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
| my $ressymb = $resource->symb(); |
my $ressymb; |
| |
if (ref($resource)) { |
| |
$ressymb = $resource->symb(); |
| |
} else { |
| |
$resource_error = 1; |
| |
last; |
| |
} |
| my ($analysis,$parts) = |
my ($analysis,$parts) = |
| &scantron_partids_tograde($resource,$env{'request.course.id'}, |
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
| $env{'user.name'},$env{'user.domain'},1); |
$env{'user.name'},$env{'user.domain'},1); |
|
Line 7461 sub scantron_process_students {
|
Line 7597 sub scantron_process_students {
|
| } |
} |
| } |
} |
| } |
} |
| |
if ($resource_error) { |
| |
$r->print(&navmap_errormsg()); |
| |
return ''; |
| |
} |
| |
|
| my ($uname,$udom); |
my ($uname,$udom); |
| my $result= <<SCANTRONFORM; |
my $result= <<SCANTRONFORM; |
|
Line 7475 SCANTRONFORM
|
Line 7615 SCANTRONFORM
|
| |
|
| my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam')); |
my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam')); |
| my $count=&get_todo_count($scanlines,$scan_data); |
my $count=&get_todo_count($scanlines,$scan_data); |
| my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status', |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status', |
| 'Scantron Progress',$count, |
'Bubblesheet Progress',$count, |
| 'inline',undef,'scantronupload'); |
'inline',undef,'scantronupload'); |
| &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
| 'Processing first student'); |
'Processing first student'); |
|
Line 7485 SCANTRONFORM
|
Line 7625 SCANTRONFORM
|
| my $i=-1; |
my $i=-1; |
| my $started; |
my $started; |
| |
|
| &scantron_get_maxbubble(); # Need the bubble lines array to parse. |
my $nav_error; |
| |
&scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse. |
| |
if ($nav_error) { |
| |
$r->print(&navmap_errormsg()); |
| |
return ''; |
| |
} |
| |
|
| # If an ssi failed in scantron_get_maxbubble, put an error message out to |
# If an ssi failed in scantron_get_maxbubble, put an error message out to |
| # the user and return. |
# the user and return. |
|
Line 7526 SCANTRONFORM
|
Line 7671 SCANTRONFORM
|
| } |
} |
| ($uname,$udom)=split(/:/,$uname); |
($uname,$udom)=split(/:/,$uname); |
| |
|
| my %partids_by_symb; |
my (%partids_by_symb,$res_error); |
| foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
| my $ressymb = $resource->symb(); |
my $ressymb; |
| |
if (ref($resource)) { |
| |
$ressymb = $resource->symb(); |
| |
} else { |
| |
$res_error = 1; |
| |
last; |
| |
} |
| if ((exists($grader_randomlists_by_symb{$ressymb})) || |
if ((exists($grader_randomlists_by_symb{$ressymb})) || |
| (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
| my ($analysis,$parts) = |
my ($analysis,$parts) = |
|
Line 7539 SCANTRONFORM
|
Line 7690 SCANTRONFORM
|
| } |
} |
| } |
} |
| |
|
| |
if ($res_error) { |
| |
&scantron_add_delay(\@delayqueue,$line, |
| |
'An error occurred while grading student '.$uname,2); |
| |
next; |
| |
} |
| |
|
| &Apache::lonxml::clear_problem_counter(); |
&Apache::lonxml::clear_problem_counter(); |
| &Apache::lonnet::appenv($scan_record); |
&Apache::lonnet::appenv($scan_record); |
| |
|
|
Line 7710 sub scantron_upload_scantron_data {
|
Line 7867 sub scantron_upload_scantron_data {
|
| my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'. |
my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'. |
| (' 'x2).&mt('(shows course personnel)'); |
(' 'x2).&mt('(shows course personnel)'); |
| my $default_form_data=&defaultFormData(&get_symb($r,1)); |
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
| |
my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.'); |
| |
my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded."); |
| $r->print(' |
$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("'.&mt('Please use the browse button to select a file from your local directory.').'"); |
alert("'.$nofile_alert.'"); |
| return false; |
return false; |
| } |
} |
| if (formname.courseid.value == "") { |
if (formname.courseid.value == "") { |
| alert("'.&mt('Please use the \"Select Course\" link to open a separate window where you can search for a course to which a file can be uploaded.').'"); |
alert("'.$nocourseid_alert.'"); |
| return false; |
return false; |
| } |
} |
| formname.submit(); |
formname.submit(); |
|
Line 7760 sub scantron_upload_scantron_data {
|
Line 7919 sub scantron_upload_scantron_data {
|
| &Apache::lonhtmlcommon::end_pick_box().'<br /> |
&Apache::lonhtmlcommon::end_pick_box().'<br /> |
| |
|
| <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="'.&mt('Upload Scantron Data').'" /> |
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" /> |
| </form> |
</form> |
| '); |
'); |
| return ''; |
return ''; |
|
Line 7778 sub scantron_upload_scantron_data_save {
|
Line 7937 sub scantron_upload_scantron_data_save {
|
| 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(&mt("You are not allowed to upload Scantron data to the requested course.")."<br />"); |
$r->print(&mt("You are not allowed to upload bubblesheet 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 7787 sub scantron_upload_scantron_data_save {
|
Line 7946 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(&mt("Doing upload to [_1]",$coursedata{'description'})." <br />"); |
my $uploadedfile; |
| my $fname=$env{'form.upfile.filename'}; |
$r->print('<h3>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</h3>'); |
| #FIXME |
|
| #copied from lonnet::userfileupload() |
|
| #make that function able to target a specified course |
|
| # Replace Windows backslashes by forward slashes |
|
| $fname=~s/\\/\//g; |
|
| # Get rid of everything but the actual filename |
|
| $fname=~s/^.*\/([^\/]+)$/$1/; |
|
| # Replace spaces by underscores |
|
| $fname=~s/\s+/\_/g; |
|
| # Replace all other weird characters by nothing |
|
| $fname=~s/[^\w\.\-]//g; |
|
| # See if there is anything left |
|
| unless ($fname) { return 'error: no uploaded file'; } |
|
| my $uploadedfile=$fname; |
|
| $fname='scantron_orig_'.$fname; |
|
| if (length($env{'form.upfile'}) < 2) { |
if (length($env{'form.upfile'}) < 2) { |
| $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>")); |
$r->print(&mt('[_1]Error:[_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.','<span class="LC_error">','</span>','<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>')); |
| } else { |
} else { |
| my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname); |
my $result = |
| if ($result =~ m|^/uploaded/|) { |
&Apache::lonnet::userfileupload('upfile','','scantron','','','', |
| $r->print(&mt("<span class=\"LC_success\">Success:</span> Successfully uploaded [_1] bytes of data into location [_2]", |
$env{'form.courseid'},$env{'form.domainid'}); |
| (length($env{'form.upfile'})-1), |
if ($result =~ m{^/uploaded/}) { |
| '<span class="LC_filename">'.$result."</span>")); |
$r->print(&mt('[_1]Success:[_2] Successfully uploaded [_3] bytes of data into location: [_4]', |
| |
'<span class="LC_success">','</span>',(length($env{'form.upfile'})-1), |
| |
'<span class="LC_filename">'.$result.'</span>')); |
| |
($uploadedfile) = ($result =~ m{/([^/]+)$}); |
| |
$r->print(&validate_uploaded_scantron_file($env{'form.domainid'}, |
| |
$env{'form.courseid'},$uploadedfile)); |
| } else { |
} else { |
| $r->print(&mt("<span class=\"LC_error\">Error:</span> An error ([_1]) occurred when attempting to upload the file, [_2]", |
$r->print(&mt('[_1]Error:[_2] An error ([_3]) occurred when attempting to upload the file, [_4]', |
| $result, |
'<span class="LC_error">','</span>',$result, |
| '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>")); |
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>')); |
| |
|
| } |
} |
| } |
} |
| if ($symb) { |
if ($symb) { |
|
Line 7827 sub scantron_upload_scantron_data_save {
|
Line 7975 sub scantron_upload_scantron_data_save {
|
| return ''; |
return ''; |
| } |
} |
| |
|
| |
sub validate_uploaded_scantron_file { |
| |
my ($cdom,$cname,$fname) = @_; |
| |
my $scanlines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.$fname); |
| |
my @lines; |
| |
if ($scanlines ne '-1') { |
| |
@lines=split("\n",$scanlines,-1); |
| |
} |
| |
my $output; |
| |
if (@lines) { |
| |
my (%counts,$max_match_format); |
| |
my ($max_match_count,$max_match_pct) = (0,0); |
| |
my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cname); |
| |
my %idmap = &username_to_idmap($classlist); |
| |
foreach my $key (keys(%idmap)) { |
| |
my $lckey = lc($key); |
| |
$idmap{$lckey} = $idmap{$key}; |
| |
} |
| |
my %unique_formats; |
| |
my @formatlines = &get_scantronformat_file(); |
| |
foreach my $line (@formatlines) { |
| |
chomp($line); |
| |
my @config = split(/:/,$line); |
| |
my $idstart = $config[5]; |
| |
my $idlength = $config[6]; |
| |
if (($idstart ne '') && ($idlength > 0)) { |
| |
if (ref($unique_formats{$idstart.':'.$idlength}) eq 'ARRAY') { |
| |
push(@{$unique_formats{$idstart.':'.$idlength}},$config[0].':'.$config[1]); |
| |
} else { |
| |
$unique_formats{$idstart.':'.$idlength} = [$config[0].':'.$config[1]]; |
| |
} |
| |
} |
| |
} |
| |
foreach my $key (keys(%unique_formats)) { |
| |
my ($idstart,$idlength) = split(':',$key); |
| |
%{$counts{$key}} = ( |
| |
'found' => 0, |
| |
'total' => 0, |
| |
); |
| |
foreach my $line (@lines) { |
| |
next if ($line =~ /^#/); |
| |
next if ($line =~ /^[\s\cz]*$/); |
| |
my $id = substr($line,$idstart-1,$idlength); |
| |
$id = lc($id); |
| |
if (exists($idmap{$id})) { |
| |
$counts{$key}{'found'} ++; |
| |
} |
| |
$counts{$key}{'total'} ++; |
| |
} |
| |
if ($counts{$key}{'total'}) { |
| |
my $percent_match = (100*$counts{$key}{'found'})/($counts{$key}{'total'}); |
| |
if (($max_match_format eq '') || ($percent_match > $max_match_pct)) { |
| |
$max_match_pct = $percent_match; |
| |
$max_match_format = $key; |
| |
$max_match_count = $counts{$key}{'total'}; |
| |
} |
| |
} |
| |
} |
| |
if (ref($unique_formats{$max_match_format}) eq 'ARRAY') { |
| |
my $format_descs; |
| |
my $numwithformat = @{$unique_formats{$max_match_format}}; |
| |
for (my $i=0; $i<$numwithformat; $i++) { |
| |
my ($name,$desc) = split(':',$unique_formats{$max_match_format}[$i]); |
| |
if ($i<$numwithformat-2) { |
| |
$format_descs .= '"<i>'.$desc.'</i>", '; |
| |
} elsif ($i==$numwithformat-2) { |
| |
$format_descs .= '"<i>'.$desc.'</i>" '.&mt('and').' '; |
| |
} elsif ($i==$numwithformat-1) { |
| |
$format_descs .= '"<i>'.$desc.'</i>"'; |
| |
} |
| |
} |
| |
my $showpct = sprintf("%.0f",$max_match_pct).'%'; |
| |
$output .= '<br />'.&mt('Comparison of student IDs in the uploaded file with the course roster found matches for [_1] of the [_2] entries in the file (for the format defined for [_3]).','<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs). |
| |
'<br />'.&mt('A low percentage of matches results from one of the following:').'<ul>'. |
| |
'<li>'.&mt('The file was uploaded to the wrong course').'</li>'. |
| |
'<li>'.&mt('The data are not in the format expected for the domain: [_1]', |
| |
'<i>'.$cdom.'</i>').'</li>'. |
| |
'<li>'.&mt('Students did not bubble their IDs, or mis-bubbled them').'</li>'. |
| |
'<li>'.&mt('The course roster is not up to date').'</li>'. |
| |
'</ul>'; |
| |
} |
| |
} else { |
| |
$output = '<span class="LC_warning">'.&mt('Uploaded file contained no data').'</span>'; |
| |
} |
| |
return $output; |
| |
} |
| |
|
| sub valid_file { |
sub valid_file { |
| my ($requested_file)=@_; |
my ($requested_file)=@_; |
| foreach my $filename (sort(&scantron_filenames())) { |
foreach my $filename (sort(&scantron_filenames())) { |
|
Line 7892 sub checkscantron_results {
|
Line 8126 sub checkscantron_results {
|
| my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&Apache::loncoursedata::get_classlist(); |
| my %idmap=&Apache::grades::username_to_idmap($classlist); |
my %idmap=&Apache::grades::username_to_idmap($classlist); |
| my $navmap=Apache::lonnavmaps::navmap->new(); |
my $navmap=Apache::lonnavmaps::navmap->new(); |
| |
unless (ref($navmap)) { |
| |
$r->print(&navmap_errormsg()); |
| |
return ''; |
| |
} |
| my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
| my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
| my (%grader_partids_by_symb,%grader_randomlists_by_symb); |
my (%grader_partids_by_symb,%grader_randomlists_by_symb); |
|
Line 7906 sub checkscantron_results {
|
Line 8144 sub checkscantron_results {
|
| my %completedstudents; |
my %completedstudents; |
| |
|
| my $count=&Apache::grades::get_todo_count($scanlines,$scan_data); |
my $count=&Apache::grades::get_todo_count($scanlines,$scan_data); |
| my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron/Submissions Comparison Status', |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status', |
| 'Progress of Scantron Data/Submission Records Comparison',$count, |
'Progress of Bubblesheet Data/Submission Records Comparison',$count, |
| 'inline',undef,'checkscantron'); |
'inline',undef,'checkscantron'); |
| my ($username,$domain,$started); |
my ($username,$domain,$started); |
| |
my $nav_error; |
| &scantron_get_maxbubble(); # Need the bubble lines array to parse. |
&scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse. |
| |
if ($nav_error) { |
| |
$r->print(&navmap_errormsg()); |
| |
return ''; |
| |
} |
| |
|
| &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
| 'Processing first student'); |
'Processing first student'); |
|
Line 7984 sub checkscantron_results {
|
Line 8226 sub checkscantron_results {
|
| if ($scandata{$pid} eq $record{$pid}) { |
if ($scandata{$pid} eq $record{$pid}) { |
| my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row'; |
my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row'; |
| $okstudents .= '<tr class="'.$css_class.'">'. |
$okstudents .= '<tr class="'.$css_class.'">'. |
| '<td>'.&mt('Scantron').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
'<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
| '</tr>'."\n". |
'</tr>'."\n". |
| '<tr class="'.$css_class.'">'."\n". |
'<tr class="'.$css_class.'">'."\n". |
| '<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n"; |
'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n"; |
| $passed ++; |
$passed ++; |
| } else { |
} else { |
| my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row'; |
my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row'; |
| $badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Scantron').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
| '</tr>'."\n". |
'</tr>'."\n". |
| '<tr class="'.$css_class.'">'."\n". |
'<tr class="'.$css_class.'">'."\n". |
| '<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n". |
'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n". |
|
Line 8002 sub checkscantron_results {
|
Line 8244 sub checkscantron_results {
|
| } |
} |
| } |
} |
| } |
} |
| $r->print('<p>'.&mt('Comparison of scantron data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b> ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>'); |
$r->print('<p>'.&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b> ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>'); |
| $r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>'); |
$r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>'); |
| if ($passed) { |
if ($passed) { |
| $r->print(&mt('Students with exact correspondence between scantron data and submissions are as follows:').'<br /><br />'); |
$r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'<br /><br />'); |
| $r->print(&Apache::loncommon::start_data_table()."\n". |
$r->print(&Apache::loncommon::start_data_table()."\n". |
| &Apache::loncommon::start_data_table_header_row()."\n". |
&Apache::loncommon::start_data_table_header_row()."\n". |
| '<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'. |
'<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'. |
|
Line 8014 sub checkscantron_results {
|
Line 8256 sub checkscantron_results {
|
| &Apache::loncommon::end_data_table().'<br />'); |
&Apache::loncommon::end_data_table().'<br />'); |
| } |
} |
| if ($failed) { |
if ($failed) { |
| $r->print(&mt('Students with differences between scantron data and submissions are as follows:').'<br /><br />'); |
$r->print(&mt('Students with differences between bubblesheet data and submissions are as follows:').'<br /><br />'); |
| $r->print(&Apache::loncommon::start_data_table()."\n". |
$r->print(&Apache::loncommon::start_data_table()."\n". |
| &Apache::loncommon::start_data_table_header_row()."\n". |
&Apache::loncommon::start_data_table_header_row()."\n". |
| '<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'. |
'<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'. |
| &Apache::loncommon::end_data_table_header_row()."\n". |
&Apache::loncommon::end_data_table_header_row()."\n". |
| $badstudents."\n". |
$badstudents."\n". |
| &Apache::loncommon::end_data_table()).'<br />'. |
&Apache::loncommon::end_data_table()).'<br />'. |
| &mt('Differences can occur if submissions were modified using manual grading after a scantron grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original scantron sheets.'); |
&mt('Differences can occur if submissions were modified using manual grading after a bubblesheet grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original bubblesheets.'); |
| } |
} |
| $r->print('</form><br />'.$grading_menu_button); |
$r->print('</form><br />'.$grading_menu_button); |
| return; |
return; |
|
Line 8204 sub grading_menu {
|
Line 8446 sub grading_menu {
|
| 'saveState'=>"", |
'saveState'=>"", |
| 'gradingMenu'=>1, |
'gradingMenu'=>1, |
| 'showgrading'=>"yes"); |
'showgrading'=>"yes"); |
| |
my $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| my $url1 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
my @menu = ({ url => $url, |
| |
name => &mt('Manual Grading/View Submissions'), |
| |
short_description => |
| |
&mt('Start the process of hand grading submissions.'), |
| |
}); |
| $fields{'command'} = 'csvform'; |
$fields{'command'} = 'csvform'; |
| my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| |
push(@menu, { url => $url, |
| |
name => &mt('Upload Scores'), |
| |
short_description => |
| |
&mt('Specify a file containing the class scores for current resource.')}); |
| $fields{'command'} = 'processclicker'; |
$fields{'command'} = 'processclicker'; |
| my $url3 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| |
push(@menu, { url => $url, |
| |
name => &mt('Process Clicker'), |
| |
short_description => |
| |
&mt('Specify a file containing the clicker information for this resource.')}); |
| $fields{'command'} = 'scantron_selectphase'; |
$fields{'command'} = 'scantron_selectphase'; |
| my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| |
push(@menu, { url => $url, |
| my @menu = ({ categorytitle=>'Course Grading', |
name => &mt('Grade/Manage/Review Bubblesheets'), |
| items =>[ |
short_description => |
| { linktext => 'Manual Grading/View Submissions', |
&mt('Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.')}); |
| url => $url1, |
$fields{'command'} = 'verify'; |
| permission => 'F', |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| icon => 'edit-find-replace.png', |
push(@menu, { url => "", |
| linktitle => 'Start the process of hand grading submissions.' |
name => &mt('Verify Receipt No.'), |
| }, |
short_description => |
| { linktext => 'Upload Scores', |
&mt('')}); |
| url => $url2, |
|
| permission => 'F', |
|
| icon => 'uploadscores.png', |
|
| linktitle => 'Specify a file containing the class scores for current resource.' |
|
| }, |
|
| { linktext => 'Process Clicker', |
|
| url => $url3, |
|
| permission => 'F', |
|
| icon => 'addClickerInfoFile.png', |
|
| linktitle => 'Specify a file containing the clicker information for this resource.' |
|
| }, |
|
| { linktext => 'Grade/Manage/Review Scantron Forms', |
|
| url => $url4, |
|
| permission => 'F', |
|
| icon => 'stat.png', |
|
| linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.' |
|
| } |
|
| ] |
|
| }); |
|
| |
|
| #$fields{'command'} = 'verify'; |
|
| #$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
|
| # |
|
| # Create the menu |
# Create the menu |
| my $Str; |
my $Str; |
| # $Str .= '<h2>'.&mt('Please select a grading task').'</h2>'; |
# $Str .= '<h2>'.&mt('Please select a grading task').'</h2>'; |
|
Line 8259 sub grading_menu {
|
Line 8487 sub grading_menu {
|
| '<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"; |
| |
foreach my $menudata (@menu) { |
| $Str .= Apache::lonhtmlcommon::generate_menu(@menu); |
if ($menudata->{'name'} ne &mt('Verify Receipt No.')) { |
| #$menudata->{'jscript'} |
$Str .=' <h3><a '. |
| $Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '. |
$menudata->{'jscript'}. |
| ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
' href="'. |
| ' /> '. |
$menudata->{'url'}.'" >'. |
| &Apache::lonnet::recprefix($env{'request.course.id'}). |
$menudata->{'name'}."</a></h3>\n"; |
| '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'; |
} else { |
| |
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '. |
| |
$menudata->{'jscript'}. |
| |
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
| |
' /> '. |
| |
&Apache::lonnet::recprefix($env{'request.course.id'}). |
| |
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'; |
| |
} |
| |
$Str .= ' '.(' 'x8).$menudata->{'short_description'}. |
| |
"\n"; |
| |
} |
| $Str .="</form>\n"; |
$Str .="</form>\n"; |
| my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); |
my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); |
| $request->print(<<GRADINGMENUJS); |
$request->print(<<GRADINGMENUJS); |
|
Line 8384 GRADINGMENUJS
|
Line 8621 GRADINGMENUJS
|
| '<input type="hidden" name="showgrading" value="yes" />'."\n"; |
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
| |
|
| $result.=' |
$result.=' |
| <h2> |
<div class="LC_grade_select_mode"> |
| '.&mt('Grade Current Resource').' |
<div class="LC_grade_select_mode_current"> |
| </h2> |
<h2> |
| <div> |
'.&mt('Grade Current Resource').' |
| '.$table.' |
</h2> |
| </div> |
<div class="LC_grade_select_mode_body"> |
| |
<div class="LC_grades_resource_info"> |
| <div class="LC_columnSection"> |
'.$table.' |
| |
</div> |
| <fieldset> |
<div class="LC_grade_select_mode_selector"> |
| <legend> |
<div class="LC_grade_select_mode_selector_header"> |
| '.&mt('Sections').' |
'.&mt('Sections').' |
| </legend> |
</div> |
| <select name="section" multiple="multiple" size="5">'."\n"; |
<div class="LC_grade_select_mode_selector_body"> |
| $result.= $selsec; |
<select name="section" multiple="multiple" size="5">'."\n"; |
| |
if (ref($sections)) { |
| |
foreach my $section (sort(@$sections)) { |
| |
$result.='<option value="'.$section.'" '. |
| |
($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n"; |
| |
} |
| |
} |
| $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> '; |
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> '; |
| $result.=' |
$result.=' |
| </fieldset> |
</div> |
| |
</div> |
| <fieldset> |
<div class="LC_grade_select_mode_selector"> |
| <legend> |
<div class="LC_grade_select_mode_selector_header"> |
| '.&mt('Groups').' |
'.&mt('Groups').' |
| </legend> |
</div> |
| '.&Apache::lonstatistics::GroupSelect('group','multiple',5).' |
<div class="LC_grade_select_mode_selector_body"> |
| </fieldset> |
'.&Apache::lonstatistics::GroupSelect('group','multiple',5).' |
| |
</div> |
| <fieldset> |
</div> |
| <legend> |
<div class="LC_grade_select_mode_selector"> |
| '.&mt('Access Status').' |
<div class="LC_grade_select_mode_selector_header"> |
| </legend> |
'.&mt('Access Status').' |
| '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').' |
</div> |
| </fieldset> |
<div class="LC_grade_select_mode_selector_body"> |
| |
'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').' |
| <fieldset> |
</div> |
| <legend> |
</div> |
| '.&mt('Submission Status').' |
<div class="LC_grade_select_mode_selector"> |
| </legend> |
<div class="LC_grade_select_mode_selector_header"> |
| <select name="submitonly" size="5"> |
'.&mt('Submission Status').' |
| <option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option> |
</div> |
| <option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option> |
<div class="LC_grade_select_mode_selector_body"> |
| <option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option> |
<select name="submitonly" size="5"> |
| <option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option> |
<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option> |
| |
<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option> |
| |
<option value="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> |
<option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option> |
| </select> |
</select> |
| </fieldset> |
</div> |
| |
</div> |
| </div> |
<div class="LC_grade_select_mode_type_body"> |
| |
<div class="LC_grade_select_mode_type"> |
| <br /> |
|
| <div> |
|
| <div> |
|
| <label> |
<label> |
| <input type="radio" name="radioChoice" value="submission" '. |
<input type="radio" name="radioChoice" value="submission" '. |
| ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '. |
($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '. |
| &mt('Select individual students to grade and view submissions.').' |
&mt('Select individual students to grade and view submissions.').' |
| </label> |
</label> |
| </div> |
</div> |
| <div> |
<div class="LC_grade_select_mode_type"> |
| <label> |
<label> |
| <input type="radio" name="radioChoice" value="viewgrades" '. |
<input type="radio" name="radioChoice" value="viewgrades" '. |
| ($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '. |
($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '. |
| &mt('Grade all selected students in a grading table.').' |
&mt('Grade all selected students in a grading table.').' |
| </label> |
</label> |
| </div> |
</div> |
| <div> |
<div class="LC_grade_select_mode_type"> |
| <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" /> |
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" /> |
| </div> |
</div> |
| </div> |
</div> |
| |
</div> |
| |
</div> |
| |
<div class="LC_grade_select_mode_page"> |
| <h2> |
<h2> |
| '.&mt('Grade Complete Folder for One Student').' |
'.&mt('Grade Complete Folder for One Student').' |
| </h2> |
</h2> |
| <div> |
<div class="LC_grades_select_mode_body"> |
| <div> |
<div class="LC_grade_select_mode_type_body"> |
| |
<div class="LC_grade_select_mode_type"> |
| <label> |
<label> |
| <input type="radio" name="radioChoice" value="pickStudentPage" '. |
<input type="radio" name="radioChoice" value="pickStudentPage" '. |
| ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '. |
($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '. |
| &mt('The <b>complete</b> page/sequence/folder: For one student').' |
&mt('The <b>complete</b> page/sequence/folder: For one student').' |
| </label> |
</label> |
| </div> |
</div> |
| <div> |
<div class="LC_grade_select_mode_type"> |
| <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" /> |
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" /> |
| </div> |
</div> |
| |
</div> |
| </div> |
</div> |
| |
</div> |
| |
</div> |
| </form>'; |
</form>'; |
| $result .= &show_grading_menu_form($symb); |
$result .= &show_grading_menu_form($symb); |
| return $result; |
return $result; |
|
Line 8582 sub process_clicker {
|
Line 8830 sub process_clicker {
|
| my %checked; |
my %checked; |
| foreach my $gradingmechanism ('attendance','personnel','specific','given') { |
foreach my $gradingmechanism ('attendance','personnel','specific','given') { |
| if ($env{'form.gradingmechanism'} eq $gradingmechanism) { |
if ($env{'form.gradingmechanism'} eq $gradingmechanism) { |
| $checked{$gradingmechanism}="checked='checked'"; |
$checked{$gradingmechanism}=' checked="checked"'; |
| } |
} |
| } |
} |
| |
|
|
Line 8646 function sanitycheck() {
|
Line 8894 function sanitycheck() {
|
| <input type="hidden" name="saveState" value="$env{'form.saveState'}" /> |
<input type="hidden" name="saveState" value="$env{'form.saveState'}" /> |
| <input type="file" name="upfile" size="50" /> |
<input type="file" name="upfile" size="50" /> |
| <br /><label>$type: $selectform</label> |
<br /><label>$type: $selectform</label> |
| <br /><label><input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" />$attendance </label> |
<br /><label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onClick="sanitycheck()" />$attendance </label> |
| <br /><label><input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" />$personnel</label> |
<br /><label><input type="radio" name="gradingmechanism" value="personnel"$checked{'personnel'} onClick="sanitycheck()" />$personnel</label> |
| <br /><label><input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" />$specific </label> |
<br /><label><input type="radio" name="gradingmechanism" value="specific"$checked{'specific'} onClick="sanitycheck()" />$specific </label> |
| <input type="text" name="specificid" value="$env{'form.specificid'}" size="20" /> |
<input type="text" name="specificid" value="$env{'form.specificid'}" size="20" /> |
| <br /><label><input type="radio" name="gradingmechanism" value="given" $checked{'given'} onClick="sanitycheck()" />$given </label> |
<br /><label><input type="radio" name="gradingmechanism" value="given"$checked{'given'} onClick="sanitycheck()" />$given </label> |
| <br /> |
<br /> |
| <input type="text" name="givenanswer" size="50" /> |
<input type="text" name="givenanswer" size="50" /> |
| <input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" /> |
<input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" /> |
|
Line 8905 sub assign_clicker_grades {
|
Line 9153 sub assign_clicker_grades {
|
| my ($symb)=&get_symb($r); |
my ($symb)=&get_symb($r); |
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| # See which part we are saving to |
# See which part we are saving to |
| my ($partlist,$handgrade,$responseType) = &response_type($symb); |
my $res_error; |
| |
my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error); |
| |
if ($res_error) { |
| |
return &navmap_errormsg(); |
| |
} |
| # FIXME: This should probably look for the first handgradeable part |
# FIXME: This should probably look for the first handgradeable part |
| my $part=$$partlist[0]; |
my $part=$$partlist[0]; |
| # Start screen output |
# Start screen output |
|
Line 8969 ENDHEADER
|
Line 9221 ENDHEADER
|
| my $sum=0; |
my $sum=0; |
| my $realnumber=$number; |
my $realnumber=$number; |
| for (my $i=0;$i<$number;$i++) { |
for (my $i=0;$i<$number;$i++) { |
| if ($answer[$i]) { |
if ($correct[$i] eq '-') { |
| |
$realnumber--; |
| |
} elsif ($answer[$i]) { |
| if ($gradingmechanism eq 'attendance') { |
if ($gradingmechanism eq 'attendance') { |
| $sum+=$pcorrect; |
$sum+=$pcorrect; |
| } elsif ($answer[$i] eq '*') { |
} elsif ($correct[$i] eq '*') { |
| $sum+=$pcorrect; |
$sum+=$pcorrect; |
| } elsif ($answer[$i] eq '-') { |
|
| $realnumber--; |
|
| } else { |
} else { |
| if ($answer[$i] eq $correct[$i]) { |
if ($answer[$i] eq $correct[$i]) { |
| $sum+=$pcorrect; |
$sum+=$pcorrect; |
|
Line 9009 ENDHEADER
|
Line 9261 ENDHEADER
|
| return $result.&show_grading_menu_form($symb); |
return $result.&show_grading_menu_form($symb); |
| } |
} |
| |
|
| |
sub navmap_errormsg { |
| |
return '<div class="LC_error">'. |
| |
&mt('An error occurred retrieving information about resources in the course.').'<br />'. |
| |
&mt('It is recommended that you [_1]re-initialize the course[_2] and then return to this grading page..','<a href="/adm/roles?selectrole=1&newrole='.$env{'request.role'}.'">','</a>'). |
| |
'</div>'; |
| |
} |
| |
|
| sub handler { |
sub handler { |
| my $request=$_[0]; |
my $request=$_[0]; |
| &reset_caches(); |
&reset_caches(); |
|
Line 9234 ssi_with_retries()
|
Line 9493 ssi_with_retries()
|
| |
|
| =item scantron_get_maxbubble() : |
=item scantron_get_maxbubble() : |
| |
|
| |
Arguments: |
| |
$nav_error - Reference to scalar which is a flag to indicate a |
| |
failure to retrieve a navmap object. |
| |
if $nav_error is set to 1 by scantron_get_maxbubble(), the |
| |
calling routine should trap the error condition and display the warning |
| |
found in &navmap_errormsg(). |
| |
|
| Returns the maximum number of bubble lines that are expected to |
Returns the maximum number of bubble lines that are expected to |
| occur. Does this by walking the selected sequence rendering the |
occur. Does this by walking the selected sequence rendering the |
| resource and then checking &Apache::lonxml::get_problem_counter() |
resource and then checking &Apache::lonxml::get_problem_counter() |
|
Line 9299 ssi_with_retries()
|
Line 9565 ssi_with_retries()
|
| Validates all scanlines in the selected file to not have any |
Validates all scanlines in the selected file to not have any |
| invalid or underspecified student/employee IDs |
invalid or underspecified student/employee IDs |
| |
|
| |
=item navmap_errormsg() : |
| |
|
| |
Returns HTML mark-up inside a <div></div> with a link to re-initialize the course. |
| |
Should be called whenever the request to instantiate a navmap object fails. |
| |
|
| =back |
=back |
| |
|
| =cut |
=cut |
![[BACK]](/icons/back.gif){kind=icon}
Return to grades.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / homework