version 1.762, 2020/02/12 16:25:56
|
version 1.770, 2020/05/20 22:02:57
|
Line 315 sub reset_caches {
|
Line 315 sub reset_caches {
|
$add_to_form = { 'code_for_randomlist' => $scancode,}; |
$add_to_form = { 'code_for_randomlist' => $scancode,}; |
} |
} |
} |
} |
my $analyze = |
my $analyze = |
&get_analyze($symb,$uname,$udom,undef,$add_to_form, |
&get_analyze($symb,$uname,$udom,undef,$add_to_form, |
undef,undef,undef,$bubbles_per_row); |
undef,undef,undef,$bubbles_per_row); |
if (ref($analyze) eq 'HASH') { |
if (ref($analyze) eq 'HASH') { |
Line 345 sub cleanRecord {
|
Line 345 sub cleanRecord {
|
if ($response =~ /^(option|rank)$/) { |
if ($response =~ /^(option|rank)$/) { |
my %answer=&Apache::lonnet::str2hash($answer); |
my %answer=&Apache::lonnet::str2hash($answer); |
my @answer = %answer; |
my @answer = %answer; |
%answer = map {&HTML::Entities::encode($_, '"<>&')} @answer; |
%answer = map {&HTML::Entities::encode($_, '"<>&')} @answer; |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
my ($toprow,$bottomrow); |
my ($toprow,$bottomrow); |
foreach my $foil (@$order) { |
foreach my $foil (@$order) { |
Line 363 sub cleanRecord {
|
Line 363 sub cleanRecord {
|
} elsif ($response eq 'match') { |
} elsif ($response eq 'match') { |
my %answer=&Apache::lonnet::str2hash($answer); |
my %answer=&Apache::lonnet::str2hash($answer); |
my @answer = %answer; |
my @answer = %answer; |
%answer = map {&HTML::Entities::encode($_, '"<>&')} @answer; |
%answer = map {&HTML::Entities::encode($_, '"<>&')} @answer; |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"}); |
my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"}); |
my ($toprow,$middlerow,$bottomrow); |
my ($toprow,$middlerow,$bottomrow); |
Line 422 sub cleanRecord {
|
Line 422 sub cleanRecord {
|
} |
} |
$answer = &Apache::lontexconvert::msgtexconverted($answer); |
$answer = &Apache::lontexconvert::msgtexconverted($answer); |
return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>'; |
return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>'; |
|
|
} elsif ( $response eq 'organic') { |
} elsif ( $response eq 'organic') { |
my $result=&mt('Smile representation: [_1]', |
my $result=&mt('Smile representation: [_1]', |
'"<tt>'.&HTML::Entities::encode($answer, '"<>&').'</tt>"'); |
'"<tt>'.&HTML::Entities::encode($answer, '"<>&').'</tt>"'); |
Line 655 sub canmodify {
|
Line 654 sub canmodify {
|
#can modify the requested section |
#can modify the requested section |
return 1; |
return 1; |
} else { |
} else { |
# can't modify the request section |
# can't modify the requested section |
return 0; |
return 0; |
} |
} |
} |
} |
Line 668 sub canview {
|
Line 667 sub canview {
|
my ($sec)=@_; |
my ($sec)=@_; |
if ($perm{'vgr'}) { |
if ($perm{'vgr'}) { |
if (!defined($perm{'vgr_section'})) { |
if (!defined($perm{'vgr_section'})) { |
# can modify whole class |
# can view whole class |
return 1; |
return 1; |
} else { |
} else { |
if ($sec eq $perm{'vgr_section'}) { |
if ($sec eq $perm{'vgr_section'}) { |
#can modify the requested section |
#can view the requested section |
return 1; |
return 1; |
} else { |
} else { |
# can't modify the request section |
# can't view the requested section |
return 0; |
return 0; |
} |
} |
} |
} |
} |
} |
#can't modify |
#can't view |
return 0; |
return 0; |
} |
} |
|
|
Line 821 sub initialverifyreceipt {
|
Line 820 sub initialverifyreceipt {
|
|
|
#--- Check whether a receipt number is valid.--- |
#--- Check whether a receipt number is valid.--- |
sub verifyreceipt { |
sub verifyreceipt { |
my ($request,$symb) = @_; |
my ($request,$symb) = @_; |
|
|
my $courseid = $env{'request.course.id'}; |
my $courseid = $env{'request.course.id'}; |
my $receipt = &Apache::lonnet::recprefix($courseid).'-'. |
my $receipt = &Apache::lonnet::recprefix($courseid).'-'. |
$env{'form.receipt'}; |
$env{'form.receipt'}; |
$receipt =~ s/[^\-\d]//g; |
$receipt =~ s/[^\-\d]//g; |
|
|
my $title.= |
my $title = |
'<h3><span class="LC_info">'. |
'<h3><span class="LC_info">'. |
&mt('Verifying Receipt Number [_1]',$receipt). |
&mt('Verifying Receipt Number [_1]',$receipt). |
'</span></h3>'."\n"; |
'</span></h3>'."\n"; |
Line 917 sub listStudents {
|
Line 916 sub listStudents {
|
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; |
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; |
my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'}; |
my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'}; |
unless ($submitonly) { |
unless ($submitonly) { |
$submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'}; |
$submitonly = $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'}; |
} |
} |
|
|
my $result=''; |
my $result=''; |
Line 1214 LISTJAVASCRIPT
|
Line 1213 LISTJAVASCRIPT
|
#---- Called from the listStudents routine |
#---- Called from the listStudents routine |
|
|
sub check_script { |
sub check_script { |
my ($form, $type)=@_; |
my ($form,$type) = @_; |
my $chkallscript= &Apache::lonhtmlcommon::scripttag(' |
my $chkallscript = &Apache::lonhtmlcommon::scripttag(' |
function checkall() { |
function checkall() { |
for (i=0; i<document.forms.'.$form.'.elements.length; i++) { |
for (i=0; i<document.forms.'.$form.'.elements.length; i++) { |
ele = document.forms.'.$form.'.elements[i]; |
ele = document.forms.'.$form.'.elements[i]; |
Line 1260 sub check_buttons {
|
Line 1259 sub check_buttons {
|
|
|
# Displays the submissions for one student or a group of students |
# Displays the submissions for one student or a group of students |
sub processGroup { |
sub processGroup { |
my ($request,$symb) = @_; |
my ($request,$symb) = @_; |
my $ctr = 0; |
my $ctr = 0; |
my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo'); |
my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo'); |
my $total = scalar(@stuchecked)-1; |
my $total = scalar(@stuchecked)-1; |
Line 2026 sub files_exist {
|
Line 2025 sub files_exist {
|
sub download_all_link { |
sub download_all_link { |
my ($r,$symb) = @_; |
my ($r,$symb) = @_; |
unless (&files_exist($r, $symb)) { |
unless (&files_exist($r, $symb)) { |
$r->print(&mt('There are currently no submitted documents.')); |
$r->print(&mt('There are currently no submitted documents.')); |
return; |
return; |
} |
} |
my $all_students = |
my $all_students = |
join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo')); |
join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo')); |
Line 4199 sub editgrades {
|
Line 4198 sub editgrades {
|
|
|
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $title='<h2>'.&mt('Current Grade Status').'</h2>'; |
my $title='<h2>'.&mt('Current Grade Status').'</h2>'; |
$title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n"; |
$title.='<h4><b>'.&mt('Section:').'</b> '.$section_display.'</h4>'."\n"; |
|
|
my $result= &Apache::loncommon::start_data_table(). |
my $result= &Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
Line 4642 ENDUPFORM
|
Line 4641 ENDUPFORM
|
|
|
|
|
sub csvuploadmap { |
sub csvuploadmap { |
my ($request,$symb)= @_; |
my ($request,$symb) = @_; |
if (!$symb) {return '';} |
if (!$symb) {return '';} |
|
|
my $datatoken; |
my $datatoken; |
Line 4738 sub get_fields {
|
Line 4737 sub get_fields {
|
} |
} |
|
|
sub csvuploadassign { |
sub csvuploadassign { |
my ($request,$symb)= @_; |
my ($request,$symb) = @_; |
if (!$symb) {return '';} |
if (!$symb) {return '';} |
my $error_msg = ''; |
my $error_msg = ''; |
my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'}); |
my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'}); |
Line 4854 sub csvuploadassign {
|
Line 4853 sub csvuploadassign {
|
$grades{$store_key}=$entries{$fields{$dest}}; |
$grades{$store_key}=$entries{$fields{$dest}}; |
} |
} |
} |
} |
if (! %grades) { |
if (! %grades) { |
push(@skipped,&mt("[_1]: no data to save","$username:$domain")); |
push(@skipped,&mt("[_1]: no data to save","$username:$domain")); |
} else { |
} else { |
$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}"; |
$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}"; |
Line 5311 sub displaySubByDates {
|
Line 5310 sub displaySubByDates {
|
} |
} |
my @matchKey; |
my @matchKey; |
if ($isTask) { |
if ($isTask) { |
@matchKey = sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys); |
@matchKey = sort(grep(/^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)); |
} elsif ($is_tool) { |
} elsif ($is_tool) { |
@matchKey = sort(grep /^resource\.\Q$partid\E\.awarded$/,@versionKeys); |
@matchKey = sort(grep(/^resource\.\Q$partid\E\.awarded$/,@versionKeys)); |
} else { |
} else { |
@matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys); |
@matchKey = 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); |
Line 5655 the homework problem.
|
Line 5654 the homework problem.
|
|
|
sub defaultFormData { |
sub defaultFormData { |
my ($symb)=@_; |
my ($symb)=@_; |
return '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'; |
return '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'; |
} |
} |
|
|
|
|
Line 5898 sub scantron_selectphase {
|
Line 5897 sub scantron_selectphase {
|
|
|
$ssi_error = 0; |
$ssi_error = 0; |
|
|
if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || |
if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || $perm{'usc'}) { |
&Apache::lonnet::allowed('usc',$env{'request.course.id'})) { |
|
|
|
# Chunk of form to prompt for a scantron file upload. |
# Chunk of form to prompt for a scantron file upload. |
|
|
Line 5907 sub scantron_selectphase {
|
Line 5905 sub scantron_selectphase {
|
<br />'); |
<br />'); |
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my $csec= $env{'request.course.sec'}; |
my $alertmsg = &mt('Please use the browse button to select a file from your local directory.'); |
my $alertmsg = &mt('Please use the browse button to select a file from your local directory.'); |
&js_escape(\$alertmsg); |
&js_escape(\$alertmsg); |
my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom); |
my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom); |
Line 5922 sub scantron_selectphase {
|
Line 5921 sub scantron_selectphase {
|
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
'.$default_form_data.' |
'.$default_form_data.' |
<input name="courseid" type="hidden" value="'.$cnum.'" /> |
<input name="courseid" type="hidden" value="'.$cnum.'" /> |
|
<input name="coursesec" type="hidden" value="'.$csec.'" /> |
<input name="domainid" type="hidden" value="'.$cdom.'" /> |
<input name="domainid" type="hidden" value="'.$cdom.'" /> |
<input name="command" value="scantronupload_save" type="hidden" /> |
<input name="command" value="scantronupload_save" type="hidden" /> |
'.&Apache::loncommon::start_data_table('LC_scantron_action').' |
'.&Apache::loncommon::start_data_table('LC_scantron_action').' |
Line 6002 sub scantron_selectphase {
|
Line 6002 sub scantron_selectphase {
|
|
|
$r->print($result); |
$r->print($result); |
|
|
|
|
|
|
# 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 6981 sub scantron_warning_screen {
|
Line 6979 sub scantron_warning_screen {
|
'<tr><td><b>'.&mt('Hand-graded items: points from last bubble in row').'</b></td><td><tt>'. |
'<tr><td><b>'.&mt('Hand-graded items: points from last bubble in row').'</b></td><td><tt>'. |
$env{'form.scantron_lastbubblepoints'}.'</tt></td></tr>'; |
$env{'form.scantron_lastbubblepoints'}.'</tt></td></tr>'; |
} |
} |
return (' |
return ' |
<p> |
<p> |
<span class="LC_warning"> |
<span class="LC_warning"> |
'.&mt("Please double check the information below before clicking on '[_1]'",&mt($button_text)).'</span> |
'.&mt("Please double check the information below before clicking on '[_1]'",&mt($button_text)).'</span> |
Line 6993 sub scantron_warning_screen {
|
Line 6991 sub scantron_warning_screen {
|
</table> |
</table> |
<p> '.&mt("If this information is correct, please click on '[_1]'.",&mt($button_text)).'<br /> |
<p> '.&mt("If this information is correct, please click on '[_1]'.",&mt($button_text)).'<br /> |
'.&mt('If something is incorrect, please return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p> |
'.&mt('If something is incorrect, please return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p> |
|
'; |
<br /> |
|
'); |
|
} |
} |
|
|
=pod |
=pod |
Line 7021 sub scantron_do_warning {
|
Line 7017 sub scantron_do_warning {
|
} |
} |
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 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',$symb); |
my $warning=&scantron_warning_screen('Grading: Validate Records',$symb); |
|
my ($checksec,@possibles) = &gradable_sections(); |
|
my $gradesections; |
|
if ($checksec) { |
|
my $file=$env{'form.scantron_selectfile'}; |
|
if (&valid_file($file)) { |
|
my %bysec = &scantron_get_sections(); |
|
my $table; |
|
if ((keys(%bysec) > 1) || ((keys(%bysec) == 1) && ((keys(%bysec))[0] ne $checksec))) { |
|
$gradesections = &mt('Your current role is for section [_1].','<i>'.$checksec.'</i>').'<br />'; |
|
$table = &Apache::loncommon::start_data_table()."\n". |
|
&Apache::loncommon::start_data_table_header_row(). |
|
'<th>'.&mt('Section').'</th><th>'.&mt('Number of records').'</th>'. |
|
&Apache::loncommon::end_data_table_header_row()."\n"; |
|
if ($bysec{'none'}) { |
|
$table .= &Apache::loncommon::start_data_table_row(). |
|
'<td>'.&mt('None').'</td><td>'.$bysec{'none'}.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n"; |
|
} |
|
foreach my $sec (sort { $a <=> $b } keys(%bysec)) { |
|
next if ($sec eq 'none'); |
|
$table .= &Apache::loncommon::start_data_table_row(). |
|
'<td>'.$sec.'</td><td>'.$bysec{$sec}.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n"; |
|
} |
|
$table .= &Apache::loncommon::end_data_table()."\n"; |
|
$gradesections .= &mt('Sections represented in the bubblesheet data file (based on bubbled student IDs) are as follows:'). |
|
'<p>'.$table.'</p>'; |
|
if (@possibles) { |
|
$gradesections .= '<p>'. |
|
&mt('You have role(s) in [quant,_1,other section,other sections] with privileges to manage grades.', |
|
scalar(@possibles)).'<br />'. |
|
&mt('Check which of those section(s), in addition to section [_1], you wish to grade using this bubblesheet file:', |
|
'<i>'.$checksec.'</i>').' '; |
|
foreach my $sec (sort {$a <=> $b } @possibles) { |
|
$gradesections .= '<label><input type="checkbox" name="scantron_othersections" value="'.$sec.'" />'.$sec.'</label>'.(' 'x2); |
|
} |
|
$gradesections .= '</p>'; |
|
} |
|
} |
|
} else { |
|
$gradesections = '<p class="LC_error">'.&mt('The selected file is unavailable').'</p>'; |
|
} |
|
} |
my $bubbledbyhand=&hand_bubble_option(); |
my $bubbledbyhand=&hand_bubble_option(); |
$r->print(' |
$r->print(' |
'.$warning.$bubbledbyhand.' |
'.$warning.$gradesections.$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 7116 sub scantron_validate_file {
|
Line 7155 sub scantron_validate_file {
|
if ($env{'form.scantron_corrections'}) { |
if ($env{'form.scantron_corrections'}) { |
&scantron_process_corrections($r); |
&scantron_process_corrections($r); |
} |
} |
$r->print('<p>'.&mt('Gathering necessary information.').'</p>');$r->rflush(); |
|
|
$r->print('<p>'.&mt('Gathering necessary information.').'</p>'); |
|
my ($checksec,@gradable); |
|
if ($env{'request.course.sec'}) { |
|
($checksec,my @possibles) = &gradable_sections(); |
|
if ($checksec) { |
|
if (@possibles) { |
|
my @chosensecs = &Apache::loncommon::get_env_multiple('form.scantron_othersections'); |
|
if (@chosensecs) { |
|
foreach my $sec (@chosensecs) { |
|
if (grep(/^\Q$sec\E$/,@possibles)) { |
|
unless (grep(/^\Q$sec\E$/,@gradable)) { |
|
push(@gradable,$sec); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
$r->print('<p><table>'); |
|
if (@gradable) { |
|
my @showsections = sort { $a <=> $b } (@gradable,$checksec); |
|
$r->print( |
|
'<tr><td><b>'.&mt('Sections to be Graded:').'</b></td><td>'.join(', ',@showsections).'</td></tr>'); |
|
} else { |
|
$r->print( |
|
'<tr><td><b>'.&mt('Section to be Graded:').'</b></td><td>'.$checksec.'</td></tr>'); |
|
} |
|
$r->print('</table></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 $nav_error; |
my $nav_error; |
Line 7141 sub scantron_validate_file {
|
Line 7211 sub scantron_validate_file {
|
$env{'form.validatepass'} = 0; |
$env{'form.validatepass'} = 0; |
} |
} |
my $currentphase=$env{'form.validatepass'}; |
my $currentphase=$env{'form.validatepass'}; |
|
my %skipbysec=(); |
|
|
my $stop=0; |
my $stop=0; |
while (!$stop && $currentphase < scalar(@validate_phases)) { |
while (!$stop && $currentphase < scalar(@validate_phases)) { |
Line 7151 sub scantron_validate_file {
|
Line 7221 sub scantron_validate_file {
|
my $which="scantron_validate_".$validate_phases[$currentphase]; |
my $which="scantron_validate_".$validate_phases[$currentphase]; |
{ |
{ |
no strict 'refs'; |
no strict 'refs'; |
($stop,$currentphase)=&$which($r,$currentphase); |
my @extras=(); |
|
if ($validate_phases[$currentphase] eq 'ID') { |
|
@extras = (\%skipbysec,$checksec,@gradable); |
|
} |
|
($stop,$currentphase)=&$which($r,$currentphase,@extras); |
} |
} |
} |
} |
if (!$stop) { |
if (!$stop) { |
my $warning=&scantron_warning_screen('Start Grading',$symb); |
my $warning=&scantron_warning_screen('Start Grading',$symb); |
|
my $secinfo; |
|
if (keys(%skipbysec) > 0) { |
|
my $seclist = '<ul>'; |
|
foreach my $sec (sort { $a <=> $b } keys(%skipbysec)) { |
|
$seclist .= '<li>'.&mt('section [_1]: [_2]',$sec,$skipbysec{$sec}).'</li>'; |
|
} |
|
$seclist .= '</ul>'; |
|
$secinfo = '<p class="LC_info">'. |
|
&mt('Numbers of records for students in sections not being graded [_1]', |
|
$seclist). |
|
'</p>'; |
|
} |
$r->print(&mt('Validation process complete.').'<br />'. |
$r->print(&mt('Validation process complete.').'<br />'. |
$warning. |
$secinfo.$warning. |
&mt('Perform verification for each student after storage of submissions?'). |
&mt('Perform verification for each student after storage of submissions?'). |
' <span class="LC_nobreak"><label>'. |
' <span class="LC_nobreak"><label>'. |
'<input type="radio" name="verifyrecord" value="1" />'.&mt('Yes').'</label>'. |
'<input type="radio" name="verifyrecord" value="1" />'.&mt('Yes').'</label>'. |
Line 7573 sub scantron_validate_sequence {
|
Line 7659 sub scantron_validate_sequence {
|
|
|
|
|
sub scantron_validate_ID { |
sub scantron_validate_ID { |
my ($r,$currentphase) = @_; |
my ($r,$currentphase,$skipbysec,$checksec,@gradable) = @_; |
|
|
#get student info |
#get student info |
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 $secidx = &Apache::loncoursedata::CL_SECTION(); |
|
|
#get scantron line setup |
#get scantron line setup |
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
Line 7591 sub scantron_validate_ID {
|
Line 7678 sub scantron_validate_ID {
|
} |
} |
|
|
my %found=('ids'=>{},'usernames'=>{}); |
my %found=('ids'=>{},'usernames'=>{}); |
|
my $unsavedskips = 0; |
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); |
if ($line=~/^[\s\cz]*$/) { next; } |
if ($line=~/^[\s\cz]*$/) { next; } |
Line 7603 sub scantron_validate_ID {
|
Line 7691 sub scantron_validate_ID {
|
} |
} |
if ($found) { |
if ($found) { |
my $username=$idmap{$found}; |
my $username=$idmap{$found}; |
|
if ($checksec) { |
|
if (ref($classlist->{$username}) eq 'ARRAY') { |
|
my $stusec = $classlist->{$username}->[$secidx]; |
|
if ($stusec ne $checksec) { |
|
unless ((@gradable > 0) && (grep(/^\Q$stusec\E$/,@gradable))) { |
|
my $skip=1; |
|
&scantron_put_line($scanlines,$scan_data,$i,$line,$skip); |
|
if (ref($skipbysec) eq 'HASH') { |
|
if ($stusec eq '') { |
|
$skipbysec->{'none'} ++; |
|
} else { |
|
$skipbysec->{$stusec} ++; |
|
} |
|
} |
|
$unsavedskips ++; |
|
next; |
|
} |
|
} |
|
} |
|
} |
if ($found{'ids'}{$found}) { |
if ($found{'ids'}{$found}) { |
&scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
&scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
$line,'duplicateID',$found); |
$line,'duplicateID',$found); |
|
if ($unsavedskips) { |
|
&scantron_putfile($scanlines,$scan_data); |
|
$unsavedskips = 0; |
|
} |
return(1,$currentphase); |
return(1,$currentphase); |
} elsif ($found{'usernames'}{$username}) { |
} elsif ($found{'usernames'}{$username}) { |
&scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
&scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
$line,'duplicateID',$username); |
$line,'duplicateID',$username); |
|
if ($unsavedskips) { |
|
&scantron_putfile($scanlines,$scan_data); |
|
$unsavedskips = 0; |
|
} |
return(1,$currentphase); |
return(1,$currentphase); |
} |
} |
#FIXME store away line we previously saw the ID on to use above |
#FIXME store away line we previously saw the ID on to use above |
Line 7618 sub scantron_validate_ID {
|
Line 7734 sub scantron_validate_ID {
|
} else { |
} else { |
if ($id =~ /^\s*$/) { |
if ($id =~ /^\s*$/) { |
my $username=&scan_data($scan_data,"$i.user"); |
my $username=&scan_data($scan_data,"$i.user"); |
if (defined($username) && $found{'usernames'}{$username}) { |
if (($checksec && $username ne '')) { |
|
if (ref($classlist->{$username}) eq 'ARRAY') { |
|
my $stusec = $classlist->{$username}->[$secidx]; |
|
if ($stusec ne $checksec) { |
|
unless ((@gradable > 0) && (grep(/^\Q$stusec\E$/,@gradable))) { |
|
my $skip=1; |
|
&scantron_put_line($scanlines,$scan_data,$i,$line,$skip); |
|
if (ref($skipbysec) eq 'HASH') { |
|
if ($stusec eq '') { |
|
$skipbysec->{'none'} ++; |
|
} else { |
|
$skipbysec->{$stusec} ++; |
|
} |
|
} |
|
$unsavedskips ++; |
|
next; |
|
} |
|
} |
|
} |
|
} elsif (defined($username) && $found{'usernames'}{$username}) { |
&scantron_get_correction($r,$i,$scan_record, |
&scantron_get_correction($r,$i,$scan_record, |
\%scantron_config, |
\%scantron_config, |
$line,'duplicateID',$username); |
$line,'duplicateID',$username); |
|
if ($unsavedskips) { |
|
&scantron_putfile($scanlines,$scan_data); |
|
$unsavedskips = 0; |
|
} |
return(1,$currentphase); |
return(1,$currentphase); |
} elsif (!defined($username)) { |
} elsif (!defined($username)) { |
&scantron_get_correction($r,$i,$scan_record, |
&scantron_get_correction($r,$i,$scan_record, |
\%scantron_config, |
\%scantron_config, |
$line,'incorrectID'); |
$line,'incorrectID'); |
|
if ($unsavedskips) { |
|
&scantron_putfile($scanlines,$scan_data); |
|
$unsavedskips = 0; |
|
} |
return(1,$currentphase); |
return(1,$currentphase); |
} |
} |
$found{'usernames'}{$username}++; |
$found{'usernames'}{$username}++; |
} else { |
} else { |
&scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
&scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
$line,'incorrectID'); |
$line,'incorrectID'); |
|
if ($unsavedskips) { |
|
&scantron_putfile($scanlines,$scan_data); |
|
$unsavedskips = 0; |
|
} |
return(1,$currentphase); |
return(1,$currentphase); |
} |
} |
} |
} |
} |
} |
|
if ($unsavedskips) { |
|
&scantron_putfile($scanlines,$scan_data); |
|
$unsavedskips = 0; |
|
} |
return (0,$currentphase+1); |
return (0,$currentphase+1); |
} |
} |
|
|
|
sub scantron_get_sections { |
|
my %bysec; |
|
if ($env{'form.scantron_format'} ne '') { |
|
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
|
my ($scanlines,$scan_data)=&scantron_getfile(); |
|
my $classlist=&Apache::loncoursedata::get_classlist(); |
|
my %idmap=&username_to_idmap($classlist); |
|
foreach my $key (keys(%idmap)) { |
|
my $lckey = lc($key); |
|
$idmap{$lckey} = $idmap{$key}; |
|
} |
|
my $secidx = &Apache::loncoursedata::CL_SECTION(); |
|
for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
|
my $line=&scantron_get_line($scanlines,$scan_data,$i); |
|
if ($line=~/^[\s\cz]*$/) { next; } |
|
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
|
$scan_data); |
|
my $id=lc($$scan_record{'scantron.ID'}); |
|
if (exists($idmap{$id})) { |
|
if (ref($classlist->{$idmap{$id}}) eq 'ARRAY') { |
|
my $stusec = $classlist->{$idmap{$id}}->[$secidx]; |
|
if ($stusec eq '') { |
|
$bysec{'none'} ++; |
|
} else { |
|
$bysec{$stusec} ++; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return %bysec; |
|
} |
|
|
sub scantron_get_correction { |
sub scantron_get_correction { |
my ($r,$i,$scan_record,$scan_config,$line,$error,$arg, |
my ($r,$i,$scan_record,$scan_config,$line,$error,$arg, |
Line 7827 sub verify_bubbles_checked {
|
Line 8009 sub verify_bubbles_checked {
|
my $ansnumstr = join('","',@ansnums); |
my $ansnumstr = join('","',@ansnums); |
my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines."); |
my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines."); |
&js_escape(\$warning); |
&js_escape(\$warning); |
my $output = &Apache::lonhtmlcommon::scripttag((<<ENDSCRIPT)); |
my $output = &Apache::lonhtmlcommon::scripttag(<<ENDSCRIPT); |
function verify_bubble_radio(form) { |
function verify_bubble_radio(form) { |
var ansnumArray = new Array ("$ansnumstr"); |
var ansnumArray = new Array ("$ansnumstr"); |
var need_bubble_count = 0; |
var need_bubble_count = 0; |
Line 8658 sub scantron_process_students {
|
Line 8840 sub scantron_process_students {
|
SCANTRONFORM |
SCANTRONFORM |
$r->print($result); |
$r->print($result); |
|
|
|
my ($checksec,@possibles)=&gradable_sections(); |
my @delayqueue; |
my @delayqueue; |
my (%completedstudents,%scandata); |
my (%completedstudents,%scandata); |
|
|
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,$count); |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count); |
Line 8720 SCANTRONFORM
|
Line 8903 SCANTRONFORM
|
next; |
next; |
} |
} |
my $usec = $classlist->{$uname}->[&Apache::loncoursedata::CL_SECTION]; |
my $usec = $classlist->{$uname}->[&Apache::loncoursedata::CL_SECTION]; |
|
if (($checksec ne '') && ($checksec ne $usec)) { |
|
unless (grep(/^\Q$usec\E$/,@possibles)) { |
|
&scantron_add_delay(\@delayqueue,$line, |
|
"No role with manage grades privilege in student's section ($usec)",3); |
|
next; |
|
} |
|
} |
my $user = $uname.':'.$usec; |
my $user = $uname.':'.$usec; |
($uname,$udom)=split(/:/,$uname); |
($uname,$udom)=split(/:/,$uname); |
|
|
Line 9011 sub grade_student_bubbles {
|
Line 9201 sub grade_student_bubbles {
|
} |
} |
|
|
sub scantron_upload_scantron_data { |
sub scantron_upload_scantron_data { |
my ($r,$symb)=@_; |
my ($r,$symb) = @_; |
my $dom = $env{'request.role.domain'}; |
my $dom = $env{'request.role.domain'}; |
my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($dom); |
my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($dom); |
my $domdesc = &Apache::lonnet::domain($dom,'description'); |
my $domdesc = &Apache::lonnet::domain($dom,'description'); |
Line 9167 END
|
Line 9357 END
|
} |
} |
|
|
sub scantron_upload_scantron_data_save { |
sub scantron_upload_scantron_data_save { |
my($r,$symb)=@_; |
my ($r,$symb) = @_; |
my $doanotherupload= |
my $doanotherupload= |
'<br /><form action="/adm/grades" method="post">'."\n". |
'<br /><form action="/adm/grades" method="post">'."\n". |
'<input type="hidden" name="command" value="scantronupload" />'."\n". |
'<input type="hidden" name="command" value="scantronupload" />'."\n". |
Line 9175 sub scantron_upload_scantron_data_save {
|
Line 9365 sub scantron_upload_scantron_data_save {
|
'</form>'."\n"; |
'</form>'."\n"; |
if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) && |
if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) && |
!&Apache::lonnet::allowed('usc', |
!&Apache::lonnet::allowed('usc', |
$env{'form.domainid'}.'_'.$env{'form.courseid'})) { |
$env{'form.domainid'}.'_'.$env{'form.courseid'}) && |
|
!&Apache::lonnet::allowed('usc', |
|
$env{'form.domainid'}.'_'.$env{'form.courseid'}.'/'.$env{'form.coursesec'})) { |
$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />"); |
$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />"); |
unless ($symb) { |
unless ($symb) { |
$r->print($doanotherupload); |
$r->print($doanotherupload); |
Line 9231 sub scantron_upload_scantron_data_save {
|
Line 9423 sub scantron_upload_scantron_data_save {
|
(length($env{'form.upfile'})-1), |
(length($env{'form.upfile'})-1), |
'<span class="LC_filename">'.$result.'</span>')); |
'<span class="LC_filename">'.$result.'</span>')); |
($uploadedfile) = ($result =~ m{/([^/]+)$}); |
($uploadedfile) = ($result =~ m{/([^/]+)$}); |
|
if ($uploadedfile =~ /^scantron_orig_/) { |
|
my $logname = $uploadedfile; |
|
$logname =~ s/^scantron_orig_//; |
|
if ($logname ne '') { |
|
my $now = time; |
|
my %info = ($logname => { $now => $env{'user.name'}.':'.$env{'user.domain'} }); |
|
&Apache::lonnet::put('scantronupload',\%info,$env{'form.domainid'},$env{'form.courseid'}); |
|
} |
|
} |
$r->print(&validate_uploaded_scantron_file($env{'form.domainid'}, |
$r->print(&validate_uploaded_scantron_file($env{'form.domainid'}, |
$env{'form.courseid'},$uploadedfile)); |
$env{'form.courseid'},$symb,$uploadedfile)); |
} else { |
} else { |
$r->print( |
$r->print( |
&Apache::lonhtmlcommon::confirm_success(&mt('Upload failed'),1).'<br />'. |
&Apache::lonhtmlcommon::confirm_success(&mt('Upload failed'),1).'<br />'. |
Line 9250 sub scantron_upload_scantron_data_save {
|
Line 9451 sub scantron_upload_scantron_data_save {
|
} |
} |
|
|
sub validate_uploaded_scantron_file { |
sub validate_uploaded_scantron_file { |
my ($cdom,$cname,$fname) = @_; |
my ($cdom,$cname,$symb,$fname,$context,$countsref) = @_; |
|
|
my $scanlines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.$fname); |
my $scanlines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.$fname); |
my @lines; |
my @lines; |
if ($scanlines ne '-1') { |
if ($scanlines ne '-1') { |
@lines=split("\n",$scanlines,-1); |
@lines=split("\n",$scanlines,-1); |
} |
} |
my $output; |
my ($output,$secidx,$checksec,$priv,%crsroleshash,@possibles); |
|
$secidx = &Apache::loncoursedata::CL_SECTION(); |
|
if ($context eq 'download') { |
|
$priv = 'mgr'; |
|
} else { |
|
$priv = 'usc'; |
|
} |
|
unless ((&Apache::lonnet::allowed($priv,$env{'request.role.domain'})) || |
|
(($env{'request.course.id'}) && |
|
(&Apache::lonnet::allowed($priv,$env{'request.course.id'})))) { |
|
if ($env{'request.course.sec'} ne '') { |
|
unless (&Apache::lonnet::allowed($priv, |
|
"$env{'request.course.id'}/$env{'request.course.sec'}")) { |
|
unless ($context eq 'download') { |
|
$output = '<p class="LC_warning">'.&mt('You do not have permission to upload bubblesheet data').'</p>'; |
|
} |
|
return $output; |
|
} |
|
($checksec,@possibles)=&gradable_sections(); |
|
} |
|
} |
if (@lines) { |
if (@lines) { |
my (%counts,$max_match_format); |
my (%counts,$max_match_format); |
my ($found_match_count,$max_match_count,$max_match_pct) = (0,0,0); |
my ($found_match_count,$max_match_count,$max_match_pct) = (0,0,0); |
Line 9286 sub validate_uploaded_scantron_file {
|
Line 9508 sub validate_uploaded_scantron_file {
|
%{$counts{$key}} = ( |
%{$counts{$key}} = ( |
'found' => 0, |
'found' => 0, |
'total' => 0, |
'total' => 0, |
|
'totalanysec' => 0, |
|
'othersec' => 0, |
); |
); |
foreach my $line (@lines) { |
foreach my $line (@lines) { |
next if ($line =~ /^#/); |
next if ($line =~ /^#/); |
Line 9293 sub validate_uploaded_scantron_file {
|
Line 9517 sub validate_uploaded_scantron_file {
|
my $id = substr($line,$idstart-1,$idlength); |
my $id = substr($line,$idstart-1,$idlength); |
$id = lc($id); |
$id = lc($id); |
if (exists($idmap{$id})) { |
if (exists($idmap{$id})) { |
|
if ($checksec ne '') { |
|
$counts{$key}{'totalanysec'} ++; |
|
if (ref($classlist->{$idmap{$id}}) eq 'ARRAY') { |
|
my $stusec = $classlist->{$idmap{$id}}->[$secidx]; |
|
if ($stusec ne $checksec) { |
|
if (@possibles) { |
|
unless (grep(/^\Q$stusec\E$/,@possibles)) { |
|
$counts{$key}{'othersec'} ++; |
|
next; |
|
} |
|
} else { |
|
$counts{$key}{'othersec'} ++; |
|
next; |
|
} |
|
} |
|
} |
|
} |
$counts{$key}{'found'} ++; |
$counts{$key}{'found'} ++; |
} |
} |
$counts{$key}{'total'} ++; |
$counts{$key}{'total'} ++; |
Line 9307 sub validate_uploaded_scantron_file {
|
Line 9548 sub validate_uploaded_scantron_file {
|
} |
} |
} |
} |
} |
} |
if (ref($unique_formats{$max_match_format}) eq 'ARRAY') { |
if ((ref($unique_formats{$max_match_format}) eq 'ARRAY') && ($context ne 'download')) { |
my $format_descs; |
my $format_descs; |
my $numwithformat = @{$unique_formats{$max_match_format}}; |
my $numwithformat = @{$unique_formats{$max_match_format}}; |
for (my $i=0; $i<$numwithformat; $i++) { |
for (my $i=0; $i<$numwithformat; $i++) { |
Line 9352 sub validate_uploaded_scantron_file {
|
Line 9593 sub validate_uploaded_scantron_file {
|
'<li>'.&mt('The course roster is not up to date.').'</li>'. |
'<li>'.&mt('The course roster is not up to date.').'</li>'. |
'</ul>'; |
'</ul>'; |
} |
} |
|
if (($checksec ne '') && (ref($counts{$max_match_format}) eq 'HASH')) { |
|
if ($counts{$max_match_format}{'othersec'}) { |
|
my $percent_nongrade = (100*$counts{$max_match_format}{'othersec'})/($counts{$max_match_format}{'totalanysec'}); |
|
my $showpct = sprintf("%.0f",$percent_nongrade).'%'; |
|
my $confirmdel = &mt('Are you sure you want to permanently delete this file?'); |
|
&js_escape(\$confirmdel); |
|
$output .= '<p class="LC_warning">'. |
|
&mt('Comparison of student IDs in the uploaded file with the course roster found [_1][quant,_2,match,matches][_3] for students in section(s) for which none of your role(s) have privileges to modify grades', |
|
'<b>',$counts{$max_match_format}{'othersec'},'</b>'). |
|
'<br />'. |
|
&mt('Unless you are assigned role(s) which allow modification of grades in additional sections, [_1] of the records in this file will be automatically excluded when you perform bubblesheet grading.','<b>'.$showpct.'</b>'). |
|
'</p><p>'. |
|
&mt('If you prefer to delete the file now, use: [_1]'). |
|
'<form method="post" name="delupload" action="/adm/grades">'. |
|
'<input type="hidden" name="symb" value="'.$symb.'" />'. |
|
'<input type="hidden" name="domainid" value="'.$cdom.'" />'. |
|
'<input type="hidden" name="courseid" value="'.$cname.'" />'. |
|
'<input type="hidden" name="coursesec" value="'.$env{'request.course.sec'}.'" />'. |
|
'<input type="hidden" name="uploadedfile" value="'.$fname.'" />'. |
|
'<input type="hidden" name="command" value="scantronupload_delete" />'. |
|
'<input type="button" name="delbutton" value="'.&mt('Delete Uploaded File').'" onclick="javascript:if (confirm('."'$confirmdel'".')) { document.delupload.submit(); }" />'. |
|
'</form></p>'; |
|
} |
|
} |
} |
} |
} else { |
if (($context eq 'download') && ($checksec ne '')) { |
|
if ((ref($countsref) eq 'HASH') && (ref($counts{$max_match_format}) eq 'HASH')) { |
|
$countsref->{'totalanysec'} = $counts{$max_match_format}{'totalanysec'}; |
|
$countsref->{'othersec'} = $counts{$max_match_format}{'othersec'}; |
|
} |
|
} |
|
} elsif ($context ne 'download') { |
$output = '<p class="LC_warning">'.&mt('Uploaded file contained no data').'</p>'; |
$output = '<p class="LC_warning">'.&mt('Uploaded file contained no data').'</p>'; |
} |
} |
return $output; |
return $output; |
} |
} |
|
|
|
sub gradable_sections { |
|
my $checksec = $env{'request.course.sec'}; |
|
my @oksecs; |
|
if ($checksec) { |
|
my %availablesecs = §ions_grade_privs(); |
|
if (ref($availablesecs{'mgr'}) eq 'ARRAY') { |
|
foreach my $sec (@{$availablesecs{'mgr'}}) { |
|
unless (grep(/^\Q$sec\E$/,@oksecs)) { |
|
push(@oksecs,$sec); |
|
} |
|
} |
|
if (grep(/^all$/,@oksecs)) { |
|
undef($checksec); |
|
} |
|
} |
|
} |
|
return($checksec,@oksecs); |
|
} |
|
|
|
sub sections_grade_privs { |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my %availablesecs = ( |
|
mgr => [], |
|
vgr => [], |
|
usc => [], |
|
); |
|
my $ccrole = 'cc'; |
|
if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') { |
|
$ccrole = 'co'; |
|
} |
|
my %crsroleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'}, |
|
'userroles',['active'], |
|
[$ccrole,'in','cr'],$cdom,1); |
|
my $crsid = $cnum.':'.$cdom; |
|
foreach my $item (keys(%crsroleshash)) { |
|
next unless ($item =~ /^$crsid\:/); |
|
my ($crsnum,$crsdom,$role,$sec) = split(/\:/,$item); |
|
my $suffix = "/$cdom/$cnum./$cdom/$cnum"; |
|
if ($sec ne '') { |
|
$suffix = "/$cdom/$cnum/$sec./$cdom/$cnum/$sec"; |
|
} |
|
if (($role eq $ccrole) || ($role eq 'in')) { |
|
foreach my $priv ('mgr','vgr','usc') { |
|
unless (grep(/^all$/,@{$availablesecs{$priv}})) { |
|
if ($sec eq '') { |
|
$availablesecs{$priv} = ['all']; |
|
} elsif ($sec ne $env{'request.course.sec'}) { |
|
unless (grep(/^\Q$sec\E$/,@{$availablesecs{$priv}})) { |
|
push(@{$availablesecs{$priv}},$sec); |
|
} |
|
} |
|
} |
|
} |
|
} elsif ($role =~ m{^cr/}) { |
|
foreach my $priv ('mgr','vgr','usc') { |
|
unless (grep(/^all$/,@{$availablesecs{$priv}})) { |
|
if ($env{"user.priv.$role.$suffix"} =~ /:$priv&/) { |
|
if ($sec eq '') { |
|
$availablesecs{$priv} = ['all']; |
|
} elsif ($sec ne $env{'request.course.sec'}) { |
|
unless (grep(/^\Q$sec\E$/,@{$availablesecs{$priv}})) { |
|
push(@{$availablesecs{$priv}},$sec); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return %availablesecs; |
|
} |
|
|
|
sub scantron_upload_delete { |
|
my ($r,$symb) = @_; |
|
my $filename = $env{'form.uploadedfile'}; |
|
if ($filename =~ /^scantron_orig_/) { |
|
if (&Apache::lonnet::allowed('usc',$env{'form.domainid'}) || |
|
&Apache::lonnet::allowed('usc', |
|
$env{'form.domainid'}.'_'.$env{'form.courseid'}) || |
|
&Apache::lonnet::allowed('usc', |
|
$env{'form.domainid'}.'_'.$env{'form.courseid'}.'/'.$env{'form.coursesec'})) { |
|
my $uploadurl = '/uploaded/'.$env{'form.domainid'}.'/'.$env{'form.courseid'}.'/'.$env{'form.uploadedfile'}; |
|
my $retrieval = &Apache::lonnet::getfile($uploadurl); |
|
if ($retrieval eq '-1') { |
|
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'<br />'. |
|
&mt('File requested for deletion not found.')); |
|
} else { |
|
$filename =~ s/^scantron_orig_//; |
|
if ($filename ne '') { |
|
my ($is_valid,$numleft); |
|
my %info = &Apache::lonnet::get('scantronupload',[$filename],$env{'form.domainid'},$env{'form.courseid'}); |
|
if (keys(%info)) { |
|
if (ref($info{$filename}) eq 'HASH') { |
|
foreach my $timestamp (sort(keys(%{$info{$filename}}))) { |
|
if ($info{$filename}{$timestamp} eq $env{'user.name'}.':'.$env{'user.domain'}) { |
|
$is_valid = 1; |
|
delete($info{$filename}{$timestamp}); |
|
} |
|
} |
|
$numleft = scalar(keys(%{$info{$filename}})); |
|
} |
|
} |
|
if ($is_valid) { |
|
my $result = &Apache::lonnet::removeuploadedurl($uploadurl); |
|
if ($result eq 'ok') { |
|
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion successful')).'<br />'); |
|
if ($numleft) { |
|
&Apache::lonnet::put('scantronupload',\%info,$env{'form.domainid'},$env{'form.courseid'}); |
|
} else { |
|
&Apache::lonnet::del('scantronupload',[$filename],$env{'form.domainid'},$env{'form.courseid'}); |
|
} |
|
} else { |
|
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'<br />'. |
|
&mt('Result was [_1]',$result)); |
|
} |
|
} else { |
|
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'<br />'. |
|
&mt('File requested for deletion was uploaded by a different user.')); |
|
} |
|
} else { |
|
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'<br />'. |
|
&mt('Filename of bubblesheet data file requested for deletion is invalid.')); |
|
} |
|
} |
|
} else { |
|
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'<br />'. |
|
&mt('You are not permitted to delete bubblesheet data files from the requested course.')); |
|
} |
|
} else { |
|
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'<br />'. |
|
&mt('Filename of bubblesheet data file requested for deletion is invalid.')); |
|
} |
|
return; |
|
} |
|
|
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 9368 sub valid_file {
|
Line 9775 sub valid_file {
|
} |
} |
|
|
sub scantron_download_scantron_data { |
sub scantron_download_scantron_data { |
my ($r,$symb)=@_; |
my ($r,$symb) = @_; |
my $default_form_data=&defaultFormData($symb); |
my $default_form_data=&defaultFormData($symb); |
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
Line 9381 sub scantron_download_scantron_data {
|
Line 9788 sub scantron_download_scantron_data {
|
'); |
'); |
return; |
return; |
} |
} |
|
my (%uploader,$is_owner,%counts,$percent); |
|
my %uploader = &Apache::lonnet::get('scantronupload',[$file],$cdom,$cname); |
|
if (ref($uploader{$file}) eq 'HASH') { |
|
foreach my $timestamp (sort { $a <=> $b } keys(%{$uploader{$file}})) { |
|
if ($uploader{$file}{$timestamp} eq $env{'user.name'}.':'.$env{'user.domain'}) { |
|
$is_owner = 1; |
|
last; |
|
} |
|
} |
|
} |
|
unless ($is_owner) { |
|
&validate_uploaded_scantron_file($cdom,$cname,$symb,'scantron_orig_'.$file,'download',\%counts); |
|
if ($counts{'totalanysec'}) { |
|
my $percent_othersec = (100*$counts{'othersec'})/($counts{'totalanysec'}); |
|
if ($percent_othersec >= 10) { |
|
my $showpct = sprintf("%.0f",$percent_othersec).'%'; |
|
$r->print('<p class="LC_warning">'. |
|
&mt('The original uploaded file includes [_1] or more of records for students for which none of your roles have rights to modify grades, so files are unavailable for download.',$showpct). |
|
'</p>'); |
|
return; |
|
} |
|
} |
|
} |
my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file; |
my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file; |
my $corrected='/uploaded/'.$cdom.'/'.$cname.'/scantron_corrected_'.$file; |
my $corrected='/uploaded/'.$cdom.'/'.$cname.'/scantron_corrected_'.$file; |
my $skipped='/uploaded/'.$cdom.'/'.$cname.'/scantron_skipped_'.$file; |
my $skipped='/uploaded/'.$cdom.'/'.$cname.'/scantron_skipped_'.$file; |
Line 9417 sub checkscantron_results {
|
Line 9847 sub checkscantron_results {
|
my %scantron_config = |
my %scantron_config = |
&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); |
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); |
my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
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(); |
Line 9739 sub verify_scantron_grading {
|
Line 10169 sub verify_scantron_grading {
|
return ($counter,$record); |
return ($counter,$record); |
} |
} |
|
|
|
|
#-------- end of section for handling grading scantron forms ------- |
#-------- end of section for handling grading scantron forms ------- |
# |
# |
#------------------------------------------------------------------- |
#------------------------------------------------------------------- |
Line 9794 sub grading_menu {
|
Line 10223 sub grading_menu {
|
icon => 'grade_students.png', |
icon => 'grade_students.png', |
linktitle => 'Grade current resource for a selection of students.' |
linktitle => 'Grade current resource for a selection of students.' |
}, |
}, |
{ linktext => 'Grade ungraded submissions.', |
{ linktext => 'Grade ungraded submissions', |
url => $url1b, |
url => $url1b, |
permission => 'F', |
permission => 'F', |
icon => 'ungrade_sub.png', |
icon => 'ungrade_sub.png', |
Line 9860 sub grading_menu {
|
Line 10289 sub grading_menu {
|
return $Str; |
return $Str; |
} |
} |
|
|
|
|
sub ungraded { |
sub ungraded { |
my ($request)=@_; |
my ($request)=@_; |
&submit_options($request); |
&submit_options($request); |
Line 9943 sub submit_options {
|
Line 10371 sub submit_options {
|
<input type="submit" value="'.&mt('Next').' →" /> |
<input type="submit" value="'.&mt('Next').' →" /> |
</div> |
</div> |
</div> |
</div> |
|
|
|
|
</form>'; |
</form>'; |
return $result; |
return $result; |
} |
} |
Line 10024 sub reset_perm {
|
Line 10450 sub reset_perm {
|
|
|
sub init_perm { |
sub init_perm { |
&reset_perm(); |
&reset_perm(); |
foreach my $test_perm ('vgr','mgr','opa') { |
foreach my $test_perm ('vgr','mgr','opa','usc') { |
|
|
my $scope = $env{'request.course.id'}; |
my $scope = $env{'request.course.id'}; |
if (!($perm{$test_perm}=&Apache::lonnet::allowed($test_perm,$scope))) { |
if (!($perm{$test_perm}=&Apache::lonnet::allowed($test_perm,$scope))) { |
Line 10212 ENDUPFORM
|
Line 10638 ENDUPFORM
|
<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'}" /> |
ENDGRADINGFORM |
ENDGRADINGFORM |
$result.='</td>'.&Apache::loncommon::end_data_table_row(). |
$result.='</td>'.&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::start_data_table_row().'<td>'.(<<ENDPERCFORM); |
&Apache::loncommon::start_data_table_row().'<td>'.(<<ENDPERCFORM); |
<label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onchange="sanitycheck()" /></label> |
<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> |
ENDPERCFORM |
ENDPERCFORM |
$result.='</td>'. |
$result.='</td>'. |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table_row(). |
Line 10226 ENDPERCFORM
|
Line 10652 ENDPERCFORM
|
} |
} |
|
|
sub process_clicker_file { |
sub process_clicker_file { |
my ($r,$symb)=@_; |
my ($r,$symb) = @_; |
if (!$symb) {return '';} |
if (!$symb) {return '';} |
|
|
my %Saveable_Parameters=&clicker_grading_parameters(); |
my %Saveable_Parameters=&clicker_grading_parameters(); |
Line 10556 sub turning_eval {
|
Line 10982 sub turning_eval {
|
|
|
|
|
sub assign_clicker_grades { |
sub assign_clicker_grades { |
my ($r,$symb)=@_; |
my ($r,$symb) = @_; |
if (!$symb) {return '';} |
if (!$symb) {return '';} |
# See which part we are saving to |
# See which part we are saving to |
my $res_error; |
my $res_error; |
Line 10567 sub assign_clicker_grades {
|
Line 10993 sub assign_clicker_grades {
|
# 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=&Apache::loncommon::start_data_table(). |
my $result = &Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
'<th>'.&mt('Assigning grades based on clicker file').'</th>'. |
'<th>'.&mt('Assigning grades based on clicker file').'</th>'. |
&Apache::loncommon::end_data_table_header_row(). |
&Apache::loncommon::end_data_table_header_row(). |
&Apache::loncommon::start_data_table_row().'<td>'; |
&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 10633 sub assign_clicker_grades {
|
Line 11059 sub assign_clicker_grades {
|
for (my $i=0;$i<$number;$i++) { |
for (my $i=0;$i<$number;$i++) { |
if ($correct[$i] eq '-') { |
if ($correct[$i] eq '-') { |
$realnumber--; |
$realnumber--; |
} elsif (($answer[$i]) || ($answer[$i]=~/^[0\.]+$/)) { |
} elsif (($answer[$i]) || ($answer[$i]=~/^[0\.]+$/)) { |
if ($gradingmechanism eq 'attendance') { |
if ($gradingmechanism eq 'attendance') { |
$sum+=$pcorrect; |
$sum+=$pcorrect; |
} elsif ($correct[$i] eq '*') { |
} elsif ($correct[$i] eq '*') { |
Line 10707 sub startpage {
|
Line 11133 sub startpage {
|
unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"}); |
unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"}); |
$args{'bread_crumbs'} = $crumbs; |
$args{'bread_crumbs'} = $crumbs; |
$r->print(&Apache::loncommon::start_page('Grading',$js,\%args)); |
$r->print(&Apache::loncommon::start_page('Grading',$js,\%args)); |
&Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading')); |
if ($env{'request.course.id'}) { |
|
&Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading')); |
|
} |
} |
} |
unless ($nodisplayflag) { |
unless ($nodisplayflag) { |
$r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp)); |
$r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp)); |
Line 10903 sub handler {
|
Line 11331 sub handler {
|
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
$request->print(&scantron_process_students($request,$symb)); |
$request->print(&scantron_process_students($request,$symb)); |
} elsif ($command eq 'scantronupload' && |
} elsif ($command eq 'scantronupload' && |
(&Apache::lonnet::allowed('usc',$env{'request.role.domain'})|| |
(&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || $perm{'usc'})) { |
&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) { |
|
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1, |
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1, |
undef,undef,undef,undef,'toggleScantab(document.rules);'); |
undef,undef,undef,undef,'toggleScantab(document.rules);'); |
$request->print(&scantron_upload_scantron_data($request,$symb)); |
$request->print(&scantron_upload_scantron_data($request,$symb)); |
} elsif ($command eq 'scantronupload_save' && |
} elsif ($command eq 'scantronupload_save' && |
(&Apache::lonnet::allowed('usc',$env{'request.role.domain'})|| |
(&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || $perm{'usc'})) { |
&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) { |
|
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
$request->print(&scantron_upload_scantron_data_save($request,$symb)); |
$request->print(&scantron_upload_scantron_data_save($request,$symb)); |
} elsif ($command eq 'scantron_download' && |
} elsif ($command eq 'scantron_download' && ($perm{'usc'} || $perm{'mgr'})) { |
&Apache::lonnet::allowed('usc',$env{'request.course.id'})) { |
|
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
$request->print(&scantron_download_scantron_data($request,$symb)); |
$request->print(&scantron_download_scantron_data($request,$symb)); |
|
} elsif ($command eq 'scantronupload_delete' && |
|
(&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || $perm{'usc'})) { |
|
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
|
&scantron_upload_delete($request,$symb); |
} elsif ($command eq 'checksubmissions' && $perm{'vgr'}) { |
} elsif ($command eq 'checksubmissions' && $perm{'vgr'}) { |
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
$request->print(&checkscantron_results($request,$symb)); |
$request->print(&checkscantron_results($request,$symb)); |
Line 10938 sub handler {
|
Line 11367 sub handler {
|
} |
} |
if ($env{'form.inhibitmenu'}) { |
if ($env{'form.inhibitmenu'}) { |
$request->print(&Apache::loncommon::end_page()); |
$request->print(&Apache::loncommon::end_page()); |
} else { |
} elsif ($env{'request.course.id'}) { |
&Apache::lonquickgrades::endGradeScreen($request); |
&Apache::lonquickgrades::endGradeScreen($request); |
} |
} |
&reset_caches(); |
&reset_caches(); |
Line 11176 Side Effects: None.
|
Line 11605 Side Effects: None.
|
=item scantron_upload_scantron_data_save() : |
=item scantron_upload_scantron_data_save() : |
|
|
Adds a provided bubble information data file to the course if user |
Adds a provided bubble information data file to the course if user |
has the correct privileges to do so. |
has the correct privileges to do so. |
|
|
|
= item scantron_upload_delete() : |
|
|
|
Deletes a previously uploaded bubble information data file, if user |
|
was the one who uploaded the file, and has the privileges to do so. |
|
|
=item valid_file() : |
=item valid_file() : |
|
|