version 1.548, 2009/01/16 10:59:52
|
version 1.596.2.12.2.5, 2012/05/02 15:36:10
|
Line 40 use Apache::lonhomework;
|
Line 40 use Apache::lonhomework;
|
use Apache::lonpickcode; |
use Apache::lonpickcode; |
use Apache::loncoursedata; |
use Apache::loncoursedata; |
use Apache::lonmsg(); |
use Apache::lonmsg(); |
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common :http); |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonenc; |
use Apache::lonenc; |
|
use Apache::bridgetask(); |
use String::Similarity; |
use String::Similarity; |
use LONCAPA; |
use LONCAPA; |
|
|
Line 97 sub ssi_print_error {
|
Line 98 sub ssi_print_error {
|
# |
# |
# --- Retrieve the parts from the metadata file.--- |
# --- Retrieve the parts from the metadata file.--- |
sub getpartlist { |
sub getpartlist { |
my ($symb) = @_; |
my ($symb,$errorref) = @_; |
|
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
unless (ref($navmap)) { |
|
if (ref($errorref)) { |
|
$$errorref = 'navmap'; |
|
return; |
|
} |
|
} |
my $res = $navmap->getBySymb($symb); |
my $res = $navmap->getBySymb($symb); |
my $partlist = $res->parts(); |
my $partlist = $res->parts(); |
my $url = $res->src(); |
my $url = $res->src(); |
Line 121 sub get_symb {
|
Line 128 sub get_symb {
|
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 144 sub nameUserString {
|
Line 151 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 183 sub get_display_part {
|
Line 200 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; |
} |
} |
Line 193 sub get_display_part {
|
Line 211 sub get_display_part {
|
#--- Show resource title |
#--- Show resource title |
#--- and parts and response type |
#--- and parts and response type |
sub showResourceInfo { |
sub showResourceInfo { |
my ($symb,$probTitle,$checkboxes) = @_; |
my ($symb,$probTitle,$checkboxes,$res_error) = @_; |
my $col=3; |
|
if ($checkboxes) { $col=4; } |
|
my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n"; |
my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n"; |
$result .='<table border="0">'; |
my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error); |
my ($partlist,$handgrade,$responseType) = &response_type($symb); |
if (ref($res_error)) { |
|
if ($$res_error) { |
|
return; |
|
} |
|
} |
|
$result.=&Apache::loncommon::start_data_table() |
|
.&Apache::loncommon::start_data_table_header_row(); |
|
if ($checkboxes) { |
|
$result.='<th> </th>'; |
|
} |
|
$result.='<th>'.&mt('Problem Part').'</th>' |
|
.'<th>'.&mt('Res. ID').'</th>' |
|
.'<th>'.&mt('Type').'</th>' |
|
.&Apache::loncommon::end_data_table_header_row(); |
my %resptype = (); |
my %resptype = (); |
my $hdgrade='no'; |
my $hdgrade='no'; |
my %partsseen; |
my %partsseen; |
foreach my $partID (sort(keys(%$responseType))) { |
foreach my $partID (sort(keys(%$responseType))) { |
foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) { |
foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) { |
my $handgrade=$$handgrade{$partID.'_'.$resID}; |
my $handgrade=$$handgrade{$partID.'_'.$resID}; |
my $responsetype = $responseType->{$partID}->{$resID}; |
my $responsetype = $responseType->{$partID}->{$resID}; |
$hdgrade = $handgrade if ($handgrade eq 'yes'); |
$hdgrade = $handgrade if ($handgrade eq 'yes'); |
$result.='<tr>'; |
$result.=&Apache::loncommon::start_data_table_row(); |
if ($checkboxes) { |
if ($checkboxes) { |
if (exists($partsseen{$partID})) { |
if (exists($partsseen{$partID})) { |
$result.="<td> </td>"; |
$result.="<td> </td>"; |
} else { |
} else { |
$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>"; |
$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>"; |
} |
} |
$partsseen{$partID}=1; |
$partsseen{$partID}=1; |
} |
} |
my $display_part=&get_display_part($partID,$symb); |
my $display_part=&get_display_part($partID,$symb); |
$result.='<td><b>'.&mt('Part').': </b>'.$display_part. |
$result.='<td>'.$display_part.'</td>' |
' <span class="LC_internal_info">'.$resID.'</span></td>'. |
.'<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>' |
'<td><b>'.&mt('Type').': </b>'.$responsetype.'</td></tr>'; |
.'<td>'.&mt($responsetype).'</td>' |
# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>'; |
# .'<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td>' |
} |
.&Apache::loncommon::end_data_table_row(); |
|
} |
} |
} |
$result.='</table>'."\n"; |
$result.=&Apache::loncommon::end_data_table(); |
return $result,$responseType,$hdgrade,$partlist,$handgrade; |
return $result,$responseType,$hdgrade,$partlist,$handgrade; |
} |
} |
|
|
Line 234 sub reset_caches {
|
Line 264 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,$no_increment)=@_; |
my ($symb,$uname,$udom,$no_increment,$add_to_hash,$type,$trial,$rndseed,$bubbles_per_row)=@_; |
my $key = "$symb\0$uname\0$udom"; |
my $key = "$symb\0$uname\0$udom"; |
return $analyze_cache{$key} if (exists($analyze_cache{$key})); |
if ($type eq 'randomizetry') { |
|
if ($trial ne '') { |
|
$key .= "\0".$trial; |
|
} |
|
} |
|
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 ($bubbles_per_row ne '') { |
'grade_noincrement' => $no_increment)); |
$form{'bubbles_per_row'} = $bubbles_per_row; |
|
} |
|
if ($type eq 'randomizetry') { |
|
$form{'grade_questiontype'} = $type; |
|
if ($rndseed ne '') { |
|
$form{'grade_rndseed'} = $rndseed; |
|
} |
|
} |
|
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,$no_increment)=@_; |
my ($partid,$respid,$symb,$uname,$udom,$no_increment,$type,$trial,$rndseed)=@_; |
my $analyze = &get_analyze($symb,$uname,$udom,$no_increment); |
my $analyze = &get_analyze($symb,$uname,$udom,$no_increment,undef,$type,$trial,$rndseed); |
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,$type,$trial,$rndseed)=@_; |
my $analyze = &get_analyze($symb,$uname,$udom); |
my $analyze = &get_analyze($symb,$uname,$udom,undef,undef,$type,$trial,$rndseed); |
foreach my $foil (@{&get_order($partid,$respid,$symb,$uname,$udom)}) { |
my $foils = &get_order($partid,$respid,$symb,$uname,$udom,undef,$type,$trial,$rndseed); |
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,$bubbles_per_row) = @_; |
|
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, |
|
undef,undef,undef,$bubbles_per_row); |
|
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 281 sub reset_caches {
|
Line 382 sub reset_caches {
|
# response types only. |
# response types only. |
sub cleanRecord { |
sub cleanRecord { |
my ($answer,$response,$symb,$partid,$respid,$record,$order,$version, |
my ($answer,$response,$symb,$partid,$respid,$record,$order,$version, |
$uname,$udom) = @_; |
$uname,$udom,$type,$trial,$rndseed) = @_; |
my $grayFont = '<span class="LC_internal_info">'; |
my $grayFont = '<span class="LC_internal_info">'; |
if ($response =~ /^(option|rank)$/) { |
if ($response =~ /^(option|rank)$/) { |
my %answer=&Apache::lonnet::str2hash($answer); |
my %answer=&Apache::lonnet::str2hash($answer); |
Line 298 sub cleanRecord {
|
Line 399 sub cleanRecord {
|
return '<blockquote><table border="1">'. |
return '<blockquote><table border="1">'. |
'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'. |
'<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>'; |
$bottomrow.'</tr></table></blockquote>'; |
} elsif ($response eq 'match') { |
} elsif ($response eq 'match') { |
my %answer=&Apache::lonnet::str2hash($answer); |
my %answer=&Apache::lonnet::str2hash($answer); |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
Line 320 sub cleanRecord {
|
Line 421 sub cleanRecord {
|
'<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'. |
$middlerow.'</tr>'. |
$middlerow.'</tr>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
$bottomrow.'</tr>'.'</table></blockquote>'; |
$bottomrow.'</tr></table></blockquote>'; |
} elsif ($response eq 'radiobutton') { |
} elsif ($response eq 'radiobutton') { |
my %answer=&Apache::lonnet::str2hash($answer); |
my %answer=&Apache::lonnet::str2hash($answer); |
my ($toprow,$bottomrow); |
my ($toprow,$bottomrow); |
my $correct = |
my $correct = |
&get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom); |
&get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed); |
foreach my $foil (@$order) { |
foreach my $foil (@$order) { |
if (exists($answer{$foil})) { |
if (exists($answer{$foil})) { |
if ($foil eq $correct) { |
if ($foil eq $correct) { |
Line 341 sub cleanRecord {
|
Line 442 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 650 sub most_similar {
|
Line 751 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 699 sub verifyreceipt {
|
Line 800 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 711 sub verifyreceipt {
|
Line 812 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 753 sub verifyreceipt {
|
Line 860 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 789 sub listStudents {
|
Line 899 sub listStudents {
|
|
|
my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes')); |
my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes')); |
|
|
my %lt = ( 'multiple' => |
my %lt = &Apache::lonlocal::texthash ( |
&mt("Please select a student or group of students before clicking on the Next button."), |
'multiple' => 'Please select a student or group of students before clicking on the Next button.', |
'single' => |
'single' => 'Please select the student before clicking on the Next button.', |
&mt("Please select the student before clicking on the Next button."), |
); |
); |
|
%lt = &Apache::lonlocal::texthash(%lt); |
|
$request->print(<<LISTJAVASCRIPT); |
$request->print(<<LISTJAVASCRIPT); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
function checkSelect(checkBox) { |
function checkSelect(checkBox) { |
Line 836 LISTJAVASCRIPT
|
Line 944 LISTJAVASCRIPT
|
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'. |
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'. |
"\n".$table; |
"\n".$table; |
|
|
$gradeTable .= |
$gradeTable .= &Apache::lonhtmlcommon::start_pick_box(); |
' <b>'.&mt('View Problem Text').': </b>'. |
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text')) |
'<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" |
$gradeTable .= |
.&Apache::lonhtmlcommon::row_closure(); |
' <b>'.&mt('View Answer').': </b>'. |
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Answer')) |
'<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n". |
.'<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n" |
'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n". |
.'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </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="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n" |
|
.&Apache::lonhtmlcommon::row_closure(); |
|
|
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 856 LISTJAVASCRIPT
|
Line 965 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" /> '. |
' <b>'.&mt('Submissions').': </b>'.$submission_options.'<br />'."\n"; |
&mt('last submission & parts info').' </label></span>'."\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 .= |
' <b>'.&mt('Grading Increments').': </b>'. |
|
'<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 883 LISTJAVASCRIPT
|
Line 1001 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) next to the student's name(s). Then click on the Next button.").'<br />'."\n". |
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism')) |
'<input type="hidden" name="command" value="processGroup" />'."\n"; |
.'<input type="checkbox" name="checkPlag" checked="checked" />' |
|
.&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 981 LISTJAVASCRIPT
|
Line 1107 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). |
Line 1014 LISTJAVASCRIPT
|
Line 1140 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 1368 INNERJS
|
Line 1494 INNERJS
|
|
|
my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); |
my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); |
$docopen=~s/^document\.//; |
$docopen=~s/^document\.//; |
my $alertmsg = &mt('Please select a word or group of words from document and then click this link.'); |
my %lt = &Apache::lonlocal::texthash( |
|
keyw => 'Keywords list, separated by a space. Add/delete to list if desired.', |
|
plse => 'Please select a word or group of words from document and then click this link.', |
|
adds => 'Add selection to keyword list? Edit if desired.', |
|
comp => 'Compose Message for: ', |
|
incl => 'Include', |
|
type => 'Type', |
|
subj => 'Subject', |
|
mesa => 'Message', |
|
new => 'New', |
|
save => 'Save', |
|
canc => 'Cancel', |
|
kehi => 'Keyword Highlight Options', |
|
txtc => 'Text Color', |
|
font => 'Font Size', |
|
fnst => 'Font Style', |
|
); |
$request->print(<<SUBJAVASCRIPT); |
$request->print(<<SUBJAVASCRIPT); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
|
|
//===================== Show list of keywords ==================== |
//===================== Show list of keywords ==================== |
function keywords(formname) { |
function keywords(formname) { |
var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",formname.keywords.value); |
var nret = prompt("$lt{'keyw'}",formname.keywords.value); |
if (nret==null) return; |
if (nret==null) return; |
formname.keywords.value = nret; |
formname.keywords.value = nret; |
|
|
Line 1401 INNERJS
|
Line 1543 INNERJS
|
else return; |
else return; |
var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," "); |
var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," "); |
if (cleantxt=="") { |
if (cleantxt=="") { |
alert("$alertmsg"); |
alert("$lt{'plse'}"); |
return; |
return; |
} |
} |
var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt); |
var nret = prompt("$lt{'adds'}",cleantxt); |
if (nret==null) return; |
if (nret==null) return; |
document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret; |
document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret; |
if (document.SCORE.keywords.value != "") { |
if (document.SCORE.keywords.value != "") { |
Line 1468 INNERJS
|
Line 1610 INNERJS
|
|
|
function savedMsgHeader(Nmsg,usrctr,fullname) { |
function savedMsgHeader(Nmsg,usrctr,fullname) { |
var height = 70*Nmsg+250; |
var height = 70*Nmsg+250; |
var scrollbar = "no"; |
|
if (height > 600) { |
if (height > 600) { |
height = 600; |
height = 600; |
scrollbar = "yes"; |
|
} |
} |
var xpos = (screen.width-600)/2; |
var xpos = (screen.width-600)/2; |
xpos = (xpos < 0) ? '0' : xpos; |
xpos = (xpos < 0) ? '0' : xpos; |
var ypos = (screen.height-height)/2-30; |
var ypos = (screen.height-height)/2-30; |
ypos = (ypos < 0) ? '0' : ypos; |
ypos = (ypos < 0) ? '0' : ypos; |
|
|
pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height); |
pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars=yes,screenx='+xpos+',screeny='+ypos+',width=700,height='+height); |
pWin.focus(); |
pWin.focus(); |
pDoc = pWin.document; |
pDoc = pWin.document; |
pDoc.$docopen; |
pDoc.$docopen; |
Line 1486 INNERJS
|
Line 1626 INNERJS
|
|
|
pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">"); |
pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">"); |
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">"); |
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">"); |
pDoc.write("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />"); |
pDoc.write("<h3><span class=\\"LC_info\\"> $lt{'comp'}\"+fullname+\"<\\/span><\\/h3><br /><br />"); |
|
|
pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">"); |
pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">"); |
pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
pDoc.write("<td><b>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>"); |
pDoc.write("<td><b>$lt{'type'}<\\/b><\\/td><td><b>$lt{'incl'}<\\/b><\\/td><td><b>$lt{'mesa'}<\\/td><\\/tr>"); |
} |
} |
function displaySubject(msg,shwsel) { |
function displaySubject(msg,shwsel) { |
pDoc = pWin.document; |
pDoc = pWin.document; |
pDoc.write("<tr bgcolor=\\"#ffffdd\\">"); |
pDoc.write("<tr bgcolor=\\"#ffffdd\\">"); |
pDoc.write("<td>Subject<\\/td>"); |
pDoc.write("<td>$lt{'subj'}<\\/td>"); |
pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>"); |
pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>"); |
pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>"); |
pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>"); |
} |
} |
Line 1511 INNERJS
|
Line 1651 INNERJS
|
function newMsg(newmsg,shwsel) { |
function newMsg(newmsg,shwsel) { |
pDoc = pWin.document; |
pDoc = pWin.document; |
pDoc.write("<tr bgcolor=\\"#ffffdd\\">"); |
pDoc.write("<tr bgcolor=\\"#ffffdd\\">"); |
pDoc.write("<td align=\\"center\\">New<\\/td>"); |
pDoc.write("<td align=\\"center\\">$lt{'new'}<\\/td>"); |
pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>"); |
pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>"); |
pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>"); |
pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>"); |
} |
} |
Line 1520 INNERJS
|
Line 1660 INNERJS
|
pDoc = pWin.document; |
pDoc = pWin.document; |
pDoc.write("<\\/table>"); |
pDoc.write("<\\/table>"); |
pDoc.write("<\\/td><\\/tr><\\/table> "); |
pDoc.write("<\\/td><\\/tr><\\/table> "); |
pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\"> "); |
pDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:checkInput()\\"> "); |
pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />"); |
pDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />"); |
pDoc.write("<\\/form>"); |
pDoc.write("<\\/form>"); |
pDoc.write('$end_page_msg_central'); |
pDoc.write('$end_page_msg_central'); |
pDoc.close(); |
pDoc.close(); |
Line 1571 INNERJS
|
Line 1711 INNERJS
|
hDoc.$docopen; |
hDoc.$docopen; |
hDoc.write('$start_page_highlight_central'); |
hDoc.write('$start_page_highlight_central'); |
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">"); |
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">"); |
hDoc.write("<h3><span class=\\"LC_info\\"> Keyword Highlight Options<\\/span><\\/h3><br /><br />"); |
hDoc.write("<h3><span class=\\"LC_info\\"> $lt{'kehi'}<\\/span><\\/h3><br /><br />"); |
|
|
hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">"); |
hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">"); |
hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>"); |
hDoc.write("<td><b>$lt{'txtc'}<\\/b><\\/td><td><b>$lt{'font'}<\\/b><\\/td><td><b>$lt{'fnst'}<\\/td><\\/tr>"); |
} |
} |
|
|
function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { |
function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { |
Line 1594 INNERJS
|
Line 1734 INNERJS
|
var hDoc = hwdWin.document; |
var hDoc = hwdWin.document; |
hDoc.write("<\\/table>"); |
hDoc.write("<\\/table>"); |
hDoc.write("<\\/td><\\/tr><\\/table> "); |
hDoc.write("<\\/td><\\/tr><\\/table> "); |
hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\"> "); |
hDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\"> "); |
hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />"); |
hDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />"); |
hDoc.write("<\\/form>"); |
hDoc.write("<\\/form>"); |
hDoc.write('$end_page_highlight_central'); |
hDoc.write('$end_page_highlight_central'); |
hDoc.close(); |
hDoc.close(); |
Line 1614 sub get_increment {
|
Line 1754 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 1633 sub gradeBox {
|
Line 1792 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(); |
Line 1641 sub gradeBox {
|
Line 1800 sub gradeBox {
|
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 class="LC_nobreak"><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 1652 sub gradeBox {
|
Line 1811 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><b>'.&mt('Grade Status').':</b>'."\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 1669 sub gradeBox {
|
Line 1828 sub gradeBox {
|
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n"; |
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n"; |
|
|
|
|
#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line); |
|
$result .= |
$result .= |
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'. |
'<td>'.$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 1682 sub gradeBox {
|
Line 1839 sub gradeBox {
|
$$record{'resource.'.$partid.'.tries'}.'" />'."\n". |
$$record{'resource.'.$partid.'.tries'}.'" />'."\n". |
'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'. |
'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'. |
$aggtries.'" />'."\n"; |
$aggtries.'" />'."\n"; |
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record); |
my $res_error; |
|
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error); |
|
if ($res_error) { |
|
return &navmap_errormsg(); |
|
} |
return $result; |
return $result; |
} |
} |
|
|
sub handback_box { |
sub handback_box { |
my ($symb,$uname,$udom,$counter,$partid,$record) = @_; |
my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_; |
my ($partlist,$handgrade,$responseType) = &response_type($symb); |
my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error); |
my (@respids); |
my (@respids); |
my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id = &flatten_responseType($responseType); |
foreach my $part_response_id (@part_response_id) { |
foreach my $part_response_id (@part_response_id) { |
my ($part,$resp) = @{ $part_response_id }; |
my ($part,$resp) = @{ $part_response_id }; |
if ($part eq $partid) { |
if ($part eq $partid) { |
Line 1702 sub handback_box {
|
Line 1863 sub handback_box {
|
my $prefix = $counter.'_'.$partid.'_'.$respid.'_'; |
my $prefix = $counter.'_'.$partid.'_'.$respid.'_'; |
my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record); |
my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record); |
next if (!@$files); |
next if (!@$files); |
my $file_counter = 1; |
my $file_counter = 0; |
foreach my $file (@$files) { |
foreach my $file (@$files) { |
if ($file =~ /\/portfolio\//) { |
if ($file =~ /\/portfolio\//) { |
|
$file_counter++; |
my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|); |
my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|); |
my ($name,$version,$ext) = &file_name_version_ext($file_disp); |
my ($name,$version,$ext) = &file_name_version_ext($file_disp); |
$file_disp = "$name.$ext"; |
$file_disp = "$name.$ext"; |
Line 1712 sub handback_box {
|
Line 1874 sub handback_box {
|
$result.=&mt('Return commented version of [_1] to student.', |
$result.=&mt('Return commented version of [_1] to student.', |
'<span class="LC_filename">'.$file_disp.'</span>'); |
'<span class="LC_filename">'.$file_disp.'</span>'); |
$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n"; |
$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n"; |
$result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />'; |
$result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />'."\n"; |
$result.='('.&mt('File will be uploaded when you click on Save & Next below.').')<br />'; |
|
$file_counter++; |
|
} |
} |
} |
} |
|
if ($file_counter) { |
|
$result .= '<input type="hidden" name="'.$prefix.'countreturndoc" value="'.$file_counter.'" />'."\n". |
|
'<span class="LC_info">'. |
|
'('.&mt('File(s) will be uploaded when you click on Save & Next below.',$file_counter).')</span><br /><br />'; |
|
} |
} |
} |
return $result; |
return $result; |
} |
} |
Line 1750 sub show_problem {
|
Line 1915 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 1941 sub submission {
|
Line 2103 sub submission {
|
$request->print($prnmsg); |
$request->print($prnmsg); |
|
|
if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') { |
if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') { |
|
|
|
my %lt = &Apache::lonlocal::texthash( |
|
keyw => 'Keyword Options', |
|
list => 'List', |
|
past => 'Paste Selection to List', |
|
high => 'Highlight Attribute', |
|
); |
# |
# |
# Print out the keyword options line |
# Print out the keyword options line |
# |
# |
$request->print(<<KEYWORDS); |
$request->print(<<KEYWORDS); |
<b>Keyword Options:</b> |
<b>$lt{'keyw'}:</b> |
<a href="javascript:keywords(document.SCORE);" target="_self">List</a> |
<a href="javascript:keywords(document.SCORE);" target="_self">$lt{'list'}</a> |
<a href="#" onMouseDown="javascript:getSel(); return false" |
<a href="#" onmousedown="javascript:getSel(); return false" |
CLASS="page">Paste Selection to List</a> |
CLASS="page">$lt{'past'}</a> |
<a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br /> |
<a href="javascript:kwhighlight();" target="_self">$lt{'high'}</a><br /><br /> |
KEYWORDS |
KEYWORDS |
# |
# |
# Load the other essays for similarity check |
# Load the other essays for similarity check |
Line 1963 KEYWORDS
|
Line 2132 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 1983 KEYWORDS
|
Line 2171 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 2011 KEYWORDS
|
Line 2201 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 2023 KEYWORDS
|
Line 2213 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 2050 KEYWORDS
|
Line 2242 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">'. |
|
'('.&mt('Response ID: [_1]',$respid).')'. |
|
'</span> '. |
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>'; |
'<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=''; |
|
my ($type,$trial,$rndseed); |
|
if ($hide eq 'rand') { |
|
$type = 'randomizetry'; |
|
$trial = $record{"resource.$partid.tries"}; |
|
$rndseed = $record{"resource.$partid.rndseed"}; |
|
} |
if($env{'form.checkPlag'}){ |
if($env{'form.checkPlag'}){ |
my ($oname,$odom,$ocrsid,$oessay,$osim)= |
my ($oname,$odom,$ocrsid,$oessay,$osim)= |
&most_similar($uname,$udom,$subval,\%old_essays); |
&most_similar($uname,$udom,$subval,\%old_essays); |
Line 2071 KEYWORDS
|
Line 2271 KEYWORDS
|
&Apache::lonnet::coursedescription($ocrsid, |
&Apache::lonnet::coursedescription($ocrsid, |
{'one_time' => 1}); |
{'one_time' => 1}); |
|
|
$similar="<hr /><h3><span class=\"LC_warning\">". |
if ($hide eq 'anon') { |
&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, |
|
undef,$type,$trial,$rndseed); |
if ($env{'form.lastSub'} eq 'lastonly' || |
if ($env{'form.lastSub'} eq 'lastonly' || |
($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('Response 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 viruses').'</span><br />'; |
if ($hide eq 'anon') { |
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 eq 'anon') { |
&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,$type,$trial,$rndseed); |
|
} |
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') { |
Line 2129 KEYWORDS
|
Line 2342 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 2173 KEYWORDS
|
Line 2386 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 2189 KEYWORDS
|
Line 2402 KEYWORDS
|
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 2218 KEYWORDS
|
Line 2422 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 2234 KEYWORDS
|
Line 2437 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 2262 sub check_collaborators {
|
Line 2467 sub check_collaborators {
|
next if ($record->{'resource.'.$part.'.collaborators'} eq ''); |
next if ($record->{'resource.'.$part.'.collaborators'} eq ''); |
my (@good_collaborators, @bad_collaborators); |
my (@good_collaborators, @bad_collaborators); |
foreach my $possible_collaborator |
foreach my $possible_collaborator |
(split(/,?\s+/,$record->{'resource.'.$part.'.collaborators'})) { |
(split(/[,;\s]+/,$record->{'resource.'.$part.'.collaborators'})) { |
$possible_collaborator =~ s/[\$\^\(\)]//g; |
$possible_collaborator =~ s/[\$\^\(\)]//g; |
next if ($possible_collaborator eq ''); |
next if ($possible_collaborator eq ''); |
my ($co_name,$co_dom) = split(/\@|:/,$possible_collaborator); |
my ($co_name,$co_dom) = split(/:/,$possible_collaborator); |
$co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i); |
$co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i); |
next if ($co_name eq $uname && $co_dom eq $udom); |
next if ($co_name eq $uname && $co_dom eq $udom); |
# Doing this grep allows 'fuzzy' specification |
# Doing this grep allows 'fuzzy' specification |
Line 2278 sub check_collaborators {
|
Line 2483 sub check_collaborators {
|
} |
} |
} |
} |
if (scalar(@good_collaborators) != 0) { |
if (scalar(@good_collaborators) != 0) { |
$result.='<br />'.&mt('Collaborators: '); |
$result.='<br />'.&mt('Collaborators:').'<ol>'; |
foreach my $name (@good_collaborators) { |
foreach my $name (@good_collaborators) { |
my ($lastname,$givenn) = split(/,/,$$fullname{$name}); |
my ($lastname,$givenn) = split(/,/,$$fullname{$name}); |
push(@col_fullnames, $givenn.' '.$lastname); |
push(@col_fullnames, $givenn.' '.$lastname); |
$result.=$fullname->{$name}.' '; |
$result.='<li>'.$fullname->{$name}.'</li>'; |
} |
} |
$result.='<br />'."\n"; |
$result.='</ol><br />'."\n"; |
my ($part)=split(/\./,$part); |
my ($part)=split(/\./,$part); |
$result.='<input type="hidden" name="collaborator'.$counter. |
$result.='<input type="hidden" name="collaborator'.$counter. |
'" value="'.$part.':'.(join ':',@good_collaborators).'" />'. |
'" value="'.$part.':'.(join ':',@good_collaborators).'" />'. |
Line 2308 sub check_collaborators {
|
Line 2513 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 2320 sub get_last_submission {
|
Line 2525 sub get_last_submission {
|
&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'}); |
&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'}); |
} |
} |
} |
} |
|
my (%typeparts,%randombytry); |
|
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') || |
|
($lasthash{$key} eq 'randomizetry')) { |
|
my ($ign,@parts) = split(/\./,$key); |
|
pop(@parts); |
|
my $id = join('.',@parts); |
|
if ($lasthash{$key} eq 'randomizetry') { |
|
$randombytry{$ign.'.'.$id} = $lasthash{$key}; |
|
} else { |
|
unless ($showsurv) { |
|
$typeparts{$ign.'.'.$id} = $lasthash{$key}; |
|
} |
|
} |
|
delete($lasthash{$key}); |
|
} |
|
} |
|
} |
|
my @hidden = keys(%typeparts); |
|
my @randomize = keys(%randombytry); |
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 = 'anon'; |
|
last; |
|
} |
|
} |
|
} |
|
unless ($hide) { |
|
if (@randomize) { |
|
foreach my $id (@hidden) { |
|
if ($key =~ /^\Q$id\E/) { |
|
$hide = 'rand'; |
|
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) { |
Line 2400 sub processHandGrade {
|
Line 2647 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.'<br />'); |
} |
} |
if ($env{'form.collaborator'.$ctr}) { |
if ($env{'form.collaborator'.$ctr}) { |
my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr"); |
my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr"); |
Line 2531 sub processHandGrade {
|
Line 2778 sub processHandGrade {
|
} |
} |
$ctr = 0; |
$ctr = 0; |
@parsedlist = reverse @parsedlist if ($button eq 'Previous'); |
@parsedlist = reverse @parsedlist if ($button eq 'Previous'); |
my ($partlist) = &response_type($symb); |
my $res_error; |
|
my ($partlist) = &response_type($symb,\$res_error); |
|
if ($res_error) { |
|
$request->print(&navmap_errormsg()); |
|
return; |
|
} |
foreach my $student (@parsedlist) { |
foreach my $student (@parsedlist) { |
my $submitonly=$env{'form.submitonly'}; |
my $submitonly=$env{'form.submitonly'}; |
my ($uname,$udom) = split(/:/,$student); |
my ($uname,$udom) = split(/:/,$student); |
Line 2582 sub processHandGrade {
|
Line 2834 sub processHandGrade {
|
} |
} |
if ($total < 0) { |
if ($total < 0) { |
my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n"; |
my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n"; |
$the_end.=&mt('<b>Message: </b> No more students for this section or class.').'<br /><br />'."\n"; |
$the_end.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\n"; |
$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n"; |
$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n"; |
$the_end.=&show_grading_menu_form($symb); |
$the_end.=&show_grading_menu_form($symb); |
$request->print($the_end); |
$request->print($the_end); |
Line 2729 sub check_and_remove_from_queue {
|
Line 2981 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 @handedback; |
|
my $file_msg; |
my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id = &flatten_responseType($responseType); |
foreach my $part_response_id (@part_response_id) { |
foreach my $part_response_id (@part_response_id) { |
my ($part_id,$resp_id) = @{ $part_response_id }; |
my ($part_id,$resp_id) = @{ $part_response_id }; |
my $part_resp = join('_',@{ $part_response_id }); |
my $part_resp = join('_',@{ $part_response_id }); |
if (($env{'form.'.$newflg.'_'.$part_resp.'_returndoc1'}) && ($new_part == $part_id)) { |
if (($env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'} =~ /^\d+$/) & ($new_part eq $part_id)) { |
|
for (my $counter=1; $counter<=$env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'}; $counter++) { |
# if multiple files are uploaded names will be 'returndoc2','returndoc3' |
# if multiple files are uploaded names will be 'returndoc2','returndoc3' |
my $file_counter = 1; |
if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) { |
my $file_msg; |
my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter.'.filename'}; |
while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) { |
|
my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'}; |
|
my ($directory,$answer_file) = |
my ($directory,$answer_file) = |
($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter} =~ /^(.*?)([^\/]*)$/); |
($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter} =~ /^(.*?)([^\/]*)$/); |
my ($answer_name,$answer_ver,$answer_ext) = |
my ($answer_name,$answer_ver,$answer_ext) = |
&file_name_version_ext($answer_file); |
&file_name_version_ext($answer_file); |
my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/); |
my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/); |
my $getpropath = 1; |
my $getpropath = 1; |
my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$portfolio_path,$domain,$stuname,$getpropath); |
my ($dir_list,$listerror) = |
my $version = &get_next_version($answer_name, $answer_ext, \@dir_list); |
&Apache::lonnet::dirlist($portfolio_root.$portfolio_path, |
|
$domain,$stuname,$getpropath); |
|
my $version = &get_next_version($answer_name,$answer_ext,$dir_list); |
# fix file name |
# fix file name |
my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/); |
my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/); |
my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain, |
my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain, |
$newflg.'_'.$part_resp.'_returndoc'.$file_counter, |
$newflg.'_'.$part_resp.'_returndoc'.$counter, |
$save_file_name); |
$save_file_name); |
if ($result !~ m|^/uploaded/|) { |
if ($result !~ m|^/uploaded/|) { |
$request->print('<br /><span class="LC_error">'. |
$request->print('<br /><span class="LC_error">'. |
&mt('An error occurred ([_1]) while trying to upload [_2].', |
&mt('An error occurred ([_1]) while trying to upload [_2].', |
$result,$newflg.'_'.$part_resp.'_returndoc'.$file_counter). |
$result,$newflg.'_'.$part_resp.'_returndoc'.$counter). |
'</span>'); |
'</span>'); |
} else { |
} else { |
# mark the file as read only |
# mark the file as read only |
my @files = ($save_file_name); |
push(@handedback,$save_file_name); |
my @what = ($symb,$env{'request.course.id'},'handback'); |
|
&Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what); |
|
if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) { |
if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) { |
$$newrecord{"resource.$new_part.$resp_id.handback"}.=','; |
$$newrecord{"resource.$new_part.$resp_id.handback"}.=','; |
} |
} |
$$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name; |
$$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name; |
$file_msg.= "\n".'<br /><span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span><br />"; |
$file_msg.='<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />"; |
|
|
} |
} |
$request->print("<br />".$fname." will be the uploaded file name"); |
$request->print('<br />'.&mt('[_1] will be the uploaded file name [_2]','<span class="LC_info">'.$fname.'</span>','<span class="LC_filename">'.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'</span>')); |
$request->print(" ".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter}); |
|
$file_counter++; |
|
} |
} |
my $subject = "File Handed Back by Instructor "; |
|
my $message = "A file has been returned that was originally submitted in reponse to: <br />"; |
|
$message .= "<strong>".&Apache::lonnet::gettitle($symb)."</strong><br />"; |
|
$message .= ' The returned file(s) are named: '. $file_msg; |
|
$message .= " and can be found in your portfolio space."; |
|
my ($feedurl,$showsymb) = |
|
&get_feedurl_and_symb($symb,$domain,$stuname); |
|
my $restitle = &Apache::lonnet::gettitle($symb); |
|
my $msgstatus = |
|
&Apache::lonmsg::user_normal_msg($stuname,$domain,$subject. |
|
' (File Returned) ['.$restitle.']',$message,undef, |
|
$feedurl,undef,undef,undef,$showsymb,$restitle); |
|
} |
} |
} |
} |
|
} |
|
if (@handedback > 0) { |
|
$request->print('<br />'); |
|
my @what = ($symb,$env{'request.course.id'},'handback'); |
|
&Apache::lonnet::mark_as_readonly($domain,$stuname,\@handedback,\@what); |
|
my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'}); |
|
my ($subject,$message); |
|
if (scalar(@handedback) == 1) { |
|
$subject = &mt_user($user_lh,'File Handed Back by Instructor'); |
|
} else { |
|
$subject = &mt_user($user_lh,'Files Handed Back by Instructor'); |
|
$message = &mt_user($user_lh,'Files have been returned that were originally submitted in response to: '); |
|
} |
|
$message .= "<p><strong>".&Apache::lonnet::gettitle($symb)." </strong></p>"; |
|
$message .= &mt_user($user_lh,'The returned file(s) are named: [_1]',"<br />$file_msg <br />"). |
|
&mt_user($user_lh,'The file(s) can be found in your [_1]portfolio[_2].','<a href="/adm/portfolio">','</a>'); |
|
my ($feedurl,$showsymb) = |
|
&get_feedurl_and_symb($symb,$domain,$stuname); |
|
my $restitle = &Apache::lonnet::gettitle($symb); |
|
$subject .= ' '.&mt_user($user_lh,'(File Returned)').' ['.$restitle.']'; |
|
my $msgstatus = |
|
&Apache::lonmsg::user_normal_msg($stuname,$domain,$subject, |
|
$message,undef,$feedurl,undef,undef,undef,$showsymb, |
|
$restitle); |
|
if ($msgstatus) { |
|
$request->print(&mt('Notification message status: [_1]','<span class="LC_info">'.$msgstatus.'</span>').'<br />'); |
|
} |
|
} |
return; |
return; |
} |
} |
|
|
Line 2896 sub version_portfiles {
|
Line 3167 sub version_portfiles {
|
my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/); |
my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/); |
my ($answer_name,$answer_ver,$answer_ext) = |
my ($answer_name,$answer_ver,$answer_ext) = |
&file_name_version_ext($answer_file); |
&file_name_version_ext($answer_file); |
my $getpropath = 1; |
my $getpropath = 1; |
my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,$stu_name,$getpropath); |
my ($dir_list,$listerror) = |
my $version = &get_next_version($answer_name, $answer_ext, \@dir_list); |
&Apache::lonnet::dirlist($portfolio_root.$directory,$domain, |
|
$stu_name,$getpropath); |
|
my $version = &get_next_version($answer_name,$answer_ext,$dir_list); |
my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version); |
my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version); |
if ($new_answer ne 'problem getting file') { |
if ($new_answer ne 'problem getting file') { |
push(@versioned_portfiles, $directory.$new_answer); |
push(@versioned_portfiles, $directory.$new_answer); |
Line 2917 sub version_portfiles {
|
Line 3190 sub version_portfiles {
|
sub get_next_version { |
sub get_next_version { |
my ($answer_name, $answer_ext, $dir_list) = @_; |
my ($answer_name, $answer_ext, $dir_list) = @_; |
my $version; |
my $version; |
foreach my $row (@$dir_list) { |
if (ref($dir_list) eq 'ARRAY') { |
my ($file) = split(/\&/,$row,2); |
foreach my $row (@{$dir_list}) { |
my ($file_name,$file_version,$file_ext) = |
my ($file) = split(/\&/,$row,2); |
&file_name_version_ext($file); |
my ($file_name,$file_version,$file_ext) = |
if (($file_name eq $answer_name) && |
&file_name_version_ext($file); |
($file_ext eq $answer_ext)) { |
if (($file_name eq $answer_name) && |
# gets here if filename and extension match, regardless of version |
($file_ext eq $answer_ext)) { |
|
# gets here if filename and extension match, |
|
# regardless of version |
if ($file_version ne '') { |
if ($file_version ne '') { |
# a versioned file is found so save it for later |
# a versioned file is found so save it for later |
if ($file_version > $version) { |
if ($file_version > $version) { |
$version = $file_version; |
$version = $file_version; |
|
} |
} |
} |
} |
} |
} |
} |
} |
} |
$version ++; |
$version ++; |
return($version); |
return($version); |
} |
} |
Line 3173 sub viewgrades {
|
Line 3449 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=&mt('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=&mt('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=&mt('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 [_1]",$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 3214 sub viewgrades {
|
Line 3494 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}.' '.&mt('(problem weight)').'</td>'."\n"; |
$weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n"; |
$line.= '<td><b>'.&mt('Grade Status').':</b><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 3232 sub viewgrades {
|
Line 3512 sub viewgrades {
|
|
|
$result.= |
$result.= |
&Apache::loncommon::start_data_table_row()."\n". |
&Apache::loncommon::start_data_table_row()."\n". |
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'. |
'<td><b>'.&mt('Part:').'</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points:').'</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'. |
&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) { |
Line 3300 sub viewgrades {
|
Line 3583 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 3352 sub viewstudentgrade {
|
Line 3635 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 3361 sub viewstudentgrade {
|
Line 3644 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 3399 sub editgrades {
|
Line 3682 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 3408 sub editgrades {
|
Line 3692 sub editgrades {
|
my %columns = (); |
my %columns = (); |
my ($i,$ctr,$count,$rec_update) = (0,0,0,0); |
my ($i,$ctr,$count,$rec_update) = (0,0,0,0); |
|
|
my (@parts) = sort(&getpartlist($symb)); |
my $partserror; |
|
my (@parts) = sort(&getpartlist($symb,\$partserror)); |
|
if ($partserror) { |
|
return &navmap_errormsg(); |
|
} |
my $header; |
my $header; |
while ($ctr < $env{'form.totalparts'}) { |
while ($ctr < $env{'form.totalparts'}) { |
my $partid = $env{'form.partid_'.$ctr}; |
my $partid = $env{'form.partid_'.$ctr}; |
Line 3426 sub editgrades {
|
Line 3714 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\]//; |
my $narrowtext = &mt('Tries'); |
my $narrowtext = &mt('Tries'); |
$display =~ s/Number of Attempts/$narrowtext/; |
$display =~ s/Number of Attempts/$narrowtext/; |
$header .= '<th align="center">'.&mt('Old').' '.$display.'</th>'. |
$header .= '<th align="center">'.&mt('Old').' '.$display.'</th>'. |
Line 3619 sub split_part_type {
|
Line 3907 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 3659 ENDPICK
|
Line 3947 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 3717 $result
|
Line 4005 $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 3740 ENDPICK
|
Line 4028 ENDPICK
|
} |
} |
|
|
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 3766 sub csvuploadmap_footer {
|
Line 4060 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 |
} |
} |
Line 3799 sub upcsvScores_form {
|
Line 4093 sub upcsvScores_form {
|
$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(); |
my $ignore=&mt('Ignore First Line'); |
my $ignore=&mt('Ignore First Line'); |
Line 3811 sub upcsvScores_form {
|
Line 4105 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 3841 sub csvuploadmap {
|
Line 4135 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 3943 sub csvuploadassign {
|
Line 4241 sub csvuploadassign {
|
my ($classlist) = &getclasslist('all',0); |
my ($classlist) = &getclasslist('all',0); |
my @notallowed; |
my @notallowed; |
my @skipped; |
my @skipped; |
|
my @warnings; |
my $countdone=0; |
my $countdone=0; |
foreach my $grade (@gradedata) { |
foreach my $grade (@gradedata) { |
my %entries=&Apache::loncommon::record_sep($grade); |
my %entries=&Apache::loncommon::record_sep($grade); |
Line 3991 sub csvuploadassign {
|
Line 4290 sub csvuploadassign {
|
my $pcr=$entries{$fields{$dest}} / $wgt; |
my $pcr=$entries{$fields{$dest}} / $wgt; |
my $award=($pcr == 0) ? 'incorrect_by_override' |
my $award=($pcr == 0) ? 'incorrect_by_override' |
: 'correct_by_override'; |
: 'correct_by_override'; |
|
if ($pcr>1) { |
|
push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain")); |
|
} |
$grades{"resource.$part.awarded"}=$pcr; |
$grades{"resource.$part.awarded"}=$pcr; |
$grades{"resource.$part.solved"}=$award; |
$grades{"resource.$part.solved"}=$award; |
$points{$part}=1; |
$points{$part}=1; |
Line 4019 sub csvuploadassign {
|
Line 4321 sub csvuploadassign {
|
$domain,$username); |
$domain,$username); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$request->print('.'); |
$request->print('.'); |
|
# Remove from grading queue |
|
&Apache::bridgetask::remove_from_queue('gradingqueue',$symb, |
|
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
|
$env{'course.'.$env{'request.course.id'}.'.num'}, |
|
$domain,$username); |
} else { |
} else { |
$request->print("<p><span class=\"LC_error\">". |
$request->print("<p><span class=\"LC_error\">". |
&mt("Failed to save data for student [_1]. Message when trying to save was: [_2]", |
&mt("Failed to save data for student [_1]. Message when trying to save was: [_2]", |
Line 4028 sub csvuploadassign {
|
Line 4335 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 (@warnings) { |
|
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('Warnings generated for the following saved scores:'),1).'<br />'); |
|
$request->print(join(', ',@warnings)); |
|
} |
if (@skipped) { |
if (@skipped) { |
$request->print('<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 4078 LISTJAVASCRIPT
|
Line 4389 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 4441 LISTJAVASCRIPT
|
$result.=' <b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n"; |
$result.=' <b>'.&mt('Use CODE').': </b> <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 4164 LISTJAVASCRIPT
|
Line 4480 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 4173 LISTJAVASCRIPT
|
Line 4489 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 4233 sub displayPage {
|
Line 4555 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 4260 sub displayPage {
|
Line 4587 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 4283 sub displayPage {
|
Line 4612 sub displayPage {
|
&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('[_1] parts)', |
: '<br />('.&mt('[_1]parts)', |
scalar(@{$parts})) |
scalar(@{$parts}).' ') |
). |
). |
'</td>'; |
'</td>'; |
$studentTable.='<td valign="top">'; |
$studentTable.='<td valign="top">'; |
Line 4331 sub displayPage {
|
Line 4660 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 4344 sub displayPage {
|
Line 4675 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 4376 sub displaySubByDates {
|
Line 4708 sub displaySubByDates {
|
|
|
my $interaction; |
my $interaction; |
my $no_increment = 1; |
my $no_increment = 1; |
|
my %lastrndseed; |
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 4393 sub displaySubByDates {
|
Line 4726 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,$type); |
|
$type = $$record{$version.':resource.'.$partid.'.type'}; |
|
if (($type eq 'anonsurvey') || ($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('Response 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 { |
|
my ($trial,$rndseed,$newvariation); |
|
if ($type eq 'randomizetry') { |
|
$trial = $$record{"$where.$partid.tries"}; |
|
$rndseed = $$record{"$where.$partid.rndseed"}; |
|
} |
|
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"}); |
} |
if ($rndseed || $lastrndseed{$partid}) { |
my $responseType=($isTask ? 'Task' |
if ($rndseed ne $lastrndseed{$partid}) { |
|
$newvariation = ' ('.&mt('New variation this try').')'; |
|
} |
|
} |
|
} |
|
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})) || ($trial)) { |
$orders{$partid}->{$responseId}= |
$orders{$partid}->{$responseId}= |
&get_order($partid,$responseId,$symb,$uname,$udom, |
&get_order($partid,$responseId,$symb,$uname,$udom, |
$no_increment); |
$no_increment,$type,$trial,$rndseed); |
} |
} |
$displaySub[0].='</b> '. |
$displaySub[0].='</b>'.$newvariation.'</span>'; # /nobreak |
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />'; |
$displaySub[0].=' '. |
|
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'<br />'; |
|
} |
} |
} |
} |
} |
if (exists($$record{"$where.$partid.checkedin"})) { |
if (exists($$record{"$where.$partid.checkedin"})) { |
Line 4483 sub updateGradeByPage {
|
Line 4838 sub updateGradeByPage {
|
|
|
$request->print($result); |
$request->print($result); |
|
|
|
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
unless (ref($navmap)) { |
|
$request->print(&navmap_errormsg()); |
|
return; |
|
} |
my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'}); |
my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'}); |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
if (!$map) { |
if (!$map) { |
Line 4519 sub updateGradeByPage {
|
Line 4879 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, part]',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>'; |
|
|
Line 4628 sub updateGradeByPage {
|
Line 4988 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 4642 sub updateGradeByPage {
|
Line 5002 sub updateGradeByPage {
|
from the file that we are parsing that represents one entire sheet |
from the file that we are parsing that represents one entire sheet |
|
|
'bubble line' refers to the data |
'bubble line' refers to the data |
representing the line of bubbles that are on the physical bubble sheet |
representing the line of bubbles that are on the physical bubblesheet |
|
|
|
|
The overall process is that a scanned in bubble sheet data is uploaded |
The overall process is that a scanned in bubblesheet data is uploaded |
into a course. When a user wants to grade, they select a |
into a course. When a user wants to grade, they select a |
sequence/folder of resources, a file of bubble sheet info, and pick |
sequence/folder of resources, a file of bubblesheet info, and pick |
one of the predefined configurations for what each scanline looks |
one of the predefined configurations for what each scanline looks |
like. |
like. |
|
|
Line 4655 Next each scanline is checked for any er
|
Line 5015 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. |
|
|
After the validation phase, there are now 3 bubble sheet files |
After the validation phase, there are now 3 bubblesheet files |
|
|
scantron_original_filename (unmodified original file) |
scantron_original_filename (unmodified original file) |
scantron_corrected_filename (file where the corrected information has replaced the original information) |
scantron_corrected_filename (file where the corrected information has replaced the original information) |
scantron_skipped_filename (contains the exact text of scanlines that where skipped) |
scantron_skipped_filename (contains the exact text of scanlines that where skipped) |
|
|
Also there is a separate hash nohist_scantrondata that contains extra |
Also there is a separate hash nohist_scantrondata that contains extra |
correction information that isn't representable in the bubble sheet |
correction information that isn't representable in the bubblesheet |
file (see &scantron_getfile() for more information) |
file (see &scantron_getfile() for more information) |
|
|
After all scanlines are either valid, marked as valid or skipped, then |
After all scanlines are either valid, marked as valid or skipped, then |
Line 4706 sub defaultFormData {
|
Line 5066 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 4728 sub getSequenceDropDown {
|
Line 5093 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 4769 sub restore_bubble_lines {
|
Line 5134 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 4778 sub restore_bubble_lines {
|
Line 5142 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 4803 sub scantron_filenames {
|
Line 5166 sub scantron_filenames {
|
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $getpropath = 1; |
my $getpropath = 1; |
my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname, |
my ($dirlist,$listerror) = &Apache::lonnet::dirlist('userfiles',$cdom, |
$getpropath); |
$cname,$getpropath); |
my @possiblenames; |
my @possiblenames; |
foreach my $filename (sort(@files)) { |
if (ref($dirlist) eq 'ARRAY') { |
($filename)=split(/&/,$filename); |
foreach my $filename (sort(@{$dirlist})) { |
if ($filename!~/^scantron_orig_/) { next ; } |
($filename)=split(/&/,$filename); |
$filename=~s/^scantron_orig_//; |
if ($filename!~/^scantron_orig_/) { next ; } |
push(@possiblenames,$filename); |
$filename=~s/^scantron_orig_//; |
|
push(@possiblenames,$filename); |
|
} |
} |
} |
return @possiblenames; |
return @possiblenames; |
} |
} |
Line 4964 sub scantron_CODEunique {
|
Line 5329 sub scantron_CODEunique {
|
|
|
=item scantron_selectphase |
=item scantron_selectphase |
|
|
Generates the initial screen to start the bubble sheet process. |
Generates the initial screen to start the bubblesheet process. |
Allows for - starting a grading run. |
Allows for - starting a grading run. |
- downloading existing scan data (original, corrected |
- downloading existing scan data (original, corrected |
or skipped info) |
or skipped info) |
Line 4981 sub scantron_selectphase {
|
Line 5346 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 4992 sub scantron_selectphase {
|
Line 5362 sub scantron_selectphase {
|
|
|
$ssi_error = 0; |
$ssi_error = 0; |
|
|
|
if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || |
|
&Apache::lonnet::allowed('usc',$env{'request.course.id'})) { |
|
|
|
# Chunk of form to prompt for a scantron file upload. |
|
|
|
$r->print(' |
|
<br /> |
|
'.&Apache::loncommon::start_data_table('LC_scantron_action').' |
|
'.&Apache::loncommon::start_data_table_header_row().' |
|
<th> |
|
'.&mt('Specify a bubblesheet data file to upload.').' |
|
</th> |
|
'.&Apache::loncommon::end_data_table_header_row().' |
|
'.&Apache::loncommon::start_data_table_row().' |
|
<td> |
|
'); |
|
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
|
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
$r->print(' |
|
<script type="text/javascript" language="javascript"> |
|
function checkUpload(formname) { |
|
if (formname.upfile.value == "") { |
|
alert("'.&mt('Please use the browse button to select a file from your local directory.').'"); |
|
return false; |
|
} |
|
formname.submit(); |
|
} |
|
</script> |
|
|
|
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
|
'.$default_form_data.' |
|
<input name="courseid" type="hidden" value="'.$cnum.'" /> |
|
<input name="domainid" type="hidden" value="'.$cdom.'" /> |
|
<input name="command" value="scantronupload_save" type="hidden" /> |
|
'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').' |
|
<br /> |
|
<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" /> |
|
</form> |
|
'); |
|
|
|
$r->print(' |
|
</td> |
|
'.&Apache::loncommon::end_data_table_row().' |
|
'.&Apache::loncommon::end_data_table().' |
|
'); |
|
} |
|
|
# Chunk of form to prompt for a file to grade and how: |
# Chunk of form to prompt for a file to grade and how: |
|
|
$result.= ' |
$result.= ' |
Line 5009 sub scantron_selectphase {
|
Line 5427 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 5030 sub scantron_selectphase {
|
Line 5448 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 5039 sub scantron_selectphase {
|
Line 5457 sub scantron_selectphase {
|
|
|
$r->print($result); |
$r->print($result); |
|
|
if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || |
|
&Apache::lonnet::allowed('usc',$env{'request.course.id'})) { |
|
|
|
# Chunk of form to prompt for a scantron file upload. |
|
|
|
$r->print(' |
|
<br /> |
|
'.&Apache::loncommon::start_data_table('LC_scantron_action').' |
|
'.&Apache::loncommon::start_data_table_header_row().' |
|
<th> |
|
'.&mt('Specify a Scantron data file to upload.').' |
|
</th> |
|
'.&Apache::loncommon::end_data_table_header_row().' |
|
'.&Apache::loncommon::start_data_table_row().' |
|
<td> |
|
'); |
|
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
|
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
$r->print(' |
|
<script type="text/javascript" language="javascript"> |
|
function checkUpload(formname) { |
|
if (formname.upfile.value == "") { |
|
alert("'.&mt('Please use the browse button to select a file from your local directory.').'"); |
|
return false; |
|
} |
|
formname.submit(); |
|
} |
|
</script> |
|
|
|
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
|
'.$default_form_data.' |
|
<input name="courseid" type="hidden" value="'.$cnum.'" /> |
|
<input name="domainid" type="hidden" value="'.$cdom.'" /> |
|
<input name="command" value="scantronupload_save" type="hidden" /> |
|
'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').' |
|
<br /> |
|
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" /> |
|
</form> |
|
'); |
|
|
|
$r->print(' |
|
</td> |
|
'.&Apache::loncommon::end_data_table_row().' |
|
'.&Apache::loncommon::end_data_table().' |
|
'); |
|
} |
|
|
|
# Chunk of the form that prompts to view a scoring office file, |
# Chunk of the form that prompts to view a scoring office file, |
# corrected file, skipped records in a file. |
# corrected file, skipped records in a file. |
|
|
Line 5118 sub scantron_selectphase {
|
Line 5488 sub scantron_selectphase {
|
&Apache::loncommon::start_data_table('LC_scantron_action')."\n". |
&Apache::loncommon::start_data_table('LC_scantron_action')."\n". |
&Apache::loncommon::start_data_table_header_row()."\n". |
&Apache::loncommon::start_data_table_header_row()."\n". |
'<th colspan="2"> |
'<th colspan="2"> |
'.&mt('Review scantron data and submissions for a previously graded folder/sequence')."\n". |
'.&mt('Review bubblesheet data and submissions for a previously graded folder/sequence')."\n". |
'</th>'."\n". |
'</th>'."\n". |
&Apache::loncommon::end_data_table_header_row()."\n". |
&Apache::loncommon::end_data_table_header_row()."\n". |
&Apache::loncommon::start_data_table_row()."\n". |
&Apache::loncommon::start_data_table_row()."\n". |
Line 5134 sub scantron_selectphase {
|
Line 5504 sub scantron_selectphase {
|
'<td> '.$format_selector.' </td>'."\n". |
'<td> '.$format_selector.' </td>'."\n". |
&Apache::loncommon::end_data_table_row()."\n". |
&Apache::loncommon::end_data_table_row()."\n". |
&Apache::loncommon::start_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". |
'<td colspan="2">'."\n". |
'<input type="hidden" name="command" value="checksubmissions" />'."\n". |
'<input type="hidden" name="command" value="checksubmissions" />'."\n". |
'<input type="submit" value="'.&mt('Review Scantron Data and Submission Records').'" />'."\n". |
'<input type="submit" value="'.&mt('Review Bubblesheet Data and Submission Records').'" />'."\n". |
'</td>'."\n". |
'</td>'."\n". |
&Apache::loncommon::end_data_table_row()."\n". |
&Apache::loncommon::end_data_table_row()."\n". |
&Apache::loncommon::end_data_table()."\n". |
&Apache::loncommon::end_data_table()."\n". |
Line 5177 sub scantron_selectphase {
|
Line 5551 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 5199 sub scantron_selectphase {
|
Line 5573 sub scantron_selectphase {
|
|
|
LastName - column that the last name starts in |
LastName - column that the last name starts in |
LastNameLength - number of columns that the last name spans |
LastNameLength - number of columns that the last name spans |
|
BubblesPerRow - number of bubbles available in each row used to |
|
bubble an answer. (If not specified, 10 assumed). |
|
|
=cut |
=cut |
|
|
Line 5229 sub get_scantron_config {
|
Line 5605 sub get_scantron_config {
|
$config{'FirstNamelength'}=$config[14]; |
$config{'FirstNamelength'}=$config[14]; |
$config{'LastName'}=$config[15]; |
$config{'LastName'}=$config[15]; |
$config{'LastNamelength'}=$config[16]; |
$config{'LastNamelength'}=$config[16]; |
|
$config{'BubblesPerRow'}=$config[17]; |
last; |
last; |
} |
} |
return %config; |
return %config; |
Line 5238 sub get_scantron_config {
|
Line 5615 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 5277 sub username_to_idmap {
|
Line 5654 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 5451 sub digits_to_letters {
|
Line 5828 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 5487 sub scantron_parse_scanline {
|
Line 5864 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 5977 sub remember_current_skipped {
|
Line 6355 sub remember_current_skipped {
|
=item check_for_error |
=item check_for_error |
|
|
Checks if there was an error when attempting to remove a specific |
Checks if there was an error when attempting to remove a specific |
scantron_.. bubble sheet data file. Prints out an error if |
scantron_.. bubblesheet data file. Prints out an error if |
something went wrong. |
something went wrong. |
|
|
=cut |
=cut |
Line 6012 sub scantron_warning_screen {
|
Line 6390 sub scantron_warning_screen {
|
'<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'. |
'<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'. |
$env{'form.scantron_CODElist'}.'</tt></td></tr>'; |
$env{'form.scantron_CODElist'}.'</tt></td></tr>'; |
} |
} |
|
my $lastbubblepoints; |
|
if ($env{'form.scantron_lastbubblepoints'} ne '') { |
|
$lastbubblepoints = |
|
'<tr><td><b>'.&mt('Hand-graded items: points from last bubble in row').'</b></td><td><tt>'. |
|
$env{'form.scantron_lastbubblepoints'}.'</tt></td></tr>'; |
|
} |
return (' |
return (' |
<p> |
<p> |
<span class="LC_warning"> |
<span class="LC_warning"> |
Line 6020 sub scantron_warning_screen {
|
Line 6404 sub scantron_warning_screen {
|
<table> |
<table> |
<tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr> |
<tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr> |
<tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr> |
<tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr> |
'.$CODElist.' |
'.$CODElist.$lastbubblepoints.' |
</table> |
</table> |
<br /> |
<br /> |
<p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p> |
<p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p> |
Line 6048 sub scantron_do_warning {
|
Line 6432 sub scantron_do_warning {
|
if ( $env{'form.selectpage'} eq '' || |
if ( $env{'form.selectpage'} eq '' || |
$env{'form.scantron_selectfile'} eq '' || |
$env{'form.scantron_selectfile'} eq '' || |
$env{'form.scantron_format'} eq '' ) { |
$env{'form.scantron_format'} eq '' ) { |
$r->print("<p>".&mt('You have forgetten to specify some information. Please go Back and try again.')."</p>"); |
$r->print("<p>".&mt('You have forgotten to specify some information. Please go Back and try again.')."</p>"); |
if ( $env{'form.selectpage'} eq '') { |
if ( $env{'form.selectpage'} eq '') { |
$r->print('<p><span class="LC_error">'.&mt('You have not selected a Sequence to grade').'</span></p>'); |
$r->print('<p><span class="LC_error">'.&mt('You have not selected a Sequence to grade').'</span></p>'); |
} |
} |
if ( $env{'form.scantron_selectfile'} eq '') { |
if ( $env{'form.scantron_selectfile'} eq '') { |
$r->print('<p><span class="LC_error">'.&mt('You have not selected a file that contains the student\'s response data.').'</span></p>'); |
$r->print('<p><span class="LC_error">'.&mt("You have not selected a file that contains the student's response data.").'</span></p>'); |
} |
} |
if ( $env{'form.scantron_format'} eq '') { |
if ( $env{'form.scantron_format'} eq '') { |
$r->print('<p><span class="LC_error">'.&mt('You have not selected a the format of the student\'s response data.').'</span></p>'); |
$r->print('<p><span class="LC_error">'.&mt("You have not selected the format of the student's response data.").'</span></p>'); |
} |
} |
} else { |
} else { |
my $warning=&scantron_warning_screen('Grading: Validate Records'); |
my $warning=&scantron_warning_screen('Grading: Validate Records'); |
|
my $bubbledbyhand=&hand_bubble_option(); |
$r->print(' |
$r->print(' |
'.$warning.' |
'.$warning.$bubbledbyhand.' |
<input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" /> |
<input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" /> |
<input type="hidden" name="command" value="scantron_validate" /> |
<input type="hidden" name="command" value="scantron_validate" /> |
'); |
'); |
Line 6113 SCANTRONFORM
|
Line 6498 SCANTRONFORM
|
|
|
=item scantron_validate_file |
=item scantron_validate_file |
|
|
Dispatch routine for doing validation of a bubble sheet data file. |
Dispatch routine for doing validation of a bubblesheet data file. |
|
|
Also processes any necessary information resets that need to |
Also processes any necessary information resets that need to |
occur before validation begins (ignore previous corrections, |
occur before validation begins (ignore previous corrections, |
Line 6150 sub scantron_validate_file {
|
Line 6535 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 %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
|
my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config); |
|
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; |
|
if ($env{'form.scantron_lastbubblepoints'} ne '') { |
|
$result .= '<input type="hidden" name="scantron_lastbubblepoints" value="'.$env{'form.scantron_lastbubblepoints'}.'" />'; |
|
} |
$r->print($result); |
$r->print($result); |
|
|
my @validate_phases=( 'sequence', |
my @validate_phases=( 'sequence', |
Line 6186 sub scantron_validate_file {
|
Line 6580 sub scantron_validate_file {
|
'<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No'). |
'<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No'). |
'</label></span><br />'. |
'</label></span><br />'. |
&mt('Grading will take longer if you use verification.').'<br />'. |
&mt('Grading will take longer if you use verification.').'<br />'. |
&mt("Alternatively, the 'Review scantron data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'. |
&mt("Alternatively, the 'Review bubblesheet data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'. |
'<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'. |
'<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'. |
'<input type="hidden" name="command" value="scantron_process" />'."\n"); |
'<input type="hidden" name="command" value="scantron_process" />'."\n"); |
} else { |
} else { |
Line 6219 sub scantron_validate_file {
|
Line 6613 sub scantron_validate_file {
|
|
|
=item scantron_remove_file |
=item scantron_remove_file |
|
|
Removes the requested bubble sheet data file, makes sure that |
Removes the requested bubblesheet data file, makes sure that |
scantron_original_<filename> is never removed |
scantron_original_<filename> is never removed |
|
|
|
|
Line 6244 sub scantron_remove_file {
|
Line 6638 sub scantron_remove_file {
|
|
|
=item scantron_remove_scan_data |
=item scantron_remove_scan_data |
|
|
Removes all scan_data correction for the requested bubble sheet |
Removes all scan_data correction for the requested bubblesheet |
data file. (In the case that both the are doing skipped records we need |
data file. (In the case that both the are doing skipped records we need |
to remember the old skipped lines for the time being so that element |
to remember the old skipped lines for the time being so that element |
persists for a while.) |
persists for a while.) |
Line 6281 sub scantron_remove_scan_data {
|
Line 6675 sub scantron_remove_scan_data {
|
|
|
=item scantron_getfile |
=item scantron_getfile |
|
|
Fetches the requested bubble sheet data file (all 3 versions), and |
Fetches the requested bubblesheet data file (all 3 versions), and |
the scan_data hash |
the scan_data hash |
|
|
Arguments: |
Arguments: |
Line 6381 sub lonnet_putfile {
|
Line 6775 sub lonnet_putfile {
|
|
|
=item scantron_putfile |
=item scantron_putfile |
|
|
Stores the current version of the bubble sheet data files, and the |
Stores the current version of the bubblesheet data files, and the |
scan_data hash. (Does not modify the original version only the |
scan_data hash. (Does not modify the original version only the |
corrected and skipped versions. |
corrected and skipped versions. |
|
|
Line 6475 sub get_todo_count {
|
Line 6869 sub get_todo_count {
|
|
|
=item scantron_put_line |
=item scantron_put_line |
|
|
Updates the 'corrected' or 'skipped' versions of the bubble sheet |
Updates the 'corrected' or 'skipped' versions of the bubblesheet |
data file. |
data file. |
|
|
Arguments: |
Arguments: |
Line 6562 sub scantron_validate_sequence {
|
Line 6956 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 6593 sub scantron_validate_ID {
|
Line 6991 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,\%scantron_config); # 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 6655 sub scantron_get_correction {
|
Line 7058 sub scantron_get_correction {
|
#the previous one or the current one |
#the previous one or the current one |
|
|
if ( $$scan_record{'scantron.PaperID'} =~ /\S/) { |
if ( $$scan_record{'scantron.PaperID'} =~ /\S/) { |
$r->print("<p>".&mt("<b>An error was detected ($error)</b>". |
$r->print( |
" for PaperID <tt>[_1]</tt>", |
'<p class="LC_warning">' |
$$scan_record{'scantron.PaperID'})."</p> \n"); |
.&mt('An error was detected ([_1]) for PaperID [_2]', |
|
"<b>$error</b>", |
|
'<tt>'.$$scan_record{'scantron.PaperID'}.'</tt>') |
|
."</p> \n"); |
} else { |
} else { |
$r->print("<p>".&mt("<b>An error was detected ($error)</b>". |
$r->print( |
" in scanline [_1] <pre>[_2]</pre>", |
'<p class="LC_warning">' |
$i,$line)."</p> \n"); |
.&mt('An error was detected ([_1]) in scanline [_2] [_3]', |
} |
"<b>$error</b>", $i, "<pre>$line</pre>") |
my $message="<p>".&mt("The ID on the form is <tt>[_1]</tt><br />". |
."</p> \n"); |
"The name on the paper is [_2],[_3]", |
} |
$$scan_record{'scantron.ID'}, |
my $message = |
$$scan_record{'scantron.LastName'}, |
'<p>' |
$$scan_record{'scantron.FirstName'})."</p>"; |
.&mt('The ID on the form is [_1]', |
|
"<tt>$$scan_record{'scantron.ID'}</tt>") |
|
.'<br />' |
|
.&mt('The name on the paper is [_1], [_2]', |
|
$$scan_record{'scantron.LastName'}, |
|
$$scan_record{'scantron.FirstName'}) |
|
.'</p>'; |
|
|
$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n"); |
$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n"); |
$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n"); |
$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n"); |
Line 6677 sub scantron_get_correction {
|
Line 7089 sub scantron_get_correction {
|
|
|
if ($error =~ /ID$/) { |
if ($error =~ /ID$/) { |
if ($error eq 'incorrectID') { |
if ($error eq 'incorrectID') { |
$r->print("<p>".&mt("The encoded ID is not in the classlist"). |
$r->print('<p class="LC_warning">'.&mt("The encoded ID is not in the classlist"). |
"</p>\n"); |
"</p>\n"); |
} elsif ($error eq 'duplicateID') { |
} elsif ($error eq 'duplicateID') { |
$r->print("<p>".&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n"); |
} |
} |
$r->print($message); |
$r->print($message); |
$r->print("<p>".&mt("How should I handle this?")." <br /> \n"); |
$r->print("<p>".&mt("How should I handle this?")." <br /> \n"); |
Line 6696 sub scantron_get_correction {
|
Line 7108 sub scantron_get_correction {
|
$r->print('</li>'); |
$r->print('</li>'); |
} elsif ($error =~ /CODE$/) { |
} elsif ($error =~ /CODE$/) { |
if ($error eq 'incorrectCODE') { |
if ($error eq 'incorrectCODE') { |
$r->print("<p>".&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n"); |
} elsif ($error eq 'duplicateCODE') { |
} elsif ($error eq 'duplicateCODE') { |
$r->print("<p>".&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n"); |
} |
} |
$r->print("<p>".&mt("The CODE on the form is <tt>'[_1]'</tt>", |
$r->print("<p>".&mt('The CODE on the form is [_1]', |
$$scan_record{'scantron.CODE'})."<br />\n"); |
"<tt>'$$scan_record{'scantron.CODE'}'</tt>") |
|
."</p>\n"); |
$r->print($message); |
$r->print($message); |
$r->print("<p>".&mt("How should I handle this?")." <br /> \n"); |
$r->print("<p>".&mt("How should I handle this?")."</p>\n"); |
$r->print("\n<br /> "); |
$r->print("\n<br /> "); |
my $i=0; |
my $i=0; |
if ($error eq 'incorrectCODE' |
if ($error eq 'incorrectCODE' |
Line 6712 sub scantron_get_correction {
|
Line 7125 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 6726 sub scantron_get_correction {
|
Line 7139 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 was on the paper, ignoring the error.", |
"<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")." |
"<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")." |
</label>"); |
</label>"); |
$r->print("\n<br />"); |
$r->print("\n<br />"); |
Line 6760 ENDSCRIPT
|
Line 7173 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 6770 ENDSCRIPT
|
Line 7183 ENDSCRIPT
|
"</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />")); |
"</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />")); |
$r->print("\n<br /><br />"); |
$r->print("\n<br /><br />"); |
} elsif ($error eq 'doublebubble') { |
} elsif ($error eq 'doublebubble') { |
$r->print("<p>".&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n"); |
|
|
# The form field scantron_questions is acutally a list of line numbers. |
# The form field scantron_questions is acutally a list of line numbers. |
# represented by this form so: |
# represented by this form so: |
Line 6788 ENDSCRIPT
|
Line 7201 ENDSCRIPT
|
} |
} |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
} elsif ($error eq 'missingbubble') { |
} elsif ($error eq 'missingbubble') { |
$r->print("<p>".&mt("There have been <b>no</b> bubbles scanned for some question(s)")."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("There have been [_1]no[_2] bubbles scanned for some question(s)",'<b>','</b>')."</p>\n"); |
$r->print($message); |
$r->print($message); |
$r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>"); |
$r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>"); |
$r->print(&mt("Some questions have no scanned bubbles.")."\n"); |
$r->print(&mt("Some questions have no scanned bubbles.")."\n"); |
Line 6953 sub prompt_for_corrections {
|
Line 7366 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 6993 sub scantron_bubble_selector {
|
Line 7406 sub scantron_bubble_selector {
|
my $max=$$scan_config{'Qlength'}; |
my $max=$$scan_config{'Qlength'}; |
|
|
my $scmode=$$scan_config{'Qon'}; |
my $scmode=$$scan_config{'Qon'}; |
if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; } |
if ($scmode eq 'number' || $scmode eq 'letter') { |
|
if (($$scan_config{'BubblesPerRow'} =~ /^\d+$/) && |
|
($$scan_config{'BubblesPerRow'} > 0)) { |
|
$max=$$scan_config{'BubblesPerRow'}; |
|
if (($scmode eq 'number') && ($max > 10)) { |
|
$max = 10; |
|
} elsif (($scmode eq 'letter') && $max > 26) { |
|
$max = 26; |
|
} |
|
} else { |
|
$max = 10; |
|
} |
|
} |
|
|
my @alphabet=('A'..'Z'); |
my @alphabet=('A'..'Z'); |
$r->print(&Apache::loncommon::start_data_table(). |
$r->print(&Apache::loncommon::start_data_table(). |
Line 7147 sub scantron_validate_CODE {
|
Line 7572 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,\%scantron_config); # 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 7201 sub scantron_validate_doublebubble {
|
Line 7631 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,\%scantron_config); # 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 7219 sub scantron_validate_doublebubble {
|
Line 7654 sub scantron_validate_doublebubble {
|
|
|
|
|
sub scantron_get_maxbubble { |
sub scantron_get_maxbubble { |
|
my ($nav_error,$scantron_config) = @_; |
if (defined($env{'form.scantron_maxbubble'}) && |
if (defined($env{'form.scantron_maxbubble'}) && |
$env{'form.scantron_maxbubble'}) { |
$env{'form.scantron_maxbubble'}) { |
&restore_bubble_lines(); |
&restore_bubble_lines(); |
Line 7229 sub scantron_get_maxbubble {
|
Line 7665 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); |
|
my $bubbles_per_row = &bubblesheet_bubbles_per_row($scantron_config); |
|
|
&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 ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom); |
my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname, |
|
$udom,$bubbles_per_row); |
if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) { |
if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) { |
foreach my $part_id (@{$parts}) { |
foreach my $part_id (@{$parts}) { |
my $lines; |
my $lines; |
Line 7275 sub scantron_get_maxbubble {
|
Line 7719 sub scantron_get_maxbubble {
|
if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') { |
if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') { |
$numshown = scalar(@{$analysis->{$part_id.'.shown'}}); |
$numshown = scalar(@{$analysis->{$part_id.'.shown'}}); |
} |
} |
my $bubbles_per_line = 10; |
my $bubbles_per_row = |
my $inner_bubble_lines = int($numbub/$bubbles_per_line); |
&bubblesheet_bubbles_per_row($scantron_config); |
if (($numbub % $bubbles_per_line) != 0) { |
my $inner_bubble_lines = int($numbub/$bubbles_per_row); |
|
if (($numbub % $bubbles_per_row) != 0) { |
$inner_bubble_lines++; |
$inner_bubble_lines++; |
} |
} |
for (my $i=0; $i<$numshown; $i++) { |
for (my $i=0; $i<$numshown; $i++) { |
Line 7288 sub scantron_get_maxbubble {
|
Line 7733 sub scantron_get_maxbubble {
|
$lines = $numshown * $inner_bubble_lines; |
$lines = $numshown * $inner_bubble_lines; |
} else { |
} else { |
$lines = $analysis->{"$part_id.bubble_lines"}; |
$lines = $analysis->{"$part_id.bubble_lines"}; |
} |
} |
|
|
$first_bubble_line{$response_number} = $bubble_line; |
$first_bubble_line{$response_number} = $bubble_line; |
$bubble_lines_per_response{$response_number} = $lines; |
$bubble_lines_per_response{$response_number} = $lines; |
Line 7301 sub scantron_get_maxbubble {
|
Line 7746 sub scantron_get_maxbubble {
|
} |
} |
} |
} |
} |
} |
&Apache::lonnet::delenv('scantron\.'); |
&Apache::lonnet::delenv('scantron.'); |
|
|
&save_bubble_lines(); |
&save_bubble_lines(); |
$env{'form.scantron_maxbubble'} = |
$env{'form.scantron_maxbubble'} = |
Line 7309 sub scantron_get_maxbubble {
|
Line 7754 sub scantron_get_maxbubble {
|
return $env{'form.scantron_maxbubble'}; |
return $env{'form.scantron_maxbubble'}; |
} |
} |
|
|
sub scantron_partids_tograde { |
sub bubblesheet_bubbles_per_row { |
my ($resource,$cid,$uname,$udom) = @_; |
my ($scantron_config) = @_; |
my (%analysis,@parts); |
my $bubbles_per_row; |
|
if (ref($scantron_config) eq 'HASH') { |
if (ref($resource)) { |
$bubbles_per_row = $scantron_config->{'BubblesPerRow'}; |
my $symb = $resource->symb(); |
} |
my $result=&ssi_with_retries($resource->src(), $ssi_retries, |
if ((!$bubbles_per_row) || ($bubbles_per_row < 1)) { |
('symb' => $symb, |
$bubbles_per_row = 10; |
'grade_target' => 'analyze', |
|
'grade_courseid' => $cid, |
|
'grade_domain' => $udom, |
|
'grade_username' => $uname)); |
|
my (undef, $an) = split(/_HASH_REF__/,$result, 2); |
|
%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); |
|
} |
|
} |
|
} |
|
} |
} |
return (\%analysis,\@parts); |
return $bubbles_per_row; |
} |
} |
|
|
sub scantron_validate_missingbubbles { |
sub scantron_validate_missingbubbles { |
Line 7345 sub scantron_validate_missingbubbles {
|
Line 7775 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,\%scantron_config); |
|
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 7389 sub scantron_validate_missingbubbles {
|
Line 7823 sub scantron_validate_missingbubbles {
|
return (0,$currentphase+1); |
return (0,$currentphase+1); |
} |
} |
|
|
|
sub hand_bubble_option { |
|
my (undef, undef, $sequence) = |
|
&Apache::lonnet::decode_symb($env{'form.selectpage'}); |
|
return if ($sequence eq ''); |
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
unless (ref($navmap)) { |
|
return; |
|
} |
|
my $needs_hand_bubbles; |
|
my $map=$navmap->getResourceByUrl($sequence); |
|
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
|
foreach my $res (@resources) { |
|
if (ref($res)) { |
|
if ($res->is_problem()) { |
|
my $partlist = $res->parts(); |
|
foreach my $part (@{ $partlist }) { |
|
my @types = $res->responseType($part); |
|
if (grep(/^(chem|essay|image|formula|math|string|functionplot)$/,@types)) { |
|
$needs_hand_bubbles = 1; |
|
last; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if ($needs_hand_bubbles) { |
|
my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
|
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); |
|
return &mt('The sequence to be graded contains response types which are handgraded.').'<p>'. |
|
&mt('If you have already graded these by bubbling sheets to indicate points awarded, [_1]what point value is assigned to a filled last bubble in each row?','<br />'). |
|
'<label><input type="radio" name="scantron_lastbubblepoints" value="'.$bubbles_per_row.'" checked="checked" />'.&mt('[quant,_1,point]',$bubbles_per_row).'</label> '.&mt('or').' '. |
|
'<label><input type="radio" name="scantron_lastbubblepoints" value="0"/>0 points</label></p>'; |
|
} |
|
return; |
|
} |
|
|
sub scantron_process_students { |
sub scantron_process_students { |
my ($r) = @_; |
my ($r) = @_; |
Line 7405 sub scantron_process_students {
|
Line 7874 sub scantron_process_students {
|
my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&Apache::loncoursedata::get_classlist(); |
my %idmap=&username_to_idmap($classlist); |
my %idmap=&username_to_idmap($classlist); |
my $navmap=Apache::lonnavmaps::navmap->new(); |
my $navmap=Apache::lonnavmaps::navmap->new(); |
|
unless (ref($navmap)) { |
|
$r->print(&navmap_errormsg()); |
|
return ''; |
|
} |
my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
|
my (%grader_partids_by_symb,%grader_randomlists_by_symb); |
my ($uname,$udom,%partids_by_symb); |
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
|
\%grader_randomlists_by_symb); |
|
my $resource_error; |
foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
my $ressymb = $resource->symb(); |
my $ressymb; |
my ($analysis,$parts) = |
if (ref($resource)) { |
&scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom); |
$ressymb = $resource->symb(); |
$partids_by_symb{$ressymb} = $parts; |
} else { |
|
$resource_error = 1; |
|
last; |
|
} |
|
my ($analysis,$parts) = |
|
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
|
$env{'user.name'},$env{'user.domain'}, |
|
1,$bubbles_per_row); |
|
$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 ''; |
} |
} |
# $r->print("geto ".scalar(@resources)."<br />"); |
|
|
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 7428 SCANTRONFORM
|
Line 7922 SCANTRONFORM
|
|
|
my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam')); |
my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam')); |
my $count=&get_todo_count($scanlines,$scan_data); |
my $count=&get_todo_count($scanlines,$scan_data); |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status', |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status', |
'Scantron Progress',$count, |
'Bubblesheet Progress',$count, |
'inline',undef,'scantronupload'); |
'inline',undef,'scantronupload'); |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
'Processing first student'); |
'Processing first student'); |
Line 7438 SCANTRONFORM
|
Line 7932 SCANTRONFORM
|
my $i=-1; |
my $i=-1; |
my $started; |
my $started; |
|
|
&scantron_get_maxbubble(); # Need the bubble lines array to parse. |
my $nav_error; |
|
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # 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 7480 SCANTRONFORM
|
Line 7978 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,undef,$bubbles_per_row); |
|
$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 7496 SCANTRONFORM
|
Line 8020 SCANTRONFORM
|
} |
} |
|
|
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
@resources) eq 'ssi_error') { |
\@resources,\%partids_by_symb, |
|
$bubbles_per_row) eq 'ssi_error') { |
$ssi_error = 0; # So end of handler error message does not trigger. |
$ssi_error = 0; # So end of handler error message does not trigger. |
$r->print("</form>"); |
$r->print("</form>"); |
&ssi_print_error($r); |
&ssi_print_error($r); |
Line 7514 SCANTRONFORM
|
Line 8039 SCANTRONFORM
|
my $studentrecord = ''; |
my $studentrecord = ''; |
my $counter = -1; |
my $counter = -1; |
foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
|
my $ressymb = $resource->symb(); |
($counter,my $recording) = |
($counter,my $recording) = |
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'}, |
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'}, |
$counter,$studentdata,\%partids_by_symb, |
$counter,$studentdata,$partids_by_symb{$ressymb}, |
\%scantron_config,\%lettdig,$numletts); |
\%scantron_config,\%lettdig,$numletts); |
$studentrecord .= $recording; |
$studentrecord .= $recording; |
} |
} |
if ($studentrecord ne $studentdata) { |
if ($studentrecord ne $studentdata) { |
|
&Apache::lonxml::clear_problem_counter(); |
|
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
|
\@resources,\%partids_by_symb, |
|
$bubbles_per_row) 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; |
$counter = -1; |
$studentrecord = ''; |
$studentrecord = ''; |
foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
|
my $ressymb = $resource->symb(); |
($counter,my $recording) = |
($counter,my $recording) = |
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'}, |
&verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'}, |
$counter,$studentdata,\%partids_by_symb, |
$counter,$studentdata,$partids_by_symb{$ressymb}, |
\%scantron_config,\%lettdig,$numletts); |
\%scantron_config,\%lettdig,$numletts); |
$studentrecord .= $recording; |
$studentrecord .= $recording; |
} |
} |
if ($studentrecord ne $studentdata) { |
if ($studentrecord ne $studentdata) { |
$r->print('<p><span class="LC_error">'); |
$r->print('<p><span class="LC_warning">'); |
if ($scancode eq '') { |
if ($scancode eq '') { |
$r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2].', |
$r->print(&mt('Mismatch grading bubblesheet for user: [_1] with ID: [_2].', |
$uname.':'.$udom,$scan_record->{'scantron.ID'})); |
$uname.':'.$udom,$scan_record->{'scantron.ID'})); |
} else { |
} else { |
$r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2] and CODE: [_3].', |
$r->print(&mt('Mismatch grading bubblesheet for user: [_1] with ID: [_2] and CODE: [_3].', |
$uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode)); |
$uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode)); |
} |
} |
$r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n". |
$r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n". |
Line 7544 SCANTRONFORM
|
Line 8083 SCANTRONFORM
|
'<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'. |
'<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'. |
&Apache::loncommon::end_data_table_header_row()."\n". |
&Apache::loncommon::end_data_table_header_row()."\n". |
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
'<td>'.&mt('Bubble Sheet').'</td>'. |
'<td>'.&mt('Bubblesheet').'</td>'. |
'<td><span class="LC_nobreak">'.$studentdata.'</span></td>'. |
'<td><span class="LC_nobreak">'.$studentdata.'</span></td>'. |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
'<td>Stored submissions</td>'. |
'<td>'.&mt('Stored submissions').'</td>'. |
'<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n". |
'<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n". |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table().'</p>'); |
&Apache::loncommon::end_data_table().'</p>'); |
Line 7563 SCANTRONFORM
|
Line 8102 SCANTRONFORM
|
if (&Apache::loncommon::connection_aborted($r)) { last; } |
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); |
&Apache::lonnet::remove_lock($lock); |
Line 7575 SCANTRONFORM
|
Line 8114 SCANTRONFORM
|
return ''; |
return ''; |
} |
} |
|
|
|
sub graders_resources_pass { |
|
my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb) = @_; |
|
if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) && |
|
(ref($grader_randomlists_by_symb) eq 'HASH')) { |
|
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,$bubbles_per_row); |
|
$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; |
|
} |
|
|
sub grade_student_bubbles { |
sub grade_student_bubbles { |
my ($r,$uname,$udom,$scan_record,$scancode,@resources) = @_; |
my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts,$bubbles_per_row) = @_; |
foreach my $resource (@resources) { |
if (ref($resources) eq 'ARRAY') { |
my %form = ('submitted' => 'scantron', |
my $count = 0; |
'grade_target' => 'grade', |
foreach my $resource (@{$resources}) { |
'grade_username'=> $uname, |
my $ressymb = $resource->symb(); |
'grade_domain' => $udom, |
my %form = ('submitted' => 'scantron', |
'grade_courseid'=> $env{'request.course.id'}, |
'grade_target' => 'grade', |
'grade_symb' => $resource->symb(), |
'grade_username' => $uname, |
'CODE' => $scancode); |
'grade_domain' => $udom, |
my $result=&ssi_with_retries($resource->src(),$ssi_retries,%form); |
'grade_courseid' => $env{'request.course.id'}, |
return 'ssi_error' if ($ssi_error); |
'grade_symb' => $ressymb, |
last if (&Apache::loncommon::connection_aborted($r)); |
'CODE' => $scancode |
|
); |
|
if ($bubbles_per_row ne '') { |
|
$form{'bubbles_per_row'} = $bubbles_per_row; |
|
} |
|
if ($env{'form.scantron_lastbubblepoints'} ne '') { |
|
$form{'scantron_lastbubblepoints'} = $env{'form.scantron_lastbubblepoints'}; |
|
} |
|
if (ref($parts) eq 'HASH') { |
|
if (ref($parts->{$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; |
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)); |
|
my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.'); |
|
my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded."); |
$r->print(' |
$r->print(' |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
function checkUpload(formname) { |
function checkUpload(formname) { |
if (formname.upfile.value == "") { |
if (formname.upfile.value == "") { |
alert("'.&mt('Please use the browse button to select a file from your local directory.').'"); |
alert("'.$nofile_alert.'"); |
return false; |
return false; |
} |
} |
|
if (formname.courseid.value == "") { |
|
alert("'.$nocourseid_alert.'"); |
|
return false; |
|
} |
formname.submit(); |
formname.submit(); |
} |
} |
|
|
|
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; |
|
} |
|
|
</script> |
</script> |
|
|
|
<h3>'.&mt('Send bubblesheet data to a course').'</h3> |
|
|
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
'.$default_form_data.' |
'.$default_form_data. |
<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 ''; |
Line 7644 sub scantron_upload_scantron_data_save {
|
Line 8254 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 7653 sub scantron_upload_scantron_data_save {
|
Line 8263 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 7693 sub scantron_upload_scantron_data_save {
|
Line 8292 sub scantron_upload_scantron_data_save {
|
return ''; |
return ''; |
} |
} |
|
|
|
sub validate_uploaded_scantron_file { |
|
my ($cdom,$cname,$fname) = @_; |
|
my $scanlines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.$fname); |
|
my @lines; |
|
if ($scanlines ne '-1') { |
|
@lines=split("\n",$scanlines,-1); |
|
} |
|
my $output; |
|
if (@lines) { |
|
my (%counts,$max_match_format); |
|
my ($max_match_count,$max_match_pct) = (0,0); |
|
my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cname); |
|
my %idmap = &username_to_idmap($classlist); |
|
foreach my $key (keys(%idmap)) { |
|
my $lckey = lc($key); |
|
$idmap{$lckey} = $idmap{$key}; |
|
} |
|
my %unique_formats; |
|
my @formatlines = &get_scantronformat_file(); |
|
foreach my $line (@formatlines) { |
|
chomp($line); |
|
my @config = split(/:/,$line); |
|
my $idstart = $config[5]; |
|
my $idlength = $config[6]; |
|
if (($idstart ne '') && ($idlength > 0)) { |
|
if (ref($unique_formats{$idstart.':'.$idlength}) eq 'ARRAY') { |
|
push(@{$unique_formats{$idstart.':'.$idlength}},$config[0].':'.$config[1]); |
|
} else { |
|
$unique_formats{$idstart.':'.$idlength} = [$config[0].':'.$config[1]]; |
|
} |
|
} |
|
} |
|
foreach my $key (keys(%unique_formats)) { |
|
my ($idstart,$idlength) = split(':',$key); |
|
%{$counts{$key}} = ( |
|
'found' => 0, |
|
'total' => 0, |
|
); |
|
foreach my $line (@lines) { |
|
next if ($line =~ /^#/); |
|
next if ($line =~ /^[\s\cz]*$/); |
|
my $id = substr($line,$idstart-1,$idlength); |
|
$id = lc($id); |
|
if (exists($idmap{$id})) { |
|
$counts{$key}{'found'} ++; |
|
} |
|
$counts{$key}{'total'} ++; |
|
} |
|
if ($counts{$key}{'total'}) { |
|
my $percent_match = (100*$counts{$key}{'found'})/($counts{$key}{'total'}); |
|
if (($max_match_format eq '') || ($percent_match > $max_match_pct)) { |
|
$max_match_pct = $percent_match; |
|
$max_match_format = $key; |
|
$max_match_count = $counts{$key}{'total'}; |
|
} |
|
} |
|
} |
|
if (ref($unique_formats{$max_match_format}) eq 'ARRAY') { |
|
my $format_descs; |
|
my $numwithformat = @{$unique_formats{$max_match_format}}; |
|
for (my $i=0; $i<$numwithformat; $i++) { |
|
my ($name,$desc) = split(':',$unique_formats{$max_match_format}[$i]); |
|
if ($i<$numwithformat-2) { |
|
$format_descs .= '"<i>'.$desc.'</i>", '; |
|
} elsif ($i==$numwithformat-2) { |
|
$format_descs .= '"<i>'.$desc.'</i>" '.&mt('and').' '; |
|
} elsif ($i==$numwithformat-1) { |
|
$format_descs .= '"<i>'.$desc.'</i>"'; |
|
} |
|
} |
|
my $showpct = sprintf("%.0f",$max_match_pct).'%'; |
|
$output .= '<br />'.&mt('Comparison of student IDs in the uploaded file with the course roster found matches for [_1] of the [_2] entries in the file (for the format defined for [_3]).','<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs). |
|
'<br />'.&mt('A low percentage of matches results from one of the following:').'<ul>'. |
|
'<li>'.&mt('The file was uploaded to the wrong course').'</li>'. |
|
'<li>'.&mt('The data are not in the format expected for the domain: [_1]', |
|
'<i>'.$cdom.'</i>').'</li>'. |
|
'<li>'.&mt('Students did not bubble their IDs, or mis-bubbled them').'</li>'. |
|
'<li>'.&mt('The course roster is not up to date').'</li>'. |
|
'</ul>'; |
|
} |
|
} else { |
|
$output = '<span class="LC_warning">'.&mt('Uploaded file contained no data').'</span>'; |
|
} |
|
return $output; |
|
} |
|
|
sub valid_file { |
sub valid_file { |
my ($requested_file)=@_; |
my ($requested_file)=@_; |
foreach my $filename (sort(&scantron_filenames())) { |
foreach my $filename (sort(&scantron_filenames())) { |
Line 7758 sub checkscantron_results {
|
Line 8443 sub checkscantron_results {
|
my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&Apache::loncoursedata::get_classlist(); |
my %idmap=&Apache::grades::username_to_idmap($classlist); |
my %idmap=&Apache::grades::username_to_idmap($classlist); |
my $navmap=Apache::lonnavmaps::navmap->new(); |
my $navmap=Apache::lonnavmaps::navmap->new(); |
my $map=$navmap->getResourceByUrl($sequence); |
unless (ref($navmap)) { |
my @resources=$navmap->retrieveResources($map,undef,1,0); |
$r->print(&navmap_errormsg()); |
my ($uname,$udom,%partids_by_symb); |
return ''; |
foreach my $resource (@resources) { |
|
my $ressymb = $resource->symb(); |
|
my ($analysis,$parts) = |
|
&scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom); |
|
$partids_by_symb{$ressymb} = $parts; |
|
} |
} |
|
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); |
|
|
|
my ($uname,$udom); |
my (%scandata,%lastname,%bylast); |
my (%scandata,%lastname,%bylast); |
$r->print(' |
$r->print(' |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="checkscantron">'."\n"); |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="checkscantron">'."\n"); |
Line 7775 sub checkscantron_results {
|
Line 8461 sub checkscantron_results {
|
my %completedstudents; |
my %completedstudents; |
|
|
my $count=&Apache::grades::get_todo_count($scanlines,$scan_data); |
my $count=&Apache::grades::get_todo_count($scanlines,$scan_data); |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron/Submissions Comparison Status', |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status', |
'Progress of Scantron Data/Submission Records Comparison',$count, |
'Progress of Bubblesheet Data/Submission Records Comparison',$count, |
'inline',undef,'checkscantron'); |
'inline',undef,'checkscantron'); |
my ($username,$domain,$started); |
my ($username,$domain,$started); |
|
my $nav_error; |
&Apache::grades::scantron_get_maxbubble(); # Need the bubble lines array to parse. |
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse. |
|
if ($nav_error) { |
|
$r->print(&navmap_errormsg()); |
|
return ''; |
|
} |
|
|
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
'Processing first student'); |
'Processing first student'); |
Line 7821 sub checkscantron_results {
|
Line 8511 sub checkscantron_results {
|
($username,$domain)=split(/:/,$uname); |
($username,$domain)=split(/:/,$uname); |
my $counter = -1; |
my $counter = -1; |
foreach my $resource (@resources) { |
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,undef, |
|
$bubbles_per_row); |
|
} else { |
|
$parts = $grader_partids_by_symb{$ressymb}; |
|
} |
($counter,my $recording) = |
($counter,my $recording) = |
&verify_scantron_grading($resource,$domain,$username,$cid,$counter, |
&verify_scantron_grading($resource,$domain,$username,$cid,$counter, |
$scandata{$pid},\%partids_by_symb, |
$scandata{$pid},$parts, |
\%scantron_config,\%lettdig,$numletts); |
\%scantron_config,\%lettdig,$numletts); |
$record{$pid} .= $recording; |
$record{$pid} .= $recording; |
} |
} |
Line 7844 sub checkscantron_results {
|
Line 8545 sub checkscantron_results {
|
if ($scandata{$pid} eq $record{$pid}) { |
if ($scandata{$pid} eq $record{$pid}) { |
my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row'; |
my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row'; |
$okstudents .= '<tr class="'.$css_class.'">'. |
$okstudents .= '<tr class="'.$css_class.'">'. |
'<td>'.&mt('Scantron').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
'<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
'</tr>'."\n". |
'</tr>'."\n". |
'<tr class="'.$css_class.'">'."\n". |
'<tr class="'.$css_class.'">'."\n". |
'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n"; |
'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n"; |
$passed ++; |
$passed ++; |
} else { |
} else { |
my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row'; |
my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row'; |
$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Scantron').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
$badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n". |
'</tr>'."\n". |
'</tr>'."\n". |
'<tr class="'.$css_class.'">'."\n". |
'<tr class="'.$css_class.'">'."\n". |
'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n". |
'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n". |
Line 7862 sub checkscantron_results {
|
Line 8563 sub checkscantron_results {
|
} |
} |
} |
} |
} |
} |
$r->print('<p>'.&mt('Comparison of scantron data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b> ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>'); |
$r->print('<p>'. |
|
&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).', |
|
'<b>', |
|
$numstudents, |
|
'</b>', |
|
$env{'form.scantron_maxbubble'}). |
|
'</p>' |
|
); |
$r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>'); |
$r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>'); |
if ($passed) { |
if ($passed) { |
$r->print(&mt('Students with exact correspondence between scantron data and submissions are as follows:').'<br /><br />'); |
$r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'<br /><br />'); |
$r->print(&Apache::loncommon::start_data_table()."\n". |
$r->print(&Apache::loncommon::start_data_table()."\n". |
&Apache::loncommon::start_data_table_header_row()."\n". |
&Apache::loncommon::start_data_table_header_row()."\n". |
'<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'. |
'<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'. |
Line 7874 sub checkscantron_results {
|
Line 8582 sub checkscantron_results {
|
&Apache::loncommon::end_data_table().'<br />'); |
&Apache::loncommon::end_data_table().'<br />'); |
} |
} |
if ($failed) { |
if ($failed) { |
$r->print(&mt('Students with differences between scantron data and submissions are as follows:').'<br /><br />'); |
$r->print(&mt('Students with differences between bubblesheet data and submissions are as follows:').'<br /><br />'); |
$r->print(&Apache::loncommon::start_data_table()."\n". |
$r->print(&Apache::loncommon::start_data_table()."\n". |
&Apache::loncommon::start_data_table_header_row()."\n". |
&Apache::loncommon::start_data_table_header_row()."\n". |
'<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'. |
'<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'. |
&Apache::loncommon::end_data_table_header_row()."\n". |
&Apache::loncommon::end_data_table_header_row()."\n". |
$badstudents."\n". |
$badstudents."\n". |
&Apache::loncommon::end_data_table()).'<br />'. |
&Apache::loncommon::end_data_table()).'<br />'. |
&mt('Differences can occur if submissions were modified using manual grading after a scantron grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original scantron sheets.'); |
&mt('Differences can occur if submissions were modified using manual grading after a bubblesheet grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original bubblesheets.'); |
} |
} |
$r->print('</form><br />'.$grading_menu_button); |
$r->print('</form><br />'.$grading_menu_button); |
return; |
return; |
} |
} |
|
|
sub verify_scantron_grading { |
sub verify_scantron_grading { |
my ($resource,$domain,$username,$cid,$counter,$scandata,$partids_by_symb, |
my ($resource,$domain,$username,$cid,$counter,$scandata,$partids, |
$scantron_config,$lettdig,$numletts) = @_; |
$scantron_config,$lettdig,$numletts) = @_; |
my ($record,%expected,%startpos); |
my ($record,%expected,%startpos); |
return ($counter,$record) if (!ref($resource)); |
return ($counter,$record) if (!ref($resource)); |
return ($counter,$record) if (!$resource->is_problem()); |
return ($counter,$record) if (!$resource->is_problem()); |
my $symb = $resource->symb(); |
my $symb = $resource->symb(); |
return ($counter,$record) if (ref($partids_by_symb) ne 'HASH'); |
return ($counter,$record) if (ref($partids) ne 'ARRAY'); |
return ($counter,$record) if (ref($partids_by_symb->{$symb}) ne 'ARRAY'); |
foreach my $part_id (@{$partids}) { |
foreach my $part_id (@{$partids_by_symb->{$symb}}) { |
|
$counter ++; |
$counter ++; |
$expected{$part_id} = 0; |
$expected{$part_id} = 0; |
if ($env{"form.scantron.sub_bubblelines.$counter"}) { |
if ($env{"form.scantron.sub_bubblelines.$counter"}) { |
Line 7989 sub verify_scantron_grading {
|
Line 8696 sub verify_scantron_grading {
|
} |
} |
} |
} |
} |
} |
foreach my $part_id (@{$partids_by_symb->{$symb}}) { |
foreach my $part_id (@{$partids}) { |
if ($recorded{$part_id} eq '') { |
if ($recorded{$part_id} eq '') { |
for (my $i=0; $i<$expected{$part_id}; $i++) { |
for (my $i=0; $i<$expected{$part_id}; $i++) { |
for (my $j=0; $j<$scantron_config->{'Qlength'}; $j++) { |
for (my $j=0; $j<$scantron_config->{'Qlength'}; $j++) { |
Line 8097 sub grading_menu {
|
Line 8804 sub grading_menu {
|
icon => 'addClickerInfoFile.png', |
icon => 'addClickerInfoFile.png', |
linktitle => 'Specify a file containing the clicker information for this resource.' |
linktitle => 'Specify a file containing the clicker information for this resource.' |
}, |
}, |
{ linktext => 'Grade/Manage/Review Scantron Forms', |
{ linktext => 'Grade/Manage/Review Bubblesheets', |
url => $url4, |
url => $url4, |
permission => 'F', |
permission => 'F', |
icon => 'stat.png', |
icon => 'stat.png', |
linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.' |
linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.' |
} |
} |
] |
] |
}); |
}); |
Line 8123 sub grading_menu {
|
Line 8830 sub grading_menu {
|
|
|
$Str .= Apache::lonhtmlcommon::generate_menu(@menu); |
$Str .= Apache::lonhtmlcommon::generate_menu(@menu); |
#$menudata->{'jscript'} |
#$menudata->{'jscript'} |
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '. |
$Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '. |
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
' onclick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
' /> '. |
' /> '. |
&Apache::lonnet::recprefix($env{'request.course.id'}). |
&Apache::lonnet::recprefix($env{'request.course.id'}). |
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'; |
'-<input type="text" name="receipt" size="4" onchange="javascript:checkReceiptNo(this.form,\'OK\')" />'; |
|
|
$Str .="</form>\n"; |
$Str .="</form>\n"; |
my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); |
my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); |
Line 8310 GRADINGMENUJS
|
Line 9017 GRADINGMENUJS
|
</label> |
</label> |
</div> |
</div> |
<div> |
<div> |
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" /> |
<input type="button" onclick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" /> |
</div> |
</div> |
</div> |
</div> |
|
|
Line 8327 GRADINGMENUJS
|
Line 9034 GRADINGMENUJS
|
</label> |
</label> |
</div> |
</div> |
<div> |
<div> |
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" /> |
<input type="button" onclick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" /> |
</div> |
</div> |
</div> |
</div> |
</form>'; |
</form>'; |
Line 8430 sub process_clicker {
|
Line 9137 sub process_clicker {
|
$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 8443 sub process_clicker {
|
Line 9150 sub process_clicker {
|
my %checked; |
my %checked; |
foreach my $gradingmechanism ('attendance','personnel','specific','given') { |
foreach my $gradingmechanism ('attendance','personnel','specific','given') { |
if ($env{'form.gradingmechanism'} eq $gradingmechanism) { |
if ($env{'form.gradingmechanism'} eq $gradingmechanism) { |
$checked{$gradingmechanism}="checked='checked'"; |
$checked{$gradingmechanism}=' checked="checked"'; |
} |
} |
} |
} |
|
|
Line 8457 sub process_clicker {
|
Line 9164 sub process_clicker {
|
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', |
|
'turning' => 'Turning Technologies'}); |
$symb = &Apache::lonenc::check_encrypt($symb); |
$symb = &Apache::lonenc::check_encrypt($symb); |
$result.=<<ENDUPFORM; |
$result.=<<ENDUPFORM; |
<script type="text/javascript"> |
<script type="text/javascript"> |
Line 8507 function sanitycheck() {
|
Line 9215 function sanitycheck() {
|
<input type="hidden" name="saveState" value="$env{'form.saveState'}" /> |
<input type="hidden" name="saveState" value="$env{'form.saveState'}" /> |
<input type="file" name="upfile" size="50" /> |
<input type="file" name="upfile" size="50" /> |
<br /><label>$type: $selectform</label> |
<br /><label>$type: $selectform</label> |
<br /><label><input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" />$attendance </label> |
<br /><label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onclick="sanitycheck()" />$attendance </label> |
<br /><label><input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" />$personnel</label> |
<br /><label><input type="radio" name="gradingmechanism" value="personnel"$checked{'personnel'} onclick="sanitycheck()" />$personnel</label> |
<br /><label><input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" />$specific </label> |
<br /><label><input type="radio" name="gradingmechanism" value="specific"$checked{'specific'} onclick="sanitycheck()" />$specific </label> |
<input type="text" name="specificid" value="$env{'form.specificid'}" size="20" /> |
<input type="text" name="specificid" value="$env{'form.specificid'}" size="20" /> |
<br /><label><input type="radio" name="gradingmechanism" value="given" $checked{'given'} onClick="sanitycheck()" />$given </label> |
<br /><label><input type="radio" name="gradingmechanism" value="given"$checked{'given'} onclick="sanitycheck()" />$given </label> |
<br /> |
<br /> |
<input type="text" name="givenanswer" size="50" /> |
<input type="text" name="givenanswer" size="50" /> |
<input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" /> |
<input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" /> |
<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". |
Line 8548 sub process_clicker_file {
|
Line 9256 sub process_clicker_file {
|
if ($env{'form.gradingmechanism'} eq 'given') { |
if ($env{'form.gradingmechanism'} eq 'given') { |
$env{'form.givenanswer'}=~s/^\s*//gs; |
$env{'form.givenanswer'}=~s/^\s*//gs; |
$env{'form.givenanswer'}=~s/\s*$//gs; |
$env{'form.givenanswer'}=~s/\s*$//gs; |
$env{'form.givenanswer'}=~s/[^a-zA-Z0-9\.\*\-]+/\,/g; |
$env{'form.givenanswer'}=~s/[^a-zA-Z0-9\.\*\-\+]+/\,/g; |
$env{'form.givenanswer'}=uc($env{'form.givenanswer'}); |
$env{'form.givenanswer'}=uc($env{'form.givenanswer'}); |
my @answers=split(/\,/,$env{'form.givenanswer'}); |
my @answers=split(/\,/,$env{'form.givenanswer'}); |
$foundgiven=$#answers+1; |
$foundgiven=$#answers+1; |
Line 8608 sub process_clicker_file {
|
Line 9316 sub process_clicker_file {
|
$result.=(<<ENDHEADER); |
$result.=(<<ENDHEADER); |
<br /><table width="100%" border="0"><tr><td bgcolor="#777777"> |
<br /><table width="100%" border="0"><tr><td bgcolor="#777777"> |
<table width="100%" border="0"><tr bgcolor="#e6ffff"><td> |
<table width="100%" border="0"><tr bgcolor="#e6ffff"><td> |
<b>$heading</b></td></tr><tr bgcolor=#ffffe6><td> |
<b>$heading</b></td></tr><tr bgcolor="#ffffe6"><td> |
<form method="post" action="/adm/grades" name="clickeranalysis"> |
<form method="post" action="/adm/grades" name="clickeranalysis"> |
<input type="hidden" name="symb" value="$symb" /> |
<input type="hidden" name="symb" value="$symb" /> |
<input type="hidden" name="command" value="assignclickergrades" /> |
<input type="hidden" name="command" value="assignclickergrades" /> |
Line 8631 ENDHEADER
|
Line 9339 ENDHEADER
|
if ($env{'form.upfiletype'} eq 'interwrite') { |
if ($env{'form.upfiletype'} eq 'interwrite') { |
($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses); |
($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses); |
} |
} |
|
if ($env{'form.upfiletype'} eq 'turning') { |
|
($errormsg,$number)=&turning_eval(\@questiontitles,\%responses); |
|
} |
$result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'. |
$result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'. |
'<input type="hidden" name="number" value="'.$number.'" />'. |
'<input type="hidden" name="number" value="'.$number.'" />'. |
&mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses', |
&mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses', |
Line 8677 ENDHEADER
|
Line 9388 ENDHEADER
|
"\n".&mt("Username").": <input type='text' name='uname".$id."' /> ". |
"\n".&mt("Username").": <input type='text' name='uname".$id."' /> ". |
"\n".&mt("Domain").": ". |
"\n".&mt("Domain").": ". |
&Apache::loncommon::select_dom_form($env{'course.'.$env{'request.course.id'}.'.domain'},'udom'.$id).' '. |
&Apache::loncommon::select_dom_form($env{'course.'.$env{'request.course.id'}.'.domain'},'udom'.$id).' '. |
&Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id); |
&Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id,0,$id); |
$unknown_count++; |
$unknown_count++; |
} |
} |
} |
} |
Line 8722 sub iclicker_eval {
|
Line 9433 sub iclicker_eval {
|
$id=~s/^[\#0]+//; |
$id=~s/^[\#0]+//; |
for (my $i=0;$i<$number;$i++) { |
for (my $i=0;$i<$number;$i++) { |
my $idx=3+$i*6; |
my $idx=3+$i*6; |
|
$entries[$idx]=~s/[^a-zA-Z0-9\.\*\-\+]+//g; |
push(@idresponses,$entries[$idx]); |
push(@idresponses,$entries[$idx]); |
} |
} |
$$responses{$id}=join(',',@idresponses); |
$$responses{$id}=join(',',@idresponses); |
Line 8761 sub interwrite_eval {
|
Line 9473 sub interwrite_eval {
|
return ($errormsg,$number); |
return ($errormsg,$number); |
} |
} |
|
|
|
sub turning_eval { |
|
my ($questiontitles,$responses)=@_; |
|
my $number=0; |
|
my $errormsg=''; |
|
foreach my $line (split(/[\n\r]/,$env{'form.upfile'})) { |
|
my %components=&Apache::loncommon::record_sep($line); |
|
my @entries=map {$components{$_}} (sort(keys(%components))); |
|
if ($#entries>$number) { $number=$#entries; } |
|
my $id=$entries[0]; |
|
my @idresponses; |
|
$id=~s/^[\#0]+//; |
|
unless ($id) { next; } |
|
for (my $idx=1;$idx<=$#entries;$idx++) { |
|
$entries[$idx]=~s/\,/\;/g; |
|
$entries[$idx]=~s/[^a-zA-Z0-9\.\*\-\+\;]+//g; |
|
push(@idresponses,$entries[$idx]); |
|
} |
|
$$responses{$id}=join(',',@idresponses); |
|
} |
|
for (my $i=1; $i<=$number; $i++) { |
|
$$questiontitles[$i]=&mt('Question [_1]',$i); |
|
} |
|
return ($errormsg,$number); |
|
} |
|
|
sub assign_clicker_grades { |
sub assign_clicker_grades { |
my ($r)=@_; |
my ($r)=@_; |
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) = &showResourceInfo($symb,$env{'form.probTitle'}); |
|
|
my $heading=&mt('Assigning grades based on clicker file'); |
$result .= '<br />'. |
$result.=(<<ENDHEADER); |
&Apache::loncommon::start_data_table(). |
<br /><table width="100%" border="0"><tr><td bgcolor="#777777"> |
&Apache::loncommon::start_data_table_header_row(). |
<table width="100%" border="0"><tr bgcolor="#e6ffff"><td> |
'<th>'.&mt('Assigning grades based on clicker file').'</th>'. |
<b>$heading</b></td></tr><tr bgcolor=#ffffe6><td> |
&Apache::loncommon::end_data_table_header_row(). |
ENDHEADER |
&Apache::loncommon::start_data_table_row().'<td>'; |
|
|
# Get correct result |
# Get correct result |
# FIXME: Possibly need delimiter other than ":" |
# FIXME: Possibly need delimiter other than ":" |
my @correct=(); |
my @correct=(); |
Line 8793 ENDHEADER
|
Line 9535 ENDHEADER
|
$result.='<br /><span class="LC_warning">'. |
$result.='<br /><span class="LC_warning">'. |
&mt('More than one correct result given for question "[_1]": [_2] versus [_3].', |
&mt('More than one correct result given for question "[_1]": [_2] versus [_3].', |
$env{'form.question:'.$i},$correct[$i],$input[$i]).'</span>'; |
$env{'form.question:'.$i},$correct[$i],$input[$i]).'</span>'; |
} elsif ($input[$i]) { |
} elsif (($input[$i]) || ($input[$i] eq '0')) { |
$correct[$i]=$input[$i]; |
$correct[$i]=$input[$i]; |
} |
} |
} |
} |
} |
} |
} |
} |
for (my $i=0;$i<$number;$i++) { |
for (my $i=0;$i<$number;$i++) { |
if (!$correct[$i]) { |
if ((!$correct[$i]) && ($correct[$i] ne '0')) { |
$result.='<br /><span class="LC_error">'. |
$result.='<br /><span class="LC_error">'. |
&mt('No correct result given for question "[_1]"!', |
&mt('No correct result given for question "[_1]"!', |
$env{'form.question:'.$i}).'</span>'; |
$env{'form.question:'.$i}).'</span>'; |
} |
} |
} |
} |
$result.='<br />'.&mt("Correct answer: [_1]",join(', ',map { ($_?$_:'-') } @correct)); |
$result.='<br />'.&mt("Correct answer: [_1]",join(', ',map { ((($_) || ($_ eq '0'))?$_:'-') } @correct)); |
} |
} |
# Start grading |
# Start grading |
my $pcorrect=$env{'form.pcorrect'}; |
my $pcorrect=$env{'form.pcorrect'}; |
my $pincorrect=$env{'form.pincorrect'}; |
my $pincorrect=$env{'form.pincorrect'}; |
my $storecount=0; |
my $storecount=0; |
|
my %users=(); |
foreach my $key (keys(%env)) { |
foreach my $key (keys(%env)) { |
my $user=''; |
my $user=''; |
if ($key=~/^form\.student\:(.*)$/) { |
if ($key=~/^form\.student\:(.*)$/) { |
Line 8825 ENDHEADER
|
Line 9568 ENDHEADER
|
$user=$env{'form.multi'.$id}; |
$user=$env{'form.multi'.$id}; |
} |
} |
} |
} |
if ($user) { |
if ($user) { |
|
if ($users{$user}) { |
|
$result.='<br /><span class="LC_warning">'. |
|
&mt("More than one entry found for <tt>[_1]</tt>!",$user). |
|
'</span><br />'; |
|
} |
|
$users{$user}=1; |
my @answer=split(/\,/,$env{$key}); |
my @answer=split(/\,/,$env{$key}); |
my $sum=0; |
my $sum=0; |
my $realnumber=$number; |
my $realnumber=$number; |
for (my $i=0;$i<$number;$i++) { |
for (my $i=0;$i<$number;$i++) { |
if ($answer[$i]) { |
if ($correct[$i] eq '-') { |
|
$realnumber--; |
|
} elsif ($answer[$i]) { |
if ($gradingmechanism eq 'attendance') { |
if ($gradingmechanism eq 'attendance') { |
$sum+=$pcorrect; |
$sum+=$pcorrect; |
} elsif ($answer[$i] eq '*') { |
} elsif ($correct[$i] eq '*') { |
$sum+=$pcorrect; |
$sum+=$pcorrect; |
} elsif ($answer[$i] eq '-') { |
|
$realnumber--; |
|
} else { |
} else { |
if ($answer[$i] eq $correct[$i]) { |
# We actually grade if correct or not |
$sum+=$pcorrect; |
my $increment=$pincorrect; |
} else { |
# Special case: numerical answer "0" |
$sum+=$pincorrect; |
if ($correct[$i] eq '0') { |
|
if ($answer[$i]=~/^[0\.]+$/) { |
|
$increment=$pcorrect; |
|
} |
|
# General numerical answer, both evaluate to something non-zero |
|
} elsif ((1.0*$correct[$i]!=0) && (1.0*$answer[$i]!=0)) { |
|
if (1.0*$correct[$i]==1.0*$answer[$i]) { |
|
$increment=$pcorrect; |
|
} |
|
# Must be just alphanumeric |
|
} elsif ($answer[$i] eq $correct[$i]) { |
|
$increment=$pcorrect; |
} |
} |
|
$sum+=$increment; |
} |
} |
} |
} |
} |
} |
Line 8864 ENDHEADER
|
Line 9625 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>'. |
'</td></tr></table><br /><br />'."\n"; |
&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::end_data_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(); |
if ($env{'browser.mathml'}) { |
if ($request->header_only) { |
&Apache::loncommon::content_type($request,'text/xml'); |
&Apache::loncommon::content_type($request,'text/html'); |
} else { |
$request->send_http_header; |
&Apache::loncommon::content_type($request,'text/html'); |
return OK; |
} |
} |
$request->send_http_header; |
|
return '' if $request->header_only; |
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); |
|
|
my $symb=&get_symb($request,1); |
my $symb=&get_symb($request,1); |
my @commands=&Apache::loncommon::get_env_multiple('form.command'); |
my @commands=&Apache::loncommon::get_env_multiple('form.command'); |
my $command=$commands[0]; |
my $command=$commands[0]; |
Line 8891 sub handler {
|
Line 9659 sub handler {
|
|
|
$ssi_error = 0; |
$ssi_error = 0; |
my $brcrum = [{href=>"/adm/grades",text=>"Grading"}]; |
my $brcrum = [{href=>"/adm/grades",text=>"Grading"}]; |
$request->print(&Apache::loncommon::start_page('Grading',undef, |
my $start_page = &Apache::loncommon::start_page('Grading',undef, |
{'bread_crumbs' => $brcrum})); |
{'bread_crumbs' => $brcrum}); |
if ($symb eq '' && $command eq '') { |
if ($symb eq '' && $command eq '') { |
if ($env{'user.adv'}) { |
if ($env{'user.adv'}) { |
|
&Apache::loncommon::content_type($request,'text/html'); |
|
$request->send_http_header; |
|
$request->print($start_page); |
if (($env{'form.codeone'}) && ($env{'form.codetwo'}) && |
if (($env{'form.codeone'}) && ($env{'form.codetwo'}) && |
($env{'form.codethree'})) { |
($env{'form.codethree'})) { |
my $token=$env{'form.codeone'}.'*'.$env{'form.codetwo'}.'*'. |
my $token=$env{'form.codeone'}.'*'.$env{'form.codetwo'}.'*'. |
Line 8918 sub handler {
|
Line 9689 sub handler {
|
} else { |
} else { |
$request->print(&Apache::lonxml::tokeninputfield()); |
$request->print(&Apache::lonxml::tokeninputfield()); |
} |
} |
} |
} elsif ($env{'request.course.id'}) { |
|
&init_perm(); |
|
if (!%perm) { |
|
$request->internal_redirect('/adm/quickgrades'); |
|
} else { |
|
&Apache::loncommon::content_type($request,'text/html'); |
|
$request->send_http_header; |
|
$request->print($start_page); |
|
} |
|
} |
} else { |
} else { |
&init_perm(); |
&init_perm(); |
|
if (!$env{'request.course.id'}) { |
|
unless ((&Apache::lonnet::allowed('usc',$env{'request.role.domain'})) && |
|
($command =~ /^scantronupload/)) { |
|
# Not in a course. |
|
$env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context"; |
|
return HTTP_NOT_ACCEPTABLE; |
|
} |
|
} elsif (!%perm) { |
|
$request->internal_redirect('/adm/quickgrades'); |
|
} |
|
&Apache::loncommon::content_type($request,'text/html'); |
|
$request->send_http_header; |
|
$request->print($start_page); |
if ($command eq 'submission' && $perm{'vgr'}) { |
if ($command eq 'submission' && $perm{'vgr'}) { |
($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0)); |
($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0)); |
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) { |
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) { |
Line 8990 sub handler {
|
Line 9783 sub handler {
|
} elsif ($command eq 'checksubmissions' && $perm{'vgr'}) { |
} elsif ($command eq 'checksubmissions' && $perm{'vgr'}) { |
$request->print(&checkscantron_results($request)); |
$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 8998 sub handler {
|
Line 9791 sub handler {
|
} |
} |
$request->print(&Apache::loncommon::end_page()); |
$request->print(&Apache::loncommon::end_page()); |
&reset_caches(); |
&reset_caches(); |
return ''; |
return OK; |
} |
} |
|
|
1; |
1; |
Line 9095 ssi_with_retries()
|
Line 9888 ssi_with_retries()
|
|
|
=item scantron_get_maxbubble() : |
=item scantron_get_maxbubble() : |
|
|
|
Arguments: |
|
$nav_error - Reference to scalar which is a flag to indicate a |
|
failure to retrieve a navmap object. |
|
if $nav_error is set to 1 by scantron_get_maxbubble(), the |
|
calling routine should trap the error condition and display the warning |
|
found in &navmap_errormsg(). |
|
|
|
$scantron_config - Reference to bubblesheet format configuration hash. |
|
|
Returns the maximum number of bubble lines that are expected to |
Returns the maximum number of bubble lines that are expected to |
occur. Does this by walking the selected sequence rendering the |
occur. Does this by walking the selected sequence rendering the |
resource and then checking &Apache::lonxml::get_problem_counter() |
resource and then checking &Apache::lonxml::get_problem_counter() |
Line 9118 ssi_with_retries()
|
Line 9920 ssi_with_retries()
|
|
|
=item scantron_process_students() : |
=item scantron_process_students() : |
|
|
Routine that does the actual grading of the bubble sheet information. |
Routine that does the actual grading of the bubblesheet information. |
|
|
The parsed scanline hash is added to %env |
The parsed scanline hash is added to %env |
|
|
Line 9138 ssi_with_retries()
|
Line 9940 ssi_with_retries()
|
|
|
=item scantron_upload_scantron_data() : |
=item scantron_upload_scantron_data() : |
|
|
Creates the screen for adding a new bubble sheet data file to a course. |
Creates the screen for adding a new bubblesheet data file to a course. |
|
|
=item scantron_upload_scantron_data_save() : |
=item scantron_upload_scantron_data_save() : |
|
|
Line 9152 ssi_with_retries()
|
Line 9954 ssi_with_retries()
|
=item scantron_download_scantron_data() : |
=item scantron_download_scantron_data() : |
|
|
Shows a list of the three internal files (original, corrected, |
Shows a list of the three internal files (original, corrected, |
skipped) for a specific bubble sheet data file that exists in the |
skipped) for a specific bubblesheet data file that exists in the |
course. |
course. |
|
|
=item scantron_validate_ID() : |
=item scantron_validate_ID() : |
|
|
Validates all scanlines in the selected file to not have any |
Validates all scanlines in the selected file to not have any |
invalid or underspecified student IDs |
invalid or underspecified student/employee IDs |
|
|
|
=item navmap_errormsg() : |
|
|
|
Returns HTML mark-up inside a <div></div> with a link to re-initialize the course. |
|
Should be called whenever the request to instantiate a navmap object fails. |
|
|
=back |
=back |
|
|