version 1.518, 2008/04/21 16:30:47
|
version 1.603, 2010/03/26 15:40:55
|
Line 26
|
Line 26
|
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
|
|
|
|
|
|
package Apache::grades; |
package Apache::grades; |
use strict; |
use strict; |
use Apache::style; |
use Apache::style; |
Line 58 my $ssi_error_resource;
|
Line 60 my $ssi_error_resource;
|
my $ssi_error_message; |
my $ssi_error_message; |
|
|
|
|
# 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. |
|
|
|
|
|
# |
|
# ssi_with_retries - Does the server side include of a resource. |
|
# 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 { |
sub ssi_with_retries { |
my ($resource, $retries, %form) = @_; |
my ($resource, $retries, %form) = @_; |
my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form); |
my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form); |
Line 134 sub ssi_print_error {
|
Line 96 sub ssi_print_error {
|
|
|
# |
# |
# --- Retrieve the parts from the metadata file.--- |
# --- Retrieve the parts from the metadata file.--- |
|
# Returns an array of everything that the resources stores away |
|
# |
|
|
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 153 sub getpartlist {
|
Line 124 sub getpartlist {
|
} |
} |
|
|
# --- Get the symbolic name of a problem and the url |
# --- Get the symbolic name of a problem and the url |
|
# Generate an error message if symb could not be found unless silent flag is set |
|
# Takes $env{'form.symb'} by default; if not present, takes $env{'form.url'} and tries to get symb from that |
|
# |
|
|
sub get_symb { |
sub get_symb { |
my ($request,$silent) = @_; |
my ($request,$silent) = @_; |
(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; |
(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; |
my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url))); |
my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url))); |
if ($symb eq '') { |
if ($symb eq '') { |
if (!$silent) { |
if (!$silent) { |
$request->print("Unable to handle ambiguous references:$url:."); |
$request->print(&mt("Unable to handle ambiguous references: [_1].",$url)); |
return (); |
return (); |
} |
} |
} |
} |
Line 182 sub nameUserString {
|
Line 157 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); |
|
unless (ref($res)) { |
|
$$response_error = 1; |
|
return; |
|
} |
my $partlist = $res->parts(); |
my $partlist = $res->parts(); |
my %vPart = |
my %vPart = |
map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart')); |
map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart')); |
Line 221 sub get_display_part {
|
Line 206 sub get_display_part {
|
my ($partID,$symb)=@_; |
my ($partID,$symb)=@_; |
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb); |
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb); |
if (defined($display) and $display ne '') { |
if (defined($display) and $display ne '') { |
$display.= " (<span class=\"LC_internal_info\">id $partID</span>)"; |
$display.= ' (<span class="LC_internal_info">' |
|
.&mt('Part ID: [_1]',$partID).'</span>)'; |
} else { |
} else { |
$display=$partID; |
$display=$partID; |
} |
} |
return $display; |
return $display; |
} |
} |
|
|
#--- Show resource title |
|
#--- and parts and response type |
|
sub showResourceInfo { |
|
my ($symb,$probTitle,$checkboxes) = @_; |
|
my $col=3; |
|
if ($checkboxes) { $col=4; } |
|
my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n"; |
|
$result .='<table border="0">'; |
|
my ($partlist,$handgrade,$responseType) = &response_type($symb); |
|
my %resptype = (); |
|
my $hdgrade='no'; |
|
my %partsseen; |
|
foreach my $partID (sort keys(%$responseType)) { |
|
foreach my $resID (sort keys(%{ $responseType->{$partID} })) { |
|
my $handgrade=$$handgrade{$partID.'_'.$resID}; |
|
my $responsetype = $responseType->{$partID}->{$resID}; |
|
$hdgrade = $handgrade if ($handgrade eq 'yes'); |
|
$result.='<tr>'; |
|
if ($checkboxes) { |
|
if (exists($partsseen{$partID})) { |
|
$result.="<td> </td>"; |
|
} else { |
|
$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>"; |
|
} |
|
$partsseen{$partID}=1; |
|
} |
|
my $display_part=&get_display_part($partID,$symb); |
|
$result.='<td>'.&mt('<b>Part: </b>[_1]',$display_part).' <span class="LC_internal_info">'. |
|
$resID.'</span></td>'. |
|
'<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>'; |
|
# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>'; |
|
} |
|
} |
|
$result.='</table>'."\n"; |
|
return $result,$responseType,$hdgrade,$partlist,$handgrade; |
|
} |
|
|
|
sub reset_caches { |
sub reset_caches { |
&reset_analyze_cache(); |
&reset_analyze_cache(); |
&reset_perm(); |
&reset_perm(); |
Line 272 sub reset_caches {
|
Line 221 sub reset_caches {
|
|
|
{ |
{ |
my %analyze_cache; |
my %analyze_cache; |
|
my %analyze_cache_formkeys; |
|
|
sub reset_analyze_cache { |
sub reset_analyze_cache { |
undef(%analyze_cache); |
undef(%analyze_cache); |
|
undef(%analyze_cache_formkeys); |
} |
} |
|
|
sub get_analyze { |
sub get_analyze { |
my ($symb,$uname,$udom)=@_; |
my ($symb,$uname,$udom,$no_increment,$add_to_hash)=@_; |
my $key = "$symb\0$uname\0$udom"; |
my $key = "$symb\0$uname\0$udom"; |
return $analyze_cache{$key} if (exists($analyze_cache{$key})); |
if (exists($analyze_cache{$key})) { |
|
my $getupdate = 0; |
|
if (ref($add_to_hash) eq 'HASH') { |
|
foreach my $item (keys(%{$add_to_hash})) { |
|
if (ref($analyze_cache_formkeys{$key}) eq 'HASH') { |
|
if (!exists($analyze_cache_formkeys{$key}{$item})) { |
|
$getupdate = 1; |
|
last; |
|
} |
|
} else { |
|
$getupdate = 1; |
|
} |
|
} |
|
} |
|
if (!$getupdate) { |
|
return $analyze_cache{$key}; |
|
} |
|
} |
|
|
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=&ssi_with_retries($url, $ssi_retries, |
my %form = ('grade_target' => 'analyze', |
('grade_target' => 'analyze', |
'grade_domain' => $udom, |
'grade_domain' => $udom, |
'grade_symb' => $symb, |
'grade_symb' => $symb, |
'grade_courseid' => $env{'request.course.id'}, |
'grade_courseid' => |
'grade_username' => $uname, |
$env{'request.course.id'}, |
'grade_noincrement' => $no_increment); |
'grade_username' => $uname)); |
if (ref($add_to_hash)) { |
|
%form = (%form,%{$add_to_hash}); |
|
} |
|
my $subresult=&ssi_with_retries($url, $ssi_retries,%form); |
(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); |
|
if (ref($add_to_hash) eq 'HASH') { |
|
$analyze_cache_formkeys{$key} = $add_to_hash; |
|
} else { |
|
$analyze_cache_formkeys{$key} = {}; |
|
} |
return $analyze_cache{$key} = \%analyze; |
return $analyze_cache{$key} = \%analyze; |
} |
} |
|
|
sub get_order { |
sub get_order { |
my ($partid,$respid,$symb,$uname,$udom)=@_; |
my ($partid,$respid,$symb,$uname,$udom,$no_increment)=@_; |
my $analyze = &get_analyze($symb,$uname,$udom); |
my $analyze = &get_analyze($symb,$uname,$udom,$no_increment); |
return $analyze->{"$partid.$respid.shown"}; |
return $analyze->{"$partid.$respid.shown"}; |
} |
} |
|
|
sub get_radiobutton_correct_foil { |
sub get_radiobutton_correct_foil { |
my ($partid,$respid,$symb,$uname,$udom)=@_; |
my ($partid,$respid,$symb,$uname,$udom)=@_; |
my $analyze = &get_analyze($symb,$uname,$udom); |
my $analyze = &get_analyze($symb,$uname,$udom); |
foreach my $foil (@{&get_order($partid,$respid,$symb,$uname,$udom)}) { |
my $foils = &get_order($partid,$respid,$symb,$uname,$udom); |
if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') { |
if (ref($foils) eq 'ARRAY') { |
return $foil; |
foreach my $foil (@{$foils}) { |
|
if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') { |
|
return $foil; |
|
} |
} |
} |
} |
} |
} |
} |
|
|
|
sub scantron_partids_tograde { |
|
my ($resource,$cid,$uname,$udom,$check_for_randomlist) = @_; |
|
my (%analysis,@parts); |
|
if (ref($resource)) { |
|
my $symb = $resource->symb(); |
|
my $add_to_form; |
|
if ($check_for_randomlist) { |
|
$add_to_form = { 'check_parts_withrandomlist' => 1,}; |
|
} |
|
my $analyze = &get_analyze($symb,$uname,$udom,undef,$add_to_form); |
|
if (ref($analyze) eq 'HASH') { |
|
%analysis = %{$analyze}; |
|
} |
|
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); |
|
} |
|
} |
|
} |
|
} |
|
return (\%analysis,\@parts); |
|
} |
|
|
} |
} |
|
|
#--- Clean response type for display |
#--- Clean response type for display |
Line 378 sub cleanRecord {
|
Line 383 sub cleanRecord {
|
return '<blockquote><table border="1">'. |
return '<blockquote><table border="1">'. |
'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'. |
'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>'; |
$bottomrow.'</tr>'.'</table></blockquote>'; |
} elsif ($response eq 'essay') { |
} elsif ($response eq 'essay') { |
if (! exists ($env{'form.'.$symb})) { |
if (! exists ($env{'form.'.$symb})) { |
my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade', |
my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade', |
Line 440 sub cleanRecord {
|
Line 445 sub cleanRecord {
|
#-- A couple of common js functions |
#-- A couple of common js functions |
sub commonJSfunctions { |
sub commonJSfunctions { |
my $request = shift; |
my $request = shift; |
$request->print(<<COMMONJSFUNCTIONS); |
$request->print(&Apache::lonhtmlcommon::scripttag(<<COMMONJSFUNCTIONS)); |
<script type="text/javascript" language="javascript"> |
|
function radioSelection(radioButton) { |
function radioSelection(radioButton) { |
var selection=null; |
var selection=null; |
if (radioButton.length > 1) { |
if (radioButton.length > 1) { |
Line 469 sub commonJSfunctions {
|
Line 473 sub commonJSfunctions {
|
return selectOne.value; |
return selectOne.value; |
} |
} |
} |
} |
</script> |
|
COMMONJSFUNCTIONS |
COMMONJSFUNCTIONS |
} |
} |
|
|
Line 624 sub student_gradeStatus {
|
Line 627 sub student_gradeStatus {
|
sub jscriptNform { |
sub jscriptNform { |
my ($symb) = @_; |
my ($symb) = @_; |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
my $jscript='<script type="text/javascript" language="javascript">'."\n". |
my $jscript= &Apache::lonhtmlcommon::scripttag( |
' function viewOneStudent(user,domain) {'."\n". |
' function viewOneStudent(user,domain) {'."\n". |
' document.onestudent.student.value = user;'."\n". |
' document.onestudent.student.value = user;'."\n". |
' document.onestudent.userdom.value = domain;'."\n". |
' document.onestudent.userdom.value = domain;'."\n". |
' document.onestudent.submit();'."\n". |
' document.onestudent.submit();'."\n". |
' }'."\n". |
' }'."\n". |
'</script>'."\n"; |
"\n"); |
$jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n". |
$jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n". |
'<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". |
Line 687 sub most_similar {
|
Line 690 sub most_similar {
|
|
|
# ignore empty submissions (occuring when only files are sent) |
# ignore empty submissions (occuring when only files are sent) |
|
|
unless ($uessay=~/\w+/) { return ''; } |
unless ($uessay=~/\w+/s) { return ''; } |
|
|
# these will be returned. Do not care if not at least 50 percent similar |
# these will be returned. Do not care if not at least 50 percent similar |
my $limit=0.6; |
my $limit=0.6; |
Line 724 sub most_similar {
|
Line 727 sub most_similar {
|
|
|
#------------------------------------ Receipt Verification Routines |
#------------------------------------ Receipt Verification Routines |
# |
# |
|
|
|
sub initialverifyreceipt { |
|
my $request = shift; |
|
&commonJSfunctions($request); |
|
my ($symb) = &get_symb($request); |
|
return '<form name="gradingMenu"><input type="submit" value="'.&mt('Verify Receipt No.').'" />'. |
|
&Apache::lonnet::recprefix($env{'request.course.id'}). |
|
'-<input type="text" name="receipt" size="4" />'. |
|
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
|
'<input type="hidden" name="command" value="verify" />'. |
|
"</form>\n"; |
|
} |
|
|
#--- Check whether a receipt number is valid.--- |
#--- Check whether a receipt number is valid.--- |
sub verifyreceipt { |
sub verifyreceipt { |
my $request = shift; |
my $request = shift; |
Line 736 sub verifyreceipt {
|
Line 752 sub verifyreceipt {
|
|
|
my $title.= |
my $title.= |
'<h3><span class="LC_info">'. |
'<h3><span class="LC_info">'. |
&mt('Verifying Submission Receipt [_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 748 sub verifyreceipt {
|
Line 764 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 790 sub verifyreceipt {
|
Line 812 sub verifyreceipt {
|
} |
} |
} |
} |
if ($matches == 0) { |
if ($matches == 0) { |
$string = $title.&mt('No match found for the above receipt.'); |
$string = $title |
|
.'<p class="LC_warning">' |
|
.&mt('No match found for the above receipt number.') |
|
.'</p>'; |
} 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 [quant,_1,student].',$matches). |
'</p>'. |
'</p>'. |
$header. |
$header. |
$contents. |
$contents. |
Line 820 sub listStudents {
|
Line 845 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"> '. |
my $result='<h3><span class="LC_info"> ' |
&mt($viewgrade.' Submissions for a Student or a Group of Students') |
.&mt("$viewgrade Submissions for a Student or a Group of Students") |
.'</span></h3>'; |
.'</span></h3>'; |
|
|
my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes')); |
my ($partlist,$handgrade,$responseType) = &response_type($symb |
|
#,$res_error |
my %lt = ( 'multiple' => |
); |
"Please select a student or group of students before clicking on the Next button.", |
|
'single' => |
my %lt = &Apache::lonlocal::texthash ( |
"Please select the student before clicking on the Next button.", |
'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(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT)); |
<script type="text/javascript" language="javascript"> |
|
function checkSelect(checkBox) { |
function checkSelect(checkBox) { |
var ctr=0; |
var ctr=0; |
var sense=""; |
var sense=""; |
Line 862 sub listStudents {
|
Line 886 sub listStudents {
|
formname.command.value = 'submission'; |
formname.command.value = 'submission'; |
formname.submit(); |
formname.submit(); |
} |
} |
</script> |
|
LISTJAVASCRIPT |
LISTJAVASCRIPT |
|
|
&commonJSfunctions($request); |
&commonJSfunctions($request); |
Line 871 LISTJAVASCRIPT
|
Line 894 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"; |
|
|
$gradeTable .= |
$gradeTable .= &Apache::lonhtmlcommon::start_pick_box(); |
' '. |
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text')) |
&mt('<b>View Problem Text: </b>[_1]', |
.'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n" |
'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n". |
.'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n" |
'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n". |
.'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n" |
'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label>').'<br />'."\n"; |
.&Apache::lonhtmlcommon::row_closure(); |
$gradeTable .= |
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Answer')) |
' '. |
.'<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n" |
&mt('<b>View Answer: </b>[_1]', |
.'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n" |
'<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n". |
.'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n" |
'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n". |
.&Apache::lonhtmlcommon::row_closure(); |
'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label>').'<br />'."\n"; |
|
|
|
my $submission_options; |
my $submission_options; |
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) { |
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) { |
Line 895 LISTJAVASCRIPT
|
Line 917 LISTJAVASCRIPT
|
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status; |
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status; |
$env{'form.Status'} = $saveStatus; |
$env{'form.Status'} = $saveStatus; |
$submission_options.= |
$submission_options.= |
'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.&mt('last submission only').' </label>'."\n". |
'<span class="LC_nobreak">'. |
'<label><input type="radio" name="lastSub" value="last" /> '.&mt('last submission & parts info').' </label>'."\n". |
'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '. |
'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n". |
&mt('last submission only').' </label></span>'."\n". |
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>'; |
'<span class="LC_nobreak">'. |
$gradeTable .= |
'<label><input type="radio" name="lastSub" value="last" /> '. |
' '. |
&mt('last submission & parts info').' </label></span>'."\n". |
&mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n"; |
'<span class="LC_nobreak">'. |
|
'<label><input type="radio" name="lastSub" value="datesub" /> '. |
|
&mt('by dates and submissions').'</label></span>'."\n". |
|
'<span class="LC_nobreak">'. |
|
'<label><input type="radio" name="lastSub" value="all" /> '. |
|
&mt('all details').'</label></span>'; |
|
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions')) |
|
.$submission_options |
|
.&Apache::lonhtmlcommon::row_closure(); |
|
|
|
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments')) |
|
.'<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>' |
|
.&Apache::lonhtmlcommon::row_closure(); |
|
|
$gradeTable .= |
$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 924 LISTJAVASCRIPT
|
Line 953 LISTJAVASCRIPT
|
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n"; |
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n"; |
|
|
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.=&mt('<b>Student Status:</b> [_1]', |
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status')) |
&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />'; |
.&Apache::lonhtmlcommon::StatusOptions( |
|
$saveStatus,undef,1,'javascript:reLoadList(this.form);') |
|
.&Apache::lonhtmlcommon::row_closure(); |
} |
} |
|
|
$gradeTable.=&mt('To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '. |
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism')) |
'next to the student\'s name(s). Then click on the Next button.').'<br />'."\n". |
.'<input type="checkbox" name="checkPlag" checked="checked" />' |
'<input type="hidden" name="command" value="processGroup" />'."\n"; |
.&Apache::lonhtmlcommon::row_closure(1) |
|
.&Apache::lonhtmlcommon::end_pick_box(); |
|
|
|
$gradeTable .= '<p>' |
|
.&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.")."\n" |
|
.'<input type="hidden" name="command" value="processGroup" />' |
|
.'</p>'; |
|
|
# 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="'.&mt('Next->').'" /> <br />'."\n"; |
'value="'.&mt('Next').' →" /> <br />'."\n"; |
$gradeTable.=&check_buttons(); |
$gradeTable.=&check_buttons(); |
$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.= &Apache::loncommon::start_data_table(). |
$gradeTable.= &Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(); |
&Apache::loncommon::start_data_table_header_row(); |
Line 1023 LISTJAVASCRIPT
|
Line 1059 LISTJAVASCRIPT
|
$gradeTable.= &Apache::loncommon::start_data_table_row(); |
$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 ne '' ?'/'.$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"> '.&mt($status{$_}).' </td>'."\n"; |
$gradeTable.='<td align="center"> '.&mt($status{$_}).' </td>'."\n"; |
} |
} |
Line 1056 LISTJAVASCRIPT
|
Line 1092 LISTJAVASCRIPT
|
} |
} |
|
|
$gradeTable.=&Apache::loncommon::end_data_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="'.&mt('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) { |
Line 1085 LISTJAVASCRIPT
|
Line 1121 LISTJAVASCRIPT
|
|
|
sub check_script { |
sub check_script { |
my ($form, $type)=@_; |
my ($form, $type)=@_; |
my $chkallscript='<script type="text/javascript"> |
my $chkallscript= &Apache::lonhtmlcommon::scripttag(' |
function checkall() { |
function checkall() { |
for (i=0; i<document.forms.'.$form.'.elements.length; i++) { |
for (i=0; i<document.forms.'.$form.'.elements.length; i++) { |
ele = document.forms.'.$form.'.elements[i]; |
ele = document.forms.'.$form.'.elements[i]; |
Line 1116 sub check_script {
|
Line 1152 sub check_script {
|
} |
} |
} |
} |
|
|
</script>'."\n"; |
'."\n"); |
return $chkallscript; |
return $chkallscript; |
} |
} |
|
|
Line 1154 sub processGroup {
|
Line 1190 sub processGroup {
|
#--- Javascript to handle the submission page functionality --- |
#--- Javascript to handle the submission page functionality --- |
sub sub_page_js { |
sub sub_page_js { |
my $request = shift; |
my $request = shift; |
$request->print(<<SUBJAVASCRIPT); |
my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = '); |
<script type="text/javascript" language="javascript"> |
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT)); |
function updateRadio(formname,id,weight) { |
function updateRadio(formname,id,weight) { |
var gradeBox = formname["GD_BOX"+id]; |
var gradeBox = formname["GD_BOX"+id]; |
var radioButton = formname["RADVAL"+id]; |
var radioButton = formname["RADVAL"+id]; |
Line 1164 sub sub_page_js {
|
Line 1200 sub sub_page_js {
|
gradeBox.value = pts; |
gradeBox.value = pts; |
var resetbox = false; |
var resetbox = false; |
if (isNaN(pts) || pts < 0) { |
if (isNaN(pts) || pts < 0) { |
alert("A number equal or greater than 0 is expected. Entered value = "+pts); |
alert("$alertmsg"+pts); |
for (var i=0; i<radioButton.length; i++) { |
for (var i=0; i<radioButton.length; i++) { |
if (radioButton[i].checked) { |
if (radioButton[i].checked) { |
gradeBox.value = i; |
gradeBox.value = i; |
Line 1323 sub sub_page_js {
|
Line 1359 sub sub_page_js {
|
|
|
formname.submit(); |
formname.submit(); |
} |
} |
</script> |
|
SUBJAVASCRIPT |
SUBJAVASCRIPT |
} |
} |
|
|
Line 1333 sub sub_page_kw_js {
|
Line 1368 sub sub_page_kw_js {
|
my $iconpath = $request->dir_config('lonIconsURL'); |
my $iconpath = $request->dir_config('lonIconsURL'); |
&commonJSfunctions($request); |
&commonJSfunctions($request); |
|
|
my $inner_js_msg_central=<<INNERJS; |
my $inner_js_msg_central= &Apache::lonhtmlcommon::scripttag(<<INNERJS); |
<script text="text/javascript"> |
|
function checkInput() { |
function checkInput() { |
opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value); |
opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value); |
var nmsg = opener.document.SCORE.savemsgN.value; |
var nmsg = opener.document.SCORE.savemsgN.value; |
Line 1371 sub sub_page_kw_js {
|
Line 1405 sub sub_page_kw_js {
|
self.close() |
self.close() |
|
|
} |
} |
</script> |
|
INNERJS |
INNERJS |
|
|
my $inner_js_highlight_central=<<INNERJS; |
my $inner_js_highlight_central= &Apache::lonhtmlcommon::scripttag(<<INNERJS); |
<script type="text/javascript"> |
|
function updateChoice(flag) { |
function updateChoice(flag) { |
opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr); |
opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr); |
opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize); |
opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize); |
Line 1386 INNERJS
|
Line 1418 INNERJS
|
} |
} |
self.close() |
self.close() |
} |
} |
</script> |
|
INNERJS |
INNERJS |
|
|
my $start_page_msg_central = |
my $start_page_msg_central = |
Line 1409 INNERJS
|
Line 1440 INNERJS
|
|
|
my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); |
my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); |
$docopen=~s/^document\.//; |
$docopen=~s/^document\.//; |
$request->print(<<SUBJAVASCRIPT); |
my $alertmsg = &mt('Please select a word or group of words from document and then click this link.'); |
<script type="text/javascript" language="javascript"> |
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT)); |
|
|
//===================== Show list of keywords ==================== |
//===================== Show list of keywords ==================== |
function keywords(formname) { |
function keywords(formname) { |
Line 1441 INNERJS
|
Line 1472 INNERJS
|
else return; |
else return; |
var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," "); |
var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," "); |
if (cleantxt=="") { |
if (cleantxt=="") { |
alert("Please select a word or group of words from document and then click this link."); |
alert("$alertmsg"); |
return; |
return; |
} |
} |
var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt); |
var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt); |
Line 1528 INNERJS
|
Line 1559 INNERJS
|
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">"); |
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">"); |
pDoc.write("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />"); |
pDoc.write("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />"); |
|
|
pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">"); |
pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">"); |
pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
pDoc.write("<td><b>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>"); |
pDoc.write("<td><b>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>"); |
} |
} |
function displaySubject(msg,shwsel) { |
function displaySubject(msg,shwsel) { |
Line 1560 INNERJS
|
Line 1591 INNERJS
|
pDoc = pWin.document; |
pDoc = pWin.document; |
pDoc.write("<\\/table>"); |
pDoc.write("<\\/table>"); |
pDoc.write("<\\/td><\\/tr><\\/table> "); |
pDoc.write("<\\/td><\\/tr><\\/table> "); |
pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\"> "); |
pDoc.write("<input type=\\"button\\" value=\\"Save\\" onclick=\\"javascript:checkInput()\\"> "); |
pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />"); |
pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onclick=\\"self.close()\\"><br /><br />"); |
pDoc.write("<\\/form>"); |
pDoc.write("<\\/form>"); |
pDoc.write('$end_page_msg_central'); |
pDoc.write('$end_page_msg_central'); |
pDoc.close(); |
pDoc.close(); |
Line 1613 INNERJS
|
Line 1644 INNERJS
|
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">"); |
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">"); |
hDoc.write("<h3><span class=\\"LC_info\\"> Keyword Highlight Options<\\/span><\\/h3><br /><br />"); |
hDoc.write("<h3><span class=\\"LC_info\\"> Keyword Highlight Options<\\/span><\\/h3><br /><br />"); |
|
|
hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">"); |
hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">"); |
hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>"); |
hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>"); |
} |
} |
|
|
Line 1634 INNERJS
|
Line 1665 INNERJS
|
var hDoc = hwdWin.document; |
var hDoc = hwdWin.document; |
hDoc.write("<\\/table>"); |
hDoc.write("<\\/table>"); |
hDoc.write("<\\/td><\\/tr><\\/table> "); |
hDoc.write("<\\/td><\\/tr><\\/table> "); |
hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\"> "); |
hDoc.write("<input type=\\"button\\" value=\\"Save\\" onclick=\\"javascript:updateChoice(1)\\"> "); |
hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />"); |
hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onclick=\\"self.close()\\"><br /><br />"); |
hDoc.write("<\\/form>"); |
hDoc.write("<\\/form>"); |
hDoc.write('$end_page_highlight_central'); |
hDoc.write('$end_page_highlight_central'); |
hDoc.close(); |
hDoc.close(); |
} |
} |
|
|
</script> |
|
SUBJAVASCRIPT |
SUBJAVASCRIPT |
} |
} |
|
|
Line 1654 sub get_increment {
|
Line 1684 sub get_increment {
|
return $increment; |
return $increment; |
} |
} |
|
|
|
sub gradeBox_start { |
|
return ( |
|
&Apache::loncommon::start_data_table() |
|
.&Apache::loncommon::start_data_table_header_row() |
|
.'<th>'.&mt('Part').'</th>' |
|
.'<th>'.&mt('Points').'</th>' |
|
.'<th> </th>' |
|
.'<th>'.&mt('Assign Grade').'</th>' |
|
.'<th>'.&mt('Weight').'</th>' |
|
.'<th>'.&mt('Grade Status').'</th>' |
|
.&Apache::loncommon::end_data_table_header_row() |
|
); |
|
} |
|
|
|
sub gradeBox_end { |
|
return ( |
|
&Apache::loncommon::end_data_table() |
|
); |
|
} |
#--- displays the grading box, used in essay type problem and grading by page/sequence |
#--- displays the grading box, used in essay type problem and grading by page/sequence |
sub gradeBox { |
sub gradeBox { |
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_; |
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_; |
Line 1673 sub gradeBox {
|
Line 1722 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>'; |
$result.=&Apache::loncommon::start_data_table_row(); |
my $ctr = 0; |
my $ctr = 0; |
my $thisweight = 0; |
my $thisweight = 0; |
my $increment = &get_increment(); |
my $increment = &get_increment(); |
|
|
my $radio.='<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) { |
$radio.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '. |
$radio.= '<td><span class="LC_nobreak"><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"; |
$radio.=(($ctr+1)%10 == 0 ? '</tr><tr>' : ''); |
$radio.=(($ctr+1)%10 == 0 ? '</tr><tr>' : ''); |
Line 1692 sub gradeBox {
|
Line 1741 sub gradeBox {
|
|
|
my $line.='<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"; |
$line.='<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>'."\n"; |
$line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '. |
$line.='<td><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') { |
$line.='<option></option>'. |
$line.='<option></option>'. |
'<option value="excused" selected="selected">'.&mt('excused').'</option>'; |
'<option value="excused" selected="selected">'.&mt('excused').'</option>'; |
Line 1709 sub gradeBox {
|
Line 1758 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 .= |
&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); |
'<td>'.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'; |
|
$result.=&Apache::loncommon::end_data_table_row(); |
|
|
$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 1722 sub gradeBox {
|
Line 1770 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) { |
Line 1790 sub show_problem {
|
Line 1842 sub show_problem {
|
$companswer=~s|name="submit"|name="would_have_been_submit"|g; |
$companswer=~s|name="submit"|name="would_have_been_submit"|g; |
} |
} |
$rendered= |
$rendered= |
'<div class="LC_grade_show_problem_header">'. |
'<div class="LC_Box">' |
&mt('View of the problem'). |
.'<h3 class="LC_hcell">'.&mt('View of the problem').'</h3>' |
'</div><div class="LC_grade_show_problem_problem">'. |
.$rendered |
$rendered. |
.'</div>'; |
'</div>'; |
|
$companswer= |
$companswer= |
'<div class="LC_grade_show_problem_header">'. |
'<div class="LC_Box">' |
&mt('Correct answer'). |
.'<h3 class="LC_hcell">'.&mt('Correct answer').'</h3>' |
'</div><div class="LC_grade_show_problem_problem">'. |
.$companswer |
$companswer. |
.'</div>'; |
'</div>'; |
|
my $result; |
my $result; |
if ($mode eq 'both') { |
if ($mode eq 'both') { |
$result=$rendered.$companswer; |
$result=$rendered.$companswer; |
} elsif ($mode eq 'text') { |
} elsif ($mode eq 'text') { |
$result=$rendered; |
$result=$rendered; |
} elsif ($mode eq 'answer') { |
} elsif ($mode eq 'answer') { |
$result=$companswer; |
$result=$companswer; |
} |
} |
$result='<div class="LC_grade_show_problem">'.$result.'</div>'; |
|
return $result; |
return $result; |
} |
} |
|
|
Line 1987 sub submission {
|
Line 2036 sub submission {
|
$request->print(<<KEYWORDS); |
$request->print(<<KEYWORDS); |
<b>Keyword Options:</b> |
<b>Keyword Options:</b> |
<a href="javascript:keywords(document.SCORE);" target="_self">List</a> |
<a href="javascript:keywords(document.SCORE);" target="_self">List</a> |
<a href="#" onMouseDown="javascript:getSel(); return false" |
<a href="#" onmousedown="javascript:getSel(); return false" |
CLASS="page">Paste Selection to List</a> |
CLASS="page">Paste Selection to List</a> |
<a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br /> |
<a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br /> |
KEYWORDS |
KEYWORDS |
Line 2003 KEYWORDS
|
Line 2052 KEYWORDS
|
} |
} |
|
|
# This is where output for one specific student would start |
# This is where output for one specific student would start |
my $add_class = ($counter%2) ? 'LC_grade_show_user_odd_row' : ''; |
my $add_class = ($counter%2) ? ' LC_grade_show_user_odd_row' : ''; |
$request->print("\n\n". |
$request->print( |
'<div class="LC_grade_show_user '.$add_class.'">'. |
"\n\n" |
'<div class="LC_grade_user_name">'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'</div>'. |
.'<div class="LC_grade_show_user'.$add_class.'">' |
'<div class="LC_grade_show_user_body">'."\n"); |
.'<h2>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'</h2>' |
|
."\n" |
|
); |
|
|
|
# Show additional functions if allowed |
|
if ($perm{'vgr'}) { |
|
$request->print( |
|
&Apache::loncommon::track_student_link( |
|
&mt('View recent activity'), |
|
$uname,$udom,'check') |
|
.' ' |
|
); |
|
} |
|
if ($perm{'opa'}) { |
|
$request->print( |
|
&Apache::loncommon::pprmlink( |
|
&mt('Set/Change parameters'), |
|
$uname,$udom,$symb,'check')); |
|
} |
|
|
|
# Show Problem |
if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') { |
if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') { |
my $mode; |
my $mode; |
if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') { |
if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') { |
Line 2023 KEYWORDS
|
Line 2091 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 />')); |
my $result='<div class="LC_grade_submissions">'; |
|
|
my $result='<div class="LC_Box">' |
$result.='<div class="LC_grade_submissions_header">'; |
.'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>'; |
$result.= &mt('Submissions'); |
|
$result.='<input type="hidden" name="name'.$counter. |
$result.='<input type="hidden" name="name'.$counter. |
'" value="'.$env{'form.fullname'}.'" />'."\n"; |
'" value="'.$env{'form.fullname'}.'" />'."\n"; |
if ($env{'form.handgrade'} eq 'no') { |
if ($env{'form.handgrade'} eq 'no') { |
$result.='<span class="LC_grade_check_note">'. |
$result.='<p class="LC_info">' |
&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)."</span>\n"; |
.&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon) |
|
."</p>\n"; |
} |
} |
|
|
|
|
|
|
# If any part of the problem is an essay-response (handgraded), then check for collaborators |
# If any part of the problem is an essay-response (handgraded), then check for collaborators |
my $fullname; |
my $fullname; |
my $col_fullnames = []; |
my $col_fullnames = []; |
Line 2051 KEYWORDS
|
Line 2121 KEYWORDS
|
$result.=$sub_result; |
$result.=$sub_result; |
} |
} |
$request->print($result."\n"); |
$request->print($result."\n"); |
$request->print('</div>'."\n"); |
|
# print student answer/submission |
# print student answer/submission |
# Options are (1) Handgaded submission only |
# Options are (1) Handgraded submission only |
# (2) Last submission, includes submission that is not handgraded |
# (2) Last submission, includes submission that is not handgraded |
# (for multi-response type part) |
# (for multi-response type part) |
# (3) Last submission plus the parts info |
# (3) Last submission plus the parts info |
Line 2063 KEYWORDS
|
Line 2133 KEYWORDS
|
|
|
my $lastsubonly; |
my $lastsubonly; |
|
|
if ($$timestamp eq '') { |
if ($$timestamp eq '') { |
$lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>'; |
$lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>'; |
} else { |
} else { |
$lastsubonly = '<div class="LC_grade_submissions_body"> <b>Date Submitted:</b> '.$$timestamp."\n"; |
$lastsubonly = |
|
'<div class="LC_grade_submissions_body">' |
|
.'<b>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n"; |
|
|
my %seenparts; |
my %seenparts; |
my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id = &flatten_responseType($responseType); |
Line 2090 KEYWORDS
|
Line 2162 KEYWORDS
|
} |
} |
my $responsetype = $responseType->{$partid}->{$respid}; |
my $responsetype = $responseType->{$partid}->{$respid}; |
if (!exists($record{"resource.$partid.$respid.submission"})) { |
if (!exists($record{"resource.$partid.$respid.submission"})) { |
$lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '. |
$lastsubonly.="\n".'<div class="LC_grade_submission_part">'. |
$display_part.' <span class="LC_internal_info">( ID '.$respid. |
'<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
' )</span> '. |
' <span class="LC_internal_info">'. |
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br /><br /></div>'; |
'('.&mt('Part ID: [_1]',$respid).')'. |
|
'</span> '. |
|
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>'; |
next; |
next; |
} |
} |
foreach my $submission (@$string) { |
foreach my $submission (@$string) { |
my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/); |
my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/); |
if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; } |
if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; } |
my ($ressub,$subval) = split(/:/,$submission,2); |
my ($ressub,$hide,$subval) = split(/:/,$submission,3); |
# Similarity check |
# Similarity check |
my $similar=''; |
my $similar=''; |
if($env{'form.checkPlag'}){ |
if($env{'form.checkPlag'}){ |
Line 2111 KEYWORDS
|
Line 2185 KEYWORDS
|
&Apache::lonnet::coursedescription($ocrsid, |
&Apache::lonnet::coursedescription($ocrsid, |
{'one_time' => 1}); |
{'one_time' => 1}); |
|
|
$similar="<hr /><h3><span class=\"LC_warning\">". |
if ($hide) { |
&mt('Essay is [_1]% similar to an essay by [_2] ([_3]:[_4]) in course [_5] (course id [_6]:[_7])', |
$similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'. |
$osim, |
&mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />'; |
&Apache::loncommon::plainname($oname,$odom), |
} else { |
$oname,$odom, |
$similar="<hr /><h3><span class=\"LC_warning\">". |
$old_course_desc{'description'}, |
&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])', |
$old_course_desc{'num'}, |
$osim, |
$old_course_desc{'domain'}). |
&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')', |
'</span></h3><blockquote><i>'. |
$old_course_desc{'description'}, |
&keywords_highlight($oessay). |
$old_course_desc{'num'}, |
'</i></blockquote><hr />'; |
$old_course_desc{'domain'}). |
|
'</span></h3><blockquote><i>'. |
|
&keywords_highlight($oessay). |
|
'</i></blockquote><hr />'; |
|
} |
} |
} |
} |
} |
my $order=&get_order($partid,$respid,$symb,$uname,$udom); |
my $order=&get_order($partid,$respid,$symb,$uname,$udom); |
Line 2129 KEYWORDS
|
Line 2207 KEYWORDS
|
($env{'form.lastSub'} eq 'hdgrade' && |
($env{'form.lastSub'} eq 'hdgrade' && |
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) { |
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) { |
my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
$lastsubonly.='<div class="LC_grade_submission_part"><b>Part:</b> '. |
$lastsubonly.='<div class="LC_grade_submission_part">'. |
$display_part.' <span class="LC_internal_info">( ID '.$respid. |
'<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
' )</span> '; |
' <span class="LC_internal_info">'. |
|
'('.&mt('Part ID: [_1]',$respid).')'. |
|
'</span> '; |
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record); |
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record); |
if (@$files) { |
if (@$files) { |
$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain virusses').'</span><br />'; |
if ($hide) { |
my $file_counter = 0; |
$lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files})); |
foreach my $file (@$files) { |
} else { |
$file_counter++; |
$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />'; |
&Apache::lonnet::allowuploaded('/adm/grades',$file); |
foreach my $file (@$files) { |
$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>'; |
&Apache::lonnet::allowuploaded('/adm/grades',$file); |
} |
$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" /> '.$file.'</a>'; |
|
} |
|
} |
$lastsubonly.='<br />'; |
$lastsubonly.='<br />'; |
} |
} |
$lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'. |
if ($hide) { |
&cleanRecord($subval,$responsetype,$symb,$partid, |
$lastsubonly.='<b>'.&mt('Anonymous Survey').'</b>'; |
$respid,\%record,$order); |
} else { |
|
$lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'. |
|
&cleanRecord($subval,$responsetype,$symb,$partid, |
|
$respid,\%record,$order,undef,$uname,$udom); |
|
} |
if ($similar) {$lastsubonly.="<br /><br />$similar\n";} |
if ($similar) {$lastsubonly.="<br /><br />$similar\n";} |
$lastsubonly.='</div>'; |
$lastsubonly.='</div>'; |
} |
} |
} |
} |
} |
} |
$lastsubonly.='</div>'."\n"; |
$lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body |
} |
} |
$request->print($lastsubonly); |
$request->print($lastsubonly); |
} elsif ($env{'form.lastSub'} eq 'datesub') { |
} elsif ($env{'form.lastSub'} eq 'datesub') { |
my (undef,$responseType,undef,$parts) = &showResourceInfo($symb); |
# my (undef,$responseType,undef,$parts) = &showResourceInfo($symb); |
|
my ($parts,$handgrade,$responseType) = &response_type($symb); |
|
|
$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom)); |
$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom)); |
} elsif ($env{'form.lastSub'} =~ /^(last|all)$/) { |
} elsif ($env{'form.lastSub'} =~ /^(last|all)$/) { |
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, |
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, |
Line 2169 KEYWORDS
|
Line 2257 KEYWORDS
|
# return if view submission with no grading option |
# return if view submission with no grading option |
if ($env{'form.showgrading'} eq '' || (!&canmodify($usec))) { |
if ($env{'form.showgrading'} eq '' || (!&canmodify($usec))) { |
my $toGrade.='<input type="button" value="Grade Student" '. |
my $toGrade.='<input type="button" value="Grade Student" '. |
'onClick="javascript:checksubmit(this.form,\'Grade Student\',\'' |
'onclick="javascript:checksubmit(this.form,\'Grade Student\',\'' |
.$counter.'\');" target="_self" /> '."\n" if (&canmodify($usec)); |
.$counter.'\');" target="_self" /> '."\n" if (&canmodify($usec)); |
$toGrade.='</div>'."\n"; |
$toGrade.='</div>'."\n"; |
if (($env{'form.command'} eq 'submission') || |
if (($env{'form.command'} eq 'submission') || |
Line 2213 KEYWORDS
|
Line 2301 KEYWORDS
|
my @partlist; |
my @partlist; |
my @gradePartRespid; |
my @gradePartRespid; |
my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id = &flatten_responseType($responseType); |
$request->print('<div class="LC_grade_assign">'. |
$request->print( |
|
'<div class="LC_Box">' |
'<div class="LC_grade_assign_header">'. |
.'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>' |
&mt('Assign Grades').'</div>'. |
); |
'<div class="LC_grade_assign_body">'); |
$request->print(&gradeBox_start()); |
foreach my $part_response_id (@part_response_id) { |
foreach my $part_response_id (@part_response_id) { |
my ($partid,$respid) = @{ $part_response_id }; |
my ($partid,$respid) = @{ $part_response_id }; |
my $part_resp = join('_',@{ $part_response_id }); |
my $part_resp = join('_',@{ $part_response_id }); |
Line 2225 KEYWORDS
|
Line 2313 KEYWORDS
|
$seen{$partid}++; |
$seen{$partid}++; |
next if ($$handgrade{$part_resp} ne 'yes' |
next if ($$handgrade{$part_resp} ne 'yes' |
&& $env{'form.lastSub'} eq 'hdgrade'); |
&& $env{'form.lastSub'} eq 'hdgrade'); |
push @partlist,$partid; |
push(@partlist,$partid); |
push @gradePartRespid,$partid.'.'.$respid; |
push(@gradePartRespid,$partid.'.'.$respid); |
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record)); |
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record)); |
} |
} |
$request->print('</div></div>'); |
$request->print(&gradeBox_end()); # </div> |
|
$request->print('</div>'); |
|
|
$request->print('<div class="LC_grade_info_links">'); |
$request->print('<div class="LC_grade_info_links">'); |
if ($perm{'vgr'}) { |
|
$request->print( |
|
&Apache::loncommon::track_student_link(&mt('View recent activity'), |
|
$uname,$udom,'check')); |
|
} |
|
if ($perm{'opa'}) { |
|
$request->print( |
|
&Apache::loncommon::pprmlink(&mt('Set/Change parameters'), |
|
$uname,$udom,$symb,'check')); |
|
} |
|
$request->print('</div>'); |
$request->print('</div>'); |
|
|
$result='<input type="hidden" name="partlist'.$counter. |
$result='<input type="hidden" name="partlist'.$counter. |
Line 2258 KEYWORDS
|
Line 2337 KEYWORDS
|
|
|
# Done with printing info for one student |
# Done with printing info for one student |
|
|
$request->print('</div>');#LC_grade_show_user_body |
|
$request->print('</div>');#LC_grade_show_user |
$request->print('</div>');#LC_grade_show_user |
|
|
|
|
# print end of form |
# print end of form |
if ($counter == $total) { |
if ($counter == $total) { |
my $endform='<table border="0"><tr><td>'."\n"; |
my $endform='<br /><hr /><table border="0"><tr><td>'."\n"; |
$endform.='<input type="button" value="'.&mt('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">'. |
'<option>1</option><option>2</option>'. |
'<option>1</option><option>2</option>'. |
Line 2274 KEYWORDS
|
Line 2352 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('[_1]student(s)',$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').'" '. |
'onClick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> '; |
'onclick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> '; |
$endform.=&mt('(Next and Previous (student) do not save the scores.)')."\n" ; |
$endform.='<span class="LC_warning">'. |
|
&mt('(Next and Previous (student) do not save the scores.)'). |
|
'</span>'."\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>'; |
Line 2348 sub check_collaborators {
|
Line 2428 sub check_collaborators {
|
#--- Retrieve the last submission for all the parts |
#--- Retrieve the last submission for all the parts |
sub get_last_submission { |
sub get_last_submission { |
my ($returnhash)=@_; |
my ($returnhash)=@_; |
my (@string,$timestamp); |
my (@string,$timestamp,%lasthidden); |
if ($$returnhash{'version'}) { |
if ($$returnhash{'version'}) { |
my %lasthash=(); |
my %lasthash=(); |
my ($version); |
my ($version); |
Line 2357 sub get_last_submission {
|
Line 2437 sub get_last_submission {
|
$$returnhash{$version.':keys'}))) { |
$$returnhash{$version.':keys'}))) { |
$lasthash{$key}=$$returnhash{$version.':'.$key}; |
$lasthash{$key}=$$returnhash{$version.':'.$key}; |
$timestamp = |
$timestamp = |
scalar(localtime($$returnhash{$version.':timestamp'})); |
&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'}); |
} |
} |
} |
} |
|
my %typeparts; |
|
my $showsurv = |
|
&Apache::lonnet::allowed('vas',$env{'request.course.id'}); |
|
foreach my $key (sort(keys(%lasthash))) { |
|
if ($key =~ /\.type$/) { |
|
if (($lasthash{$key} eq 'anonsurvey') || |
|
($lasthash{$key} eq 'anonsurveycred')) { |
|
my ($ign,@parts) = split(/\./,$key); |
|
pop(@parts); |
|
unless ($showsurv) { |
|
my $id = join(',',@parts); |
|
$typeparts{$ign.'.'.$id} = $lasthash{$key}; |
|
} |
|
delete($lasthash{$key}); |
|
} |
|
} |
|
} |
|
my @hidden = keys(%typeparts); |
foreach my $key (keys(%lasthash)) { |
foreach my $key (keys(%lasthash)) { |
next if ($key !~ /\.submission$/); |
next if ($key !~ /\.submission$/); |
|
my $hide; |
|
if (@hidden) { |
|
foreach my $id (@hidden) { |
|
if ($key =~ /^\Q$id\E/) { |
|
$hide = 1; |
|
last; |
|
} |
|
} |
|
} |
my ($partid,$foo) = split(/submission$/,$key); |
my ($partid,$foo) = split(/submission$/,$key); |
my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ? |
my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ? |
'<span class="LC_warning">Draft Copy</span> ' : ''; |
'<span class="LC_warning">Draft Copy</span> ' : ''; |
push(@string, join(':', $key, $draft.$lasthash{$key})); |
push(@string, join(':', $key, $hide, $draft.$lasthash{$key})); |
} |
} |
} |
} |
if (!@string) { |
if (!@string) { |
$string[0] = |
$string[0] = |
'<span class="LC_warning">Nothing submitted - no attempts.</span>'; |
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span>'; |
} |
} |
return (\@string,\$timestamp); |
return (\@string,\$timestamp); |
} |
} |
Line 2440 sub processHandGrade {
|
Line 2546 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 2533 sub processHandGrade {
|
Line 2639 sub processHandGrade {
|
|
|
# Go directly to grade student - from submission or link from chart page |
# Go directly to grade student - from submission or link from chart page |
if ($button eq 'Grade Student') { |
if ($button eq 'Grade Student') { |
(undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb); |
# (undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb); |
my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}}; |
my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}}; |
($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser); |
($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser); |
$env{'form.fullname'} = $$fullname{$processUser}; |
$env{'form.fullname'} = $$fullname{$processUser}; |
Line 2553 sub processHandGrade {
|
Line 2659 sub processHandGrade {
|
|
|
my (@parsedlist,@nextlist); |
my (@parsedlist,@nextlist); |
my ($nextflg) = 0; |
my ($nextflg) = 0; |
foreach (sort |
foreach my $item (sort |
{ |
{ |
if (lc($$fullname{$a}) ne lc($$fullname{$b})) { |
if (lc($$fullname{$a}) ne lc($$fullname{$b})) { |
return (lc($$fullname{$a}) cmp lc($$fullname{$b})); |
return (lc($$fullname{$a}) cmp lc($$fullname{$b})); |
Line 2561 sub processHandGrade {
|
Line 2667 sub processHandGrade {
|
return $a cmp $b; |
return $a cmp $b; |
} (keys(%$fullname))) { |
} (keys(%$fullname))) { |
if ($nextflg == 1 && $button =~ /Next$/) { |
if ($nextflg == 1 && $button =~ /Next$/) { |
push @parsedlist,$_; |
push(@parsedlist,$item); |
} |
} |
$nextflg = 1 if ($_ eq $laststu); |
$nextflg = 1 if ($item eq $laststu); |
if ($button eq 'Previous') { |
if ($button eq 'Previous') { |
last if ($_ eq $firststu); |
last if ($item eq $firststu); |
push @parsedlist,$_; |
push(@parsedlist,$item); |
} |
} |
} |
} |
$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 2589 sub processHandGrade {
|
Line 2700 sub processHandGrade {
|
my $submitted = 0; |
my $submitted = 0; |
my $ungraded = 0; |
my $ungraded = 0; |
my $incorrect = 0; |
my $incorrect = 0; |
foreach (keys(%status)) { |
foreach my $item (keys(%status)) { |
$submitted = 1 if ($status{$_} ne 'nothing'); |
$submitted = 1 if ($status{$item} ne 'nothing'); |
$ungraded = 1 if ($status{$_} =~ /^ungraded/); |
$ungraded = 1 if ($status{$item} =~ /^ungraded/); |
$incorrect = 1 if ($status{$_} =~ /^incorrect/); |
$incorrect = 1 if ($status{$item} =~ /^incorrect/); |
my ($foo,$partid,$foo1) = split(/\./,$_); |
my ($foo,$partid,$foo1) = split(/\./,$item); |
if ($status{'resource.'.$partid.'.submitted_by'} ne '') { |
if ($status{'resource.'.$partid.'.submitted_by'} ne '') { |
$submitted = 0; |
$submitted = 0; |
} |
} |
Line 2604 sub processHandGrade {
|
Line 2715 sub processHandGrade {
|
next if (!$ungraded && ($submitonly eq 'graded')); |
next if (!$ungraded && ($submitonly eq 'graded')); |
next if (!$incorrect && $submitonly eq 'incorrect'); |
next if (!$incorrect && $submitonly eq 'incorrect'); |
} |
} |
push @nextlist,$student if ($ctr < $ntstu); |
push(@nextlist,$student) if ($ctr < $ntstu); |
last if ($ctr == $ntstu); |
last if ($ctr == $ntstu); |
$ctr++; |
$ctr++; |
} |
} |
Line 2612 sub processHandGrade {
|
Line 2723 sub processHandGrade {
|
$ctr = 0; |
$ctr = 0; |
my $total = scalar(@nextlist)-1; |
my $total = scalar(@nextlist)-1; |
|
|
foreach (sort @nextlist) { |
foreach (sort(@nextlist)) { |
my ($uname,$udom,$submitter) = split(/:/); |
my ($uname,$udom,$submitter) = split(/:/); |
$env{'form.student'} = $uname; |
$env{'form.student'} = $uname; |
$env{'form.userdom'} = $udom; |
$env{'form.userdom'} = $udom; |
Line 2658 sub saveHandGrade {
|
Line 2769 sub saveHandGrade {
|
} |
} |
} elsif ($dropMenu eq 'reset status' |
} elsif ($dropMenu eq 'reset status' |
&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts |
&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts |
foreach my $key (keys (%record)) { |
foreach my $key (keys(%record)) { |
if ($key=~/^resource\.\Q$new_part\E\./) { $newrecord{$key} = ''; } |
if ($key=~/^resource\.\Q$new_part\E\./) { $newrecord{$key} = ''; } |
} |
} |
$newrecord{'resource.'.$new_part.'.regrader'}= |
$newrecord{'resource.'.$new_part.'.regrader'}= |
Line 2693 sub saveHandGrade {
|
Line 2804 sub saveHandGrade {
|
&handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord); |
&handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord); |
next; |
next; |
} else { |
} else { |
push @parts_graded, $new_part; |
push(@parts_graded,$new_part); |
} |
} |
if ($record{'resource.'.$new_part.'.awarded'} ne $partial) { |
if ($record{'resource.'.$new_part.'.awarded'} ne $partial) { |
$newrecord{'resource.'.$new_part.'.awarded'} = $partial; |
$newrecord{'resource.'.$new_part.'.awarded'} = $partial; |
Line 2720 sub saveHandGrade {
|
Line 2831 sub saveHandGrade {
|
$record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' || |
$record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' || |
$dropMenu eq 'reset status') |
$dropMenu eq 'reset status') |
{ |
{ |
push (@version_parts,$new_part); |
push(@version_parts,$new_part); |
} |
} |
} |
} |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
Line 2769 sub check_and_remove_from_queue {
|
Line 2880 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 2795 sub handback_files {
|
Line 2910 sub handback_files {
|
$newflg.'_'.$part_resp.'_returndoc'.$file_counter, |
$newflg.'_'.$part_resp.'_returndoc'.$file_counter, |
$save_file_name); |
$save_file_name); |
if ($result !~ m|^/uploaded/|) { |
if ($result !~ m|^/uploaded/|) { |
$request->print('<span class="LC_error">An error occurred ('.$result. |
$request->print('<br /><span class="LC_error">'. |
') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</span><br />'); |
&mt('An error occurred ([_1]) while trying to upload [_2].', |
|
$result,$newflg.'_'.$part_resp.'_returndoc'.$file_counter). |
|
'</span>'); |
} else { |
} else { |
# mark the file as read only |
# mark the file as read only |
my @files = ($save_file_name); |
my @files = ($save_file_name); |
Line 2893 sub decrement_aggs {
|
Line 3010 sub decrement_aggs {
|
if ($aggtries == $totaltries) { |
if ($aggtries == $totaltries) { |
$decrement{'users'} = 1; |
$decrement{'users'} = 1; |
} |
} |
foreach my $type (keys (%decrement)) { |
foreach my $type (keys(%decrement)) { |
$$aggregate{$symb."\0".$part."\0".$type} = -$decrement{$type}; |
$$aggregate{$symb."\0".$part."\0".$type} = -$decrement{$type}; |
} |
} |
return; |
return; |
Line 3015 sub file_name_version_ext {
|
Line 3132 sub file_name_version_ext {
|
sub viewgrades_js { |
sub viewgrades_js { |
my ($request) = shift; |
my ($request) = shift; |
|
|
$request->print(<<VIEWJAVASCRIPT); |
my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = '); |
<script type="text/javascript" language="javascript"> |
$request->print(&Apache::lonhtmlcommon::scripttag(<<VIEWJAVASCRIPT)); |
function writePoint(partid,weight,point) { |
function writePoint(partid,weight,point) { |
var radioButton = document.classgrade["RADVAL_"+partid]; |
var radioButton = document.classgrade["RADVAL_"+partid]; |
var textbox = document.classgrade["TEXTVAL_"+partid]; |
var textbox = document.classgrade["TEXTVAL_"+partid]; |
if (point == "textval") { |
if (point == "textval") { |
point = document.classgrade["TEXTVAL_"+partid].value; |
point = document.classgrade["TEXTVAL_"+partid].value; |
if (isNaN(point) || parseFloat(point) < 0) { |
if (isNaN(point) || parseFloat(point) < 0) { |
alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point)); |
alert("$alertmsg"+parseFloat(point)); |
var resetbox = false; |
var resetbox = false; |
for (var i=0; i<radioButton.length; i++) { |
for (var i=0; i<radioButton.length; i++) { |
if (radioButton[i].checked) { |
if (radioButton[i].checked) { |
Line 3121 sub viewgrades_js {
|
Line 3238 sub viewgrades_js {
|
var weight = document.classgrade["weight_"+partid].value; |
var weight = document.classgrade["weight_"+partid].value; |
|
|
if (isNaN(point) || parseFloat(point) < 0) { |
if (isNaN(point) || parseFloat(point) < 0) { |
alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point)); |
alert("$alertmsg"+parseFloat(point)); |
textbox.value = ""; |
textbox.value = ""; |
return; |
return; |
} |
} |
Line 3177 sub viewgrades_js {
|
Line 3294 sub viewgrades_js {
|
} |
} |
} |
} |
|
|
</script> |
|
VIEWJAVASCRIPT |
VIEWJAVASCRIPT |
} |
} |
|
|
Line 3210 sub viewgrades {
|
Line 3326 sub viewgrades {
|
'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n". |
'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n". |
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n"; |
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n"; |
|
|
my $sectionClass; |
my ($common_header,$specific_header); |
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'; |
$common_header = &mt('Assign Common Grade to Class'); |
|
$specific_header = &mt('Assign Grade to Specific Students in Class'); |
} elsif ($env{'form.section'} eq 'none') { |
} elsif ($env{'form.section'} eq 'none') { |
$sectionClass='Students in no Section'; |
$common_header = &mt('Assign Common Grade to Students in no Section'); |
|
$specific_header = &mt('Assign Grade to Specific Students in no Section'); |
} else { |
} else { |
$sectionClass='Students in Section(s) [_1]'; |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
|
$common_header = &mt('Assign Common Grade to Students in Section(s) [_1]',$section_display); |
|
$specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1]',$section_display); |
} |
} |
$result.= |
$result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table(); |
'<h3>'. |
|
&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 $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 3251 sub viewgrades {
|
Line 3371 sub viewgrades {
|
} |
} |
$radio.='</tr></table>'; |
$radio.='</tr></table>'; |
my $line = '<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}.' '.&mt('(problem weight)').'</td>'."\n"; |
$line.= '<td><select name="SELVAL_'.$partid.'"'. |
$line.= '<td><b>'.&mt('Grade Status').':</b><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 value="excused">'.&mt('excused').'</option>'. |
'<option value="excused">'.&mt('excused').'</option>'. |
Line 3269 sub viewgrades {
|
Line 3389 sub viewgrades {
|
|
|
$result.= |
$result.= |
&Apache::loncommon::start_data_table_row()."\n". |
&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). |
'<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>'. |
&Apache::loncommon::end_data_table_row()."\n"; |
&Apache::loncommon::end_data_table_row()."\n"; |
$ctsparts++; |
$ctsparts++; |
} |
} |
$result.=&Apache::loncommon::end_data_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="'.&mt('Revert to Default').'" '. |
$result.='<input type="button" value="'.&mt('Revert to Default').'" '. |
'onClick="javascript:resetEntry('.$ctsparts.');" />'; |
'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>'.&mt('Assign Grade to Specific Students in '.$sectionClass, |
$result.= '<h3>'.$specific_header.'</h3>'. |
$section_display).'</h3>'; |
&Apache::loncommon::start_data_table(). |
$result.= &Apache::loncommon::start_data_table(). |
&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 $partserror; |
my (@parts) = sort(&getpartlist($symb)); |
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) { |
my $display=&Apache::lonnet::metadata($url,$part.'.display'); |
my $display=&Apache::lonnet::metadata($url,$part.'.display'); |
$display =~ s|^Number of Attempts|Tries<br />|; # makes the column narrower |
my $narrowtext = &mt('Tries'); |
|
$display =~ s|^Number of Attempts|$narrowtext <br />|; # makes the column narrower |
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } |
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } |
my ($partid) = &split_part_type($part); |
my ($partid) = &split_part_type($part); |
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.='<th>'. |
$result.='<th>'. |
Line 3336 sub viewgrades {
|
Line 3460 sub viewgrades {
|
$result.=&Apache::loncommon::end_data_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="'.&mt('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')); |
Line 3388 sub viewstudentgrade {
|
Line 3512 sub viewstudentgrade {
|
'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n"; |
'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n"; |
$result.='<input type="text" name="'. |
$result.='<input type="text" name="'. |
'GD_'.$student.'_'.$part.'_awarded" '. |
'GD_'.$student.'_'.$part.'_awarded" '. |
'onChange="javascript:changeSelect(\''.$part.'\',\''.$student. |
'onchange="javascript:changeSelect(\''.$part.'\',\''.$student. |
'\')" value="'.$pts.'" size="4" /></td>'."\n"; |
'\')" value="'.$pts.'" size="4" /></td>'."\n"; |
} elsif ($type eq 'solved') { |
} elsif ($type eq 'solved') { |
my ($status,$foo)=split(/_/,$score,2); |
my ($status,$foo)=split(/_/,$score,2); |
Line 3397 sub viewstudentgrade {
|
Line 3521 sub viewstudentgrade {
|
$part.'_solved_s" value="'.$status.'" />'."\n"; |
$part.'_solved_s" value="'.$status.'" />'."\n"; |
$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" value="excused">'.&mt('excused').'</option>' |
$result.= (($status eq 'excused') ? '<option> </option><option selected="selected" value="excused">'.&mt('excused').'</option>' |
: '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n"; |
: '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n"; |
$result.='<option value="reset status">'.&mt('reset status').'</option>'; |
$result.='<option value="reset status">'.&mt('reset status').'</option>'; |
Line 3435 sub editgrades {
|
Line 3559 sub editgrades {
|
'incorrect'=>'incorrect_by_override', |
'incorrect'=>'incorrect_by_override', |
'excused' =>'excused', |
'excused' =>'excused', |
'ungraded' =>'ungraded_attempted', |
'ungraded' =>'ungraded_attempted', |
|
'credited' =>'credit_attempted', |
'nothing' => '', |
'nothing' => '', |
); |
); |
my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0'); |
my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0'); |
Line 3444 sub editgrades {
|
Line 3569 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}; |
push @partid,$partid; |
push(@partid,$partid); |
$weight{$partid} = $env{'form.weight_'.$partid}; |
$weight{$partid} = $env{'form.weight_'.$partid}; |
$ctr++; |
$ctr++; |
} |
} |
Line 3462 sub editgrades {
|
Line 3591 sub editgrades {
|
if ($part !~ m/^\Q$partid\E/) { next;} |
if ($part !~ m/^\Q$partid\E/) { next;} |
if ($type eq 'awarded' || $type eq 'solved') { next; } |
if ($type eq 'awarded' || $type eq 'solved') { next; } |
my $display=&Apache::lonnet::metadata($url,$stores.'.display'); |
my $display=&Apache::lonnet::metadata($url,$stores.'.display'); |
$display =~ s/\[Part: (\w)+\]//; |
$display =~ s/\[Part: \Q$part\E\]//; |
$display =~ s/Number of Attempts/Tries/; |
my $narrowtext = &mt('Tries'); |
$header .= '<th align="center">'.&mt('Old '.$display).'</th>'. |
$display =~ s/Number of Attempts/$narrowtext/; |
'<th align="center">'.&mt('New '.$display).'</th>'; |
$header .= '<th align="center">'.&mt('Old').' '.$display.'</th>'. |
|
'<th align="center">'.&mt('New').' '.$display.'</th>'; |
$columns{$partid}+=2; |
$columns{$partid}+=2; |
} |
} |
} |
} |
Line 3654 sub split_part_type {
|
Line 3784 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 3694 ENDPICK
|
Line 3824 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 3739 sub csvuploadmap_header {
|
Line 3869 sub csvuploadmap_header {
|
$javascript=&csvupload_javascript_forward_associate(); |
$javascript=&csvupload_javascript_forward_associate(); |
} |
} |
|
|
my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}); |
# my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}); |
|
my $result=''; |
my $checked=(($env{'form.noFirstLine'})?' checked="checked"':''); |
my $checked=(($env{'form.noFirstLine'})?' checked="checked"':''); |
my $ignore=&mt('Ignore First Line'); |
my $ignore=&mt('Ignore First Line'); |
$symb = &Apache::lonenc::check_encrypt($symb); |
$symb = &Apache::lonenc::check_encrypt($symb); |
Line 3752 $result
|
Line 3883 $result
|
Total number of records found in file: $distotal <hr /> |
Total number of records found in file: $distotal <hr /> |
Enter as many fields as you can. The system will inform you and bring you back |
Enter as many fields as you can. The system will inform you and bring you back |
to this page if the data selected is insufficient to run your class.<hr /> |
to this page if the data selected is insufficient to run your class.<hr /> |
<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" /> |
<input type="button" value="Reverse Association" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" /> |
<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label> |
<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label> |
<input type="hidden" name="associate" value="" /> |
<input type="hidden" name="associate" value="" /> |
<input type="hidden" name="phase" value="three" /> |
<input type="hidden" name="phase" value="three" /> |
Line 3766 to this page if the data selected is ins
|
Line 3897 to this page if the data selected is ins
|
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" /> |
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" /> |
<input type="hidden" name="command" value="csvuploadoptions" /> |
<input type="hidden" name="command" value="csvuploadoptions" /> |
<hr /> |
<hr /> |
<script type="text/javascript" language="Javascript"> |
|
$javascript |
|
</script> |
|
ENDPICK |
ENDPICK |
|
$request->print(&Apache::lonhtmlcommon::scripttag($javascript)); |
return ''; |
return ''; |
|
|
} |
} |
|
|
sub csvupload_fields { |
sub csvupload_fields { |
my ($symb) = @_; |
my ($symb,$errorref) = @_; |
my (@parts) = &getpartlist($symb); |
my (@parts) = &getpartlist($symb,$errorref); |
my @fields=(['ID','Student ID'], |
if (ref($errorref)) { |
|
if ($$errorref) { |
|
return; |
|
} |
|
} |
|
|
|
my @fields=(['ID','Student/Employee ID'], |
['username','Student Username'], |
['username','Student Username'], |
['domain','Student Domain']); |
['domain','Student Domain']); |
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); |
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); |
Line 3801 sub csvuploadmap_footer {
|
Line 3936 sub csvuploadmap_footer {
|
</table> |
</table> |
<input type="hidden" name="nfields" value="$i" /> |
<input type="hidden" name="nfields" value="$i" /> |
<input type="hidden" name="keyfields" value="$keyfields" /> |
<input type="hidden" name="keyfields" value="$keyfields" /> |
<input type="button" onClick="javascript:verify(this.form)" value="Assign Grades" /><br /> |
<input type="button" onclick="javascript:verify(this.form)" value="Assign Grades" /><br /> |
</form> |
</form> |
ENDPICK |
ENDPICK |
} |
} |
|
|
sub checkforfile_js { |
sub checkforfile_js { |
my $result =<<CSVFORMJS; |
my $alertmsg = &mt('Please use the browse button to select a file from your local directory.'); |
<script type="text/javascript" language="javascript"> |
my $result = &Apache::lonhtmlcommon::scripttag(<<CSVFORMJS); |
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("$alertmsg"); |
return false; |
return false; |
} |
} |
formname.submit(); |
formname.submit(); |
} |
} |
</script> |
|
CSVFORMJS |
CSVFORMJS |
return $result; |
return $result; |
} |
} |
Line 3827 sub upcsvScores_form {
|
Line 3961 sub upcsvScores_form {
|
if (!$symb) {return '';} |
if (!$symb) {return '';} |
my $result=&checkforfile_js(); |
my $result=&checkforfile_js(); |
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb); |
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb); |
my ($table) = &showResourceInfo($symb,$env{'form.probTitle'}); |
# my ($table) = &showResourceInfo($symb,$env{'form.probTitle'}); |
$result.=$table; |
# $result.=$table; |
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n"; |
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n"; |
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n"; |
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n"; |
$result.=' <b>'.&mt('Specify a file containing the class scores for current resource'). |
$result.=' <b>'.&mt('Specify a file containing the class scores for current resource.'). |
'.</b></td></tr>'."\n"; |
'</b></td></tr>'."\n"; |
$result.='<tr bgcolor=#ffffe6><td>'."\n"; |
$result.='<tr bgcolor=#ffffe6><td>'."\n"; |
my $upload=&mt("Upload Scores"); |
my $upload=&mt("Upload Scores"); |
my $upfile_select=&Apache::loncommon::upfile_select_html(); |
my $upfile_select=&Apache::loncommon::upfile_select_html(); |
Line 3845 sub upcsvScores_form {
|
Line 3979 sub upcsvScores_form {
|
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" /> |
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" /> |
<input type="hidden" name="saveState" value="$env{'form.saveState'}" /> |
<input type="hidden" name="saveState" value="$env{'form.saveState'}" /> |
$upfile_select |
$upfile_select |
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" /> |
<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" /> |
<label><input type="checkbox" name="noFirstLine" />$ignore</label> |
<label><input type="checkbox" name="noFirstLine" />$ignore</label> |
</form> |
</form> |
ENDUPFORM |
ENDUPFORM |
Line 3875 sub csvuploadmap {
|
Line 4009 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 4062 sub csvuploadassign {
|
Line 4200 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 4085 sub csvuploadassign {
|
Line 4223 sub csvuploadassign {
|
sub pickStudentPage { |
sub pickStudentPage { |
my ($request) = shift; |
my ($request) = shift; |
|
|
$request->print(<<LISTJAVASCRIPT); |
my $alertmsg = &mt('Please select the student you wish to grade.'); |
<script type="text/javascript" language="javascript"> |
$request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT)); |
|
|
function checkPickOne(formname) { |
function checkPickOne(formname) { |
if (radioSelection(formname.student) == null) { |
if (radioSelection(formname.student) == null) { |
alert("Please select the student you wish to grade."); |
alert("$alertmsg"); |
return; |
return; |
} |
} |
ptr = pullDownSelection(formname.selectpage); |
ptr = pullDownSelection(formname.selectpage); |
Line 4099 function checkPickOne(formname) {
|
Line 4237 function checkPickOne(formname) {
|
formname.submit(); |
formname.submit(); |
} |
} |
|
|
</script> |
|
LISTJAVASCRIPT |
LISTJAVASCRIPT |
&commonJSfunctions($request); |
&commonJSfunctions($request); |
my ($symb) = &get_symb($request); |
my ($symb) = &get_symb($request); |
Line 4111 LISTJAVASCRIPT
|
Line 4248 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 4125 LISTJAVASCRIPT
|
Line 4267 LISTJAVASCRIPT
|
$ctr++; |
$ctr++; |
} |
} |
$select.= '</select>'; |
$select.= '</select>'; |
$result.=&mt(' <b>Problems from:</b> [_1]',$select)."<br />\n"; |
$result.=' <b>'.&mt('Problems from').':</b> '.$select."<br />\n"; |
|
|
$ctr=0; |
$ctr=0; |
foreach (@$titles) { |
foreach (@$titles) { |
Line 4140 LISTJAVASCRIPT
|
Line 4282 LISTJAVASCRIPT
|
my $options = |
my $options = |
'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\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"; |
'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n"; |
$result.=' '.&mt('<b>View Problems Text: </b> [_1]',$options); |
$result.=' <b>'.&mt('View Problem Text').': </b>'.$options; |
|
|
$options = |
$options = |
'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </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="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n". |
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n"; |
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n"; |
$result.=' '.&mt('<b>Submission Details: </b>[_1]',$options); |
$result.=' <b>'.&mt('Submissions').': </b>'.$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 4155 LISTJAVASCRIPT
|
Line 4297 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.=' '.&mt('<b>Use CODE: [_1] </b>', |
$result.=' <b>'.&mt('Use CODE').': </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="'.&mt('Next->').'" /><br />'."\n"; |
'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' →" /><br />'."\n"; |
|
|
$request->print($result); |
$request->print($result); |
|
|
Line 4199 LISTJAVASCRIPT
|
Line 4339 LISTJAVASCRIPT
|
} |
} |
$studentTable.=&Apache::loncommon::end_data_table()."\n"; |
$studentTable.=&Apache::loncommon::end_data_table()."\n"; |
$studentTable.='<input type="button" '. |
$studentTable.='<input type="button" '. |
'onClick="javascript:checkPickOne(this.form);" value="'.&mt('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 4208 LISTJAVASCRIPT
|
Line 4348 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 4268 sub displayPage {
|
Line 4414 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 4295 sub displayPage {
|
Line 4446 sub displayPage {
|
my $checkIcon = '<img alt="'.&mt('Check Mark'). |
my $checkIcon = '<img alt="'.&mt('Check Mark'). |
'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />'; |
'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />'; |
|
|
$studentTable.=' '.&mt('<b>Note:</b> Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon)."\n". |
$studentTable.=' <span class="LC_info">'. |
|
&mt('Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon). |
|
'</span>'."\n". |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
'<th align="center"> Prob. </th>'. |
'<th align="center"> Prob. </th>'. |
Line 4336 sub displayPage {
|
Line 4489 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 /> '.&mt('<b>Correct answer:</b><br />[_1]',$companswer); |
$studentTable.=' <b>'.$title.'</b> <br /> <b>'.&mt('Correct answer').':</b><br />'.$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); |
Line 4366 sub displayPage {
|
Line 4519 sub displayPage {
|
|
|
} |
} |
if (&canmodify($usec)) { |
if (&canmodify($usec)) { |
|
$studentTable.=&gradeBox_start(); |
foreach my $partid (@{$parts}) { |
foreach my $partid (@{$parts}) { |
$studentTable.=&gradeBox($request,$symbx,$uname,$udom,$question,$partid,\%record); |
$studentTable.=&gradeBox($request,$symbx,$uname,$udom,$question,$partid,\%record); |
$studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n"; |
$studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n"; |
$question++; |
$question++; |
} |
} |
|
$studentTable.=&gradeBox_end(); |
$prob++; |
$prob++; |
} |
} |
$studentTable.='</td></tr>'; |
$studentTable.='</td></tr>'; |
Line 4379 sub displayPage {
|
Line 4534 sub displayPage {
|
$curRes = $iterator->next(); |
$curRes = $iterator->next(); |
} |
} |
|
|
$studentTable.='</table>'."\n". |
$studentTable.= |
'<input type="button" value="'.&mt('Save').'" '. |
'</table>'."\n". |
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'. |
'<input type="button" value="'.&mt('Save').'" '. |
'</form>'."\n"; |
'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'. |
|
'</form>'."\n"; |
$studentTable.=&show_grading_menu_form($symb); |
$studentTable.=&show_grading_menu_form($symb); |
$request->print($studentTable); |
$request->print($studentTable); |
|
|
Line 4406 sub displaySubByDates {
|
Line 4562 sub displaySubByDates {
|
my %orders; |
my %orders; |
$mark{'correct_by_student'} = $checkIcon; |
$mark{'correct_by_student'} = $checkIcon; |
if (!exists($$record{'1:timestamp'})) { |
if (!exists($$record{'1:timestamp'})) { |
return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br />'; |
return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />'; |
} |
} |
|
|
my $interaction; |
my $interaction; |
|
my $no_increment = 1; |
for ($version=1;$version<=$$record{'version'};$version++) { |
for ($version=1;$version<=$$record{'version'};$version++) { |
my $timestamp = |
my $timestamp = |
&Apache::lonlocal::locallocaltime($$record{$version.':timestamp'}); |
&Apache::lonlocal::locallocaltime($$record{$version.':timestamp'}); |
Line 4427 sub displaySubByDates {
|
Line 4584 sub displaySubByDates {
|
my @versionKeys = split(/\:/,$$record{$version.':keys'}); |
my @versionKeys = split(/\:/,$$record{$version.':keys'}); |
my @displaySub = (); |
my @displaySub = (); |
foreach my $partid (@{$parts}) { |
foreach my $partid (@{$parts}) { |
|
my $hidden; |
|
if (($$record{$version.':resource.'.$partid.'.type'} eq 'anonsurvey') || |
|
($$record{$version.':resource.'.$partid.'.type'} eq 'anonsurveycred')) { |
|
$hidden = 1; |
|
} |
my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys) |
my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys) |
: sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys)); |
: sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys)); |
|
|
|
|
# next if ($$record{"$version:resource.$partid.solved"} eq ''); |
# next if ($$record{"$version:resource.$partid.solved"} eq ''); |
my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
foreach my $matchKey (@matchKey) { |
foreach my $matchKey (@matchKey) { |
if (exists($$record{$version.':'.$matchKey}) && |
if (exists($$record{$version.':'.$matchKey}) && |
$$record{$version.':'.$matchKey} ne '') { |
$$record{$version.':'.$matchKey} ne '') { |
|
|
my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/) |
my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/) |
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/)); |
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/)); |
$displaySub[0].='<b>'.&mt('Part:').'</b> '.$display_part.' '; |
$displaySub[0].='<span class="LC_nobreak"'; |
$displaySub[0].='<span class="LC_internal_info">('.&mt('ID').' '. |
$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>' |
$responseId.')</span> <b>'; |
.' <span class="LC_internal_info">' |
if ($$record{"$where.$partid.tries"} eq '') { |
.'('.&mt('Part ID: [_1]',$responseId).')' |
$displaySub[0].=&mt('Trial not counted'); |
.'</span>' |
} else { |
.' <b>'; |
$displaySub[0].=&mt('Trial [_1]', |
if ($hidden) { |
|
$displaySub[0].= &mt('Anonymous Survey').'</b>'; |
|
} else { |
|
if ($$record{"$where.$partid.tries"} eq '') { |
|
$displaySub[0].=&mt('Trial not counted'); |
|
} else { |
|
$displaySub[0].=&mt('Trial: [_1]', |
$$record{"$where.$partid.tries"}); |
$$record{"$where.$partid.tries"}); |
} |
} |
my $responseType=($isTask ? 'Task' |
my $responseType=($isTask ? 'Task' |
: $responseType->{$partid}->{$responseId}); |
: $responseType->{$partid}->{$responseId}); |
if (!exists($orders{$partid})) { $orders{$partid}={}; } |
if (!exists($orders{$partid})) { $orders{$partid}={}; } |
if (!exists($orders{$partid}->{$responseId})) { |
if (!exists($orders{$partid}->{$responseId})) { |
$orders{$partid}->{$responseId}= |
$orders{$partid}->{$responseId}= |
&get_order($partid,$responseId,$symb,$uname,$udom); |
&get_order($partid,$responseId,$symb,$uname,$udom, |
} |
$no_increment); |
$displaySub[0].='</b> '. |
} |
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />'; |
$displaySub[0].='</b></span>'; # /nobreak |
|
$displaySub[0].=' '. |
|
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />'; |
|
} |
} |
} |
} |
} |
if (exists($$record{"$where.$partid.checkedin"})) { |
if (exists($$record{"$where.$partid.checkedin"})) { |
Line 4506 sub updateGradeByPage {
|
Line 4676 sub updateGradeByPage {
|
my ($uname,$udom) = split(/:/,$env{'form.student'}); |
my ($uname,$udom) = split(/:/,$env{'form.student'}); |
my $usec=$classlist->{$env{'form.student'}}[5]; |
my $usec=$classlist->{$env{'form.student'}}[5]; |
if (!&canmodify($usec)) { |
if (!&canmodify($usec)) { |
$request->print('<span class="LC_warning">Unable to modify requested student.('.$env{'form.student'}.'</span>'); |
$request->print('<span class="LC_warning">'.&mt('Unable to modify requested student ([_1])',$env{'form.student'}).'</span>'); |
$request->print(&show_grading_menu_form($env{'form.symb'})); |
$request->print(&show_grading_menu_form($env{'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,$env{'form.fullname'},$uname,$udom). |
$result.='<h3> '.&mt('Student: ').&nameUserString(undef,$env{'form.fullname'},$uname,$udom). |
'</h3>'."\n"; |
'</h3>'."\n"; |
|
|
$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) { |
$request->print('<span class="LC_warning">Unable to grade requested sequence. ('.$resUrl.')</span>'); |
$request->print('<span class="LC_warning">'.&mt('Unable to grade requested sequence ([_1]).',$resUrl).'</span>'); |
my ($symb)=&get_symb($request); |
my ($symb)=&get_symb($request); |
$request->print(&show_grading_menu_form($symb)); |
$request->print(&show_grading_menu_form($symb)); |
return; |
return; |
Line 4552 sub updateGradeByPage {
|
Line 4727 sub updateGradeByPage {
|
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
'<td align="center" valign="top" >'.$prob. |
'<td align="center" valign="top" >'.$prob. |
(scalar(@{$parts}) == 1 ? '' |
(scalar(@{$parts}) == 1 ? '' |
: '<br />('.&mt('[quant,_1, parts]',scalar(@{$parts})) |
: '<br />('.&mt('[quant,_1, part]',scalar(@{$parts})) |
).')</td>'; |
.')').'</td>'; |
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>'; |
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>'; |
|
|
my %newrecord=(); |
my %newrecord=(); |
Line 4597 sub updateGradeByPage {
|
Line 4772 sub updateGradeByPage {
|
} |
} |
my $display_part=&get_display_part($partid,$curRes->symb()); |
my $display_part=&get_display_part($partid,$curRes->symb()); |
my $oldstatus = $env{'form.solved'.$question.'_'.$partid}; |
my $oldstatus = $env{'form.solved'.$question.'_'.$partid}; |
$displayPts[0].=' <b>Part:</b> '.$display_part.' = '. |
$displayPts[0].=' <b>'.&mt('Part').':</b> '.$display_part.' = '. |
(($oldstatus eq 'excused') ? 'excused' : $oldpts). |
(($oldstatus eq 'excused') ? 'excused' : $oldpts). |
' <br />'; |
' <br />'; |
$displayPts[1].=' <b>Part:</b> '.$display_part.' = '. |
$displayPts[1].=' <b>'.&mt('Part').':</b> '.$display_part.' = '. |
(($score eq 'excused') ? 'excused' : $newpts). |
(($score eq 'excused') ? 'excused' : $newpts). |
' <br />'; |
' <br />'; |
$question++; |
$question++; |
Line 4649 sub updateGradeByPage {
|
Line 4824 sub updateGradeByPage {
|
|
|
$studentTable.=&Apache::loncommon::end_data_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 ? &mt('No score was changed or updated.') : |
'The scores were changed for '. |
&mt('The scores were changed for [quant,_1,problem].', |
$changeflag.' problem'.($changeflag == 1 ? '.' : 's.')); |
$changeflag)); |
$request->print($grademsg.$studentTable); |
$request->print($grademsg.$studentTable); |
|
|
return ''; |
return ''; |
Line 4661 sub updateGradeByPage {
|
Line 4836 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 4688 Next each scanline is checked for any er
|
Line 4863 Next each scanline is checked for any er
|
bubbles' (it's an error because it may have been mis-scanned |
bubbles' (it's an error because it may have been mis-scanned |
because too light bubbling), 'double bubble' (each bubble line should |
because too light bubbling), 'double bubble' (each bubble line should |
have no more that one letter picked), invalid or duplicated CODE, |
have no more that one letter picked), invalid or duplicated CODE, |
invalid student ID |
invalid student/employee ID |
|
|
If the CODE option is used that determines the randomization of the |
If the CODE option is used that determines the randomization of the |
homework problems, either way the student ID is looked up into a |
homework problems, either way the student/employee ID is looked up into a |
username:domain. |
username:domain. |
|
|
During the validation phase the instructor can choose to skip scanlines. |
During the validation phase the instructor can choose to skip scanlines. |
Line 4739 sub defaultFormData {
|
Line 4914 sub defaultFormData {
|
Return html dropdown of possible sequences to grade |
Return html dropdown of possible sequences to grade |
|
|
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 |
|
|
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 4761 sub getSequenceDropDown {
|
Line 4941 sub getSequenceDropDown {
|
} |
} |
|
|
my %bubble_lines_per_response; # no. bubble lines for each response. |
my %bubble_lines_per_response; # no. bubble lines for each response. |
# index is "symb.part_id" |
# key is zero-based index - 0, 1, 2 ... |
|
|
my %first_bubble_line; # First bubble line no. for each bubble. |
my %first_bubble_line; # First bubble line no. for each bubble. |
|
|
Line 4802 sub restore_bubble_lines {
|
Line 4982 sub restore_bubble_lines {
|
$env{"form.scantron.responsetype.$line"}; |
$env{"form.scantron.responsetype.$line"}; |
$line++; |
$line++; |
} |
} |
|
|
} |
} |
|
|
# Given the parsed scanline, get the response for |
# Given the parsed scanline, get the response for |
Line 4811 sub restore_bubble_lines {
|
Line 4990 sub restore_bubble_lines {
|
sub get_response_bubbles { |
sub get_response_bubbles { |
my ($parsed_line, $response) = @_; |
my ($parsed_line, $response) = @_; |
|
|
|
|
my $bubble_line = $first_bubble_line{$response-1} +1; |
my $bubble_line = $first_bubble_line{$response-1} +1; |
my $bubble_lines= $bubble_lines_per_response{$response-1}; |
my $bubble_lines= $bubble_lines_per_response{$response-1}; |
|
|
Line 4908 sub scantron_scantab {
|
Line 5086 sub scantron_scantab {
|
domainconfig user, lines are from this file. |
domainconfig user, lines are from this file. |
|
|
Otherwise, fall back to getting lines from the legacy file on the |
Otherwise, fall back to getting lines from the legacy file on the |
local server: /home/httpd/lonTabs/scantronformat.tab |
local server: /home/httpd/lonTabs/default_scantronformat.tab |
|
|
=cut |
=cut |
|
|
Line 4936 sub get_scantronformat_file {
|
Line 5114 sub get_scantronformat_file {
|
} |
} |
} |
} |
if (!$gottab) { |
if (!$gottab) { |
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); |
my @domains = &Apache::lonnet::current_machine_domains(); |
@lines = <$fh>; |
if (grep(/^\Q$cdom\E$/,@domains)) { |
close($fh); |
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; |
return @lines; |
} |
} |
Line 4975 sub scantron_CODElist {
|
Line 5160 sub scantron_CODElist {
|
=cut |
=cut |
|
|
sub scantron_CODEunique { |
sub scantron_CODEunique { |
my $result='<span style="white-space: nowrap;"> |
my $result='<span class="LC_nobreak"> |
<label><input type="radio" name="scantron_CODEunique" |
<label><input type="radio" name="scantron_CODEunique" |
value="yes" checked="checked" />'.&mt('Yes').' </label> |
value="yes" checked="checked" />'.&mt('Yes').' </label> |
</span> |
</span> |
<span style="white-space: nowrap;"> |
<span class="LC_nobreak"> |
<label><input type="radio" name="scantron_CODEunique" |
<label><input type="radio" name="scantron_CODEunique" |
value="no" />'.&mt('No').' </label> |
value="no" />'.&mt('No').' </label> |
</span>'; |
</span>'; |
Line 5007 sub scantron_selectphase {
|
Line 5192 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 5035 sub scantron_selectphase {
|
Line 5225 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 5056 sub scantron_selectphase {
|
Line 5246 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 5075 sub scantron_selectphase {
|
Line 5265 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 5084 sub scantron_selectphase {
|
Line 5274 sub scantron_selectphase {
|
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(' |
$r->print(&Apache::lonhtmlcommon::scripttag(' |
<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("'.&mt('Please use the browse button to select a file from your local directory.').'"); |
return false; |
return false; |
} |
} |
formname.submit(); |
formname.submit(); |
} |
}')); |
</script> |
$r->print(' |
|
|
<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.'" /> |
Line 5102 sub scantron_selectphase {
|
Line 5290 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 5138 sub scantron_selectphase {
|
Line 5326 sub scantron_selectphase {
|
'); |
'); |
|
|
&Apache::lonpickcode::code_list($r,2); |
&Apache::lonpickcode::code_list($r,2); |
|
|
|
$r->print('<br /><form method="post" name="checkscantron">'. |
|
$default_form_data."\n". |
|
&Apache::loncommon::start_data_table('LC_scantron_action')."\n". |
|
&Apache::loncommon::start_data_table_header_row()."\n". |
|
'<th colspan="2"> |
|
'.&mt('Review bubblesheet data and submissions for a previously graded folder/sequence')."\n". |
|
'</th>'."\n". |
|
&Apache::loncommon::end_data_table_header_row()."\n". |
|
&Apache::loncommon::start_data_table_row()."\n". |
|
'<td> '.&mt('Graded folder/sequence:').' </td>'."\n". |
|
'<td> '.$sequence_selector.' </td>'. |
|
&Apache::loncommon::end_data_table_row()."\n". |
|
&Apache::loncommon::start_data_table_row()."\n". |
|
'<td> '.&mt('Filename of scoring office file:').' </td>'."\n". |
|
'<td> '.$file_selector.' </td>'."\n". |
|
&Apache::loncommon::end_data_table_row()."\n". |
|
&Apache::loncommon::start_data_table_row()."\n". |
|
'<td> '.&mt('Format of data file:').' </td>'."\n". |
|
'<td> '.$format_selector.' </td>'."\n". |
|
&Apache::loncommon::end_data_table_row()."\n". |
|
&Apache::loncommon::start_data_table_row()."\n". |
|
'<td> '.&mt('Options').' </td>'."\n". |
|
'<td> <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> '.&mt('Skip hidden resources').'</label></td>'. |
|
&Apache::loncommon::end_data_table_row()."\n". |
|
&Apache::loncommon::start_data_table_row()."\n". |
|
'<td colspan="2">'."\n". |
|
'<input type="hidden" name="command" value="checksubmissions" />'."\n". |
|
'<input type="submit" value="'.&mt('Review Bubblesheet Data and Submission Records').'" />'."\n". |
|
'</td>'."\n". |
|
&Apache::loncommon::end_data_table_row()."\n". |
|
&Apache::loncommon::end_data_table()."\n". |
|
'</form><br />'); |
$r->print($grading_menu_button); |
$r->print($grading_menu_button); |
return |
return; |
} |
} |
|
|
=pod |
=pod |
Line 5174 sub scantron_selectphase {
|
Line 5395 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 ID number starts |
IDstart - column where the student/employee ID starts |
IDlength - length of the student 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 |
Qlength - number of columns comprising a single bubble line from |
Qlength - number of columns comprising a single bubble line from |
Line 5235 sub get_scantron_config {
|
Line 5456 sub get_scantron_config {
|
|
|
=item username_to_idmap |
=item username_to_idmap |
|
|
creates a hash keyed by student id with values of the corresponding |
creates a hash keyed by student/employee ID with values of the corresponding |
student username:domain. |
student username:domain. |
|
|
Arguments: |
Arguments: |
Line 5274 sub username_to_idmap {
|
Line 5495 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 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 5448 sub digits_to_letters {
|
Line 5669 sub digits_to_letters {
|
CODE_ignore_dup - 1 if the CODE is a duplicated use when unique |
CODE_ignore_dup - 1 if the CODE is a duplicated use when unique |
CODEs were selected, but the usage has been |
CODEs were selected, but the usage has been |
forced by the operator |
forced by the operator |
ID - student ID |
ID - student/employee ID |
PaperID - if used, the ID number printed on the sheet when the |
PaperID - if used, the ID number printed on the sheet when the |
paper was scanned |
paper was scanned |
FirstName - first name from the sheet |
FirstName - first name from the sheet |
Line 5484 sub scantron_parse_scanline {
|
Line 5705 sub scantron_parse_scanline {
|
my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_; |
my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_; |
|
|
my %record; |
my %record; |
my $questions=substr($line,$$scantron_config{'Qstart'}-1); # Answers |
my $lastpos = $env{'form.scantron_maxbubble'}*$$scantron_config{'Qlength'}; |
|
my $questions=substr($line,$$scantron_config{'Qstart'}-1,$lastpos); # Answers |
my $data=substr($line,0,$$scantron_config{'Qstart'}-1); # earlier stuff |
my $data=substr($line,0,$$scantron_config{'Qstart'}-1); # earlier stuff |
if (!($$scantron_config{'CODElocation'} eq 0 || |
if (!($$scantron_config{'CODElocation'} eq 0 || |
$$scantron_config{'CODElocation'} eq 'none')) { |
$$scantron_config{'CODElocation'} eq 'none')) { |
Line 6147 sub scantron_validate_file {
|
Line 6369 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 6174 sub scantron_validate_file {
|
Line 6401 sub scantron_validate_file {
|
} |
} |
if (!$stop) { |
if (!$stop) { |
my $warning=&scantron_warning_screen('Start Grading'); |
my $warning=&scantron_warning_screen('Start Grading'); |
$r->print(&mt('Validation process complete.').'<br /> |
$r->print(&mt('Validation process complete.').'<br />'. |
'.$warning.' |
$warning. |
<input type="submit" name="submit" value="'.&mt('Start Grading').'" /> |
&mt('Perform verification for each student after storage of submissions?'). |
<input type="hidden" name="command" value="scantron_process" /> |
' <span class="LC_nobreak"><label>'. |
'); |
'<input type="radio" name="verifyrecord" value="1" />'.&mt('Yes').'</label>'. |
|
(' 'x3).'<label>'. |
|
'<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No'). |
|
'</label></span><br />'. |
|
&mt('Grading will take longer if you use verification.').'<br />'. |
|
&mt("Alternatively, the 'Review bubblesheet data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'. |
|
'<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'. |
|
'<input type="hidden" name="command" value="scantron_process" />'."\n"); |
} else { |
} else { |
$r->print('<input type="hidden" name="command" value="scantron_validate" />'); |
$r->print('<input type="hidden" name="command" value="scantron_validate" />'); |
$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />"); |
$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />"); |
} |
} |
if ($stop) { |
if ($stop) { |
if ($validate_phases[$currentphase] eq 'sequence') { |
if ($validate_phases[$currentphase] eq 'sequence') { |
$r->print('<input type="submit" name="submit" value="'.&mt('Ignore ->').' " />'); |
$r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' → " />'); |
$r->print(' '.&mt('this error').' <br />'); |
$r->print(' '.&mt('this error').' <br />'); |
|
|
$r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>"); |
$r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>"); |
} else { |
} else { |
if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') { |
if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') { |
$r->print('<input type="button" name="submitbutton" value="'.&mt('Continue ->').'" onclick="javascript:verify_bubble_radio(this.form)" />'); |
$r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' →" onclick="javascript:verify_bubble_radio(this.form)" />'); |
} else { |
} else { |
$r->print('<input type="submit" name="submit" value="'.&mt('Continue ->').'" />'); |
$r->print('<input type="submit" name="submit" value="'.&mt('Continue').' →" />'); |
} |
} |
$r->print(' '.&mt('using corrected info').' <br />'); |
$r->print(' '.&mt('using corrected info').' <br />'); |
$r->print("<input type='submit' value='".&mt("Skip")."' name='scantron_skip_record' />"); |
$r->print("<input type='submit' value='".&mt("Skip")."' name='scantron_skip_record' />"); |
Line 6553 sub scantron_validate_sequence {
|
Line 6786 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 6572 sub scantron_validate_sequence {
|
Line 6809 sub scantron_validate_sequence {
|
return (0,$currentphase+1); |
return (0,$currentphase+1); |
} |
} |
|
|
=pod |
|
|
|
=item scantron_validate_ID |
|
|
|
Validates all scanlines in the selected file to not have any |
|
invalid or underspecified student IDs |
|
|
|
=cut |
|
|
|
sub scantron_validate_ID { |
sub scantron_validate_ID { |
my ($r,$currentphase) = @_; |
my ($r,$currentphase) = @_; |
Line 6591 sub scantron_validate_ID {
|
Line 6821 sub scantron_validate_ID {
|
#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_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 6645 sub scantron_validate_ID {
|
Line 6880 sub scantron_validate_ID {
|
return (0,$currentphase+1); |
return (0,$currentphase+1); |
} |
} |
|
|
=pod |
|
|
|
=item scantron_get_correction |
|
|
|
Builds the interface screen to interact with the operator to fix a |
|
specific error condition in a specific scanline |
|
|
|
Arguments: |
|
$r - Apache request object |
|
$i - number of the current scanline |
|
$scan_record - hash ref as returned from &scantron_parse_scanline() |
|
$scan_config - hash ref as returned from &get_scantron_config() |
|
$line - full contents of the current scanline |
|
$error - error condition, valid values are |
|
'incorrectCODE', 'duplicateCODE', |
|
'doublebubble', 'missingbubble', |
|
'duplicateID', 'incorrectID' |
|
$arg - extra information needed |
|
For errors: |
|
- duplicateID - paper number that this studentID was seen before on |
|
- duplicateCODE - array ref of the paper numbers this CODE was |
|
seen on before |
|
- incorrectCODE - current incorrect CODE |
|
- doublebubble - array ref of the bubble lines that have double |
|
bubble errors |
|
- missingbubble - array ref of the bubble lines that have missing |
|
bubble errors |
|
|
|
=cut |
|
|
|
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)=@_; |
Line 6739 sub scantron_get_correction {
|
Line 6945 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 6753 sub scantron_get_correction {
|
Line 6959 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>"); |
$r->print("\n<br />"); |
$r->print("\n<br />"); |
} |
} |
|
|
$r->print(<<ENDSCRIPT); |
$r->print(&Apache::lonhtmlcommon::scripttag(<<ENDSCRIPT)); |
<script type="text/javascript"> |
|
function change_radio(field) { |
function change_radio(field) { |
var slct=document.scantronupload.scantron_CODE_resolution; |
var slct=document.scantronupload.scantron_CODE_resolution; |
var i; |
var i; |
Line 6772 function change_radio(field) {
|
Line 6977 function change_radio(field) {
|
if (slct[i].value==field) { slct[i].checked=true; } |
if (slct[i].value==field) { slct[i].checked=true; } |
} |
} |
} |
} |
</script> |
|
ENDSCRIPT |
ENDSCRIPT |
my $href="/adm/pickcode?". |
my $href="/adm/pickcode?". |
"form=".&escape("scantronupload"). |
"form=".&escape("scantronupload"). |
Line 6787 ENDSCRIPT
|
Line 6991 ENDSCRIPT
|
".&mt("[_1]Select[_2] a CODE from the list of all CODEs and use it.", |
".&mt("[_1]Select[_2] a CODE from the list of all CODEs and use it.", |
"<a target='_blank' href='$href'>","</a>")." |
"<a target='_blank' href='$href'>","</a>")." |
</label> |
</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')\" />")); |
".&mt("Selected CODE is [_1]",'<input readonly="readonly" 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(" |
$r->print(" |
Line 6811 ENDSCRIPT
|
Line 7015 ENDSCRIPT
|
foreach my $question (@{$arg}) { |
foreach my $question (@{$arg}) { |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
$scan_record, $error); |
$scan_record, $error); |
push (@lines_to_correct,@linenums); |
push(@lines_to_correct,@linenums); |
} |
} |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
} elsif ($error eq 'missingbubble') { |
} elsif ($error eq 'missingbubble') { |
Line 6831 ENDSCRIPT
|
Line 7035 ENDSCRIPT
|
foreach my $question (@{$arg}) { |
foreach my $question (@{$arg}) { |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
$scan_record, $error); |
$scan_record, $error); |
push (@lines_to_correct,@linenums); |
push(@lines_to_correct,@linenums); |
} |
} |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
} else { |
} else { |
Line 6844 sub verify_bubbles_checked {
|
Line 7048 sub verify_bubbles_checked {
|
my (@ansnums) = @_; |
my (@ansnums) = @_; |
my $ansnumstr = join('","',@ansnums); |
my $ansnumstr = join('","',@ansnums); |
my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines."); |
my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines."); |
my $output = (<<ENDSCRIPT); |
my $output = &Apache::lonhtmlcommon::scripttag((<<ENDSCRIPT)); |
<script type="text/javascript"> |
|
function verify_bubble_radio(form) { |
function verify_bubble_radio(form) { |
var ansnumArray = new Array ("$ansnumstr"); |
var ansnumArray = new Array ("$ansnumstr"); |
var need_bubble_count = 0; |
var need_bubble_count = 0; |
Line 6868 function verify_bubble_radio(form) {
|
Line 7071 function verify_bubble_radio(form) {
|
} |
} |
form.submit(); |
form.submit(); |
} |
} |
</script> |
|
ENDSCRIPT |
ENDSCRIPT |
return $output; |
return $output; |
} |
} |
Line 6980 sub prompt_for_corrections {
|
Line 7182 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 6989 sub prompt_for_corrections {
|
Line 7191 sub prompt_for_corrections {
|
my $selected = $$scan_record{"scantron.$current_line.answer"}; |
my $selected = $$scan_record{"scantron.$current_line.answer"}; |
&scantron_bubble_selector($r,$scan_config,$current_line, |
&scantron_bubble_selector($r,$scan_config,$current_line, |
$questionnum,$error,split('', $selected)); |
$questionnum,$error,split('', $selected)); |
push (@linenums,$current_line); |
push(@linenums,$current_line); |
$current_line++; |
$current_line++; |
} |
} |
if ($lines > 1) { |
if ($lines > 1) { |
Line 7174 sub scantron_validate_CODE {
|
Line 7376 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 7205 sub scantron_validate_CODE {
|
Line 7412 sub scantron_validate_CODE {
|
$line,'duplicateCODE',$usedCODEs{$CODE}); |
$line,'duplicateCODE',$usedCODEs{$CODE}); |
return(1,$currentphase); |
return(1,$currentphase); |
} |
} |
push (@{$usedCODEs{$CODE}},$$scan_record{'scantron.PaperID'}); |
push(@{$usedCODEs{$CODE}},$$scan_record{'scantron.PaperID'}); |
} |
} |
return (0,$currentphase+1); |
return (0,$currentphase+1); |
} |
} |
Line 7228 sub scantron_validate_doublebubble {
|
Line 7435 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 7244 sub scantron_validate_doublebubble {
|
Line 7456 sub scantron_validate_doublebubble {
|
return (0,$currentphase+1); |
return (0,$currentphase+1); |
} |
} |
|
|
=pod |
|
|
|
=item scantron_get_maxbubble |
|
|
|
Returns the maximum number of bubble lines that are expected to |
|
occur. Does this by walking the selected sequence rendering the |
|
resource and then checking &Apache::lonxml::get_problem_counter() |
|
for what the current value of the problem counter is. |
|
|
|
Caches the results to $env{'form.scantron_maxbubble'}, |
|
$env{'form.scantron.bubble_lines.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 |
|
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 |
|
|
|
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 7275 sub scantron_get_maxbubble {
|
Line 7469 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); |
|
|
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonxml::clear_problem_counter(); |
|
|
my $uname = $env{'form.student'}; |
my $uname = $env{'user.name'}; |
my $udom = $env{'form.userdom'}; |
my $udom = $env{'user.domain'}; |
my $cid = $env{'request.course.id'}; |
my $cid = $env{'request.course.id'}; |
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 = (); |
%subdivided_bubble_lines = (); |
%responsetype_per_response = (); |
%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 ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom); |
# Need to retrieve part IDs and response IDs because essayresponse, |
if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) { |
# reactionresponse and organicresponse items are not included in |
foreach my $part_id (@{$parts}) { |
# $analysis{'parts'} from lonnet::ssi. |
my $lines; |
my %possible_part_ids; |
|
if (ref($resource->parts()) eq 'ARRAY') { |
# TODO - make this a persistent hash not an array. |
foreach my $part (@{$resource->parts()}) { |
|
if (!&Apache::loncommon::check_if_partid_hidden($part,$symb,$udom,$uname)) { |
# optionresponse, matchresponse and rankresponse type items |
my @resp_ids = $resource->responseIds($part); |
# render as separate sub-questions in exam mode. |
foreach my $id (@resp_ids) { |
if (($analysis->{$part_id.'.type'} eq 'optionresponse') || |
$possible_part_ids{$part.'.'.$id} = 1; |
($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 $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) = |
|
split(/_HASH_REF__/,$result, 2); |
|
|
|
my @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); |
|
} |
|
} |
|
} |
|
|
|
foreach my $part_id (@parts) { |
|
my $lines = $analysis{"$part_id.bubble_lines"}; |
|
|
|
# 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') { |
my $bubbles_per_line = 10; |
if (ref($analysis{$part_id.'.items'}) eq 'ARRAY') { |
my $inner_bubble_lines = int($numbub/$bubbles_per_line); |
$numbub = scalar(@{$analysis{$part_id.'.items'}}); |
if (($numbub % $bubbles_per_line) != 0) { |
|
$inner_bubble_lines++; |
} |
} |
} elsif ($analysis{$part_id.'.type'} eq 'rankresponse') { |
for (my $i=0; $i<$numshown; $i++) { |
if (ref($analysis{$part_id.'.foils'}) eq 'ARRAY') { |
$subdivided_bubble_lines{$response_number} .= |
$numbub = scalar(@{$analysis{$part_id.'.foils'}}); |
$inner_bubble_lines.','; |
} |
} |
} |
$subdivided_bubble_lines{$response_number} =~ s/,$//; |
if (ref($analysis{$part_id.'.shown'}) eq 'ARRAY') { |
$lines = $numshown * $inner_bubble_lines; |
$numshown = scalar(@{$analysis{$part_id.'.shown'}}); |
} else { |
} |
$lines = $analysis->{"$part_id.bubble_lines"}; |
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; |
|
$bubble_lines_per_response{$response_number} = $lines; |
|
$responsetype_per_response{$response_number} = |
|
$analysis{$part_id.'.type'}; |
|
$response_number++; |
|
|
|
$bubble_line += $lines; |
$first_bubble_line{$response_number} = $bubble_line; |
$total_lines += $lines; |
$bubble_lines_per_response{$response_number} = $lines; |
} |
$responsetype_per_response{$response_number} = |
|
$analysis->{$part_id.'.type'}; |
|
$response_number++; |
|
|
|
$bubble_line += $lines; |
|
$total_lines += $lines; |
|
} |
|
} |
} |
} |
&Apache::lonnet::delenv('scantron\.'); |
&Apache::lonnet::delenv('scantron.'); |
|
|
&save_bubble_lines(); |
&save_bubble_lines(); |
$env{'form.scantron_maxbubble'} = |
$env{'form.scantron_maxbubble'} = |
Line 7397 sub scantron_get_maxbubble {
|
Line 7555 sub scantron_get_maxbubble {
|
return $env{'form.scantron_maxbubble'}; |
return $env{'form.scantron_maxbubble'}; |
} |
} |
|
|
=pod |
|
|
|
=item scantron_validate_missingbubbles |
|
|
|
Validates all scanlines in the selected file to not have any |
|
answers that don't have bubbles that have not been verified |
|
to be bubble free. |
|
|
|
=cut |
|
|
|
sub scantron_validate_missingbubbles { |
sub scantron_validate_missingbubbles { |
my ($r,$currentphase) = @_; |
my ($r,$currentphase) = @_; |
#get student info |
#get student info |
Line 7416 sub scantron_validate_missingbubbles {
|
Line 7564 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 7460 sub scantron_validate_missingbubbles {
|
Line 7612 sub scantron_validate_missingbubbles {
|
return (0,$currentphase+1); |
return (0,$currentphase+1); |
} |
} |
|
|
=pod |
|
|
|
=item scantron_process_students |
|
|
|
Routine that does the actual grading of the bubble sheet information. |
|
|
|
The parsed scanline hash is added to %env |
|
|
|
Then foreach unskipped scanline it does an &Apache::lonnet::ssi() |
|
foreach resource , with the form data of |
|
|
|
'submitted' =>'scantron' |
|
'grade_target' =>'grade', |
|
'grade_username'=> username of student |
|
'grade_domain' => domain of student |
|
'grade_courseid'=> of course |
|
'grade_symb' => symb of resource to grade |
|
|
|
This triggers a grading pass. The problem grading code takes care |
|
of converting the bubbled letter information (now in %env) into a |
|
valid submission. |
|
|
|
=cut |
|
|
|
sub scantron_process_students { |
sub scantron_process_students { |
my ($r) = @_; |
my ($r) = @_; |
Line 7499 sub scantron_process_students {
|
Line 7628 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); |
# $r->print("geto ".scalar(@resources)."<br />"); |
my (%grader_partids_by_symb,%grader_randomlists_by_symb); |
|
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
|
\%grader_randomlists_by_symb); |
|
my $resource_error; |
|
foreach my $resource (@resources) { |
|
my $ressymb; |
|
if (ref($resource)) { |
|
$ressymb = $resource->symb(); |
|
} else { |
|
$resource_error = 1; |
|
last; |
|
} |
|
my ($analysis,$parts) = |
|
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
|
$env{'user.name'},$env{'user.domain'},1); |
|
$grader_partids_by_symb{$ressymb} = $parts; |
|
if (ref($analysis) eq 'HASH') { |
|
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
|
$grader_randomlists_by_symb{$ressymb} = |
|
$analysis->{'parts_withrandomlist'}; |
|
} |
|
} |
|
} |
|
if ($resource_error) { |
|
$r->print(&navmap_errormsg()); |
|
return ''; |
|
} |
|
|
|
my ($uname,$udom); |
my $result= <<SCANTRONFORM; |
my $result= <<SCANTRONFORM; |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload"> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload"> |
<input type="hidden" name="command" value="scantron_configphase" /> |
<input type="hidden" name="command" value="scantron_configphase" /> |
Line 7510 SCANTRONFORM
|
Line 7671 SCANTRONFORM
|
$r->print($result); |
$r->print($result); |
|
|
my @delayqueue; |
my @delayqueue; |
my %completedstudents; |
my (%completedstudents,%scandata); |
|
|
|
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'); |
|
$r->print('<br />'); |
my $start=&Time::HiRes::time(); |
my $start=&Time::HiRes::time(); |
my $i=-1; |
my $i=-1; |
my ($uname,$udom,$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 7532 SCANTRONFORM
|
Line 7699 SCANTRONFORM
|
$r->print("</form>"); |
$r->print("</form>"); |
&ssi_print_error($r); |
&ssi_print_error($r); |
$r->print(&show_grading_menu_form($symb)); |
$r->print(&show_grading_menu_form($symb)); |
|
&Apache::lonnet::remove_lock($lock); |
return ''; # Dunno why the other returns return '' rather than just returning. |
return ''; # Dunno why the other returns return '' rather than just returning. |
} |
} |
|
|
|
my %lettdig = &letter_to_digits(); |
|
my $numletts = scalar(keys(%lettdig)); |
|
|
while ($i<$scanlines->{'count'}) { |
while ($i<$scanlines->{'count'}) { |
($uname,$udom)=('',''); |
($uname,$udom)=('',''); |
$i++; |
$i++; |
Line 7560 SCANTRONFORM
|
Line 7731 SCANTRONFORM
|
} |
} |
($uname,$udom)=split(/:/,$uname); |
($uname,$udom)=split(/:/,$uname); |
|
|
|
my (%partids_by_symb,$res_error); |
|
foreach my $resource (@resources) { |
|
my $ressymb; |
|
if (ref($resource)) { |
|
$ressymb = $resource->symb(); |
|
} else { |
|
$res_error = 1; |
|
last; |
|
} |
|
if ((exists($grader_randomlists_by_symb{$ressymb})) || |
|
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
|
my ($analysis,$parts) = |
|
&scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom); |
|
$partids_by_symb{$ressymb} = $parts; |
|
} else { |
|
$partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb}; |
|
} |
|
} |
|
|
|
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 7567 SCANTRONFORM
|
Line 7763 SCANTRONFORM
|
&scantron_putfile($scanlines,$scan_data); |
&scantron_putfile($scanlines,$scan_data); |
} |
} |
|
|
my $i=0; |
my $scancode; |
foreach my $resource (@resources) { |
if ((exists($scan_record->{'scantron.CODE'})) && |
$i++; |
(&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) { |
my %form=('submitted' =>'scantron', |
$scancode = $scan_record->{'scantron.CODE'}; |
'grade_target' =>'grade', |
} else { |
'grade_username'=>$uname, |
$scancode = ''; |
'grade_domain' =>$udom, |
} |
'grade_courseid'=>$env{'request.course.id'}, |
|
'grade_symb' =>$resource->symb()); |
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
if (exists($scan_record->{'scantron.CODE'}) |
\@resources,\%partids_by_symb) eq 'ssi_error') { |
&& |
$ssi_error = 0; # So end of handler error message does not trigger. |
&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'})) { |
$r->print("</form>"); |
$form{'CODE'}=$scan_record->{'scantron.CODE'}; |
&ssi_print_error($r); |
} else { |
$r->print(&show_grading_menu_form($symb)); |
$form{'CODE'}=''; |
&Apache::lonnet::remove_lock($lock); |
} |
return ''; # Why return ''? Beats me. |
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. |
|
} |
|
|
|
if (&Apache::loncommon::connection_aborted($r)) { last; } |
|
} |
|
$completedstudents{$uname}={'line'=>$line}; |
$completedstudents{$uname}={'line'=>$line}; |
if (&Apache::loncommon::connection_aborted($r)) { last; } |
if ($env{'form.verifyrecord'}) { |
|
my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'}; |
|
my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos); |
|
chomp($studentdata); |
|
$studentdata =~ s/\r$//; |
|
my $studentrecord = ''; |
|
my $counter = -1; |
|
foreach my $resource (@resources) { |
|
my $ressymb = $resource->symb(); |
|
($counter,my $recording) = |
|
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'}, |
|
$counter,$studentdata,$partids_by_symb{$ressymb}, |
|
\%scantron_config,\%lettdig,$numletts); |
|
$studentrecord .= $recording; |
|
} |
|
if ($studentrecord ne $studentdata) { |
|
&Apache::lonxml::clear_problem_counter(); |
|
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
|
\@resources,\%partids_by_symb) eq '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)); |
|
&Apache::lonnet::remove_lock($lock); |
|
delete($completedstudents{$uname}); |
|
return ''; |
|
} |
|
$counter = -1; |
|
$studentrecord = ''; |
|
foreach my $resource (@resources) { |
|
my $ressymb = $resource->symb(); |
|
($counter,my $recording) = |
|
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'}, |
|
$counter,$studentdata,$partids_by_symb{$ressymb}, |
|
\%scantron_config,\%lettdig,$numletts); |
|
$studentrecord .= $recording; |
|
} |
|
if ($studentrecord ne $studentdata) { |
|
$r->print('<p><span class="LC_error">'); |
|
if ($scancode eq '') { |
|
$r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2].', |
|
$uname.':'.$udom,$scan_record->{'scantron.ID'})); |
|
} else { |
|
$r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2] and CODE: [_3].', |
|
$uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode)); |
|
} |
|
$r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n". |
|
&Apache::loncommon::start_data_table_header_row()."\n". |
|
'<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'. |
|
&Apache::loncommon::end_data_table_header_row()."\n". |
|
&Apache::loncommon::start_data_table_row(). |
|
'<td>'.&mt('Bubble Sheet').'</td>'. |
|
'<td><span class="LC_nobreak">'.$studentdata.'</span></td>'. |
|
&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::start_data_table_row(). |
|
'<td>Stored submissions</td>'. |
|
'<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n". |
|
&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::end_data_table().'</p>'); |
|
} else { |
|
$r->print('<br /><span class="LC_warning">'. |
|
&mt('A second grading pass was needed for user: [_1] with ID: [_2], because a mismatch was seen on the first pass.',$uname.':'.$udom,$scan_record->{'scantron.ID'}).'<br />'. |
|
&mt("As a consequence, this user's submission history records two tries."). |
|
'</span><br />'); |
|
} |
|
} |
|
} |
|
if (&Apache::loncommon::connection_aborted($r)) { last; } |
} continue { |
} continue { |
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonnet::delenv('scantron\.'); |
&Apache::lonnet::delenv('scantron.'); |
} |
} |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
|
&Apache::lonnet::remove_lock($lock); |
# my $lasttime = &Time::HiRes::time()-$start; |
# my $lasttime = &Time::HiRes::time()-$start; |
# $r->print("<p>took $lasttime</p>"); |
# $r->print("<p>took $lasttime</p>"); |
|
|
Line 7609 SCANTRONFORM
|
Line 7864 SCANTRONFORM
|
return ''; |
return ''; |
} |
} |
|
|
=pod |
sub graders_resources_pass { |
|
my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb) = @_; |
=item scantron_upload_scantron_data |
if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) && |
|
(ref($grader_randomlists_by_symb) eq 'HASH')) { |
Creates the screen for adding a new bubble sheet data file to a course. |
foreach my $resource (@{$resources}) { |
|
my $ressymb = $resource->symb(); |
|
my ($analysis,$parts) = |
|
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
|
$env{'user.name'},$env{'user.domain'},1); |
|
$grader_partids_by_symb->{$ressymb} = $parts; |
|
if (ref($analysis) eq 'HASH') { |
|
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
|
$grader_randomlists_by_symb->{$ressymb} = |
|
$analysis->{'parts_withrandomlist'}; |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
=cut |
sub grade_student_bubbles { |
|
my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts) = @_; |
|
if (ref($resources) eq 'ARRAY') { |
|
my $count = 0; |
|
foreach my $resource (@{$resources}) { |
|
my $ressymb = $resource->symb(); |
|
my %form = ('submitted' => 'scantron', |
|
'grade_target' => 'grade', |
|
'grade_username' => $uname, |
|
'grade_domain' => $udom, |
|
'grade_courseid' => $env{'request.course.id'}, |
|
'grade_symb' => $ressymb, |
|
'CODE' => $scancode |
|
); |
|
if (ref($parts) eq 'HASH') { |
|
if (ref($parts->{$ressymb}) eq 'ARRAY') { |
|
foreach my $part (@{$parts->{$ressymb}}) { |
|
$form{'scantron_questnum_start.'.$part} = |
|
1+$env{'form.scantron.first_bubble_line.'.$count}; |
|
$count++; |
|
} |
|
} |
|
} |
|
my $result=&ssi_with_retries($resource->src(),$ssi_retries,%form); |
|
return 'ssi_error' if ($ssi_error); |
|
last if (&Apache::loncommon::connection_aborted($r)); |
|
} |
|
} |
|
return; |
|
} |
|
|
sub scantron_upload_scantron_data { |
sub scantron_upload_scantron_data { |
my ($r)=@_; |
my ($r)=@_; |
$r->print(&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'})); |
my $dom = $env{'request.role.domain'}; |
|
my $domdesc = &Apache::lonnet::domain($dom,'description'); |
|
$r->print(&Apache::loncommon::coursebrowser_javascript($dom)); |
my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid', |
my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid', |
'domainid', |
'domainid', |
'coursename'); |
'coursename',$dom); |
my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'}, |
my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'. |
'domainid'); |
(' 'x2).&mt('(shows course personnel)'); |
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
$r->print(' |
my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.'); |
<script type="text/javascript" language="javascript"> |
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(&Apache::lonhtmlcommon::scripttag(' |
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("'.$nofile_alert.'"); |
return false; |
return false; |
} |
} |
|
if (formname.courseid.value == "") { |
|
alert("'.$nocourseid_alert.'"); |
|
return false; |
|
} |
formname.submit(); |
formname.submit(); |
} |
} |
</script> |
|
|
function ToSyllabus() { |
|
var cdom = '."'$dom'".'; |
|
var cnum = document.rules.courseid.value; |
|
if (cdom == "" || cdom == null) { |
|
return; |
|
} |
|
if (cnum == "" || cnum == null) { |
|
return; |
|
} |
|
syllwin=window.open("/public/"+cdom+"/"+cnum+"/syllabus","LONCAPASyllabus", |
|
"height=350,width=350,scrollbars=yes,menubar=no"); |
|
return; |
|
} |
|
|
|
')); |
|
$r->print(' |
|
<h3>'.&mt('Send scanned bubblesheet data to a course').'</h3> |
|
|
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
'.$default_form_data.' |
'.$default_form_data. |
<table> |
&Apache::lonhtmlcommon::start_pick_box(). |
<tr><td>'.$select_link.' </td></tr> |
&Apache::lonhtmlcommon::row_title(&mt('Course ID')). |
<tr><td>'.&mt('Course ID:').' </td> |
'<input name="courseid" type="text" size="30" />'.$select_link. |
<td><input name="courseid" type="text" /> </td></tr> |
&Apache::lonhtmlcommon::row_closure(). |
<tr><td>'.&mt('Course Name:').' </td> |
&Apache::lonhtmlcommon::row_title(&mt('Course Name')). |
<td><input name="coursename" type="text" /> </td></tr> |
'<input name="coursename" type="text" size="30" />'.$syllabuslink. |
<tr><td>'.&mt('Domain:').' </td> |
&Apache::lonhtmlcommon::row_closure(). |
<td>'.$domsel.' </td></tr> |
&Apache::lonhtmlcommon::row_title(&mt('Domain')). |
<tr><td>'.&mt('File to upload:').'</td> |
'<input name="domainid" type="hidden" />'.$domdesc. |
<td><input type="file" name="upfile" size="50" /></td></tr> |
&Apache::lonhtmlcommon::row_closure(). |
</table> |
&Apache::lonhtmlcommon::row_title(&mt('File to upload')). |
|
'<input type="file" name="upfile" size="50" />'. |
|
&Apache::lonhtmlcommon::row_closure(1). |
|
&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 ''; |
} |
} |
|
|
=pod |
|
|
|
=item scantron_upload_scantron_data_save |
|
|
|
Adds a provided bubble information data file to the course if user |
|
has the correct privileges to do so. |
|
|
|
=cut |
|
|
|
sub scantron_upload_scantron_data_save { |
sub scantron_upload_scantron_data_save { |
my($r)=@_; |
my($r)=@_; |
Line 7677 sub scantron_upload_scantron_data_save {
|
Line 7996 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 7686 sub scantron_upload_scantron_data_save {
|
Line 8005 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 7726 sub scantron_upload_scantron_data_save {
|
Line 8034 sub scantron_upload_scantron_data_save {
|
return ''; |
return ''; |
} |
} |
|
|
=pod |
sub validate_uploaded_scantron_file { |
|
my ($cdom,$cname,$fname) = @_; |
=item valid_file |
my $scanlines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.$fname); |
|
my @lines; |
Validates that the requested bubble data file exists in the course. |
if ($scanlines ne '-1') { |
|
@lines=split("\n",$scanlines,-1); |
=cut |
} |
|
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)=@_; |
Line 7742 sub valid_file {
|
Line 8128 sub valid_file {
|
return 0; |
return 0; |
} |
} |
|
|
=pod |
|
|
|
=item scantron_download_scantron_data |
|
|
|
Shows a list of the three internal files (original, corrected, |
|
skipped) for a specific bubble sheet data file that exists in the |
|
course. |
|
|
|
=cut |
|
|
|
sub scantron_download_scantron_data { |
sub scantron_download_scantron_data { |
my ($r)=@_; |
my ($r)=@_; |
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
Line 7791 sub scantron_download_scantron_data {
|
Line 8167 sub scantron_download_scantron_data {
|
return ''; |
return ''; |
} |
} |
|
|
=pod |
sub checkscantron_results { |
|
my ($r) = @_; |
|
my ($symb)=&get_symb($r); |
|
if (!$symb) {return '';} |
|
my $grading_menu_button=&show_grading_menu_form($symb); |
|
my $cid = $env{'request.course.id'}; |
|
my %lettdig = &letter_to_digits(); |
|
my $numletts = scalar(keys(%lettdig)); |
|
my $cnum = $env{'course.'.$cid.'.num'}; |
|
my $cdom = $env{'course.'.$cid.'.domain'}; |
|
my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'}); |
|
my %record; |
|
my %scantron_config = |
|
&Apache::grades::get_scantron_config($env{'form.scantron_format'}); |
|
my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile(); |
|
my $classlist=&Apache::loncoursedata::get_classlist(); |
|
my %idmap=&Apache::grades::username_to_idmap($classlist); |
|
my $navmap=Apache::lonnavmaps::navmap->new(); |
|
unless (ref($navmap)) { |
|
$r->print(&navmap_errormsg()); |
|
return ''; |
|
} |
|
my $map=$navmap->getResourceByUrl($sequence); |
|
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
|
my (%grader_partids_by_symb,%grader_randomlists_by_symb); |
|
&graders_resources_pass(\@resources,\%grader_partids_by_symb, \%grader_randomlists_by_symb); |
|
|
=back |
my ($uname,$udom); |
|
my (%scandata,%lastname,%bylast); |
|
$r->print(' |
|
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="checkscantron">'."\n"); |
|
|
|
my @delayqueue; |
|
my %completedstudents; |
|
|
|
my $count=&Apache::grades::get_todo_count($scanlines,$scan_data); |
|
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status', |
|
'Progress of Bubblesheet Data/Submission Records Comparison',$count, |
|
'inline',undef,'checkscantron'); |
|
my ($username,$domain,$started); |
|
my $nav_error; |
|
&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, |
|
'Processing first student'); |
|
my $start=&Time::HiRes::time(); |
|
my $i=-1; |
|
|
|
while ($i<$scanlines->{'count'}) { |
|
($username,$domain,$uname)=('','',''); |
|
$i++; |
|
my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i); |
|
if ($line=~/^[\s\cz]*$/) { next; } |
|
if ($started) { |
|
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
|
'last student'); |
|
} |
|
$started=1; |
|
my $scan_record= |
|
&Apache::grades::scantron_parse_scanline($line,$i,\%scantron_config, |
|
$scan_data); |
|
unless ($uname=&Apache::grades::scantron_find_student($scan_record,$scan_data, |
|
\%idmap,$i)) { |
|
&Apache::grades::scantron_add_delay(\@delayqueue,$line, |
|
'Unable to find a student that matches',1); |
|
next; |
|
} |
|
if (exists $completedstudents{$uname}) { |
|
&Apache::grades::scantron_add_delay(\@delayqueue,$line, |
|
'Student '.$uname.' has multiple sheets',2); |
|
next; |
|
} |
|
my $pid = $scan_record->{'scantron.ID'}; |
|
$lastname{$pid} = $scan_record->{'scantron.LastName'}; |
|
push(@{$bylast{$lastname{$pid}}},$pid); |
|
my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'}; |
|
$scandata{$pid} = substr($line,$scantron_config{'Qstart'}-1,$lastpos); |
|
chomp($scandata{$pid}); |
|
$scandata{$pid} =~ s/\r$//; |
|
($username,$domain)=split(/:/,$uname); |
|
my $counter = -1; |
|
foreach my $resource (@resources) { |
|
my $parts; |
|
my $ressymb = $resource->symb(); |
|
if ((exists($grader_randomlists_by_symb{$ressymb})) || |
|
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
|
(my $analysis,$parts) = |
|
&scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain); |
|
} else { |
|
$parts = $grader_partids_by_symb{$ressymb}; |
|
} |
|
($counter,my $recording) = |
|
&verify_scantron_grading($resource,$domain,$username,$cid,$counter, |
|
$scandata{$pid},$parts, |
|
\%scantron_config,\%lettdig,$numletts); |
|
$record{$pid} .= $recording; |
|
} |
|
} |
|
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
|
$r->print('<br />'); |
|
my ($okstudents,$badstudents,$numstudents,$passed,$failed); |
|
$passed = 0; |
|
$failed = 0; |
|
$numstudents = 0; |
|
foreach my $last (sort(keys(%bylast))) { |
|
if (ref($bylast{$last}) eq 'ARRAY') { |
|
foreach my $pid (sort(@{$bylast{$last}})) { |
|
my $showscandata = $scandata{$pid}; |
|
my $showrecord = $record{$pid}; |
|
$showscandata =~ s/\s/ /g; |
|
$showrecord =~ s/\s/ /g; |
|
if ($scandata{$pid} eq $record{$pid}) { |
|
my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row'; |
|
$okstudents .= '<tr class="'.$css_class.'">'. |
|
'<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
|
'</tr>'."\n". |
|
'<tr class="'.$css_class.'">'."\n". |
|
'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n"; |
|
$passed ++; |
|
} else { |
|
my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row'; |
|
$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
|
'</tr>'."\n". |
|
'<tr class="'.$css_class.'">'."\n". |
|
'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n". |
|
'</tr>'."\n"; |
|
$failed ++; |
|
} |
|
$numstudents ++; |
|
} |
|
} |
|
} |
|
$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>'); |
|
if ($passed) { |
|
$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". |
|
&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>'. |
|
&Apache::loncommon::end_data_table_header_row()."\n". |
|
$okstudents."\n". |
|
&Apache::loncommon::end_data_table().'<br />'); |
|
} |
|
if ($failed) { |
|
$r->print(&mt('Students with differences between bubblesheet data and submissions are as follows:').'<br /><br />'); |
|
$r->print(&Apache::loncommon::start_data_table()."\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>'. |
|
&Apache::loncommon::end_data_table_header_row()."\n". |
|
$badstudents."\n". |
|
&Apache::loncommon::end_data_table()).'<br />'. |
|
&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); |
|
return; |
|
} |
|
|
|
sub verify_scantron_grading { |
|
my ($resource,$domain,$username,$cid,$counter,$scandata,$partids, |
|
$scantron_config,$lettdig,$numletts) = @_; |
|
my ($record,%expected,%startpos); |
|
return ($counter,$record) if (!ref($resource)); |
|
return ($counter,$record) if (!$resource->is_problem()); |
|
my $symb = $resource->symb(); |
|
return ($counter,$record) if (ref($partids) ne 'ARRAY'); |
|
foreach my $part_id (@{$partids}) { |
|
$counter ++; |
|
$expected{$part_id} = 0; |
|
if ($env{"form.scantron.sub_bubblelines.$counter"}) { |
|
my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$counter"}); |
|
foreach my $item (@sub_lines) { |
|
$expected{$part_id} += $item; |
|
} |
|
} else { |
|
$expected{$part_id} = $env{"form.scantron.bubblelines.$counter"}; |
|
} |
|
$startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"}; |
|
} |
|
if ($symb) { |
|
my %recorded; |
|
my (%returnhash) = &Apache::lonnet::restore($symb,$cid,$domain,$username); |
|
if ($returnhash{'version'}) { |
|
my %lasthash=(); |
|
my $version; |
|
for ($version=1;$version<=$returnhash{'version'};$version++) { |
|
foreach my $key (sort(split(/\:/,$returnhash{$version.':keys'}))) { |
|
$lasthash{$key}=$returnhash{$version.':'.$key}; |
|
} |
|
} |
|
foreach my $key (keys(%lasthash)) { |
|
if ($key =~ /\.scantron$/) { |
|
my $value = &unescape($lasthash{$key}); |
|
my ($part_id) = ($key =~ /^resource\.(.+)\.scantron$/); |
|
if ($value eq '') { |
|
for (my $i=0; $i<$expected{$part_id}; $i++) { |
|
for (my $j=0; $j<$scantron_config->{'length'}; $j++) { |
|
$recorded{$part_id} .= $scantron_config->{'Qoff'}; |
|
} |
|
} |
|
} else { |
|
my @tocheck; |
|
my @items = split(//,$value); |
|
if (($scantron_config->{'Qon'} eq 'letter') || |
|
($scantron_config->{'Qon'} eq 'number')) { |
|
if (@items < $expected{$part_id}) { |
|
my $fragment = substr($scandata,$startpos{$part_id},$expected{$part_id}); |
|
my @singles = split(//,$fragment); |
|
foreach my $pos (@singles) { |
|
if ($pos eq ' ') { |
|
push(@tocheck,$pos); |
|
} else { |
|
my $next = shift(@items); |
|
push(@tocheck,$next); |
|
} |
|
} |
|
} else { |
|
@tocheck = @items; |
|
} |
|
foreach my $letter (@tocheck) { |
|
if ($scantron_config->{'Qon'} eq 'letter') { |
|
if ($letter !~ /^[A-J]$/) { |
|
$letter = $scantron_config->{'Qoff'}; |
|
} |
|
$recorded{$part_id} .= $letter; |
|
} elsif ($scantron_config->{'Qon'} eq 'number') { |
|
my $digit; |
|
if ($letter !~ /^[A-J]$/) { |
|
$digit = $scantron_config->{'Qoff'}; |
|
} else { |
|
$digit = $lettdig->{$letter}; |
|
} |
|
$recorded{$part_id} .= $digit; |
|
} |
|
} |
|
} else { |
|
@tocheck = @items; |
|
for (my $i=0; $i<$expected{$part_id}; $i++) { |
|
my $curr_sub = shift(@tocheck); |
|
my $digit; |
|
if ($curr_sub =~ /^[A-J]$/) { |
|
$digit = $lettdig->{$curr_sub}-1; |
|
} |
|
if ($curr_sub eq 'J') { |
|
$digit += scalar($numletts); |
|
} |
|
for (my $j=0; $j<$scantron_config->{'Qlength'}; $j++) { |
|
if ($j == $digit) { |
|
$recorded{$part_id} .= $scantron_config->{'Qon'}; |
|
} else { |
|
$recorded{$part_id} .= $scantron_config->{'Qoff'}; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
foreach my $part_id (@{$partids}) { |
|
if ($recorded{$part_id} eq '') { |
|
for (my $i=0; $i<$expected{$part_id}; $i++) { |
|
for (my $j=0; $j<$scantron_config->{'Qlength'}; $j++) { |
|
$recorded{$part_id} .= $scantron_config->{'Qoff'}; |
|
} |
|
} |
|
} |
|
$record .= $recorded{$part_id}; |
|
} |
|
} |
|
return ($counter,$record); |
|
} |
|
|
|
sub letter_to_digits { |
|
my %lettdig = ( |
|
A => 1, |
|
B => 2, |
|
C => 3, |
|
D => 4, |
|
E => 5, |
|
F => 6, |
|
G => 7, |
|
H => 8, |
|
I => 9, |
|
J => 0, |
|
); |
|
return %lettdig; |
|
} |
|
|
=cut |
|
|
|
#-------- end of section for handling grading scantron forms ------- |
#-------- end of section for handling grading scantron forms ------- |
# |
# |
Line 7815 sub show_grading_menu_form {
|
Line 8478 sub show_grading_menu_form {
|
return $result; |
return $result; |
} |
} |
|
|
# -- Retrieve choices for grading form |
|
sub savedState { |
|
my %savedState = (); |
|
if ($env{'form.saveState'}) { |
|
foreach (split(/:/,$env{'form.saveState'})) { |
|
my ($key,$value) = split(/=/,$_,2); |
|
$savedState{$key} = $value; |
|
} |
|
} |
|
return \%savedState; |
|
} |
|
|
|
sub grading_menu { |
sub grading_menu { |
my ($request) = @_; |
my ($request) = @_; |
my ($symb)=&get_symb($request); |
my ($symb)=&get_symb($request); |
if (!$symb) {return '';} |
if (!$symb) {return '';} |
my $probTitle = &Apache::lonnet::gettitle($symb); |
my $probTitle = &Apache::lonnet::gettitle($symb); |
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle); |
|
|
|
$request->print($table); |
|
my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb), |
my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb), |
'handgrade'=>$hdgrade, |
|
'probTitle'=>$probTitle, |
'probTitle'=>$probTitle, |
'command'=>'submit_options', |
'command'=>'individual', |
'saveState'=>"", |
|
'gradingMenu'=>1, |
'gradingMenu'=>1, |
'showgrading'=>"yes"); |
'showgrading'=>"yes"); |
my $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
|
my @menu = ({ url => $url, |
my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
name => &mt('Manual Grading/View Submissions'), |
|
short_description => |
$fields{'command'}='ungraded'; |
&mt('Start the process of hand grading submissions.'), |
my $url1b=&Apache::lonhtmlcommon::build_url('grades/',\%fields); |
}); |
|
|
$fields{'command'}='table'; |
|
my $url1c=&Apache::lonhtmlcommon::build_url('grades/',\%fields); |
|
|
|
$fields{'command'}='all_for_one'; |
|
my $url1d=&Apache::lonhtmlcommon::build_url('grades/',\%fields); |
|
|
$fields{'command'} = 'csvform'; |
$fields{'command'} = 'csvform'; |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
my $url2 = &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'; |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
my $url3 = &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'; |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
push (@menu, { url => $url, |
|
name => &mt('Grade/Manage Scantron Forms'), |
$fields{'command'} = 'initialverifyreceipt'; |
short_description => |
my $url5 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
&mt('')}); |
|
$fields{'command'} = 'verify'; |
my @menu = ({ categorytitle=>'Hand Grading', |
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
items =>[ |
push (@menu, { url => "", |
{ linktext => 'Select individual students to grade', |
name => &mt('Verify Receipt'), |
url => $url1a, |
short_description => |
permission => 'F', |
&mt('')}); |
icon => 'edit-find-replace.png', |
# |
linktitle => 'Grade current resource for a selection of students.' |
|
}, |
|
{ linktext => 'Grade ungraded submissions.', |
|
url => $url1b, |
|
permission => 'F', |
|
icon => 'edit-find-replace.png', |
|
linktitle => 'Grade all submissions that have not been graded yet.' |
|
}, |
|
|
|
{ linktext => 'Grading table', |
|
url => $url1c, |
|
permission => 'F', |
|
icon => 'edit-find-replace.png', |
|
linktitle => 'Grade current resource for all students.' |
|
}, |
|
{ linktext => 'Grade complete page/sequence/folder for one student', |
|
url => $url1d, |
|
permission => 'F', |
|
icon => 'edit-find-replace.png', |
|
linktitle => 'Grade all resources in current page/sequence/folder for one student.' |
|
}]}, |
|
{ categorytitle=>'Automated Grading', |
|
items =>[ |
|
|
|
{ linktext => 'Upload Scores', |
|
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 Bubblesheets', |
|
url => $url4, |
|
permission => 'F', |
|
icon => 'stat.png', |
|
linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.' |
|
}, |
|
{ linktext => 'Verify Receipt No.', |
|
url => $url5, |
|
permission => 'F', |
|
icon => 'edit-find-replace.png', |
|
linktitle => 'Verify a system-generated receipt number for correct problem solution.' |
|
} |
|
|
|
] |
|
}); |
|
|
# Create the menu |
# Create the menu |
my $Str; |
my $Str; |
# $Str .= '<h2>'.&mt('Please select a grading task').'</h2>'; |
|
$Str .= '<form method="post" action="" name="gradingMenu">'; |
$Str .= '<form method="post" action="" name="gradingMenu">'; |
$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="probTitle" value="'.$probTitle.'" />'."\n". |
'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\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')) { |
return $Str; |
$Str .=' <h3><a '. |
} |
$menudata->{'jscript'}. |
|
' href="'. |
|
$menudata->{'url'}.'" >'. |
|
$menudata->{'name'}."</a></h3>\n"; |
|
} else { |
|
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '. |
|
$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"; |
|
$request->print(<<GRADINGMENUJS); |
|
<script type="text/javascript" language="javascript"> |
|
function checkChoice(formname,val,cmdx) { |
|
if (val <= 2) { |
|
var cmd = radioSelection(formname.radioChoice); |
|
var cmdsave = cmd; |
|
} else { |
|
cmd = cmdx; |
|
cmdsave = 'submission'; |
|
} |
|
formname.command.value = cmd; |
|
if (val < 5) formname.submit(); |
|
if (val == 5) { |
|
if (!checkReceiptNo(formname,'notOK')) { |
|
return false; |
|
} else { |
|
formname.submit(); |
|
} |
|
} |
|
} |
|
|
|
function checkReceiptNo(formname,nospace) { |
|
var receiptNo = formname.receipt.value; |
sub ungraded { |
var checkOpt = false; |
my ($request)=@_; |
if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;} |
&submit_options($request); |
if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;} |
} |
if (checkOpt) { |
|
alert("Please enter a receipt number given by a student in the receipt box."); |
sub submit_options_sequence { |
formname.receipt.value = ""; |
my ($request) = @_; |
formname.receipt.focus(); |
my ($symb)=&get_symb($request); |
return false; |
if (!$symb) {return '';} |
} |
|
return true; |
|
} |
|
</script> |
|
GRADINGMENUJS |
|
&commonJSfunctions($request); |
&commonJSfunctions($request); |
return $Str; |
my $result; |
|
|
|
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n". |
|
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
|
'<input type="hidden" name="gradingMenu" value="1" />'."\n". |
|
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
|
|
|
$result.=' |
|
<h2> |
|
'.&mt('Grade complete page/sequence/folder for one student').' |
|
</h2>'. |
|
&selectfield(0). |
|
'<input type="hidden" name="command" value="pickStudentPage" /> |
|
<div> |
|
<input type="submit" value="'.&mt('Next').' →" /> |
|
</div> |
|
</div> |
|
</form>'; |
|
$result .= &show_grading_menu_form($symb); |
|
return $result; |
} |
} |
|
|
|
sub submit_options_table { |
|
my ($request) = @_; |
|
my ($symb)=&get_symb($request); |
|
if (!$symb) {return '';} |
|
&commonJSfunctions($request); |
|
my $result; |
|
|
|
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n". |
|
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
|
'<input type="hidden" name="gradingMenu" value="1" />'."\n". |
|
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
|
|
|
$result.=' |
|
<h2> |
|
'.&mt('Grading table').' |
|
</h2>'. |
|
&selectfield(0). |
|
'<input type="hidden" name="command" value="viewgrades" /> |
|
<div> |
|
<input type="submit" value="'.&mt('Next').' →" /> |
|
</div> |
|
</div> |
|
</form>'; |
|
$result .= &show_grading_menu_form($symb); |
|
return $result; |
|
} |
|
|
|
|
|
|
#--- Displays the submissions first page ------- |
#--- Displays the submissions first page ------- |
sub submit_options { |
sub submit_options { |
Line 7952 sub submit_options {
|
Line 8653 sub submit_options {
|
if (!$symb) {return '';} |
if (!$symb) {return '';} |
my $probTitle = &Apache::lonnet::gettitle($symb); |
my $probTitle = &Apache::lonnet::gettitle($symb); |
|
|
$request->print(<<GRADINGMENUJS); |
|
<script type="text/javascript" language="javascript"> |
|
function checkChoice(formname,val,cmdx) { |
|
if (val <= 2) { |
|
var cmd = radioSelection(formname.radioChoice); |
|
var cmdsave = cmd; |
|
} else { |
|
cmd = cmdx; |
|
cmdsave = 'submission'; |
|
} |
|
formname.command.value = cmd; |
|
formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+ |
|
":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status); |
|
if (val < 5) formname.submit(); |
|
if (val == 5) { |
|
if (!checkReceiptNo(formname,'notOK')) { return false;} |
|
formname.submit(); |
|
} |
|
if (val < 7) formname.submit(); |
|
} |
|
|
|
function checkReceiptNo(formname,nospace) { |
|
var receiptNo = formname.receipt.value; |
|
var checkOpt = false; |
|
if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;} |
|
if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;} |
|
if (checkOpt) { |
|
alert("Please enter a receipt number given by a student in the receipt box."); |
|
formname.receipt.value = ""; |
|
formname.receipt.focus(); |
|
return false; |
|
} |
|
return true; |
|
} |
|
</script> |
|
GRADINGMENUJS |
|
&commonJSfunctions($request); |
&commonJSfunctions($request); |
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle); |
|
my $result; |
my $result; |
my (undef,$sections) = &getclasslist('all','0'); |
|
my $savedState = &savedState(); |
|
my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'}); |
|
my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'}); |
|
my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'}); |
|
my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'}); |
|
|
|
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n". |
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n". |
'<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="probTitle" value="'.$probTitle.'" />'."\n". |
'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n". |
'<input type="hidden" name="command" 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"; |
|
|
$result.=' |
$result.=' |
<div class="LC_grade_select_mode"> |
<h2> |
<div class="LC_grade_select_mode_current"> |
'.&mt('Select individual students to grade').' |
<h2> |
</h2>'.&selectfield(1).' |
'.&mt('Grade Current Resource').' |
<input type="hidden" name="command" value="submission" /> |
</h2> |
<input type="submit" value="'.&mt('Next').' →" /> |
<div class="LC_grade_select_mode_body"> |
|
<div class="LC_grades_resource_info"> |
|
'.$table.' |
|
</div> |
|
<div class="LC_grade_select_mode_selector"> |
|
<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)) { |
|
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.=' |
|
</div> |
|
</div> |
|
<div class="LC_grade_select_mode_selector"> |
|
<div class="LC_grade_select_mode_selector_header"> |
|
'.&mt('Groups').' |
|
</div> |
|
<div class="LC_grade_select_mode_selector_body"> |
|
'.&Apache::lonstatistics::GroupSelect('group','multiple',5).' |
|
</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('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> |
</div> |
|
</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> |
|
</form>'; |
</form>'; |
$result .= &show_grading_menu_form($symb); |
$result .= &show_grading_menu_form($symb); |
return $result; |
return $result; |
} |
} |
|
|
|
sub selectfield { |
|
my ($full)=@_; |
|
my $result='<div class="LC_columnSection"> |
|
|
|
<fieldset> |
|
<legend> |
|
'.&mt('Sections').' |
|
</legend> |
|
'.&Apache::lonstatistics::SectionSelect('section','multiple',5).' |
|
</fieldset> |
|
|
|
<fieldset> |
|
<legend> |
|
'.&mt('Groups').' |
|
</legend> |
|
'.&Apache::lonstatistics::GroupSelect('group','multiple',5).' |
|
</fieldset> |
|
|
|
<fieldset> |
|
<legend> |
|
'.&mt('Access Status').' |
|
</legend> |
|
'.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').' |
|
</fieldset>'; |
|
if ($full) { |
|
$result.=' |
|
<fieldset> |
|
<legend> |
|
'.&mt('Submission Status').' |
|
</legend>'. |
|
&Apache::loncommon::select_form('all','submitonly', |
|
(&Apache::lonlocal::texthash( |
|
'yes' => 'with submissions', |
|
'queued' => 'in grading queue', |
|
'graded' => 'with ungraded submissions', |
|
'incorrect' => 'with incorrect submissions', |
|
'all' => 'with any status'), |
|
'select_form_order' => ['yes','queued','graded','incorrect','all'])). |
|
'</fieldset>'; |
|
} |
|
$result.='</div><br />'; |
|
return $result; |
|
} |
|
|
sub reset_perm { |
sub reset_perm { |
undef(%perm); |
undef(%perm); |
} |
} |
Line 8198 sub process_clicker {
|
Line 8810 sub process_clicker {
|
if (!$symb) {return '';} |
if (!$symb) {return '';} |
my $result=&checkforfile_js(); |
my $result=&checkforfile_js(); |
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb); |
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb); |
my ($table) = &showResourceInfo($symb,$env{'form.probTitle'}); |
|
$result.=$table; |
|
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n"; |
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n"; |
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n"; |
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n"; |
$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource'). |
$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource.'). |
'.</b></td></tr>'."\n"; |
'</b></td></tr>'."\n"; |
$result.='<tr bgcolor=#ffffe6><td>'."\n"; |
$result.='<tr bgcolor="#ffffe6"><td>'."\n"; |
# Attempt to restore parameters from last session, set defaults if not present |
# Attempt to restore parameters from last session, set defaults if not present |
my %Saveable_Parameters=&clicker_grading_parameters(); |
my %Saveable_Parameters=&clicker_grading_parameters(); |
&Apache::loncommon::restore_course_settings('grades_clicker', |
&Apache::loncommon::restore_course_settings('grades_clicker', |
Line 8215 sub process_clicker {
|
Line 8825 sub process_clicker {
|
if (!$env{'form.upfiletype'}) { $env{'form.upfiletype'}='iclicker'; } |
if (!$env{'form.upfiletype'}) { $env{'form.upfiletype'}='iclicker'; } |
|
|
my %checked; |
my %checked; |
foreach my $gradingmechanism ('attendance','personnel','specific') { |
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 8226 sub process_clicker {
|
Line 8836 sub process_clicker {
|
my $attendance=&mt("Award points just for participation"); |
my $attendance=&mt("Award points just for participation"); |
my $personnel=&mt("Correctness determined from response by course personnel"); |
my $personnel=&mt("Correctness determined from response by course personnel"); |
my $specific=&mt("Correctness determined from response with clicker ID(s)"); |
my $specific=&mt("Correctness determined from response with clicker ID(s)"); |
|
my $given=&mt("Correctness determined from given list of answers").' '. |
|
'<font size="-2"><tt>('.&mt("Provide comma-separated list. Use '*' for any answer correct, '-' for skip").')</tt></font>'; |
my $pcorrect=&mt("Percentage points for correct solution"); |
my $pcorrect=&mt("Percentage points for correct solution"); |
my $pincorrect=&mt("Percentage points for incorrect solution"); |
my $pincorrect=&mt("Percentage points for incorrect solution"); |
my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype', |
my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype', |
('iclicker' => 'i>clicker', |
('iclicker' => 'i>clicker', |
'interwrite' => 'interwrite PRS')); |
'interwrite' => 'interwrite PRS')); |
$symb = &Apache::lonenc::check_encrypt($symb); |
$symb = &Apache::lonenc::check_encrypt($symb); |
$result.=<<ENDUPFORM; |
$result.= &Apache::lonhtmlcommon::scripttag(<<ENDUPFORM); |
<script type="text/javascript"> |
|
function sanitycheck() { |
function sanitycheck() { |
// Accept only integer percentages |
// Accept only integer percentages |
document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value); |
document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value); |
Line 8271 function sanitycheck() {
|
Line 8882 function sanitycheck() {
|
// Remember the old state |
// Remember the old state |
document.forms.gradesupload.waschecked.value=newgradingchoice; |
document.forms.gradesupload.waschecked.value=newgradingchoice; |
} |
} |
</script> |
ENDUPFORM |
|
$result.= <<ENDUPFORM; |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
<input type="hidden" name="symb" value="$symb" /> |
<input type="hidden" name="symb" value="$symb" /> |
<input type="hidden" name="command" value="processclickerfile" /> |
<input type="hidden" name="command" value="processclickerfile" /> |
Line 8279 function sanitycheck() {
|
Line 8891 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 /> |
|
<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'}" /> |
<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onChange="sanitycheck()" /></label> |
<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onchange="sanitycheck()" /></label> |
<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onChange="sanitycheck()" /></label> |
<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onchange="sanitycheck()" /></label> |
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" /> |
<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" /> |
</form> |
</form>' |
ENDUPFORM |
ENDUPFORM |
$result.='</td></tr></table>'."\n". |
$result.='</td></tr></table>'."\n". |
'</td></tr></table><br /><br />'."\n"; |
'</td></tr></table><br /><br />'."\n"; |
Line 8303 sub process_clicker_file {
|
Line 8918 sub process_clicker_file {
|
my %Saveable_Parameters=&clicker_grading_parameters(); |
my %Saveable_Parameters=&clicker_grading_parameters(); |
&Apache::loncommon::store_course_settings('grades_clicker', |
&Apache::loncommon::store_course_settings('grades_clicker', |
\%Saveable_Parameters); |
\%Saveable_Parameters); |
|
my $result=''; |
my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}); |
# my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}); |
if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) { |
if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) { |
$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>'; |
$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>'; |
return $result.&show_grading_menu_form($symb); |
return $result.&show_grading_menu_form($symb); |
} |
} |
|
if (($env{'form.gradingmechanism'} eq 'given') && ($env{'form.givenanswer'}!~/\S/)) { |
|
$result.='<span class="LC_error">'.&mt('You need to specify the correct answer').'</span>'; |
|
return $result.&show_grading_menu_form($symb); |
|
} |
|
my $foundgiven=0; |
|
if ($env{'form.gradingmechanism'} eq 'given') { |
|
$env{'form.givenanswer'}=~s/^\s*//gs; |
|
$env{'form.givenanswer'}=~s/\s*$//gs; |
|
$env{'form.givenanswer'}=~s/[^a-zA-Z0-9\.\*\-]+/\,/g; |
|
$env{'form.givenanswer'}=uc($env{'form.givenanswer'}); |
|
my @answers=split(/\,/,$env{'form.givenanswer'}); |
|
$foundgiven=$#answers+1; |
|
} |
my %clicker_ids=&gather_clicker_ids(); |
my %clicker_ids=&gather_clicker_ids(); |
my %correct_ids; |
my %correct_ids; |
if ($env{'form.gradingmechanism'} eq 'personnel') { |
if ($env{'form.gradingmechanism'} eq 'personnel') { |
Line 8327 sub process_clicker_file {
|
Line 8955 sub process_clicker_file {
|
} |
} |
if ($env{'form.gradingmechanism'} eq 'attendance') { |
if ($env{'form.gradingmechanism'} eq 'attendance') { |
$result.=&mt('Score based on attendance only'); |
$result.=&mt('Score based on attendance only'); |
|
} elsif ($env{'form.gradingmechanism'} eq 'given') { |
|
$result.=&mt('Score based on [_1] ([_2] answers)','<tt>'.$env{'form.givenanswer'}.'</tt>',$foundgiven); |
} else { |
} else { |
my $number=0; |
my $number=0; |
$result.='<p><b>'.&mt('Correctness determined by the following IDs').'</b>'; |
$result.='<p><b>'.&mt('Correctness determined by the following IDs').'</b>'; |
Line 8372 sub process_clicker_file {
|
Line 9002 sub process_clicker_file {
|
<input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" /> |
<input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" /> |
<input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" /> |
<input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" /> |
ENDHEADER |
ENDHEADER |
|
if ($env{'form.gradingmechanism'} eq 'given') { |
|
$result.='<input type="hidden" name="correct:given" value="'.$env{'form.givenanswer'}.'" />'; |
|
} |
my %responses; |
my %responses; |
my @questiontitles; |
my @questiontitles; |
my $errormsg=''; |
my $errormsg=''; |
Line 8387 ENDHEADER
|
Line 9020 ENDHEADER
|
&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 />'; |
|
if (($env{'form.gradingmechanism'} eq 'given') && ($number!=$foundgiven)) { |
|
$result.='<span class="LC_error">'.&mt('Number of given answers does not agree with number of questions in file.').'</span>'; |
|
return $result.&show_grading_menu_form($symb); |
|
} |
# Remember Question Titles |
# Remember Question Titles |
# FIXME: Possibly need delimiter other than ":" |
# FIXME: Possibly need delimiter other than ":" |
for (my $i=0;$i<$number;$i++) { |
for (my $i=0;$i<$number;$i++) { |
Line 8430 ENDHEADER
|
Line 9067 ENDHEADER
|
} |
} |
$result.='<hr />'. |
$result.='<hr />'. |
&mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count); |
&mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count); |
if ($env{'form.gradingmechanism'} ne 'attendance') { |
if (($env{'form.gradingmechanism'} ne 'attendance') && ($env{'form.gradingmechanism'} ne 'given')) { |
if ($correct_count==0) { |
if ($correct_count==0) { |
$errormsg.="Found no correct answers answers for grading!"; |
$errormsg.="Found no correct answers answers for grading!"; |
} elsif ($correct_count>1) { |
} elsif ($correct_count>1) { |
Line 8501 sub interwrite_eval {
|
Line 9138 sub interwrite_eval {
|
$id=~s/[\-\:]//g; |
$id=~s/[\-\:]//g; |
$idresponses{$id}[$number]=$entries[6]; |
$idresponses{$id}[$number]=$entries[6]; |
} |
} |
foreach my $id (keys %idresponses) { |
foreach my $id (keys(%idresponses)) { |
$$responses{$id}=join(',',@{$idresponses{$id}}); |
$$responses{$id}=join(',',@{$idresponses{$id}}); |
$$responses{$id}=~s/^\s*\,//; |
$$responses{$id}=~s/^\s*\,//; |
} |
} |
Line 8513 sub assign_clicker_grades {
|
Line 9150 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 |
my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}); |
my $result=''; |
|
# my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}); |
|
|
my $heading=&mt('Assigning grades based on clicker file'); |
my $heading=&mt('Assigning grades based on clicker file'); |
$result.=(<<ENDHEADER); |
$result.=(<<ENDHEADER); |
Line 8575 ENDHEADER
|
Line 9217 ENDHEADER
|
if ($user) { |
if ($user) { |
my @answer=split(/\,/,$env{$key}); |
my @answer=split(/\,/,$env{$key}); |
my $sum=0; |
my $sum=0; |
|
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 ($correct[$i] eq '*') { |
|
$sum+=$pcorrect; |
} else { |
} else { |
if ($answer[$i] eq $correct[$i]) { |
if ($answer[$i] eq $correct[$i]) { |
$sum+=$pcorrect; |
$sum+=$pcorrect; |
Line 8588 ENDHEADER
|
Line 9235 ENDHEADER
|
} |
} |
} |
} |
} |
} |
my $ave=$sum/(100*$number); |
my $ave=$sum/(100*$realnumber); |
# Store |
# Store |
my ($username,$domain)=split(/\:/,$user); |
my ($username,$domain)=split(/\:/,$user); |
my %grades=(); |
my %grades=(); |
Line 8606 ENDHEADER
|
Line 9253 ENDHEADER
|
} |
} |
} |
} |
# We are done |
# We are done |
$result.='<br />'.&mt('Successfully stored grades for [_1] student(s).',$storecount). |
$result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount). |
'</td></tr></table>'."\n". |
'</td></tr></table>'."\n". |
'</td></tr></table><br /><br />'."\n"; |
'</td></tr></table><br /><br />'."\n"; |
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 8632 sub handler {
|
Line 9286 sub handler {
|
} |
} |
|
|
$ssi_error = 0; |
$ssi_error = 0; |
$request->print(&Apache::loncommon::start_page('Grading')); |
my $brcrum = [{href=>"/adm/grades",text=>"Grading"}]; |
|
$request->print(&Apache::loncommon::start_page('Grading',undef, |
|
{'bread_crumbs' => $brcrum})); |
if ($symb eq '' && $command eq '') { |
if ($symb eq '' && $command eq '') { |
if ($env{'user.adv'}) { |
# |
if (($env{'form.codeone'}) && ($env{'form.codetwo'}) && |
# Not called from a resource |
($env{'form.codethree'})) { |
# |
my $token=$env{'form.codeone'}.'*'.$env{'form.codetwo'}.'*'. |
|
$env{'form.codethree'}; |
|
my ($tsymb,$tuname,$tudom,$tcrsid)= |
|
&Apache::lonnet::checkin($token); |
|
if ($tsymb) { |
|
my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb); |
|
if (&Apache::lonnet::allowed('mgr',$tcrsid)) { |
|
$request->print(&ssi_with_retries('/res/'.$url, $ssi_retries, |
|
('grade_username' => $tuname, |
|
'grade_domain' => $tudom, |
|
'grade_courseid' => $tcrsid, |
|
'grade_symb' => $tsymb))); |
|
} else { |
|
$request->print('<h3>Not authorized: '.$token.'</h3>'); |
|
} |
|
} else { |
|
$request->print('<h3>Not a valid DocID: '.$token.'</h3>'); |
|
} |
|
} else { |
|
$request->print(&Apache::lonxml::tokeninputfield()); |
|
} |
|
} |
|
} else { |
} else { |
&init_perm(); |
&init_perm(); |
if ($command eq 'submission' && $perm{'vgr'}) { |
if ($command eq 'submission' && $perm{'vgr'}) { |
Line 8673 sub handler {
|
Line 9308 sub handler {
|
&processGroup($request); |
&processGroup($request); |
} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) { |
} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) { |
$request->print(&grading_menu($request)); |
$request->print(&grading_menu($request)); |
} elsif ($command eq 'submit_options' && $perm{'vgr'}) { |
} elsif ($command eq 'individual' && $perm{'vgr'}) { |
$request->print(&submit_options($request)); |
$request->print(&submit_options($request)); |
|
} elsif ($command eq 'ungraded' && $perm{'vgr'}) { |
|
$request->print(&submit_options($request)); |
|
} elsif ($command eq 'table' && $perm{'vgr'}) { |
|
$request->print(&submit_options_table($request)); |
|
} elsif ($command eq 'all_for_one' && $perm{'vgr'}) { |
|
$request->print(&submit_options_sequence($request)); |
} elsif ($command eq 'viewgrades' && $perm{'vgr'}) { |
} elsif ($command eq 'viewgrades' && $perm{'vgr'}) { |
$request->print(&viewgrades($request)); |
$request->print(&viewgrades($request)); |
} elsif ($command eq 'handgrade' && $perm{'mgr'}) { |
} elsif ($command eq 'handgrade' && $perm{'mgr'}) { |
$request->print(&processHandGrade($request)); |
$request->print(&processHandGrade($request)); |
} elsif ($command eq 'editgrades' && $perm{'mgr'}) { |
} elsif ($command eq 'editgrades' && $perm{'mgr'}) { |
$request->print(&editgrades($request)); |
$request->print(&editgrades($request)); |
|
} elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) { |
|
$request->print(&initialverifyreceipt($request)); |
} elsif ($command eq 'verify' && $perm{'vgr'}) { |
} elsif ($command eq 'verify' && $perm{'vgr'}) { |
$request->print(&verifyreceipt($request)); |
$request->print(&verifyreceipt($request)); |
} elsif ($command eq 'processclicker' && $perm{'mgr'}) { |
} elsif ($command eq 'processclicker' && $perm{'mgr'}) { |
Line 8727 sub handler {
|
Line 9370 sub handler {
|
} elsif ($command eq 'scantron_download' && |
} elsif ($command eq 'scantron_download' && |
&Apache::lonnet::allowed('usc',$env{'request.course.id'})) { |
&Apache::lonnet::allowed('usc',$env{'request.course.id'})) { |
$request->print(&scantron_download_scantron_data($request)); |
$request->print(&scantron_download_scantron_data($request)); |
|
} elsif ($command eq 'checksubmissions' && $perm{'vgr'}) { |
|
$request->print(&checkscantron_results($request)); |
} elsif ($command) { |
} elsif ($command) { |
$request->print("Access Denied ($command)"); |
$request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>'); |
} |
} |
} |
} |
if ($ssi_error) { |
if ($ssi_error) { |
Line 8742 sub handler {
|
Line 9387 sub handler {
|
1; |
1; |
|
|
__END__; |
__END__; |
|
|
|
|
|
=head1 NAME |
|
|
|
Apache::grades |
|
|
|
=head1 SYNOPSIS |
|
|
|
Handles the viewing of grades. |
|
|
|
This is part of the LearningOnline Network with CAPA project |
|
described at http://www.lon-capa.org. |
|
|
|
=head1 OVERVIEW |
|
|
|
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. |
|
|
|
|
|
|
|
ssi_with_retries - Does the server side include of a resource. |
|
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. |
|
|
|
|
|
=head1 HANDLER SUBROUTINE |
|
|
|
ssi_with_retries() |
|
|
|
=head1 SUBROUTINES |
|
|
|
=over |
|
|
|
=item scantron_get_correction() : |
|
|
|
Builds the interface screen to interact with the operator to fix a |
|
specific error condition in a specific scanline |
|
|
|
Arguments: |
|
$r - Apache request object |
|
$i - number of the current scanline |
|
$scan_record - hash ref as returned from &scantron_parse_scanline() |
|
$scan_config - hash ref as returned from &get_scantron_config() |
|
$line - full contents of the current scanline |
|
$error - error condition, valid values are |
|
'incorrectCODE', 'duplicateCODE', |
|
'doublebubble', 'missingbubble', |
|
'duplicateID', 'incorrectID' |
|
$arg - extra information needed |
|
For errors: |
|
- duplicateID - paper number that this studentID was seen before on |
|
- duplicateCODE - array ref of the paper numbers this CODE was |
|
seen on before |
|
- incorrectCODE - current incorrect CODE |
|
- doublebubble - array ref of the bubble lines that have double |
|
bubble errors |
|
- missingbubble - array ref of the bubble lines that have missing |
|
bubble errors |
|
|
|
=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 |
|
occur. Does this by walking the selected sequence rendering the |
|
resource and then checking &Apache::lonxml::get_problem_counter() |
|
for what the current value of the problem counter is. |
|
|
|
Caches the results to $env{'form.scantron_maxbubble'}, |
|
$env{'form.scantron.bubble_lines.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 |
|
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. |
|
|
|
|
|
=item scantron_validate_missingbubbles() : |
|
|
|
Validates all scanlines in the selected file to not have any |
|
answers that don't have bubbles that have not been verified |
|
to be bubble free. |
|
|
|
=item scantron_process_students() : |
|
|
|
Routine that does the actual grading of the bubble sheet information. |
|
|
|
The parsed scanline hash is added to %env |
|
|
|
Then foreach unskipped scanline it does an &Apache::lonnet::ssi() |
|
foreach resource , with the form data of |
|
|
|
'submitted' =>'scantron' |
|
'grade_target' =>'grade', |
|
'grade_username'=> username of student |
|
'grade_domain' => domain of student |
|
'grade_courseid'=> of course |
|
'grade_symb' => symb of resource to grade |
|
|
|
This triggers a grading pass. The problem grading code takes care |
|
of converting the bubbled letter information (now in %env) into a |
|
valid submission. |
|
|
|
=item scantron_upload_scantron_data() : |
|
|
|
Creates the screen for adding a new bubble sheet data file to a course. |
|
|
|
=item scantron_upload_scantron_data_save() : |
|
|
|
Adds a provided bubble information data file to the course if user |
|
has the correct privileges to do so. |
|
|
|
=item valid_file() : |
|
|
|
Validates that the requested bubble data file exists in the course. |
|
|
|
=item scantron_download_scantron_data() : |
|
|
|
Shows a list of the three internal files (original, corrected, |
|
skipped) for a specific bubble sheet data file that exists in the |
|
course. |
|
|
|
=item scantron_validate_ID() : |
|
|
|
Validates all scanlines in the selected file to not have any |
|
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 |
|
|
|
=cut |