|
version 1.596.2.7, 2011/10/10 22:45:20
|
version 1.806, 2024/12/14 17:47:39
|
|
Line 43 use Apache::lonmsg();
|
Line 43 use Apache::lonmsg();
|
| use Apache::Constants qw(:common :http); |
use Apache::Constants qw(:common :http); |
| use Apache::lonlocal; |
use Apache::lonlocal; |
| use Apache::lonenc; |
use Apache::lonenc; |
| |
use Apache::lonstathelpers; |
| |
use Apache::lonquickgrades; |
| use Apache::bridgetask(); |
use Apache::bridgetask(); |
| |
use Apache::lontexconvert(); |
| |
use Apache::loncourserespicker; |
| use String::Similarity; |
use String::Similarity; |
| |
use HTML::Parser(); |
| |
use File::MMagic; |
| use LONCAPA; |
use LONCAPA; |
| |
use LONCAPA::ltiutils(); |
| |
|
| use POSIX qw(floor); |
use POSIX qw(floor); |
| |
|
| |
|
| |
|
| my %perm=(); |
my %perm=(); |
| |
my %old_essays=(); |
| |
|
| # These variables are used to recover from ssi errors |
# These variables are used to recover from ssi errors |
| |
|
|
Line 59 my $ssi_retries = 5;
|
Line 67 my $ssi_retries = 5;
|
| my $ssi_error; |
my $ssi_error; |
| my $ssi_error_resource; |
my $ssi_error_resource; |
| my $ssi_error_message; |
my $ssi_error_message; |
| |
my $registered_cleanup; |
| |
|
| sub ssi_with_retries { |
sub ssi_with_retries { |
| my ($resource, $retries, %form) = @_; |
my ($resource, $retries, %form) = @_; |
|
Line 97 sub ssi_print_error {
|
Line 105 sub ssi_print_error {
|
| |
|
| # |
# |
| # --- Retrieve the parts from the metadata file.--- |
# --- Retrieve the parts from the metadata file.--- |
| |
# Returns an array of everything that the resources stores away |
| |
# |
| |
|
| sub getpartlist { |
sub getpartlist { |
| my ($symb,$errorref) = @_; |
my ($symb,$errorref) = @_; |
| |
|
|
Line 110 sub getpartlist {
|
Line 121 sub getpartlist {
|
| 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(); |
| my @metakeys = split(/,/,&Apache::lonnet::metadata($url,'keys')); |
my $toolsymb; |
| |
if ($url =~ /ext\.tool$/) { |
| |
$toolsymb = $symb; |
| |
} |
| |
my @metakeys = split(/,/,&Apache::lonnet::metadata($url,'keys',$toolsymb)); |
| |
|
| my @stores; |
my @stores; |
| foreach my $part (@{ $partlist }) { |
foreach my $part (@{ $partlist }) { |
|
Line 121 sub getpartlist {
|
Line 136 sub getpartlist {
|
| return @stores; |
return @stores; |
| } |
} |
| |
|
| # --- Get the symbolic name of a problem and the url |
|
| sub get_symb { |
|
| my ($request,$silent) = @_; |
|
| (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; |
|
| my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url))); |
|
| if ($symb eq '') { |
|
| if (!$silent) { |
|
| $request->print(&mt("Unable to handle ambiguous references: [_1].",$url)); |
|
| return (); |
|
| } |
|
| } |
|
| &Apache::lonenc::check_decrypt(\$symb); |
|
| return ($symb); |
|
| } |
|
| |
|
| #--- Format fullname, username:domain if different for display |
#--- Format fullname, username:domain if different for display |
| #--- Use anywhere where the student names are listed |
#--- Use anywhere where the student names are listed |
| sub nameUserString { |
sub nameUserString { |
|
Line 149 sub nameUserString {
|
Line 149 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. --- |
#--- Count responseIDs, essayresponse items, and dropbox items --- |
| |
#--- Sets response_error pointer to "1" if navmaps object broken --- |
| sub response_type { |
sub response_type { |
| my ($symb,$response_error) = @_; |
my ($symb,$response_error) = @_; |
| |
|
|
Line 166 sub response_type {
|
Line 167 sub response_type {
|
| return; |
return; |
| } |
} |
| my $partlist = $res->parts(); |
my $partlist = $res->parts(); |
| |
my ($numresp,$numessay,$numdropbox) = (0,0,0); |
| my %vPart = |
my %vPart = |
| map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart')); |
map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart')); |
| my (%response_types,%handgrade); |
my (%response_types,%handgrade); |
|
Line 175 sub response_type {
|
Line 177 sub response_type {
|
| my @types = $res->responseType($part); |
my @types = $res->responseType($part); |
| my @ids = $res->responseIds($part); |
my @ids = $res->responseIds($part); |
| for (my $i=0; $i < scalar(@ids); $i++) { |
for (my $i=0; $i < scalar(@ids); $i++) { |
| |
$numresp ++; |
| $response_types{$part}{$ids[$i]} = $types[$i]; |
$response_types{$part}{$ids[$i]} = $types[$i]; |
| |
if ($types[$i] eq 'essay') { |
| |
$numessay ++; |
| |
if (&Apache::lonnet::EXT("resource.$part".'_'.$ids[$i].".uploadedfiletypes",$symb)) { |
| |
$numdropbox ++; |
| |
} |
| |
} |
| $handgrade{$part.'_'.$ids[$i]} = |
$handgrade{$part.'_'.$ids[$i]} = |
| &Apache::lonnet::EXT('resource.'.$part.'_'.$ids[$i]. |
&Apache::lonnet::EXT('resource.'.$part.'_'.$ids[$i]. |
| '.handgrade',$symb); |
'.handgrade',$symb); |
| } |
} |
| } |
} |
| return ($partlist,\%handgrade,\%response_types); |
return ($partlist,\%handgrade,\%response_types,$numresp,$numessay,$numdropbox); |
| } |
} |
| |
|
| sub flatten_responseType { |
sub flatten_responseType { |
|
Line 208 sub get_display_part {
|
Line 217 sub get_display_part {
|
| return $display; |
return $display; |
| } |
} |
| |
|
| #--- Show resource title |
#--- Show parts and response type |
| #--- and parts and response type |
|
| sub showResourceInfo { |
sub showResourceInfo { |
| my ($symb,$probTitle,$checkboxes,$res_error) = @_; |
my ($symb,$partlist,$responseType,$formname,$checkboxes,$uploads) = @_; |
| my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n"; |
unless ((ref($partlist) eq 'ARRAY') && (ref($responseType) eq 'HASH')) { |
| my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error); |
return '<br clear="all">'; |
| if (ref($res_error)) { |
} |
| if ($$res_error) { |
my $coltitle = &mt('Problem Part Shown'); |
| return; |
if ($checkboxes) { |
| |
$coltitle = &mt('Problem Part'); |
| |
} else { |
| |
my $checkedparts = 0; |
| |
foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) { |
| |
if (grep(/^\Q$partid\E$/,@{$partlist})) { |
| |
$checkedparts ++; |
| |
} |
| |
} |
| |
if ($checkedparts == scalar(@{$partlist})) { |
| |
return '<br clear="all">'; |
| |
} |
| |
if ($uploads) { |
| |
$coltitle = &mt('Problem Part Selected'); |
| } |
} |
| } |
} |
| $result.=&Apache::loncommon::start_data_table() |
my $result = '<div class="LC_left_float" style="display:inline-block;">'; |
| .&Apache::loncommon::start_data_table_header_row(); |
|
| if ($checkboxes) { |
if ($checkboxes) { |
| $result.='<th> </th>'; |
my $legend = &mt('Parts to display'); |
| |
if ($uploads) { |
| |
$legend = &mt('Part(s) with dropbox'); |
| |
} |
| |
$result .= '<fieldset style="display:inline-block;"><legend>'.$legend.'</legend>'. |
| |
'<span class="LC_nobreak">'. |
| |
'<label><input type="radio" name="chooseparts" value="0" onclick="toggleParts('."'$formname'".');" checked="checked" />'. |
| |
&mt('All parts').'</label>'.(' 'x2). |
| |
'<label><input type="radio" name="chooseparts" value="1" onclick="toggleParts('."'$formname'".');" />'. |
| |
&mt('Selected parts').'</label></span>'. |
| |
'<div id="LC_partselector" style="display:none">'; |
| } |
} |
| $result.='<th>'.&mt('Problem Part').'</th>' |
$result .= &Apache::loncommon::start_data_table() |
| .'<th>'.&mt('Res. ID').'</th>' |
.&Apache::loncommon::start_data_table_header_row(); |
| .'<th>'.&mt('Type').'</th>' |
if ($checkboxes) { |
| .&Apache::loncommon::end_data_table_header_row(); |
$result .= '<th>'.&mt('Display?').'</th>'; |
| my %resptype = (); |
} |
| my $hdgrade='no'; |
$result .= '<th>'.$coltitle.'</th>' |
| |
.'<th>'.&mt('Res. ID').'</th>' |
| |
.'<th>'.&mt('Type').'</th>' |
| |
.&Apache::loncommon::end_data_table_header_row(); |
| 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 $responsetype = $responseType->{$partID}->{$resID}; |
my $responsetype = $responseType->{$partID}->{$resID}; |
| $hdgrade = $handgrade if ($handgrade eq 'yes'); |
if ($uploads) { |
| $result.=&Apache::loncommon::start_data_table_row(); |
next unless ($responsetype eq 'essay'); |
| if ($checkboxes) { |
next unless (&Apache::lonnet::EXT("resource.$partID".'_'."$resID.uploadedfiletypes",$symb)); |
| if (exists($partsseen{$partID})) { |
} |
| $result.="<td> </td>"; |
my $display_part=&get_display_part($partID,$symb); |
| |
if (exists($partsseen{$partID})) { |
| |
$result.=&Apache::loncommon::continue_data_table_row(); |
| |
} else { |
| |
$partsseen{$partID}=scalar(keys(%{$responseType->{$partID}})); |
| |
$result.=&Apache::loncommon::start_data_table_row(). |
| |
'<td rowspan="'.$partsseen{$partID}.'" style="vertical-align:middle">'; |
| |
if ($checkboxes) { |
| |
$result.='<input type="checkbox" name="vPart" checked="checked" value="'.$partID.'" /></td>'. |
| |
'<td rowspan="'.$partsseen{$partID}.'" style="vertical-align:middle">'.$display_part.'</td>'; |
| } else { |
} else { |
| $result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>"; |
$result.=$display_part.'</td>'; |
| } |
} |
| $partsseen{$partID}=1; |
|
| } |
} |
| my $display_part=&get_display_part($partID,$symb); |
$result.='<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>' |
| $result.='<td>'.$display_part.'</td>' |
|
| .'<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>' |
|
| .'<td>'.&mt($responsetype).'</td>' |
.'<td>'.&mt($responsetype).'</td>' |
| # .'<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td>' |
|
| .&Apache::loncommon::end_data_table_row(); |
.&Apache::loncommon::end_data_table_row(); |
| } |
} |
| } |
} |
| $result.=&Apache::loncommon::end_data_table(); |
$result.=&Apache::loncommon::end_data_table(); |
| return $result,$responseType,$hdgrade,$partlist,$handgrade; |
if ($checkboxes) { |
| |
$result .= '</div></fieldset>'; |
| |
} |
| |
$result .= '</div><div style="padding:0;clear:both;margin:0;border:0"></div>'; |
| |
if (!keys(%partsseen)) { |
| |
$result = ''; |
| |
if ($uploads) { |
| |
return '<div style="padding:0;clear:both;margin:0;border:0"></div>'. |
| |
'<p class="LC_info">'. |
| |
&mt('No dropbox items or essayresponse items with uploadedfiletypes set.'). |
| |
'</p>'; |
| |
} else { |
| |
return '<br clear="all" />'; |
| |
} |
| |
} |
| |
return $result; |
| |
} |
| |
|
| |
sub part_selector_js { |
| |
my $js = <<"END"; |
| |
function toggleParts(formname) { |
| |
if (document.getElementById('LC_partselector')) { |
| |
var index = ''; |
| |
if (document.forms.length) { |
| |
for (var i=0; i<document.forms.length; i++) { |
| |
if (document.forms[i].name == formname) { |
| |
index = i; |
| |
break; |
| |
} |
| |
} |
| |
} |
| |
if ((index != '') && (document.forms[index].elements['chooseparts'].length > 1)) { |
| |
for (var i=0; i<document.forms[index].elements['chooseparts'].length; i++) { |
| |
if (document.forms[index].elements['chooseparts'][i].checked) { |
| |
var val = document.forms[index].elements['chooseparts'][i].value; |
| |
if (document.forms[index].elements['chooseparts'][i].value == 1) { |
| |
document.getElementById('LC_partselector').style.display = 'block'; |
| |
} else { |
| |
document.getElementById('LC_partselector').style.display = 'none'; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
END |
| |
return &Apache::lonhtmlcommon::scripttag($js); |
| } |
} |
| |
|
| sub reset_caches { |
sub reset_caches { |
| &reset_analyze_cache(); |
&reset_analyze_cache(); |
| &reset_perm(); |
&reset_perm(); |
| |
&reset_old_essays(); |
| } |
} |
| |
|
| { |
{ |
|
Line 272 sub reset_caches {
|
Line 356 sub reset_caches {
|
| } |
} |
| |
|
| sub get_analyze { |
sub get_analyze { |
| my ($symb,$uname,$udom,$no_increment,$add_to_hash,$type,$trial,$rndseed)=@_; |
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"; |
| if ($type eq 'randomizetry') { |
if ($type eq 'randomizetry') { |
| if ($trial ne '') { |
if ($trial ne '') { |
|
Line 306 sub reset_caches {
|
Line 390 sub reset_caches {
|
| 'grade_courseid' => $env{'request.course.id'}, |
'grade_courseid' => $env{'request.course.id'}, |
| 'grade_username' => $uname, |
'grade_username' => $uname, |
| 'grade_noincrement' => $no_increment); |
'grade_noincrement' => $no_increment); |
| |
if ($bubbles_per_row ne '') { |
| |
$form{'bubbles_per_row'} = $bubbles_per_row; |
| |
} |
| if ($type eq 'randomizetry') { |
if ($type eq 'randomizetry') { |
| $form{'grade_questiontype'} = $type; |
$form{'grade_questiontype'} = $type; |
| if ($rndseed ne '') { |
if ($rndseed ne '') { |
|
Line 346 sub reset_caches {
|
Line 433 sub reset_caches {
|
| } |
} |
| |
|
| sub scantron_partids_tograde { |
sub scantron_partids_tograde { |
| my ($resource,$cid,$uname,$udom,$check_for_randomlist) = @_; |
my ($resource,$cid,$uname,$udom,$check_for_randomlist,$bubbles_per_row,$scancode) = @_; |
| my (%analysis,@parts); |
my (%analysis,@parts); |
| if (ref($resource)) { |
if (ref($resource)) { |
| my $symb = $resource->symb(); |
my $symb = $resource->symb(); |
|
Line 354 sub reset_caches {
|
Line 441 sub reset_caches {
|
| if ($check_for_randomlist) { |
if ($check_for_randomlist) { |
| $add_to_form = { 'check_parts_withrandomlist' => 1,}; |
$add_to_form = { 'check_parts_withrandomlist' => 1,}; |
| } |
} |
| my $analyze = &get_analyze($symb,$uname,$udom,undef,$add_to_form); |
if ($scancode) { |
| |
if (ref($add_to_form) eq 'HASH') { |
| |
$add_to_form->{'code_for_randomlist'} = $scancode; |
| |
} else { |
| |
$add_to_form = { 'code_for_randomlist' => $scancode,}; |
| |
} |
| |
} |
| |
my $analyze = |
| |
&get_analyze($symb,$uname,$udom,undef,$add_to_form, |
| |
undef,undef,undef,$bubbles_per_row); |
| if (ref($analyze) eq 'HASH') { |
if (ref($analyze) eq 'HASH') { |
| %analysis = %{$analyze}; |
%analysis = %{$analyze}; |
| } |
} |
|
Line 381 sub cleanRecord {
|
Line 477 sub cleanRecord {
|
| 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); |
| |
my @answer = %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 397 sub cleanRecord {
|
Line 495 sub cleanRecord {
|
| $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 @answer = %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 416 sub cleanRecord {
|
Line 516 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 @answer = %answer; |
| |
%answer = map {&HTML::Entities::encode($_, '"<>&')} @answer; |
| my ($toprow,$bottomrow); |
my ($toprow,$bottomrow); |
| my $correct = |
my $correct = |
| &get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed); |
&get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed); |
|
Line 451 sub cleanRecord {
|
Line 553 sub cleanRecord {
|
| $env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : ''; |
$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : ''; |
| $env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob. |
$env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob. |
| } |
} |
| $answer =~ s-\n-<br />-g; |
$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='Smile representation: "<tt>'.$answer.'</tt>"'; |
my $result=&mt('Smile representation: [_1]', |
| |
'"<tt>'.&HTML::Entities::encode($answer, '"<>&').'</tt>"'); |
| my $jme=$record->{$version."resource.$partid.$respid.molecule"}; |
my $jme=$record->{$version."resource.$partid.$respid.molecule"}; |
| $result.=&Apache::chemresponse::jme_img($jme,$answer,400); |
$result.=&Apache::chemresponse::jme_img($jme,$answer,400); |
| return $result; |
return $result; |
|
Line 488 sub cleanRecord {
|
Line 591 sub cleanRecord {
|
| $result.='</ul>'; |
$result.='</ul>'; |
| return $result; |
return $result; |
| } |
} |
| } elsif ( $response =~ m/(?:numerical|formula)/) { |
} elsif ( $response =~ m/(?:numerical|formula|custom)/) { |
| |
# Respect multiple input fields, see Bug #5409 |
| $answer = |
$answer = |
| &Apache::loncommon::format_previous_attempt_value('submission', |
&Apache::loncommon::format_previous_attempt_value('submission', |
| $answer); |
$answer); |
| |
return $answer; |
| } |
} |
| return $answer; |
return &HTML::Entities::encode($answer, '"<>&'); |
| } |
} |
| |
|
| #-- A couple of common js functions |
#-- A couple of common js functions |
| sub commonJSfunctions { |
sub commonJSfunctions { |
| my $request = shift; |
my $request = shift; |
| $request->print(<<COMMONJSFUNCTIONS); |
$request->print(&Apache::lonhtmlcommon::scripttag(<<COMMONJSFUNCTIONS)); |
| <script type="text/javascript" language="javascript"> |
|
| function radioSelection(radioButton) { |
function radioSelection(radioButton) { |
| var selection=null; |
var selection=null; |
| if (radioButton.length > 1) { |
if (radioButton.length > 1) { |
|
Line 528 sub commonJSfunctions {
|
Line 632 sub commonJSfunctions {
|
| return selectOne.value; |
return selectOne.value; |
| } |
} |
| } |
} |
| </script> |
|
| COMMONJSFUNCTIONS |
COMMONJSFUNCTIONS |
| } |
} |
| |
|
| #--- Dumps the class list with usernames,list of sections, |
#--- Dumps the class list with usernames,list of sections, |
| #--- section, ids and fullnames for each user. |
#--- section, ids and fullnames for each user. |
| sub getclasslist { |
sub getclasslist { |
| my ($getsec,$filterlist,$getgroup) = @_; |
my ($getsec,$filterbyaccstatus,$getgroup,$symb,$submitonly,$filterbysubmstatus,$filterbypbid,$possibles) = @_; |
| my @getsec; |
my @getsec; |
| my @getgroup; |
my @getgroup; |
| my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
|
Line 563 sub getclasslist {
|
Line 666 sub getclasslist {
|
| # |
# |
| my %sections; |
my %sections; |
| my %fullnames; |
my %fullnames; |
| |
my %passback; |
| |
my ($cdom,$cnum,$partlist); |
| |
if (($filterbysubmstatus) && ($submitonly ne 'all') && ($symb ne '')) { |
| |
$cdom = $env{"course.$env{'request.course.id'}.domain"}; |
| |
$cnum = $env{"course.$env{'request.course.id'}.num"}; |
| |
my $res_error; |
| |
($partlist) = &response_type($symb,\$res_error); |
| |
} elsif ($filterbypbid) { |
| |
$cdom = $env{"course.$env{'request.course.id'}.domain"}; |
| |
$cnum = $env{"course.$env{'request.course.id'}.num"}; |
| |
} |
| foreach my $student (keys(%$classlist)) { |
foreach my $student (keys(%$classlist)) { |
| my $end = |
my $end = |
| $classlist->{$student}->[&Apache::loncoursedata::CL_END()]; |
$classlist->{$student}->[&Apache::loncoursedata::CL_END()]; |
|
Line 579 sub getclasslist {
|
Line 693 sub getclasslist {
|
| my $group = |
my $group = |
| $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()]; |
$classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()]; |
| # filter students according to status selected |
# filter students according to status selected |
| if ($filterlist && (!($stu_status =~ /Any/))) { |
if ($filterbyaccstatus && (!($stu_status =~ /Any/))) { |
| if (!($stu_status =~ $status)) { |
if (!($stu_status =~ $status)) { |
| delete($classlist->{$student}); |
delete($classlist->{$student}); |
| next; |
next; |
|
Line 596 sub getclasslist {
|
Line 710 sub getclasslist {
|
| } |
} |
| } |
} |
| if (($grp eq 'none') && !$group) { |
if (($grp eq 'none') && !$group) { |
| $exclude = 0; |
$exclude = 0; |
| } |
} |
| } |
} |
| if ($exclude) { |
if ($exclude) { |
| delete($classlist->{$student}); |
delete($classlist->{$student}); |
| |
next; |
| } |
} |
| } |
} |
| |
if (($filterbysubmstatus) && ($submitonly ne 'all') && ($symb ne '')) { |
| |
my $udom = |
| |
$classlist->{$student}->[&Apache::loncoursedata::CL_SDOM()]; |
| |
my $uname = |
| |
$classlist->{$student}->[&Apache::loncoursedata::CL_SNAME()]; |
| |
if (($symb ne '') && ($udom ne '') && ($uname ne '')) { |
| |
if ($submitonly eq 'queued') { |
| |
my %queue_status = |
| |
&Apache::bridgetask::get_student_status($symb,$cdom,$cnum, |
| |
$udom,$uname); |
| |
if (!defined($queue_status{'gradingqueue'})) { |
| |
delete($classlist->{$student}); |
| |
next; |
| |
} |
| |
} else { |
| |
my (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist); |
| |
my $submitted = 0; |
| |
my $graded = 0; |
| |
my $incorrect = 0; |
| |
foreach (keys(%status)) { |
| |
$submitted = 1 if ($status{$_} ne 'nothing'); |
| |
$graded = 1 if ($status{$_} =~ /^ungraded/); |
| |
$incorrect = 1 if ($status{$_} =~ /^incorrect/); |
| |
|
| |
my ($foo,$partid,$foo1) = split(/\./,$_); |
| |
if ($status{'resource.'.$partid.'.submitted_by'} ne '') { |
| |
$submitted = 0; |
| |
} |
| |
} |
| |
if (!$submitted && ($submitonly eq 'yes' || |
| |
$submitonly eq 'incorrect' || |
| |
$submitonly eq 'graded')) { |
| |
delete($classlist->{$student}); |
| |
next; |
| |
} elsif (!$graded && ($submitonly eq 'graded')) { |
| |
delete($classlist->{$student}); |
| |
next; |
| |
} elsif (!$incorrect && $submitonly eq 'incorrect') { |
| |
delete($classlist->{$student}); |
| |
next; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($filterbypbid) { |
| |
if (ref($possibles) eq 'HASH') { |
| |
unless (exists($possibles->{$student})) { |
| |
delete($classlist->{$student}); |
| |
next; |
| |
} |
| |
} |
| |
my $udom = |
| |
$classlist->{$student}->[&Apache::loncoursedata::CL_SDOM()]; |
| |
my $uname = |
| |
$classlist->{$student}->[&Apache::loncoursedata::CL_SNAME()]; |
| |
if (($udom ne '') && ($uname ne '')) { |
| |
my %pbinfo = &Apache::lonnet::get('nohist_'.$cdom.'_'.$cnum.'_linkprot_pb',[$filterbypbid],$udom,$uname); |
| |
if (ref($pbinfo{$filterbypbid}) eq 'ARRAY') { |
| |
$passback{$student} = $pbinfo{$filterbypbid}; |
| |
} else { |
| |
delete($classlist->{$student}); |
| |
next; |
| |
} |
| |
} |
| |
} |
| $section = ($section ne '' ? $section : 'none'); |
$section = ($section ne '' ? $section : 'none'); |
| if (&canview($section)) { |
if (&canview($section)) { |
| if (!@getsec || grep(/^\Q$section\E$/,@getsec)) { |
if (!@getsec || grep(/^\Q$section\E$/,@getsec)) { |
|
Line 617 sub getclasslist {
|
Line 797 sub getclasslist {
|
| delete($classlist->{$student}); |
delete($classlist->{$student}); |
| } |
} |
| } |
} |
| my %seen = (); |
|
| my @sections = sort(keys(%sections)); |
my @sections = sort(keys(%sections)); |
| return ($classlist,\@sections,\%fullnames); |
return ($classlist,\@sections,\%fullnames,\%passback); |
| } |
} |
| |
|
| sub canmodify { |
sub canmodify { |
|
Line 633 sub canmodify {
|
Line 812 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 646 sub canview {
|
Line 825 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 683 sub student_gradeStatus {
|
Line 862 sub student_gradeStatus {
|
| sub jscriptNform { |
sub jscriptNform { |
| my ($symb) = @_; |
my ($symb) = @_; |
| my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
| my $jscript='<script type="text/javascript" language="javascript">'."\n". |
my $jscript= &Apache::lonhtmlcommon::scripttag( |
| ' function viewOneStudent(user,domain) {'."\n". |
' function viewOneStudent(user,domain) {'."\n". |
| ' document.onestudent.student.value = user;'."\n". |
' document.onestudent.student.value = user;'."\n". |
| ' document.onestudent.userdom.value = domain;'."\n". |
' document.onestudent.userdom.value = domain;'."\n". |
| ' document.onestudent.submit();'."\n". |
' document.onestudent.submit();'."\n". |
| ' }'."\n". |
' }'."\n". |
| '</script>'."\n"; |
"\n"); |
| $jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n". |
$jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n". |
| '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
| '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n". |
|
| '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n". |
|
| '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n". |
'<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n". |
| '<input type="hidden" name="command" value="submission" />'."\n". |
'<input type="hidden" name="command" value="submission" />'."\n". |
| '<input type="hidden" name="student" value="" />'."\n". |
'<input type="hidden" name="student" value="" />'."\n". |
|
Line 738 sub compute_points {
|
Line 915 sub compute_points {
|
| # |
# |
| |
|
| sub most_similar { |
sub most_similar { |
| my ($uname,$udom,$uessay,$old_essays)=@_; |
my ($uname,$udom,$symb,$uessay)=@_; |
| |
|
| |
unless ($symb) { return ''; } |
| |
|
| |
unless (ref($old_essays{$symb}) eq 'HASH') { return ''; } |
| |
|
| # ignore spaces and punctuation |
# ignore spaces and punctuation |
| |
|
|
Line 755 sub most_similar {
|
Line 936 sub most_similar {
|
| my $scrsid=''; |
my $scrsid=''; |
| my $sessay=''; |
my $sessay=''; |
| # go through all essays ... |
# go through all essays ... |
| foreach my $tkey (keys(%$old_essays)) { |
foreach my $tkey (keys(%{$old_essays{$symb}})) { |
| my ($tname,$tdom,$tcrsid)=map {&unescape($_)} (split(/\./,$tkey)); |
my ($tname,$tdom,$tcrsid)=map {&unescape($_)} (split(/\./,$tkey)); |
| # ... except the same student |
# ... except the same student |
| next if (($tname eq $uname) && ($tdom eq $udom)); |
next if (($tname eq $uname) && ($tdom eq $udom)); |
| my $tessay=$old_essays->{$tkey}; |
my $tessay=$old_essays{$symb}{$tkey}; |
| $tessay=~s/\W+/ /gs; |
$tessay=~s/\W+/ /gs; |
| # String similarity gives up if not even limit |
# String similarity gives up if not even limit |
| my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit); |
my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit); |
|
Line 769 sub most_similar {
|
Line 950 sub most_similar {
|
| $sname=$tname; |
$sname=$tname; |
| $sdom=$tdom; |
$sdom=$tdom; |
| $scrsid=$tcrsid; |
$scrsid=$tcrsid; |
| $sessay=$old_essays->{$tkey}; |
$sessay=$old_essays{$symb}{$tkey}; |
| } |
} |
| } |
} |
| if ($limit>0.6) { |
if ($limit>0.6) { |
|
Line 783 sub most_similar {
|
Line 964 sub most_similar {
|
| |
|
| #------------------------------------ Receipt Verification Routines |
#------------------------------------ Receipt Verification Routines |
| # |
# |
| |
|
| |
sub initialverifyreceipt { |
| |
my ($request,$symb) = @_; |
| |
&commonJSfunctions($request); |
| |
return '<form name="gradingMenu" action=""><input type="submit" value="'.&mt('Verify Receipt Number.').'" />'. |
| |
&Apache::lonnet::recprefix($env{'request.course.id'}). |
| |
'-<input type="text" name="receipt" size="4" />'. |
| |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
| |
'<input type="hidden" name="command" value="verify" />'. |
| |
"</form>\n"; |
| |
} |
| |
|
| #--- Check whether a receipt number is valid.--- |
#--- Check whether a receipt number is valid.--- |
| sub verifyreceipt { |
sub verifyreceipt { |
| my $request = shift; |
my ($request,$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 ($symb) = &get_symb($request); |
|
| |
|
| my $title.= |
my $title = |
| '<h3><span class="LC_info">'. |
'<h3><span class="LC_info">'. |
| &mt('Verifying Receipt No. [_1]',$receipt). |
&mt('Verifying Receipt Number [_1]',$receipt). |
| '</span></h3>'."\n". |
'</span></h3>'."\n"; |
| '<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}). |
|
| '</h4>'."\n"; |
|
| |
|
| my ($string,$contents,$matches) = ('','',0); |
my ($string,$contents,$matches) = ('','',0); |
| my (undef,undef,$fullname) = &getclasslist('all','0'); |
my (undef,undef,$fullname) = &getclasslist('all','0'); |
|
Line 868 sub verifyreceipt {
|
Line 1058 sub verifyreceipt {
|
| $contents. |
$contents. |
| &Apache::loncommon::end_data_table()."\n"; |
&Apache::loncommon::end_data_table()."\n"; |
| } |
} |
| return $string.&show_grading_menu_form($symb); |
return $string; |
| |
} |
| |
|
| |
#------------------------------------------------------------------- |
| |
|
| |
#------------------------------------------- Grade Passback Routines |
| |
# |
| |
|
| |
sub initialpassback { |
| |
my ($request,$symb) = @_; |
| |
my $cdom = $env{"course.$env{'request.course.id'}.domain"}; |
| |
my $cnum = $env{"course.$env{'request.course.id'}.num"}; |
| |
my $crstype = &Apache::loncommon::course_type(); |
| |
my %passback = &Apache::lonnet::dump('nohist_linkprot_passback',$cdom,$cnum); |
| |
my $readonly; |
| |
unless ($perm{'mgr'}) { |
| |
$readonly = 1; |
| |
} |
| |
my $formname = 'initialpassback'; |
| |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
my $output; |
| |
if (!defined($navmap)) { |
| |
if ($crstype eq 'Community') { |
| |
$output = &mt('Unable to retrieve information about community contents'); |
| |
} else { |
| |
$output = &mt('Unable to retrieve information about course contents'); |
| |
} |
| |
return '<p>'.$output.'</p>'; |
| |
} |
| |
return &Apache::loncourserespicker::create_picker($navmap,'passback',$formname,$crstype,undef, |
| |
undef,undef,undef,undef,undef,undef, |
| |
\%passback,$readonly); |
| |
} |
| |
|
| |
sub passback_filters { |
| |
my ($request,$symb) = @_; |
| |
my $cdom = $env{"course.$env{'request.course.id'}.domain"}; |
| |
my $cnum = $env{"course.$env{'request.course.id'}.num"}; |
| |
my $crstype = &Apache::loncommon::course_type(); |
| |
my ($launcher,$appname,$setter,$linkuri,$linkprotector,$scope,$chosen); |
| |
if ($env{'form.passback'} ne '') { |
| |
$chosen = &unescape($env{'form.passback'}); |
| |
($linkuri,$linkprotector,$scope) = split("\0",$chosen); |
| |
($launcher,$appname,$setter) = &get_passback_launcher($cdom,$cnum,$chosen); |
| |
} |
| |
my $result; |
| |
if ($launcher ne '') { |
| |
$result = &launcher_info_box($launcher,$appname,$setter,$linkuri,$scope). |
| |
'<p><br />'.&mt('Set criteria to use to list students for possible passback of scores, then push Next [_1]', |
| |
'→'). |
| |
'</p>'; |
| |
} |
| |
$result .= '<form action="/adm/grades" method="post" name="gradingMenu">'."\n". |
| |
'<input type="hidden" name="passback" value="'.&escape($chosen).'" />'."\n". |
| |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n"; |
| |
my ($submittext,$newcommand); |
| |
if ($launcher ne '') { |
| |
$submittext = &mt('Next').' →'; |
| |
$newcommand = 'passbacknames'; |
| |
$result .= &selectfield(0)."\n"; |
| |
} else { |
| |
$submittext = '← '.&mt('Previous'); |
| |
$newcommand = 'initialpassback'; |
| |
if ($env{'form.passback'}) { |
| |
$result .= '<span class="LC_warning">'.&mt('Invalid launcher').'</span>'."\n"; |
| |
} else { |
| |
$result .= '<span class="LC_warning">'.&mt('No launcher selected').'</span>'."\n"; |
| |
} |
| |
} |
| |
$result .= '<input type="hidden" name="command" value="'.$newcommand.'" />'."\n". |
| |
'<div>'."\n". |
| |
'<input type="submit" value="'.$submittext.'" />'."\n". |
| |
'</div>'."\n". |
| |
'</form>'."\n"; |
| |
return $result; |
| |
} |
| |
|
| |
sub names_for_passback { |
| |
my ($request,$symb) = @_; |
| |
my $cdom = $env{"course.$env{'request.course.id'}.domain"}; |
| |
my $cnum = $env{"course.$env{'request.course.id'}.num"}; |
| |
my $crstype = &Apache::loncommon::course_type(); |
| |
my ($launcher,$appname,$setter,$linkuri,$linkprotector,$scope,$chosen); |
| |
if ($env{'form.passback'} ne '') { |
| |
$chosen = &unescape($env{'form.passback'}); |
| |
($linkuri,$linkprotector,$scope) = split("\0",$chosen); |
| |
($launcher,$appname,$setter) = &get_passback_launcher($cdom,$cnum,$chosen); |
| |
} |
| |
my ($result,$ctr,$newcommand,$submittext); |
| |
if ($launcher ne '') { |
| |
$result = &launcher_info_box($launcher,$appname,$setter,$linkuri,$scope); |
| |
} |
| |
$ctr = 0; |
| |
my @statuses = &Apache::loncommon::get_env_multiple('form.Status'); |
| |
my $stu_status = join(':',@statuses); |
| |
$result .= '<form action="/adm/grades" method="post" name="passbackusers">'."\n". |
| |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n"; |
| |
if ($launcher ne '') { |
| |
$result .= '<input type="hidden" name="passback" value="'.&escape($chosen).'" />'."\n". |
| |
'<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n"; |
| |
my ($sections,$groups,$group_display,$disabled) = §ions_and_groups(); |
| |
my $section_display = join(' ',@{$sections}); |
| |
my $status_display; |
| |
if ((grep(/^Any$/,@statuses)) || |
| |
(@statuses == 3)) { |
| |
$status_display = &mt('Any'); |
| |
} else { |
| |
$status_display = join(' '.&mt('or').' ',map { &mt($_); } @statuses); |
| |
} |
| |
$result .= '<p>'.&mt('Student(s) with stored passback credentials for [_1], and also satisfy:', |
| |
'<span class="LC_cusr_emph">'.$linkuri.'</span>'). |
| |
'<ul>'. |
| |
'<li>'.&mt('Section(s)').": $section_display</li>\n". |
| |
'<li>'.&mt('Group(s)').": $group_display</li>\n". |
| |
'<li>'.&mt('Status').": $status_display</li>\n". |
| |
'</ul>'; |
| |
my ($classlist,undef,$fullname) = &getclasslist($sections,'1',$groups,'','','',$chosen); |
| |
if (keys(%$fullname)) { |
| |
$newcommand = 'passbackscores'; |
| |
$result .= &build_section_inputs(). |
| |
&checkselect_js('passbackusers'). |
| |
'<p><br />'. |
| |
&mt("To send scores, check box(es) next to the student's name(s), then push 'Send Scores'."). |
| |
'</p>'. |
| |
&check_script('passbackusers', 'stuinfo')."\n". |
| |
'<input type="button" '."\n". |
| |
'onclick="javascript:checkSelect(this.form.stuinfo);" '."\n". |
| |
'value="'.&mt('Send Scores').'" /> <br />'."\n". |
| |
&check_buttons()."\n". |
| |
&Apache::loncommon::start_data_table(). |
| |
&Apache::loncommon::start_data_table_header_row(); |
| |
my $loop = 0; |
| |
while ($loop < 2) { |
| |
$result .= '<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'. |
| |
'<th>'.&nameUserString('header').' '.&mt('Section/Group').'</th>'; |
| |
$loop++; |
| |
} |
| |
$result .= &Apache::loncommon::end_data_table_header_row()."\n"; |
| |
foreach my $student (sort |
| |
{ |
| |
if (lc($$fullname{$a}) ne lc($$fullname{$b})) { |
| |
return (lc($$fullname{$a}) cmp lc($$fullname{$b})); |
| |
} |
| |
return $a cmp $b; |
| |
} |
| |
(keys(%$fullname))) { |
| |
$ctr++; |
| |
my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()]; |
| |
my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()]; |
| |
my $udom = $classlist->{$student}->[&Apache::loncoursedata::CL_SDOM()]; |
| |
my $uname = $classlist->{$student}->[&Apache::loncoursedata::CL_SNAME()]; |
| |
if ( $perm{'vgr'} eq 'F' ) { |
| |
if ($ctr%2 ==1) { |
| |
$result.= &Apache::loncommon::start_data_table_row(); |
| |
} |
| |
$result .= '<td align="right">'.$ctr.' </td>'. |
| |
'<td align="center"><label><input type="checkbox" name="stuinfo" value="'. |
| |
$student.':'.$$fullname{$student}.':::SECTION'.$section. |
| |
') " /> </label></td>'."\n".'<td>'. |
| |
&nameUserString(undef,$$fullname{$student},$uname,$udom). |
| |
' '.$section.($group ne '' ?'/'.$group:'').'</td>'."\n"; |
| |
|
| |
if ($ctr%2 ==0) { |
| |
$result .= &Apache::loncommon::end_data_table_row()."\n"; |
| |
} |
| |
} |
| |
} |
| |
if ($ctr%2 ==1) { |
| |
$result .= &Apache::loncommon::end_data_table_row(); |
| |
} |
| |
$result .= &Apache::loncommon::end_data_table()."\n"; |
| |
if ($ctr) { |
| |
$result .= '<input type="button" '. |
| |
'onclick="javascript:checkSelect(this.form.stuinfo);" '. |
| |
'value="'.&mt('Send Scores').'" />'."\n"; |
| |
} |
| |
} else { |
| |
$submittext = '← '.&mt('Previous'); |
| |
$newcommand = 'passback'; |
| |
$result .= '<span class="LC_warning">'.&mt('No students match the selection criteria').'</p>'; |
| |
} |
| |
} else { |
| |
$newcommand = 'initialpassback'; |
| |
$submittext = &mt('Start over'); |
| |
if ($env{'form.passback'}) { |
| |
$result .= '<span class="LC_warning">'.&mt('Invalid launcher').'</span>'."\n"; |
| |
} else { |
| |
$result .= '<span class="LC_warning">'.&mt('No launcher selected').'</span>'."\n"; |
| |
} |
| |
} |
| |
$result .= '<input type="hidden" name="command" value="'.$newcommand.'" />'."\n"; |
| |
if (!$ctr) { |
| |
$result .= '<div>'."\n". |
| |
'<input type="submit" value="'.$submittext.'" />'."\n". |
| |
'</div>'."\n"; |
| |
} |
| |
$result .= '</form>'."\n"; |
| |
return $result; |
| |
} |
| |
|
| |
sub do_passback { |
| |
my ($request,$symb) = @_; |
| |
my $cdom = $env{"course.$env{'request.course.id'}.domain"}; |
| |
my $cnum = $env{"course.$env{'request.course.id'}.num"}; |
| |
my $crstype = &Apache::loncommon::course_type(); |
| |
my ($launchsymb,$appname,$setter,$linkuri,$linkprotector,$scope,$chosen); |
| |
if ($env{'form.passback'} ne '') { |
| |
$chosen = &unescape($env{'form.passback'}); |
| |
($linkuri,$linkprotector,$scope) = split("\0",$chosen); |
| |
($launchsymb,$appname,$setter) = &get_passback_launcher($cdom,$cnum,$chosen); |
| |
} |
| |
if ($launchsymb ne '') { |
| |
$request->print(&launcher_info_box($launchsymb,$appname,$setter,$linkuri,$scope)); |
| |
} |
| |
my $error; |
| |
if ($perm{'mgr'}) { |
| |
if ($launchsymb ne '') { |
| |
my @poss_students = &Apache::loncommon::get_env_multiple('form.stuinfo'); |
| |
if (@poss_students) { |
| |
my %possibles; |
| |
foreach my $item (@poss_students) { |
| |
my ($stuname,$studom) = split(/:/,$item,3); |
| |
$possibles{$stuname.':'.$studom} = 1; |
| |
} |
| |
my ($sections,$groups,$group_display,$disabled) = §ions_and_groups(); |
| |
my ($classlist,undef,$fullname,$pbinfo) = |
| |
&getclasslist($sections,'1',$groups,'','','',$chosen,\%possibles); |
| |
if ((ref($classlist) eq 'HASH') && (ref($pbinfo) eq 'HASH')) { |
| |
my %passback = %{$pbinfo}; |
| |
my (%tosend,%remotenotok,%scorenotok,%zeroposs,%nopbinfo); |
| |
foreach my $possible (keys(%possibles)) { |
| |
if ((exists($classlist->{$possible})) && |
| |
(exists($passback{$possible})) && (ref($passback{$possible}) eq 'ARRAY')) { |
| |
$tosend{$possible} = 1; |
| |
} |
| |
} |
| |
if (keys(%tosend)) { |
| |
my ($lti_in_use,$crsdef); |
| |
my ($ltinum,$ltitype) = ($linkprotector =~ /^(\d+)(c|d)$/); |
| |
if ($ltitype eq 'c') { |
| |
my %crslti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider'); |
| |
$lti_in_use = $crslti{$ltinum}; |
| |
$crsdef = 1; |
| |
} else { |
| |
my %domlti = &Apache::lonnet::get_domain_lti($cdom,'linkprot'); |
| |
$lti_in_use = $domlti{$ltinum}; |
| |
} |
| |
if (ref($lti_in_use) eq 'HASH') { |
| |
my $msgformat = $lti_in_use->{'passbackformat'}; |
| |
my $keynum = $lti_in_use->{'cipher'}; |
| |
my $scoretype = 'decimal'; |
| |
if ($lti_in_use->{'scoreformat'} =~ /^(decimal|ratio|percentage)$/) { |
| |
$scoretype = $1; |
| |
} |
| |
my $pbmap; |
| |
if ($launchsymb =~ /\.(page|sequence)$/) { |
| |
$pbmap = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($launchsymb))[2]); |
| |
} else { |
| |
$pbmap = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($launchsymb))[0]); |
| |
} |
| |
$pbmap = &Apache::lonnet::clutter($pbmap); |
| |
my $pbscope; |
| |
if ($scope eq 'res') { |
| |
$pbscope = 'resource'; |
| |
} elsif ($scope eq 'map') { |
| |
$pbscope = 'nonrec'; |
| |
} elsif ($scope eq 'rec') { |
| |
$pbscope = 'map'; |
| |
} |
| |
my %pb = &common_passback_info(); |
| |
my $numstudents = scalar(keys(%tosend)); |
| |
my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($request,$numstudents); |
| |
my $outcome = &Apache::loncommon::start_data_table(). |
| |
&Apache::loncommon::start_data_table_header_row(); |
| |
my $loop = 0; |
| |
while ($loop < 2) { |
| |
$outcome .= '<th>'.&mt('No.').'</th>'. |
| |
'<th>'.&nameUserString('header').' '.&mt('Section/Group').'</th>'. |
| |
'<th>'.&mt('Score').'</th>'; |
| |
$loop++; |
| |
} |
| |
$outcome .= &Apache::loncommon::end_data_table_header_row()."\n"; |
| |
my $ctr=0; |
| |
foreach my $student (sort |
| |
{ |
| |
if (lc($$fullname{$a}) ne lc($$fullname{$b})) { |
| |
return (lc($$fullname{$a}) cmp lc($$fullname{$b})); |
| |
} |
| |
return $a cmp $b; |
| |
} (keys(%$fullname))) { |
| |
next unless ($tosend{$student}); |
| |
my ($uname,$udom) = split(/:/,$student); |
| |
&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,'last student'); |
| |
my ($uname,$udom) = split(/:/,$student); |
| |
my $uhome = &Apache::lonnet::homeserver($uname,$udom), |
| |
my $id = $passback{$student}[0], |
| |
my $url = $passback{$student}[1], |
| |
my ($total,$possible,$usec); |
| |
if (ref($classlist->{$student}) eq 'ARRAY') { |
| |
$usec = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION]; |
| |
} |
| |
if ($pbscope eq 'resource') { |
| |
$total = 0; |
| |
$possible = 0; |
| |
my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom); |
| |
if (ref($navmap)) { |
| |
my $res = $navmap->getBySymb($launchsymb); |
| |
if (ref($res)) { |
| |
my $partlist = $res->parts(); |
| |
if (ref($partlist) eq 'ARRAY') { |
| |
my %record = &Apache::lonnet::restore($launchsymb,$env{'request.course.id'},$udom,$uname); |
| |
foreach my $part (@{$partlist}) { |
| |
next if ($record{"resource.$part.solved"} =~/^excused/); |
| |
my $weight = &Apache::lonnet::EXT("resource.$part.weight",$launchsymb,$udom,$uname,$usec); |
| |
$possible += $weight; |
| |
if (($record{'version'}) && (exists($record{"resource.$part.awarded"}))) { |
| |
my $awarded = $record{"resource.$part.awarded"}; |
| |
if ($awarded) { |
| |
$total += $weight * $awarded; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} elsif (($pbscope eq 'map') || ($pbscope eq 'nonrec')) { |
| |
($total,$possible) = |
| |
&Apache::lonhomework::get_lti_score($uname,$udom,$usec,$pbmap,$pbscope); |
| |
} |
| |
if (($id ne '') && ($url ne '') && ($possible)) { |
| |
my ($sent,$score,$code,$result) = |
| |
&LONCAPA::ltiutils::send_grade($cdom,$cnum,$crsdef,$pb{'type'},$ltinum,$keynum,$id, |
| |
$url,$scoretype,$pb{'sigmethod'},$msgformat,$total,$possible); |
| |
my $no_passback; |
| |
if ($sent) { |
| |
if ($code == 200) { |
| |
delete($tosend{$student}); |
| |
my $namespace = $cdom.'_'.$cnum.'_lp_passback'; |
| |
my $store = { |
| |
'score' => $score, |
| |
'ip' => $pb{'ip'}, |
| |
'host' => $pb{'lonhost'}, |
| |
'protector' => $linkprotector, |
| |
'deeplink' => $linkuri, |
| |
'scope' => $scope, |
| |
'url' => $url, |
| |
'id' => $id, |
| |
'clientip' => $pb{'clientip'}, |
| |
'whodoneit' => $env{'user.name'}.':'.$env{'user.domain'}, |
| |
}; |
| |
my $value=''; |
| |
foreach my $key (keys(%{$store})) { |
| |
$value.=&escape($key).'='.&Apache::lonnet::freeze_escape($store->{$key}).'&'; |
| |
} |
| |
$value=~s/\&$//; |
| |
&Apache::lonnet::courselog(&escape($linkuri).':'.$uname.':'.$udom.':EXPORT:'.$value); |
| |
&Apache::lonnet::cstore({'score' => $score},$chosen,$namespace,$udom,$uname,'',$pb{'ip'},1); |
| |
$ctr++; |
| |
if ($ctr%2 ==1) { |
| |
$outcome .= &Apache::loncommon::start_data_table_row(); |
| |
} |
| |
my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()]; |
| |
$outcome .= '<td align="right">'.$ctr.' </td>'. |
| |
'<td>'.&nameUserString(undef,$$fullname{$student},$uname,$udom). |
| |
' '.$usec.($group ne '' ?'/'.$group:'').'</td>'. |
| |
'<td>'.$score.'</td>'."\n"; |
| |
if ($ctr%2 ==0) { |
| |
$outcome .= &Apache::loncommon::end_data_table_row()."\n"; |
| |
} |
| |
} else { |
| |
$remotenotok{$student} = 1; |
| |
$no_passback = "Passback response for ".$linkprotector." was $code ($result)"; |
| |
&Apache::lonnet::logthis($no_passback." for $uname:$udom in ${cdom}_${cnum}"); |
| |
} |
| |
} else { |
| |
$scorenotok{$student} = 1; |
| |
$no_passback = "Passback of grades not sent for ".$linkprotector; |
| |
&Apache::lonnet::logthis($no_passback." for $uname:$udom in ${cdom}_${cnum}"); |
| |
} |
| |
if ($no_passback) { |
| |
&Apache::lonnet::log($udom,$uname,$uhome,$no_passback." score: $score; total: $total; possible: $possible"); |
| |
my $key = &Time::HiRes::time().':'.$uname.':'.$udom.':'. |
| |
"$linkuri\0$linkprotector\0$scope"; |
| |
my $ltigrade = { |
| |
$key => { |
| |
'ltinum' => $ltinum, |
| |
'lti' => $lti_in_use, |
| |
'crsdef' => $crsdef, |
| |
'cid' => $cdom.'_'.$cnum, |
| |
'uname' => $uname, |
| |
'udom' => $udom, |
| |
'uhome' => $uhome, |
| |
'pbid' => $id, |
| |
'pburl' => $url, |
| |
'pbtype' => $pb{'type'}, |
| |
'pbscope' => $pbscope, |
| |
'pbmap' => $pbmap, |
| |
'pbsymb' => $launchsymb, |
| |
'format' => $scoretype, |
| |
'scope' => $scope, |
| |
'clientip' => $pb{'clientip'}, |
| |
'linkprot' => $linkprotector.':'.$linkuri, |
| |
'total' => $total, |
| |
'possible' => $possible, |
| |
'score' => $score, |
| |
}, |
| |
}; |
| |
&Apache::lonnet::put('linkprot_passback_pending',$ltigrade,$cdom,$cnum); |
| |
} |
| |
} else { |
| |
if (($id ne '') && ($url ne '')) { |
| |
$zeroposs{$student} = 1; |
| |
} else { |
| |
$nopbinfo{$student} = 1; |
| |
} |
| |
} |
| |
} |
| |
&Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state); |
| |
if ($ctr%2 ==1) { |
| |
$outcome .= &Apache::loncommon::end_data_table_row(); |
| |
} |
| |
$outcome .= &Apache::loncommon::end_data_table(); |
| |
if ($ctr) { |
| |
$request->print('<p><br />'.&mt('Scores sent to launcher CMS').'</p>'. |
| |
'<p>'.$outcome.'</p>'); |
| |
} else { |
| |
$request->print('<p>'.&mt('No scores sent to launcher CMS').'</p>'); |
| |
} |
| |
if (keys(%tosend)) { |
| |
$request->print('<p>'.&mt('No scores sent for following')); |
| |
my ($zeros,$nopbcreds,$noconfirm,$noscore); |
| |
foreach my $student (sort |
| |
{ |
| |
if (lc($$fullname{$a}) ne lc($$fullname{$b})) { |
| |
return (lc($$fullname{$a}) cmp lc($$fullname{$b})); |
| |
} |
| |
return $a cmp $b; |
| |
} (keys(%$fullname))) { |
| |
next unless ($tosend{$student}); |
| |
my ($uname,$udom) = split(/:/,$student); |
| |
my $line = '<li>'.&nameUserString(undef,$$fullname{$student},$uname,$udom).'</li>'."\n"; |
| |
if ($zeroposs{$student}) { |
| |
$zeros .= $line; |
| |
} elsif ($nopbinfo{$student}) { |
| |
$nopbcreds .= $line; |
| |
} elsif ($remotenotok{$student}) { |
| |
$noconfirm .= $line; |
| |
} elsif ($scorenotok{$student}) { |
| |
$noscore .= $line; |
| |
} |
| |
} |
| |
if ($zeros) { |
| |
$request->print('<br />'.&mt('Total points possible was 0').':'. |
| |
'<ul>'.$zeros.'</ul><br />'); |
| |
} |
| |
if ($nopbcreds) { |
| |
$request->print('<br />'.&mt('Missing unique identifier and/or passback location').':'. |
| |
'<ul>'.$nopbcreds.'</ul><br />'); |
| |
} |
| |
if ($noconfirm) { |
| |
$request->print('<br />'.&mt('Score receipt not confirmed by receiving CMS').':'. |
| |
'<ul>'.$noconfirm.'</ul><br />'); |
| |
} |
| |
if ($noscore) { |
| |
$request->print('<br />'.&mt('Score computation or transmission failed').':'. |
| |
'<ul>'.$noscore.'</ul><br />'); |
| |
} |
| |
$request->print('</p>'); |
| |
} |
| |
} else { |
| |
$error = &mt('Settings for deep-link launch target unavailable, so no scores were sent'); |
| |
} |
| |
} else { |
| |
$error = &mt('No available students for whom scores can be sent.'); |
| |
} |
| |
} else { |
| |
$error = &mt('Classlist could not be retrieved so no scores were sent.'); |
| |
} |
| |
} else { |
| |
$error = &mt('No students selected to receive scores so none were sent.'); |
| |
} |
| |
} else { |
| |
if ($env{'form.passback'}) { |
| |
$error = &mt('Deep-link launch target was invalid so no scores were sent.'); |
| |
} else { |
| |
$error = &mt('Deep-link launch target was missing so no scores were sent.'); |
| |
} |
| |
} |
| |
} else { |
| |
$error = &mt('You do not have permission to manage grades, so no scores were sent'); |
| |
} |
| |
if ($error) { |
| |
$request->print('<p class="LC_info">'.$error.'</p>'); |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub get_passback_launcher { |
| |
my ($cdom,$cnum,$chosen) = @_; |
| |
my ($linkuri,$linkprotector,$scope) = split("\0",$chosen); |
| |
my ($ltinum,$ltitype) = ($linkprotector =~ /^(\d+)(c|d)$/); |
| |
my ($appname,$setter); |
| |
if ($ltitype eq 'c') { |
| |
my %lti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider'); |
| |
if (ref($lti{$ltinum}) eq 'HASH') { |
| |
$appname = $lti{$ltinum}{'name'}; |
| |
if ($appname) { |
| |
$setter = ' (defined in course)'; |
| |
} |
| |
} |
| |
} elsif ($ltitype eq 'd') { |
| |
my %lti = &Apache::lonnet::get_domain_lti($cdom,'linkprot'); |
| |
if (ref($lti{$ltinum}) eq 'HASH') { |
| |
$appname = $lti{$ltinum}{'name'}; |
| |
if ($appname) { |
| |
$setter = ' (defined in domain)'; |
| |
} |
| |
} |
| |
} |
| |
my $launchsymb = &Apache::loncommon::symb_from_tinyurl($linkuri,$cnum,$cdom); |
| |
if ($launchsymb eq '') { |
| |
my %passback = &Apache::lonnet::dump('nohist_linkprot_passback',$cdom,$cnum); |
| |
foreach my $poss_symb (keys(%passback)) { |
| |
if (ref($passback{$poss_symb}) eq 'HASH') { |
| |
if (exists($passback{$poss_symb}{$chosen})) { |
| |
$launchsymb = $poss_symb; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
if ($launchsymb ne '') { |
| |
return ($launchsymb,$appname,$setter); |
| |
} |
| |
} else { |
| |
my %passback = &Apache::lonnet::get('nohist_linkprot_passback',[$launchsymb],$cdom,$cnum); |
| |
if (ref($passback{$launchsymb}) eq 'HASH') { |
| |
if (exists($passback{$launchsymb}{$chosen})) { |
| |
return ($launchsymb,$appname,$setter); |
| |
} |
| |
} |
| |
} |
| |
return (); |
| |
} |
| |
|
| |
sub sections_and_groups { |
| |
my (@sections,@groups,$group_display); |
| |
@groups = &Apache::loncommon::get_env_multiple('form.group'); |
| |
if (grep(/^all$/,@groups)) { |
| |
@groups = ('all'); |
| |
$group_display = 'all'; |
| |
} elsif (grep(/^none$/,@groups)) { |
| |
@groups = ('none'); |
| |
$group_display = 'none'; |
| |
} elsif (@groups > 0) { |
| |
$group_display = join(', ',@groups); |
| |
} |
| |
if ($env{'request.course.sec'} ne '') { |
| |
@sections = ($env{'request.course.sec'}); |
| |
} else { |
| |
@sections = &Apache::loncommon::get_env_multiple('form.section'); |
| |
} |
| |
my $disabled = ' disabled="disabled"'; |
| |
if ($perm{'mgr'}) { |
| |
if (grep(/^all$/,@sections)) { |
| |
undef($disabled); |
| |
} else { |
| |
foreach my $sec (@sections) { |
| |
if (&canmodify($sec)) { |
| |
undef($disabled); |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if (grep(/^all$/,@sections)) { |
| |
@sections = ('all'); |
| |
} |
| |
return(\@sections,\@groups,$group_display,$disabled); |
| |
} |
| |
|
| |
sub launcher_info_box { |
| |
my ($launcher,$appname,$setter,$linkuri,$scope) = @_; |
| |
my $shownscope; |
| |
if ($scope eq 'res') { |
| |
$shownscope = &mt('Resource'); |
| |
} elsif ($scope eq 'map') { |
| |
$shownscope = &mt('Folder'); |
| |
} elsif ($scope eq 'rec') { |
| |
$shownscope = &mt('Folder + sub-folders'); |
| |
} |
| |
return '<p>'. |
| |
&Apache::lonhtmlcommon::start_pick_box(). |
| |
&Apache::lonhtmlcommon::row_title(&mt('Launch Item Title')). |
| |
&Apache::lonnet::gettitle($launcher). |
| |
&Apache::lonhtmlcommon::row_closure(). |
| |
&Apache::lonhtmlcommon::row_title(&mt('Deep-link')). |
| |
$linkuri. |
| |
&Apache::lonhtmlcommon::row_closure(). |
| |
&Apache::lonhtmlcommon::row_title(&mt('Launcher')). |
| |
$appname.' '.$setter. |
| |
&Apache::lonhtmlcommon::row_closure(). |
| |
&Apache::lonhtmlcommon::row_title(&mt('Score Type')). |
| |
$shownscope. |
| |
&Apache::lonhtmlcommon::row_closure(1). |
| |
&Apache::lonhtmlcommon::end_pick_box().'</p>'."\n"; |
| |
} |
| |
|
| |
sub passbacks_for_symb { |
| |
my ($cdom,$cnum,$symb) = @_; |
| |
my %passback = &Apache::lonnet::dump('nohist_linkprot_passback',$cdom,$cnum); |
| |
my %needpb; |
| |
if (keys(%passback)) { |
| |
my $checkpb = 1; |
| |
if (exists($passback{$symb})) { |
| |
if (keys(%passback) == 1) { |
| |
undef($checkpb); |
| |
} |
| |
if (ref($passback{$symb}) eq 'HASH') { |
| |
foreach my $launcher (keys(%{$passback{$symb}})) { |
| |
$needpb{$launcher} = $symb; |
| |
} |
| |
} |
| |
} |
| |
if ($checkpb) { |
| |
my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb); |
| |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
if (ref($navmap)) { |
| |
my $mapres = $navmap->getResourceByUrl($map); |
| |
if (ref($mapres)) { |
| |
my $mapsymb = $mapres->symb(); |
| |
if (exists($passback{$mapsymb})) { |
| |
if (keys(%passback) == 1) { |
| |
undef($checkpb); |
| |
} |
| |
if (ref($passback{$mapsymb}) eq 'HASH') { |
| |
foreach my $launcher (keys(%{$passback{$mapsymb}})) { |
| |
$needpb{$launcher} = $mapsymb; |
| |
} |
| |
} |
| |
} |
| |
my %posspb; |
| |
if ($checkpb) { |
| |
my @recurseup = $navmap->recurseup_maps($map,1); |
| |
if (@recurseup) { |
| |
map { $posspb{$_} = 1; } @recurseup; |
| |
} |
| |
} |
| |
foreach my $key (keys(%passback)) { |
| |
if (exists($posspb{$key})) { |
| |
if (ref($passback{$key}) eq 'HASH') { |
| |
foreach my $launcher (keys(%{$passback{$key}})) { |
| |
my ($linkuri,$linkprotector,$scope) = split("\0",$launcher); |
| |
next unless ($scope eq 'rec'); |
| |
$needpb{$launcher} = $key; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return %needpb; |
| |
} |
| |
|
| |
sub process_passbacks { |
| |
my ($context,$symbs,$cdom,$cnum,$udom,$uname,$usec,$weights,$awardeds,$excuseds,$needpb, |
| |
$skip_passback,$pbsave,$pbids) = @_; |
| |
if ((ref($needpb) eq 'HASH') && (ref($skip_passback) eq 'HASH') && (ref($pbsave) eq 'HASH')) { |
| |
my (%weight,%awarded,%excused); |
| |
if ((ref($symbs) eq 'ARRAY') && (ref($weights) eq 'HASH') && (ref($awardeds) eq 'HASH') && |
| |
(ref($excuseds) eq 'HASH')) { |
| |
%weight = %{$weights}; |
| |
%awarded = %{$awardeds}; |
| |
%excused = %{$excuseds}; |
| |
} |
| |
my $uhome = &Apache::lonnet::homeserver($uname,$udom); |
| |
my @launchers = keys(%{$needpb}); |
| |
my %pbinfo; |
| |
if (ref($pbids) eq 'HASH') { |
| |
%pbinfo = %{$pbids}; |
| |
} else { |
| |
%pbinfo = &Apache::lonnet::get('nohist_'.$cdom.'_'.$cnum.'_linkprot_pb',\@launchers,$udom,$uname); |
| |
} |
| |
my %pbc = &common_passback_info(); |
| |
foreach my $launcher (@launchers) { |
| |
if (ref($pbinfo{$launcher}) eq 'ARRAY') { |
| |
my $pbid = $pbinfo{$launcher}[0]; |
| |
my $pburl = $pbinfo{$launcher}[1]; |
| |
my (%total_by_symb,%possible_by_symb); |
| |
if (($pbid ne '') && ($pburl ne '')) { |
| |
next if ($skip_passback->{$launcher}); |
| |
my %pb = %pbc; |
| |
if ((exists($pbsave->{$launcher})) && |
| |
(ref($pbsave->{$launcher}) eq 'HASH')) { |
| |
foreach my $item ('lti_in_use','crsdef','ltinum','keynum','scoretype','msgformat', |
| |
'symb','map','pbscope','linkuri','linkprotector','scope') { |
| |
$pb{$item} = $pbsave->{$launcher}{$item}; |
| |
} |
| |
} else { |
| |
my $ltitype; |
| |
($pb{'linkuri'},$pb{'linkprotector'},$pb{'scope'}) = split("\0",$launcher); |
| |
($pb{'ltinum'},$ltitype) = ($pb{'linkprotector'} =~ /^(\d+)(c|d)$/); |
| |
if ($ltitype eq 'c') { |
| |
my %crslti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider'); |
| |
$pb{'lti_in_use'} = $crslti{$pb{'ltinum'}}; |
| |
$pb{'crsdef'} = 1; |
| |
} else { |
| |
my %domlti = &Apache::lonnet::get_domain_lti($cdom,'linkprot'); |
| |
$pb{'lti_in_use'} = $domlti{$pb{'ltinum'}}; |
| |
} |
| |
if (ref($pb{'lti_in_use'}) eq 'HASH') { |
| |
$pb{'msgformat'} = $pb{'lti_in_use'}->{'passbackformat'}; |
| |
$pb{'keynum'} = $pb{'lti_in_use'}->{'cipher'}; |
| |
$pb{'scoretype'} = 'decimal'; |
| |
if ($pb{'lti_in_use'}->{'scoreformat'} =~ /^(decimal|ratio|percentage)$/) { |
| |
$pb{'scoretype'} = $1; |
| |
} |
| |
$pb{'symb'} = $needpb->{$launcher}; |
| |
if ($pb{'symb'} =~ /\.(page|sequence)$/) { |
| |
$pb{'map'} = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($pb{'symb'}))[2]); |
| |
} else { |
| |
$pb{'map'} = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($pb{'symb'}))[0]); |
| |
} |
| |
$pb{'map'} = &Apache::lonnet::clutter($pb{'map'}); |
| |
if ($pb{'scope'} eq 'res') { |
| |
$pb{'pbscope'} = 'resource'; |
| |
} elsif ($pb{'scope'} eq 'map') { |
| |
$pb{'pbscope'} = 'nonrec'; |
| |
} elsif ($pb{'scope'} eq 'rec') { |
| |
$pb{'pbscope'} = 'map'; |
| |
} |
| |
foreach my $item ('lti_in_use','crsdef','ltinum','keynum','scoretype','msgformat', |
| |
'symb','map','pbscope','linkuri','linkprotector','scope') { |
| |
$pbsave->{$launcher}{$item} = $pb{$item}; |
| |
} |
| |
} else { |
| |
$skip_passback->{$launcher} = 1; |
| |
} |
| |
} |
| |
if (ref($symbs) eq 'ARRAY') { |
| |
foreach my $symb (@{$symbs}) { |
| |
if ((ref($weight{$symb}) eq 'HASH') && (ref($awarded{$symb}) eq 'HASH') && |
| |
(ref($excused{$symb}) eq 'HASH')) { |
| |
foreach my $part (keys(%{$weight{$symb}})) { |
| |
if ($excused{$symb}{$part}) { |
| |
next; |
| |
} |
| |
my $partweight = $weight{$symb}{$part} eq '' ? 1 : |
| |
$weight{$symb}{$part}; |
| |
if ($awarded{$symb}{$part}) { |
| |
$total_by_symb{$symb} += $partweight * $awarded{$symb}{$part}; |
| |
} |
| |
$possible_by_symb{$symb} += $partweight; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($context eq 'updatebypage') { |
| |
my $ltigrade = { |
| |
'ltinum' => $pb{'ltinum'}, |
| |
'lti' => $pb{'lti_in_use'}, |
| |
'crsdef' => $pb{'crsdef'}, |
| |
'cid' => $cdom.'_'.$cnum, |
| |
'uname' => $uname, |
| |
'udom' => $udom, |
| |
'uhome' => $uhome, |
| |
'usec' => $usec, |
| |
'pbid' => $pbid, |
| |
'pburl' => $pburl, |
| |
'pbtype' => $pb{'type'}, |
| |
'pbscope' => $pb{'pbscope'}, |
| |
'pbmap' => $pb{'map'}, |
| |
'pbsymb' => $pb{'symb'}, |
| |
'format' => $pb{'scoretype'}, |
| |
'scope' => $pb{'scope'}, |
| |
'clientip' => $pb{'clientip'}, |
| |
'linkprot' => $pb{'linkprotector'}.':'.$pb{'linkuri'}, |
| |
'total_s' => \%total_by_symb, |
| |
'possible_s' => \%possible_by_symb, |
| |
}; |
| |
push(@Apache::grades::ltipassback,$ltigrade); |
| |
next; |
| |
} |
| |
my ($total,$possible); |
| |
if ($pb{'pbscope'} eq 'resource') { |
| |
$total = $total_by_symb{$pb{'symb'}}; |
| |
$possible = $possible_by_symb{$pb{'symb'}}; |
| |
} elsif (($pb{'pbscope'} eq 'map') || ($pb{'pbscope'} eq 'nonrec')) { |
| |
($total,$possible) = |
| |
&Apache::lonhomework::get_lti_score($uname,$udom,$usec,$pb{'map'},$pb{'pbscope'}, |
| |
\%total_by_symb,\%possible_by_symb); |
| |
} |
| |
if (!$possible) { |
| |
$total = 0; |
| |
$possible = 1; |
| |
} |
| |
my ($sent,$score,$code,$result) = |
| |
&LONCAPA::ltiutils::send_grade($cdom,$cnum,$pb{'crsdef'},$pb{'type'},$pb{'ltinum'}, |
| |
$pb{'keynum'},$pbid,$pburl,$pb{'scoretype'},$pb{'sigmethod'}, |
| |
$pb{'msgformat'},$total,$possible); |
| |
my $no_passback; |
| |
if ($sent) { |
| |
if ($code == 200) { |
| |
my $namespace = $cdom.'_'.$cnum.'_lp_passback'; |
| |
my $store = { |
| |
'score' => $score, |
| |
'ip' => $pb{'ip'}, |
| |
'host' => $pb{'lonhost'}, |
| |
'protector' => $pb{'linkprotector'}, |
| |
'deeplink' => $pb{'linkuri'}, |
| |
'scope' => $pb{'scope'}, |
| |
'url' => $pburl, |
| |
'id' => $pbid, |
| |
'clientip' => $pb{'clientip'}, |
| |
'whodoneit' => $env{'user.name'}.':'.$env{'user.domain'}, |
| |
}; |
| |
my $value=''; |
| |
foreach my $key (keys(%{$store})) { |
| |
$value.=&escape($key).'='.&Apache::lonnet::freeze_escape($store->{$key}).'&'; |
| |
} |
| |
$value=~s/\&$//; |
| |
&Apache::lonnet::courselog(&escape($pb{'linkuri'}).':'.$uname.':'.$udom.':EXPORT:'.$value); |
| |
&Apache::lonnet::cstore({'score' => $score},$launcher,$namespace,$udom,$uname,'',$pb{'ip'},1); |
| |
} else { |
| |
$no_passback = 1; |
| |
} |
| |
} else { |
| |
$no_passback = 1; |
| |
} |
| |
if ($no_passback) { |
| |
&Apache::lonnet::log($udom,$uname,$uhome,$no_passback." score: $score; total: $total; possible: $possible"); |
| |
my $ltigrade = { |
| |
'ltinum' => $pb{'ltinum'}, |
| |
'lti' => $pb{'lti_in_use'}, |
| |
'crsdef' => $pb{'crsdef'}, |
| |
'cid' => $cdom.'_'.$cnum, |
| |
'uname' => $uname, |
| |
'udom' => $udom, |
| |
'uhome' => $uhome, |
| |
'pbid' => $pbid, |
| |
'pburl' => $pburl, |
| |
'pbtype' => $pb{'type'}, |
| |
'pbscope' => $pb{'pbscope'}, |
| |
'pbmap' => $pb{'map'}, |
| |
'pbsymb' => $pb{'symb'}, |
| |
'format' => $pb{'scoretype'}, |
| |
'scope' => $pb{'scope'}, |
| |
'clientip' => $pb{'clientip'}, |
| |
'linkprot' => $pb{'linkprotector'}.':'.$pb{'linkuri'}, |
| |
'total' => $total, |
| |
'possible' => $possible, |
| |
'score' => $score, |
| |
}; |
| |
&Apache::lonnet::put('linkprot_passback_pending',$ltigrade,$cdom,$cnum); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub common_passback_info { |
| |
my %pbc = ( |
| |
sigmethod => 'HMAC-SHA1', |
| |
type => 'linkprot', |
| |
clientip => &Apache::lonnet::get_requestor_ip(), |
| |
lonhost => $Apache::lonnet::perlvar{'lonHostID'}, |
| |
ip => &Apache::lonnet::get_host_ip($Apache::lonnet::perlvar{'lonHostID'}), |
| |
); |
| |
return %pbc; |
| } |
} |
| |
|
| #--- This is called by a number of programs. |
#--- This is called by a number of programs. |
|
Line 876 sub verifyreceipt {
|
Line 1937 sub verifyreceipt {
|
| #--- Also called directly when one clicks on the subm button |
#--- Also called directly when one clicks on the subm button |
| # on the problem page. |
# on the problem page. |
| sub listStudents { |
sub listStudents { |
| my ($request) = shift; |
my ($request,$symb,$submitonly,$divforres) = @_; |
| |
|
| my ($symb) = &get_symb($request); |
my $is_tool = ($symb =~ /ext\.tool$/); |
| 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 $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'}; |
| my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'}; |
unless ($submitonly) { |
| my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View'; |
$submitonly = $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'}; |
| $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? |
|
| &Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; |
|
| |
|
| my $result='<h3><span class="LC_info"> ' |
|
| .&mt("$viewgrade Submissions for a Student or a Group of Students") |
|
| .'</span></h3>'; |
|
| |
|
| my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes')); |
|
| |
|
| my %lt = &Apache::lonlocal::texthash ( |
|
| 'multiple' => 'Please select a student or group of students before clicking on the Next button.', |
|
| 'single' => 'Please select the student before clicking on the Next button.', |
|
| ); |
|
| $request->print(<<LISTJAVASCRIPT); |
|
| <script type="text/javascript" language="javascript"> |
|
| function checkSelect(checkBox) { |
|
| var ctr=0; |
|
| var sense=""; |
|
| if (checkBox.length > 1) { |
|
| for (var i=0; i<checkBox.length; i++) { |
|
| if (checkBox[i].checked) { |
|
| ctr++; |
|
| } |
|
| } |
|
| sense = '$lt{'multiple'}'; |
|
| } else { |
|
| if (checkBox.checked) { |
|
| ctr = 1; |
|
| } |
|
| sense = '$lt{'single'}'; |
|
| } |
|
| if (ctr == 0) { |
|
| alert(sense); |
|
| return false; |
|
| } |
|
| document.gradesub.submit(); |
|
| } |
} |
| |
|
| |
my $result=''; |
| |
my $res_error; |
| |
my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error); |
| |
|
| |
my $table; |
| |
if (ref($partlist) eq 'ARRAY') { |
| |
if (scalar(@$partlist) > 1 ) { |
| |
$table = &showResourceInfo($symb,$partlist,$responseType,'gradesub',1); |
| |
} elsif ($divforres) { |
| |
$table = '<div style="padding:0;clear:both;margin:0;border:0"></div>'; |
| |
} else { |
| |
$table = '<br clear="all" />'; |
| |
} |
| |
} |
| |
|
| |
$request->print(&checkselect_js()); |
| |
$request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT)); |
| |
|
| function reLoadList(formname) { |
function reLoadList(formname) { |
| if (formname.saveStatusOld.value == pullDownSelection(formname.Status)) {return;} |
if (formname.saveStatusOld.value == pullDownSelection(formname.Status)) {return;} |
| formname.command.value = 'submission'; |
formname.command.value = 'submission'; |
| formname.submit(); |
formname.submit(); |
| } |
} |
| </script> |
|
| LISTJAVASCRIPT |
LISTJAVASCRIPT |
| |
|
| &commonJSfunctions($request); |
&commonJSfunctions($request); |
| $request->print($result); |
$request->print($result); |
| |
|
| my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : ''; |
|
| my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : ''; |
|
| my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'. |
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'. |
| "\n".$table; |
"\n".$table; |
| |
|
| $gradeTable .= &Apache::lonhtmlcommon::start_pick_box(); |
|
| $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="yes" /> '.&mt('one student').' </label>'."\n" |
|
| .'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n" |
|
| .&Apache::lonhtmlcommon::row_closure(); |
|
| $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="yes" /> '.&mt('one student').' </label>'."\n" |
|
| .'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n" |
|
| .&Apache::lonhtmlcommon::row_closure(); |
|
| |
|
| my $submission_options; |
$gradeTable .= &Apache::lonhtmlcommon::start_pick_box(); |
| if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) { |
unless ($is_tool) { |
| $submission_options.= |
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text')) |
| '<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> '.&mt('essay part only').' </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="all" /> '.&mt('all students').' </label><br />'."\n" |
| |
.&Apache::lonhtmlcommon::row_closure(); |
| |
$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="yes" /> '.&mt('one student').' </label>'."\n" |
| |
.'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n" |
| |
.&Apache::lonhtmlcommon::row_closure(); |
| } |
} |
| |
|
| my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
| my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status; |
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status; |
| $env{'form.Status'} = $saveStatus; |
$env{'form.Status'} = $saveStatus; |
| $submission_options.= |
my %optiontext; |
| |
if ($is_tool) { |
| |
%optiontext = &Apache::lonlocal::texthash ( |
| |
lastonly => 'last transaction', |
| |
last => 'last transaction with details', |
| |
datesub => 'all transactions', |
| |
all => 'all transactions with details', |
| |
); |
| |
} else { |
| |
%optiontext = &Apache::lonlocal::texthash ( |
| |
lastonly => 'last submission', |
| |
last => 'last submission with details', |
| |
datesub => 'all submissions', |
| |
all => 'all submissions with details', |
| |
); |
| |
} |
| |
my $submission_options = |
| '<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
| '<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '. |
'<label><input type="radio" name="lastSub" value="lastonly" /> '. |
| &mt('last submission only').' </label></span>'."\n". |
$optiontext{'lastonly'}.' </label></span>'."\n". |
| '<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
| '<label><input type="radio" name="lastSub" value="last" /> '. |
'<label><input type="radio" name="lastSub" value="last" /> '. |
| &mt('last submission & parts info').' </label></span>'."\n". |
$optiontext{'last'}.' </label></span>'."\n". |
| '<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
| '<label><input type="radio" name="lastSub" value="datesub" /> '. |
'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '. |
| &mt('by dates and submissions').'</label></span>'."\n". |
$optiontext{'datesub'}.'</label></span>'."\n". |
| '<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
| '<label><input type="radio" name="lastSub" value="all" /> '. |
'<label><input type="radio" name="lastSub" value="all" /> '. |
| &mt('all details').'</label></span>'; |
$optiontext{'all'}.'</label></span>'; |
| $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions')) |
my $viewtitle; |
| .$submission_options |
if ($is_tool) { |
| |
$viewtitle = &mt('View Transactions'); |
| |
} else { |
| |
$viewtitle = &mt('View Submissions'); |
| |
} |
| |
my ($compmsg,$nocompmsg); |
| |
$nocompmsg = ' checked="checked"'; |
| |
if ($numessay) { |
| |
$compmsg = $nocompmsg; |
| |
$nocompmsg = ''; |
| |
} |
| |
$gradeTable .= &Apache::lonhtmlcommon::row_title($viewtitle) |
| |
.$submission_options; |
| |
# Check if any gradable |
| |
my $showmore; |
| |
if ($perm{'mgr'}) { |
| |
my @sections; |
| |
if ($env{'request.course.sec'} ne '') { |
| |
@sections = ($env{'request.course.sec'}); |
| |
} elsif ($env{'form.section'} eq '') { |
| |
@sections = ('all'); |
| |
} else { |
| |
@sections = &Apache::loncommon::get_env_multiple('form.section'); |
| |
} |
| |
if (grep(/^all$/,@sections)) { |
| |
$showmore = 1; |
| |
} else { |
| |
foreach my $sec (@sections) { |
| |
if (&canmodify($sec)) { |
| |
$showmore = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
|
| |
if ($showmore) { |
| |
$gradeTable .= |
| |
&Apache::lonhtmlcommon::row_closure() |
| |
.&Apache::lonhtmlcommon::row_title(&mt('Send Messages')) |
| |
.'<span class="LC_nobreak">' |
| |
.'<label><input type="radio" name="compmsg" value="0"'.$nocompmsg.' />' |
| |
.&mt('No').(' 'x2).'</label>' |
| |
.'<label><input type="radio" name="compmsg" value="1"'.$compmsg.' />' |
| |
.&mt('Yes').(' 'x2).'</label>' |
| .&Apache::lonhtmlcommon::row_closure(); |
.&Apache::lonhtmlcommon::row_closure(); |
| |
|
| $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments')) |
$gradeTable .= |
| |
&Apache::lonhtmlcommon::row_title(&mt('Grading Increments')) |
| .'<select name="increment">' |
.'<select name="increment">' |
| .'<option value="1">'.&mt('Whole Points').'</option>' |
.'<option value="1">'.&mt('Whole Points').'</option>' |
| .'<option value=".5">'.&mt('Half Points').'</option>' |
.'<option value=".5">'.&mt('Half Points').'</option>' |
| .'<option value=".25">'.&mt('Quarter Points').'</option>' |
.'<option value=".25">'.&mt('Quarter Points').'</option>' |
| .'<option value=".1">'.&mt('Tenths of a Point').'</option>' |
.'<option value=".1">'.&mt('Tenths of a Point').'</option>' |
| .'</select>' |
.'</select>'; |
| .&Apache::lonhtmlcommon::row_closure(); |
} |
| |
|
| $gradeTable .= |
$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="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\n". |
|
| '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n". |
|
| '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n". |
|
| '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
| '<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n"; |
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n"; |
| |
if (exists($env{'form.Status'})) { |
| if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) { |
$gradeTable .= '<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n"; |
| $gradeTable .= '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n"; |
|
| } else { |
} else { |
| $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status')) |
$gradeTable .= &Apache::lonhtmlcommon::row_closure() |
| |
.&Apache::lonhtmlcommon::row_title(&mt('Student Status')) |
| .&Apache::lonhtmlcommon::StatusOptions( |
.&Apache::lonhtmlcommon::StatusOptions( |
| $saveStatus,undef,1,'javascript:reLoadList(this.form);') |
$saveStatus,undef,1,'javascript:reLoadList(this.form);'); |
| .&Apache::lonhtmlcommon::row_closure(); |
|
| } |
} |
| |
if ($numessay) { |
| $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism')) |
$gradeTable .= &Apache::lonhtmlcommon::row_closure() |
| .'<input type="checkbox" name="checkPlag" checked="checked" />' |
.&Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism')) |
| .&Apache::lonhtmlcommon::row_closure(1) |
.'<input type="checkbox" name="checkPlag" checked="checked" />'; |
| |
} |
| |
$gradeTable .= &Apache::lonhtmlcommon::row_closure(1) |
| .&Apache::lonhtmlcommon::end_pick_box(); |
.&Apache::lonhtmlcommon::end_pick_box(); |
| |
my $regrademsg; |
| |
if ($is_tool) { |
| |
$regrademsg =&mt("To view/grade/regrade, click on the check box(es) next to the student's name(s). Then click on the Next button."); |
| |
} else { |
| |
$regrademsg = &mt("To view/grade/regrade 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."); |
| |
} |
| $gradeTable .= '<p>' |
$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" |
.$regrademsg."\n" |
| .'<input type="hidden" name="command" value="processGroup" />' |
.'<input type="hidden" name="command" value="processGroup" />' |
| .'</p>'; |
.'</p>'; |
| |
|
|
Line 1027 LISTJAVASCRIPT
|
Line 2126 LISTJAVASCRIPT
|
| while ($loop < 2) { |
while ($loop < 2) { |
| $gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'. |
$gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'. |
| '<th>'.&nameUserString('header').' '.&mt('Section/Group').'</th>'; |
'<th>'.&nameUserString('header').' '.&mt('Section/Group').'</th>'; |
| if ($env{'form.showgrading'} eq 'yes' |
if (($submitonly ne 'queued') && ($submitonly ne 'all')) { |
| && $submitonly ne 'queued' |
|
| && $submitonly ne 'all') { |
|
| foreach my $part (sort(@$partlist)) { |
foreach my $part (sort(@$partlist)) { |
| my $display_part= |
my $display_part= |
| &get_display_part((split(/_/,$part))[0],$symb); |
&get_display_part((split(/_/,$part))[0],$symb); |
|
Line 1065 LISTJAVASCRIPT
|
Line 2162 LISTJAVASCRIPT
|
| $status{'gradingqueue'} = $queue_status{'gradingqueue'}; |
$status{'gradingqueue'} = $queue_status{'gradingqueue'}; |
| } |
} |
| |
|
| if ($env{'form.showgrading'} eq 'yes' |
if (($submitonly ne 'queued') && ($submitonly ne 'all')) { |
| && $submitonly ne 'queued' |
|
| && $submitonly ne 'all') { |
|
| (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist); |
(%status) =&student_gradeStatus($symb,$udom,$uname,$partlist); |
| my $submitted = 0; |
my $submitted = 0; |
| my $graded = 0; |
my $graded = 0; |
|
Line 1108 LISTJAVASCRIPT
|
Line 2203 LISTJAVASCRIPT
|
| &nameUserString(undef,$$fullname{$student},$uname,$udom). |
&nameUserString(undef,$$fullname{$student},$uname,$udom). |
| ' '.$section.($group ne '' ?'/'.$group:'').'</td>'."\n"; |
' '.$section.($group ne '' ?'/'.$group:'').'</td>'."\n"; |
| |
|
| if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
if ($submitonly ne 'all') { |
| foreach (sort(keys(%status))) { |
foreach (sort(keys(%status))) { |
| next if ($_ =~ /^resource.*?submitted_by$/); |
next if ($_ =~ /^resource.*?submitted_by$/); |
| $gradeTable.='<td align="center"> '.&mt($status{$_}).' </td>'."\n"; |
$gradeTable.='<td align="center"> '.&mt($status{$_}).' </td>'."\n"; |
|
Line 1122 LISTJAVASCRIPT
|
Line 2217 LISTJAVASCRIPT
|
| } |
} |
| if ($ctr%2 ==1) { |
if ($ctr%2 ==1) { |
| $gradeTable.='<td> </td><td> </td><td> </td>'; |
$gradeTable.='<td> </td><td> </td><td> </td>'; |
| if ($env{'form.showgrading'} eq 'yes' |
if (($submitonly ne 'queued') && ($submitonly ne 'all')) { |
| && $submitonly ne 'queued' |
|
| && $submitonly ne 'all') { |
|
| foreach (@$partlist) { |
foreach (@$partlist) { |
| $gradeTable.='<td> </td>'; |
$gradeTable.='<td> </td>'; |
| } |
} |
|
Line 1148 LISTJAVASCRIPT
|
Line 2241 LISTJAVASCRIPT
|
| if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; } |
if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; } |
| if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; } |
if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; } |
| $gradeTable='<br /> <span class="LC_warning">'. |
$gradeTable='<br /> <span class="LC_warning">'. |
| &mt('No '.$submissions.' found for this resource for any students. ([_1] students checked for '.$submissions.')', |
&mt('No '.$submissions.' found for this resource for any students. ([quant,_1,student] checked for '.$submissions.')', |
| $num_students). |
$num_students). |
| '</span><br />'; |
'</span><br />'; |
| } |
} |
| } elsif ($ctr == 1) { |
} elsif ($ctr == 1) { |
| $gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/; |
$gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/; |
| } |
} |
| $gradeTable.=&show_grading_menu_form($symb); |
|
| $request->print($gradeTable); |
$request->print($gradeTable); |
| return ''; |
return ''; |
| } |
} |
| |
|
| #---- Called from the listStudents routine |
#---- Called from the listStudents and the names_for_passback routines. |
| |
|
| |
sub checkselect_js { |
| |
my ($formname) = @_; |
| |
if ($formname eq '') { |
| |
$formname = 'gradesub'; |
| |
} |
| |
my %js_lt; |
| |
if ($formname eq 'passbackusers') { |
| |
%js_lt = &Apache::lonlocal::texthash ( |
| |
'multiple' => 'Please select a student or group of students before pushing the Save Scores button.', |
| |
'single' => 'Please select the student before pushing the Save Scores button.', |
| |
); |
| |
} else { |
| |
%js_lt = &Apache::lonlocal::texthash ( |
| |
'multiple' => 'Please select a student or group of students before clicking on the Next button.', |
| |
'single' => 'Please select the student before clicking on the Next button.', |
| |
); |
| |
} |
| |
&js_escape(\%js_lt); |
| |
return &Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT); |
| |
|
| |
function checkSelect(checkBox) { |
| |
var ctr=0; |
| |
var sense=""; |
| |
var len = checkBox.length; |
| |
if (len == undefined) len = 1; |
| |
if (len > 1) { |
| |
for (var i=0; i<len; i++) { |
| |
if (checkBox[i].checked) { |
| |
ctr++; |
| |
} |
| |
} |
| |
sense = '$js_lt{'multiple'}'; |
| |
} else { |
| |
if (checkBox.checked) { |
| |
ctr = 1; |
| |
} |
| |
sense = '$js_lt{'single'}'; |
| |
} |
| |
if (ctr == 0) { |
| |
alert(sense); |
| |
return false; |
| |
} |
| |
document.$formname.submit(); |
| |
} |
| |
LISTJAVASCRIPT |
| |
|
| |
} |
| |
|
| sub check_script { |
sub check_script { |
| my ($form, $type)=@_; |
my ($form,$type) = @_; |
| my $chkallscript='<script type="text/javascript"> |
my $chkallscript = &Apache::lonhtmlcommon::scripttag(' |
| function checkall() { |
function checkall() { |
| for (i=0; i<document.forms.'.$form.'.elements.length; i++) { |
for (i=0; i<document.forms.'.$form.'.elements.length; i++) { |
| ele = document.forms.'.$form.'.elements[i]; |
ele = document.forms.'.$form.'.elements[i]; |
|
Line 1195 sub check_script {
|
Line 2335 sub check_script {
|
| } |
} |
| } |
} |
| |
|
| </script>'."\n"; |
'."\n"); |
| return $chkallscript; |
return $chkallscript; |
| } |
} |
| |
|
|
Line 1209 sub check_buttons {
|
Line 2349 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) = shift; |
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 1219 sub processGroup {
|
Line 2359 sub processGroup {
|
| $env{'form.student'} = $uname; |
$env{'form.student'} = $uname; |
| $env{'form.userdom'} = $udom; |
$env{'form.userdom'} = $udom; |
| $env{'form.fullname'} = $fullname; |
$env{'form.fullname'} = $fullname; |
| &submission($request,$ctr,$total); |
&submission($request,$ctr,$total,$symb); |
| $ctr++; |
$ctr++; |
| } |
} |
| return ''; |
return ''; |
|
Line 1233 sub processGroup {
|
Line 2373 sub processGroup {
|
| #--- Javascript to handle the submission page functionality --- |
#--- Javascript to handle the submission page functionality --- |
| sub sub_page_js { |
sub sub_page_js { |
| my $request = shift; |
my $request = shift; |
| my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = '); |
my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = '); |
| $request->print(<<SUBJAVASCRIPT); |
&js_escape(\$alertmsg); |
| <script type="text/javascript" language="javascript"> |
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT)); |
| function updateRadio(formname,id,weight) { |
function updateRadio(formname,id,weight) { |
| var gradeBox = formname["GD_BOX"+id]; |
var gradeBox = formname["GD_BOX"+id]; |
| var radioButton = formname["RADVAL"+id]; |
var radioButton = formname["RADVAL"+id]; |
|
Line 1352 sub sub_page_js {
|
Line 2492 sub sub_page_js {
|
| } |
} |
| } |
} |
| } |
} |
| |
|
| } |
} |
| } |
} |
| |
|
| } |
|
| if (val == "Grade Student") { |
|
| formname.showgrading.value = "yes"; |
|
| if (formname.Status.value == "") { |
|
| formname.Status.value = "Active"; |
|
| } |
|
| formname.studentNo.value = total; |
|
| } |
} |
| formname.submit(); |
formname.submit(); |
| } |
} |
|
Line 1403 sub sub_page_js {
|
Line 2534 sub sub_page_js {
|
| |
|
| formname.submit(); |
formname.submit(); |
| } |
} |
| </script> |
|
| SUBJAVASCRIPT |
SUBJAVASCRIPT |
| } |
} |
| |
|
| #--- javascript for essay type problem -- |
#--- javascript for grading message center |
| sub sub_page_kw_js { |
sub sub_grademessage_js { |
| my $request = shift; |
my $request = shift; |
| my $iconpath = $request->dir_config('lonIconsURL'); |
my $iconpath = $request->dir_config('lonIconsURL'); |
| &commonJSfunctions($request); |
&commonJSfunctions($request); |
| |
|
| my $inner_js_msg_central=<<INNERJS; |
my $inner_js_msg_central= (<<INNERJS); |
| <script text="text/javascript"> |
<script type="text/javascript"> |
| function checkInput() { |
function checkInput() { |
| opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value); |
opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value); |
| var nmsg = opener.document.SCORE.savemsgN.value; |
var nmsg = opener.document.SCORE.savemsgN.value; |
|
Line 1451 sub sub_page_kw_js {
|
Line 2581 sub sub_page_kw_js {
|
| self.close() |
self.close() |
| |
|
| } |
} |
| </script> |
|
| INNERJS |
|
| |
|
| my $inner_js_highlight_central=<<INNERJS; |
|
| <script type="text/javascript"> |
|
| function updateChoice(flag) { |
|
| opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr); |
|
| opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize); |
|
| opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle); |
|
| opener.document.SCORE.refresh.value = "on"; |
|
| if (opener.document.SCORE.keywords.value!=""){ |
|
| opener.document.SCORE.submit(); |
|
| } |
|
| self.close() |
|
| } |
|
| </script> |
</script> |
| INNERJS |
INNERJS |
| |
|
| my $start_page_msg_central = |
my $start_page_msg_central = |
| &Apache::loncommon::start_page('Message Central',$inner_js_msg_central, |
&Apache::loncommon::start_page('Message Central',$inner_js_msg_central, |
| {'js_ready' => 1, |
{'js_ready' => 1, |
| 'only_body' => 1, |
'only_body' => 1, |
| 'bgcolor' =>'#FFFFFF',}); |
'bgcolor' =>'#FFFFFF',}); |
| my $end_page_msg_central = |
my $end_page_msg_central = |
| &Apache::loncommon::end_page({'js_ready' => 1}); |
|
| |
|
| |
|
| my $start_page_highlight_central = |
|
| &Apache::loncommon::start_page('Highlight Central', |
|
| $inner_js_highlight_central, |
|
| {'js_ready' => 1, |
|
| 'only_body' => 1, |
|
| 'bgcolor' =>'#FFFFFF',}); |
|
| my $end_page_highlight_central = |
|
| &Apache::loncommon::end_page({'js_ready' => 1}); |
&Apache::loncommon::end_page({'js_ready' => 1}); |
| |
|
| my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); |
my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); |
| $docopen=~s/^document\.//; |
$docopen=~s/^document\.//; |
| my %lt = &Apache::lonlocal::texthash( |
|
| keyw => 'Keywords list, separated by a space. Add/delete to list if desired.', |
my %html_js_lt = &Apache::lonlocal::texthash( |
| 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: ', |
comp => 'Compose Message for: ', |
| incl => 'Include', |
incl => 'Include', |
| type => 'Type', |
type => 'Type', |
|
Line 1501 INNERJS
|
Line 2604 INNERJS
|
| new => 'New', |
new => 'New', |
| save => 'Save', |
save => 'Save', |
| canc => 'Cancel', |
canc => 'Cancel', |
| kehi => 'Keyword Highlight Options', |
|
| txtc => 'Text Color', |
|
| font => 'Font Size', |
|
| fnst => 'Font Style', |
|
| ); |
); |
| $request->print(<<SUBJAVASCRIPT); |
&html_escape(\%html_js_lt); |
| <script type="text/javascript" language="javascript"> |
&js_escape(\%html_js_lt); |
| |
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT)); |
| //===================== Show list of keywords ==================== |
|
| function keywords(formname) { |
|
| var nret = prompt("$lt{'keyw'}",formname.keywords.value); |
|
| if (nret==null) return; |
|
| formname.keywords.value = nret; |
|
| |
|
| if (formname.keywords.value != "") { |
|
| formname.refresh.value = "on"; |
|
| formname.submit(); |
|
| } |
|
| return; |
|
| } |
|
| |
|
| //===================== Script to view submitted by ================== |
//===================== Script to view submitted by ================== |
| function viewSubmitter(submitter) { |
function viewSubmitter(submitter) { |
|
Line 1531 INNERJS
|
Line 2618 INNERJS
|
| return; |
return; |
| } |
} |
| |
|
| //===================== Script to add keyword(s) ================== |
|
| function getSel() { |
|
| if (document.getSelection) txt = document.getSelection(); |
|
| else if (document.selection) txt = document.selection.createRange().text; |
|
| else return; |
|
| var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," "); |
|
| if (cleantxt=="") { |
|
| alert("$lt{'plse'}"); |
|
| return; |
|
| } |
|
| var nret = prompt("$lt{'adds'}",cleantxt); |
|
| if (nret==null) return; |
|
| document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret; |
|
| if (document.SCORE.keywords.value != "") { |
|
| document.SCORE.refresh.value = "on"; |
|
| document.SCORE.submit(); |
|
| } |
|
| return; |
|
| } |
|
| |
|
| //====================== Script for composing message ============== |
//====================== Script for composing message ============== |
| // preload images |
// preload images |
| img1 = new Image(); |
img1 = new Image(); |
|
Line 1605 INNERJS
|
Line 2672 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=700,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 1623 INNERJS
|
Line 2688 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\\"> $lt{'comp'}\"+fullname+\"<\\/span><\\/h3><br /><br />"); |
pDoc.write("<h1> $html_js_lt{'comp'}\"+fullname+\"<\\/h1>"); |
| |
|
| pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
pDoc.write('<table style="border:1px solid black;"><tr>'); |
| pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
pDoc.write("<td><b>$html_js_lt{'incl'}<\\/b><\\/td><td><b>$html_js_lt{'type'}<\\/b><\\/td><td><b>$html_js_lt{'mesa'}<\\/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>"); |
| 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>$html_js_lt{'subj'}<\\/td>"); |
| |
pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"40\\" maxlength=\\"80\\"><\\/td><\\/tr>"); |
| } |
} |
| |
|
| function displaySavedMsg(ctr,msg,shwsel) { |
function displaySavedMsg(ctr,msg,shwsel) { |
| pDoc = pWin.document; |
pDoc = pWin.document; |
| pDoc.write("<tr bgcolor=\\"#ffffdd\\">"); |
pDoc.write("<tr>"); |
| pDoc.write("<td align=\\"center\\">"+ctr+"<\\/td>"); |
|
| pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"><\\/td>"); |
pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"><\\/td>"); |
| |
pDoc.write("<td align=\\"center\\">"+ctr+"<\\/td>"); |
| pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"<\\/textarea><\\/td><\\/tr>"); |
pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"<\\/textarea><\\/td><\\/tr>"); |
| } |
} |
| |
|
| function newMsg(newmsg,shwsel) { |
function newMsg(newmsg,shwsel) { |
| pDoc = pWin.document; |
pDoc = pWin.document; |
| pDoc.write("<tr bgcolor=\\"#ffffdd\\">"); |
pDoc.write("<tr>"); |
| 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 align=\\"center\\">$html_js_lt{'new'}<\\/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>"); |
| } |
} |
| |
|
| function msgTail() { |
function msgTail() { |
| 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=\\"$lt{'save'}\\" onclick=\\"javascript:checkInput()\\"> "); |
pDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'save'}\\" onclick=\\"javascript:checkInput()\\"> "); |
| pDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />"); |
pDoc.write("<input type=\\"button\\" value=\\"$html_js_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(); |
| } |
} |
| |
|
| |
SUBJAVASCRIPT |
| |
} |
| |
|
| |
#--- javascript for essay type problem -- |
| |
sub sub_page_kw_js { |
| |
my $request = shift; |
| |
|
| |
unless ($env{'form.compmsg'}) { |
| |
&commonJSfunctions($request); |
| |
} |
| |
|
| |
my $inner_js_highlight_central= (<<INNERJS); |
| |
<script type="text/javascript"> |
| |
function updateChoice(flag) { |
| |
opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr); |
| |
opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize); |
| |
opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle); |
| |
opener.document.SCORE.refresh.value = "on"; |
| |
if (opener.document.SCORE.keywords.value!=""){ |
| |
opener.document.SCORE.submit(); |
| |
} |
| |
self.close() |
| |
} |
| |
</script> |
| |
INNERJS |
| |
|
| |
my $start_page_highlight_central = |
| |
&Apache::loncommon::start_page('Highlight Central', |
| |
$inner_js_highlight_central, |
| |
{'js_ready' => 1, |
| |
'only_body' => 1, |
| |
'bgcolor' =>'#FFFFFF',}); |
| |
my $end_page_highlight_central = |
| |
&Apache::loncommon::end_page({'js_ready' => 1}); |
| |
|
| |
my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); |
| |
$docopen=~s/^document\.//; |
| |
|
| |
my %js_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.', |
| |
col1 => 'red', |
| |
col2 => 'green', |
| |
col3 => 'blue', |
| |
siz1 => 'normal', |
| |
siz2 => '+1', |
| |
siz3 => '+2', |
| |
sty1 => 'normal', |
| |
sty2 => 'italic', |
| |
sty3 => 'bold', |
| |
); |
| |
my %html_js_lt = &Apache::lonlocal::texthash( |
| |
save => 'Save', |
| |
canc => 'Cancel', |
| |
kehi => 'Keyword Highlight Options', |
| |
txtc => 'Text Color', |
| |
font => 'Font Size', |
| |
fnst => 'Font Style', |
| |
); |
| |
&js_escape(\%js_lt); |
| |
&html_escape(\%html_js_lt); |
| |
&js_escape(\%html_js_lt); |
| |
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT)); |
| |
|
| |
//===================== Show list of keywords ==================== |
| |
function keywords(formname) { |
| |
var nret = prompt("$js_lt{'keyw'}",formname.keywords.value); |
| |
if (nret==null) return; |
| |
formname.keywords.value = nret; |
| |
|
| |
if (formname.keywords.value != "") { |
| |
formname.refresh.value = "on"; |
| |
formname.submit(); |
| |
} |
| |
return; |
| |
} |
| |
|
| |
//===================== Script to add keyword(s) ================== |
| |
function getSel() { |
| |
if (document.getSelection) txt = document.getSelection(); |
| |
else if (document.selection) txt = document.selection.createRange().text; |
| |
else return; |
| |
if (typeof(txt) != 'string') { |
| |
txt = String(txt); |
| |
} |
| |
var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," "); |
| |
if (cleantxt=="") { |
| |
alert("$js_lt{'plse'}"); |
| |
return; |
| |
} |
| |
var nret = prompt("$js_lt{'adds'}",cleantxt); |
| |
if (nret==null) return; |
| |
document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret; |
| |
if (document.SCORE.keywords.value != "") { |
| |
document.SCORE.refresh.value = "on"; |
| |
document.SCORE.submit(); |
| |
} |
| |
return; |
| |
} |
| |
|
| //====================== Script for keyword highlight options ============== |
//====================== Script for keyword highlight options ============== |
| function kwhighlight() { |
function kwhighlight() { |
| var kwclr = document.SCORE.kwclr.value; |
var kwclr = document.SCORE.kwclr.value; |
|
Line 1672 INNERJS
|
Line 2837 INNERJS
|
| var redsel = ""; |
var redsel = ""; |
| var grnsel = ""; |
var grnsel = ""; |
| var blusel = ""; |
var blusel = ""; |
| if (kwclr=="red") {var redsel="checked"}; |
var txtcol1 = "$js_lt{'col1'}"; |
| if (kwclr=="green") {var grnsel="checked"}; |
var txtcol2 = "$js_lt{'col2'}"; |
| if (kwclr=="blue") {var blusel="checked"}; |
var txtcol3 = "$js_lt{'col3'}"; |
| |
var txtsiz1 = "$js_lt{'siz1'}"; |
| |
var txtsiz2 = "$js_lt{'siz2'}"; |
| |
var txtsiz3 = "$js_lt{'siz3'}"; |
| |
var txtsty1 = "$js_lt{'sty1'}"; |
| |
var txtsty2 = "$js_lt{'sty2'}"; |
| |
var txtsty3 = "$js_lt{'sty3'}"; |
| |
if (kwclr=="red") {var redsel="checked='checked'"}; |
| |
if (kwclr=="green") {var grnsel="checked='checked'"}; |
| |
if (kwclr=="blue") {var blusel="checked='checked'"}; |
| var sznsel = ""; |
var sznsel = ""; |
| var sz1sel = ""; |
var sz1sel = ""; |
| var sz2sel = ""; |
var sz2sel = ""; |
| if (kwsize=="0") {var sznsel="checked"}; |
if (kwsize=="0") {var sznsel="checked='checked'"}; |
| if (kwsize=="+1") {var sz1sel="checked"}; |
if (kwsize=="+1") {var sz1sel="checked='checked'"}; |
| if (kwsize=="+2") {var sz2sel="checked"}; |
if (kwsize=="+2") {var sz2sel="checked='checked'"}; |
| var synsel = ""; |
var synsel = ""; |
| var syisel = ""; |
var syisel = ""; |
| var sybsel = ""; |
var sybsel = ""; |
| if (kwstyle=="") {var synsel="checked"}; |
if (kwstyle=="") {var synsel="checked='checked'"}; |
| if (kwstyle=="<i>") {var syisel="checked"}; |
if (kwstyle=="<i>") {var syisel="checked='checked'"}; |
| if (kwstyle=="<b>") {var sybsel="checked"}; |
if (kwstyle=="<b>") {var sybsel="checked='checked'"}; |
| highlightCentral(); |
highlightCentral(); |
| highlightbody('red','red',redsel,'0','normal',sznsel,'','normal',synsel); |
highlightbody('red',txtcol1,redsel,'0',txtsiz1,sznsel,'',txtsty1,synsel); |
| highlightbody('green','green',grnsel,'+1','+1',sz1sel,'<i>','italic',syisel); |
highlightbody('green',txtcol2,grnsel,'+1',txtsiz2,sz1sel,'<i>',txtsty2,syisel); |
| highlightbody('blue','blue',blusel,'+2','+2',sz2sel,'<b>','bold',sybsel); |
highlightbody('blue',txtcol3,blusel,'+2',txtsiz3,sz2sel,'<b>',txtsty3,sybsel); |
| highlightend(); |
highlightend(); |
| return; |
return; |
| } |
} |
|
Line 1708 INNERJS
|
Line 2882 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\\"> $lt{'kehi'}<\\/span><\\/h3><br /><br />"); |
hDoc.write("<h1>$html_js_lt{'kehi'}<\\/h1>"); |
| |
|
| hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
hDoc.write('<table border="0" width="100%"><tr style="background-color:#A1D676">'); |
| hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
hDoc.write("<th>$html_js_lt{'txtc'}<\\/th><th>$html_js_lt{'font'}<\\/th><th>$html_js_lt{'fnst'}<\\/th><\\/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) { |
| var hDoc = hwdWin.document; |
var hDoc = hwdWin.document; |
| hDoc.write("<tr bgcolor=\\"#ffffdd\\">"); |
hDoc.write("<tr>"); |
| hDoc.write("<td align=\\"left\\">"); |
hDoc.write("<td align=\\"left\\">"); |
| hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+"> "+clrtxt+"<\\/td>"); |
hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+" \\/> "+clrtxt+"<\\/td>"); |
| hDoc.write("<td align=\\"left\\">"); |
hDoc.write("<td align=\\"left\\">"); |
| hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+"> "+sztxt+"<\\/td>"); |
hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+" \\/> "+sztxt+"<\\/td>"); |
| hDoc.write("<td align=\\"left\\">"); |
hDoc.write("<td align=\\"left\\">"); |
| hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+"> "+sytxt+"<\\/td>"); |
hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+" \\/> "+sytxt+"<\\/td>"); |
| hDoc.write("<\\/tr>"); |
hDoc.write("<\\/tr>"); |
| } |
} |
| |
|
| function highlightend() { |
function highlightend() { |
| var hDoc = hwdWin.document; |
var hDoc = hwdWin.document; |
| hDoc.write("<\\/table>"); |
hDoc.write("<\\/table><br \\/>"); |
| hDoc.write("<\\/td><\\/tr><\\/table> "); |
hDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\" \\/> "); |
| hDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\"> "); |
hDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'canc'}\\" 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(); |
| } |
} |
| |
|
| </script> |
|
| SUBJAVASCRIPT |
SUBJAVASCRIPT |
| } |
} |
| |
|
|
Line 1781 sub gradeBox {
|
Line 2952 sub gradeBox {
|
| $wgt = ($wgt > 0 ? $wgt : '1'); |
$wgt = ($wgt > 0 ? $wgt : '1'); |
| my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ? |
my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ? |
| '' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt)); |
'' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt)); |
| my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n"; |
my $data_WGT='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n"; |
| my $display_part= &get_display_part($partid,$symb); |
my $display_part= &get_display_part($partid,$symb); |
| my %last_resets = &get_last_resets($symb,$env{'request.course.id'}, |
my %last_resets = &get_last_resets($symb,$env{'request.course.id'}, |
| [$partid]); |
[$partid]); |
|
Line 1789 sub gradeBox {
|
Line 2960 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.=&Apache::loncommon::start_data_table_row(); |
my $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 1825 sub gradeBox {
|
Line 2996 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>'.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'; |
'<td>'.$data_WGT.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'; |
| $result.=&Apache::loncommon::end_data_table_row(); |
$result.=&Apache::loncommon::end_data_table_row(); |
| |
$result.=&Apache::loncommon::start_data_table_row().'<td colspan="6">'; |
| $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 1839 sub gradeBox {
|
Line 3010 sub gradeBox {
|
| $aggtries.'" />'."\n"; |
$aggtries.'" />'."\n"; |
| my $res_error; |
my $res_error; |
| $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error); |
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error); |
| |
$result.='</td>'.&Apache::loncommon::end_data_table_row(); |
| if ($res_error) { |
if ($res_error) { |
| return &navmap_errormsg(); |
return &navmap_errormsg(); |
| } |
} |
|
Line 1846 sub gradeBox {
|
Line 3018 sub gradeBox {
|
| } |
} |
| |
|
| sub handback_box { |
sub handback_box { |
| my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_; |
my ($symb,$uname,$udom,$counter,$partid,$record,$res_error_pointer) = @_; |
| my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error); |
my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,$res_error_pointer); |
| |
return unless ($numessay); |
| my (@respids); |
my (@respids); |
| my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id = &flatten_responseType($responseType); |
| foreach my $part_response_id (@part_response_id) { |
foreach my $part_response_id (@part_response_id) { |
|
Line 1866 sub handback_box {
|
Line 3039 sub handback_box {
|
| if ($file =~ /\/portfolio\//) { |
if ($file =~ /\/portfolio\//) { |
| $file_counter++; |
$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) = &Apache::lonnet::file_name_version_ext($file_disp); |
| $file_disp = "$name.$ext"; |
$file_disp = "$name.$ext"; |
| $file = $file_path.$file_disp; |
$file = $file_path.$file_disp; |
| $result.=&mt('Return commented version of [_1] to student.', |
$result.=&mt('Return commented version of [_1] to student.', |
|
Line 1912 sub show_problem {
|
Line 3085 sub show_problem {
|
| $companswer=~s|</form>||g; |
$companswer=~s|</form>||g; |
| $companswer=~s|name="submit"|name="would_have_been_submit"|g; |
$companswer=~s|name="submit"|name="would_have_been_submit"|g; |
| } |
} |
| |
my $renderheading = &mt('View of the problem'); |
| |
my $answerheading = &mt('Correct answer'); |
| |
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
| |
my $stu_fullname = $env{'form.fullname'}; |
| |
if ($stu_fullname eq '') { |
| |
$stu_fullname = &Apache::loncommon::plainname($uname,$udom,'lastname'); |
| |
} |
| |
my $forwhom = &nameUserString(undef,$stu_fullname,$uname,$udom); |
| |
if ($forwhom ne '') { |
| |
$renderheading = &mt('View of the problem for[_1]',$forwhom); |
| |
$answerheading = &mt('Correct answer for[_1]',$forwhom); |
| |
} |
| |
} |
| $rendered= |
$rendered= |
| '<div class="LC_Box">' |
'<div class="LC_Box">' |
| .'<h3 class="LC_hcell">'.&mt('View of the problem').'</h3>' |
.'<h3 class="LC_hcell">'.$renderheading.'</h3>' |
| .$rendered |
.$rendered |
| .'</div>'; |
.'</div>'; |
| $companswer= |
$companswer= |
| '<div class="LC_Box">' |
'<div class="LC_Box">' |
| .'<h3 class="LC_hcell">'.&mt('Correct answer').'</h3>' |
.'<h3 class="LC_hcell">'.$answerheading.'</h3>' |
| .$companswer |
.$companswer |
| .'</div>'; |
.'</div>'; |
| my $result; |
my $result; |
|
Line 1936 sub show_problem {
|
Line 3122 sub show_problem {
|
| sub files_exist { |
sub files_exist { |
| my ($r, $symb) = @_; |
my ($r, $symb) = @_; |
| my @students = &Apache::loncommon::get_env_multiple('form.stuinfo'); |
my @students = &Apache::loncommon::get_env_multiple('form.stuinfo'); |
| |
|
| foreach my $student (@students) { |
foreach my $student (@students) { |
| my ($uname,$udom,$fullname) = split(/:/,$student); |
my ($uname,$udom,$fullname) = split(/:/,$student); |
| my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'}, |
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'}, |
| $udom,$uname); |
$udom,$uname); |
| my ($string,$timestamp)= &get_last_submission(\%record); |
my ($string)= &get_last_submission(\%record); |
| foreach my $submission (@$string) { |
foreach my $submission (@$string) { |
| my ($partid,$respid) = |
my ($partid,$respid) = |
| ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/); |
($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/); |
|
Line 1955 sub files_exist {
|
Line 3140 sub files_exist {
|
| |
|
| sub download_all_link { |
sub download_all_link { |
| my ($r,$symb) = @_; |
my ($r,$symb) = @_; |
| |
unless (&files_exist($r, $symb)) { |
| |
$r->print(&mt('There are currently no submitted documents.')); |
| |
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 1967 sub download_all_link {
|
Line 3156 sub download_all_link {
|
| 'cgi.'.$identifier.'.parts' => $parts,}); |
'cgi.'.$identifier.'.parts' => $parts,}); |
| $r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'. |
$r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'. |
| &mt('Download All Submitted Documents').'</a>'); |
&mt('Download All Submitted Documents').'</a>'); |
| return |
return; |
| |
} |
| |
|
| |
sub submit_download_link { |
| |
my ($request,$symb) = @_; |
| |
if (!$symb) { return ''; } |
| |
my $res_error; |
| |
my ($partlist,$handgrade,$responseType,$numresp,$numessay,$numdropbox) = |
| |
&response_type($symb,\$res_error); |
| |
if ($res_error) { |
| |
$request->print(&mt('An error occurred retrieving response types')); |
| |
return; |
| |
} |
| |
unless ($numessay) { |
| |
$request->print(&mt('No essayresponse items found')); |
| |
return; |
| |
} |
| |
my @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart'); |
| |
if (@chosenparts) { |
| |
$request->print(&showResourceInfo($symb,$partlist,$responseType, |
| |
undef,undef,1)); |
| |
} |
| |
if ($numessay) { |
| |
my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'}; |
| |
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; |
| |
my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'}; |
| |
(undef,undef,my $fullname) = &getclasslist($getsec,1,$getgroup,$symb,$submitonly,1); |
| |
if (ref($fullname) eq 'HASH') { |
| |
my @students = map { $_.':'.$fullname->{$_} } (keys(%{$fullname})); |
| |
if (@students) { |
| |
@{$env{'form.stuinfo'}} = @students; |
| |
if ($numdropbox) { |
| |
&download_all_link($request,$symb); |
| |
} else { |
| |
$request->print(&mt('No essayrespose items with dropbox found')); |
| |
} |
| |
# FIXME Need a mechanism to download essays, i.e., if $numessay > $numdropbox |
| |
# Needs to omit user's identity if resource instance is for an anonymous survey. |
| |
} else { |
| |
$request->print(&mt('No students match the criteria you selected')); |
| |
} |
| |
} else { |
| |
$request->print(&mt('Could not retrieve student information')); |
| |
} |
| |
} else { |
| |
$request->print(&mt('No essayresponse items found')); |
| |
} |
| |
return; |
| } |
} |
| |
|
| sub build_section_inputs { |
sub build_section_inputs { |
|
Line 1985 sub build_section_inputs {
|
Line 3221 sub build_section_inputs {
|
| |
|
| # --------------------------- show submissions of a student, option to grade |
# --------------------------- show submissions of a student, option to grade |
| sub submission { |
sub submission { |
| my ($request,$counter,$total) = @_; |
my ($request,$counter,$total,$symb,$divforres,$calledby) = @_; |
| my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'}); |
my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'}); |
| $udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student? |
$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student? |
| my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'}); |
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'}); |
| $env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq ''; |
$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq ''; |
| my $symb = &get_symb($request); |
|
| if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; } |
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; } |
| |
my $probtitle=&Apache::lonnet::gettitle($symb); |
| |
my $is_tool = ($symb =~ /ext\.tool$/); |
| |
my ($essayurl,%coursedesc_by_cid); |
| |
|
| if (!&canview($usec)) { |
if (!&canview($usec)) { |
| $request->print('<span class="LC_warning">Unable to view requested student.('. |
$request->print( |
| $uname.':'.$udom.' in section '.$usec.' in course id '. |
'<span class="LC_warning">'. |
| $env{'request.course.id'}.')</span>'); |
&mt('Unable to view requested student.'). |
| $request->print(&show_grading_menu_form($symb)); |
' '.&mt('([_1] in section [_2] in course id [_3])', |
| |
$uname.':'.$udom,$usec,$env{'request.course.id'}). |
| |
'</span>'); |
| return; |
return; |
| } |
} |
| |
|
| |
my $res_error; |
| |
my ($partlist,$handgrade,$responseType,$numresp,$numessay) = |
| |
&response_type($symb,\$res_error); |
| |
if ($res_error) { |
| |
$request->print(&navmap_errormsg()); |
| |
return; |
| |
} |
| |
|
| if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; } |
if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; } |
| if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; } |
unless ($is_tool) { |
| if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; } |
if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; } |
| |
if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; } |
| |
} |
| |
if (($numessay) && ($calledby eq 'submission') && (!exists($env{'form.compmsg'}))) { |
| |
$env{'form.compmsg'} = 1; |
| |
} |
| my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : ''); |
my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : ''); |
| my $checkIcon = '<img alt="'.&mt('Check Mark'). |
my $checkIcon = '<img alt="'.&mt('Check Mark'). |
| '" src="'.$request->dir_config('lonIconsURL'). |
'" src="'.$request->dir_config('lonIconsURL'). |
| '/check.gif" height="16" border="0" />'; |
'/check.gif" height="16" border="0" />'; |
| |
|
| my %old_essays; |
|
| # header info |
# header info |
| if ($counter == 0) { |
if ($counter == 0) { |
| |
my @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart'); |
| |
if (@chosenparts) { |
| |
$request->print(&showResourceInfo($symb,$partlist,$responseType,'gradesub')); |
| |
} elsif ($divforres) { |
| |
$request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>'); |
| |
} else { |
| |
$request->print('<br clear="all" />'); |
| |
} |
| &sub_page_js($request); |
&sub_page_js($request); |
| &sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes'); |
&sub_grademessage_js($request) if ($env{'form.compmsg'}); |
| $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? |
&sub_page_kw_js($request) if ($numessay); |
| &Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; |
|
| if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) { |
|
| &download_all_link($request, $symb); |
|
| } |
|
| $request->print('<h3> <span class="LC_info">'.&mt('Submission Record').'</span></h3>'."\n". |
|
| '<h4> '.&mt('<b>Resource: </b> [_1]',$env{'form.probTitle'}).'</h4>'."\n"); |
|
| |
|
| # option to display problem, only once else it cause problems |
# option to display problem, only once else it cause problems |
| # with the form later since the problem has a form. |
# with the form later since the problem has a form. |
|
Line 2037 sub submission {
|
Line 3292 sub submission {
|
| $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode)); |
$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode)); |
| } |
} |
| |
|
| # kwclr is the only variable that is guaranteed to be non blank |
|
| # if this subroutine has been called once. |
|
| my %keyhash = (); |
my %keyhash = (); |
| if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') { |
if (($env{'form.kwclr'} eq '' && $numessay) || ($env{'form.compmsg'})) { |
| %keyhash = &Apache::lonnet::dump('nohist_handgrade', |
%keyhash = &Apache::lonnet::dump('nohist_handgrade', |
| $env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
| $env{'course.'.$env{'request.course.id'}.'.num'}); |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
| |
} |
| |
# kwclr is the only variable that is guaranteed not to be blank |
| |
# if this subroutine has been called once. |
| |
if ($env{'form.kwclr'} eq '' && $numessay) { |
| my $loginuser = $env{'user.name'}.':'.$env{'user.domain'}; |
my $loginuser = $env{'user.name'}.':'.$env{'user.domain'}; |
| $env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : ''; |
$env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : ''; |
| $env{'form.kwclr'} = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red'; |
$env{'form.kwclr'} = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red'; |
| $env{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0'; |
$env{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0'; |
| $env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : ''; |
$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : ''; |
| $env{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ? |
} |
| $keyhash{$symb.'_subject'} : $env{'form.probTitle'}; |
if ($env{'form.compmsg'}) { |
| |
$env{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ? |
| |
$keyhash{$symb.'_subject'} : $probtitle; |
| $env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0'; |
$env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0'; |
| } |
} |
| |
|
| my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'}; |
my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'}; |
| my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
| $request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\n". |
$request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\n". |
| '<input type="hidden" name="command" value="handgrade" />'."\n". |
'<input type="hidden" name="command" value="handgrade" />'."\n". |
| '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n". |
|
| '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n". |
'<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n". |
| '<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n". |
'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n". |
| '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n". |
|
| '<input type="hidden" name="refresh" value="off" />'."\n". |
'<input type="hidden" name="refresh" value="off" />'."\n". |
| '<input type="hidden" name="studentNo" value="" />'."\n". |
'<input type="hidden" name="studentNo" value="" />'."\n". |
| '<input type="hidden" name="gradeOpt" value="" />'."\n". |
'<input type="hidden" name="gradeOpt" value="" />'."\n". |
| '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
| '<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" />'."\n". |
|
| '<input type="hidden" name="vProb" value="'.$env{'form.vProb'}.'" />'."\n". |
'<input type="hidden" name="vProb" value="'.$env{'form.vProb'}.'" />'."\n". |
| '<input type="hidden" name="vAns" value="'.$env{'form.vAns'}.'" />'."\n". |
'<input type="hidden" name="vAns" value="'.$env{'form.vAns'}.'" />'."\n". |
| '<input type="hidden" name="lastSub" value="'.$env{'form.lastSub'}.'" />'."\n". |
'<input type="hidden" name="lastSub" value="'.$env{'form.lastSub'}.'" />'."\n". |
| |
'<input type="hidden" name="compmsg" value="'.$env{'form.compmsg'}.'" />'."\n". |
| &build_section_inputs(). |
&build_section_inputs(). |
| '<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'" />'."\n". |
'<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'" />'."\n". |
| '<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" />'."\n". |
|
| '<input type="hidden" name="NCT"'. |
'<input type="hidden" name="NCT"'. |
| ' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n"); |
' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n"); |
| if ($env{'form.handgrade'} eq 'yes') { |
if ($env{'form.compmsg'}) { |
| |
$request->print('<input type="hidden" name="msgsub" value="'.$env{'form.msgsub'}.'" />'."\n". |
| |
'<input type="hidden" name="shownSub" value="0" />'."\n". |
| |
'<input type="hidden" name="savemsgN" value="'.$env{'form.savemsgN'}.'" />'."\n"); |
| |
} |
| |
if ($numessay) { |
| $request->print('<input type="hidden" name="keywords" value="'.$env{'form.keywords'}.'" />'."\n". |
$request->print('<input type="hidden" name="keywords" value="'.$env{'form.keywords'}.'" />'."\n". |
| '<input type="hidden" name="kwclr" value="'.$env{'form.kwclr'}.'" />'."\n". |
'<input type="hidden" name="kwclr" value="'.$env{'form.kwclr'}.'" />'."\n". |
| '<input type="hidden" name="kwsize" value="'.$env{'form.kwsize'}.'" />'."\n". |
'<input type="hidden" name="kwsize" value="'.$env{'form.kwsize'}.'" />'."\n". |
| '<input type="hidden" name="kwstyle" value="'.$env{'form.kwstyle'}.'" />'."\n". |
'<input type="hidden" name="kwstyle" value="'.$env{'form.kwstyle'}.'" />'."\n"); |
| '<input type="hidden" name="msgsub" value="'.$env{'form.msgsub'}.'" />'."\n". |
|
| '<input type="hidden" name="shownSub" value="0" />'."\n". |
|
| '<input type="hidden" name="savemsgN" value="'.$env{'form.savemsgN'}.'" />'."\n"); |
|
| foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) { |
|
| $request->print('<input type="hidden" name="vPart" value="'.$partid.'" />'."\n"); |
|
| } |
|
| } |
} |
| |
|
| my ($cts,$prnmsg) = (1,''); |
my ($cts,$prnmsg) = (1,''); |
| while ($cts <= $env{'form.savemsgN'}) { |
while ($cts <= $env{'form.savemsgN'}) { |
| $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'. |
$prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'. |
|
Line 2100 sub submission {
|
Line 3355 sub submission {
|
| } |
} |
| $request->print($prnmsg); |
$request->print($prnmsg); |
| |
|
| if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') { |
if ($numessay) { |
| |
|
| my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
| |
keyh => 'Keyword Highlighting for Essays', |
| keyw => 'Keyword Options', |
keyw => 'Keyword Options', |
| list => 'List', |
list => 'List', |
| past => 'Paste Selection to List', |
past => 'Paste Selection to List', |
| high => 'Hightlight Attribute', |
high => 'Highlight Attribute', |
| ); |
); |
| # |
# |
| # Print out the keyword options line |
# Print out the keyword options line |
| # |
# |
| $request->print(<<KEYWORDS); |
$request->print( |
| <b>$lt{'keyw'}:</b> |
'<div class="LC_columnSection">' |
| <a href="javascript:keywords(document.SCORE);" target="_self">$lt{'list'}</a> |
.'<fieldset><legend>'.$lt{'keyh'}.'</legend>' |
| <a href="#" onmousedown="javascript:getSel(); return false" |
.&Apache::lonhtmlcommon::funclist_from_array( |
| CLASS="page">$lt{'past'}</a> |
['<a href="javascript:keywords(document.SCORE);" target="_self">'.$lt{'list'}.'</a>', |
| <a href="javascript:kwhighlight();" target="_self">$lt{'high'}</a><br /><br /> |
'<a href="#" onmousedown="javascript:getSel(); return false" |
| KEYWORDS |
class="page">'.$lt{'past'}.'</a>', |
| |
'<a href="javascript:kwhighlight();" target="_self">'.$lt{'high'}.'</a>'], |
| |
{legend => $lt{'keyw'}}) |
| |
.'</fieldset></div>' |
| |
); |
| |
|
| # |
# |
| # Load the other essays for similarity check |
# Load the other essays for similarity check |
| # |
# |
| my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb); |
(undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb); |
| my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); |
if ($essayurl eq 'lib/templates/simpleproblem.problem') { |
| $apath=&escape($apath); |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| $apath=~s/\W/\_/gs; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| %old_essays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname); |
if ($cdom ne '' && $cnum ne '') { |
| |
my ($map,$id,$res) = &Apache::lonnet::decode_symb($symb); |
| |
if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(default(?:|_\d+)\.(?:sequence|page))$}) { |
| |
my $apath = $1.'_'.$id; |
| |
$apath=~s/\W/\_/gs; |
| |
&init_old_essays($symb,$apath,$cdom,$cnum); |
| |
} |
| |
} |
| |
} else { |
| |
my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); |
| |
$apath=&escape($apath); |
| |
$apath=~s/\W/\_/gs; |
| |
&init_old_essays($symb,$apath,$adom,$aname); |
| |
} |
| } |
} |
| } |
} |
| |
|
|
Line 2142 KEYWORDS
|
Line 3416 KEYWORDS
|
| if ($perm{'vgr'}) { |
if ($perm{'vgr'}) { |
| $request->print( |
$request->print( |
| &Apache::loncommon::track_student_link( |
&Apache::loncommon::track_student_link( |
| &mt('View recent activity'), |
'View recent activity', |
| $uname,$udom,'check') |
$uname,$udom,'check') |
| .' ' |
.' ' |
| ); |
); |
|
Line 2169 KEYWORDS
|
Line 3443 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 $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 $boxtitle = &mt('Submissions'); |
| |
if ($is_tool) { |
| |
$boxtitle = &mt('Transactions') |
| |
} |
| my $result='<div class="LC_Box">' |
my $result='<div class="LC_Box">' |
| .'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>'; |
.'<h3 class="LC_hcell">'.$boxtitle.'</h3>'; |
| $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 (($numresp > $numessay) && !$is_tool) { |
| $result.='<p class="LC_info">' |
$result.='<p class="LC_info">' |
| .&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon) |
.&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon) |
| ."</p>\n"; |
."</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 essayresponse, then check for collaborators |
| my $fullname; |
my $fullname; |
| my $col_fullnames = []; |
my $col_fullnames = []; |
| if ($env{'form.handgrade'} eq 'yes') { |
if ($numessay) { |
| (my $sub_result,$fullname,$col_fullnames)= |
(my $sub_result,$fullname,$col_fullnames)= |
| &check_collaborators($symb,$uname,$udom,\%record,$handgrade, |
&check_collaborators($symb,$uname,$udom,\%record,$handgrade, |
| $counter); |
$counter); |
|
Line 2201 KEYWORDS
|
Line 3473 KEYWORDS
|
| $request->print($result."\n"); |
$request->print($result."\n"); |
| |
|
| # print student answer/submission |
# print student answer/submission |
| # Options are (1) Handgraded submission only |
# Options are (1) Last submission only |
| # (2) Last submission, includes submission that is not handgraded |
# (2) Last submission (with detailed information for that submission) |
| # (for multi-response type part) |
# (3) All transactions (by date) |
| # (3) Last submission plus the parts info |
# (4) The whole record (with detailed information for all transactions) |
| # (4) The whole record for this student |
|
| if ($env{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) { |
my ($lastsubonly,$partinfo) = |
| my ($string,$timestamp)= &get_last_submission(\%record); |
&show_last_submission($uname,$udom,$symb,$essayurl,$responseType,$env{'form.lastSub'}, |
| |
$is_tool,$fullname,\%record,\%coursedesc_by_cid); |
| my $lastsubonly; |
$request->print($partinfo); |
| |
$request->print($lastsubonly); |
| |
|
| if ($$timestamp eq '') { |
if ($env{'form.lastSub'} eq 'datesub') { |
| $lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>'; |
my ($parts,$handgrade,$responseType) = &response_type($symb,\$res_error); |
| } else { |
|
| $lastsubonly = |
|
| '<div class="LC_grade_submissions_body">' |
|
| .'<b>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n"; |
|
| |
|
| my %seenparts; |
|
| my @part_response_id = &flatten_responseType($responseType); |
|
| foreach my $part (@part_response_id) { |
|
| next if ($env{'form.lastSub'} eq 'hdgrade' |
|
| && $$handgrade{$$part[0].'_'.$$part[1]} ne 'yes'); |
|
| |
|
| my ($partid,$respid) = @{ $part }; |
|
| my $display_part=&get_display_part($partid,$symb); |
|
| if ($env{"form.$uname:$udom:$partid:submitted_by"}) { |
|
| if (exists($seenparts{$partid})) { next; } |
|
| $seenparts{$partid}=1; |
|
| my $submitby='<b>Part:</b> '.$display_part. |
|
| ' <b>Collaborative submission by:</b> '. |
|
| '<a href="javascript:viewSubmitter(\''. |
|
| $env{"form.$uname:$udom:$partid:submitted_by"}. |
|
| '\');" target="_self">'. |
|
| $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />'; |
|
| $request->print($submitby); |
|
| next; |
|
| } |
|
| my $responsetype = $responseType->{$partid}->{$respid}; |
|
| if (!exists($record{"resource.$partid.$respid.submission"})) { |
|
| $lastsubonly.="\n".'<div class="LC_grade_submission_part">'. |
|
| '<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
|
| ' <span class="LC_internal_info">'. |
|
| '('.&mt('Response ID: [_1]',$respid).')'. |
|
| '</span> '. |
|
| '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>'; |
|
| next; |
|
| } |
|
| foreach my $submission (@$string) { |
|
| my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/); |
|
| if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; } |
|
| my ($ressub,$hide,$subval) = split(/:/,$submission,3); |
|
| # Similarity check |
|
| 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'}){ |
|
| my ($oname,$odom,$ocrsid,$oessay,$osim)= |
|
| &most_similar($uname,$udom,$subval,\%old_essays); |
|
| if ($osim) { |
|
| $osim=int($osim*100.0); |
|
| my %old_course_desc = |
|
| &Apache::lonnet::coursedescription($ocrsid, |
|
| {'one_time' => 1}); |
|
| |
|
| if ($hide eq 'anon') { |
|
| $similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'. |
|
| &mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />'; |
|
| } else { |
|
| $similar="<hr /><h3><span class=\"LC_warning\">". |
|
| &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])', |
|
| $osim, |
|
| &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')', |
|
| $old_course_desc{'description'}, |
|
| $old_course_desc{'num'}, |
|
| $old_course_desc{'domain'}). |
|
| '</span></h3><blockquote><i>'. |
|
| &keywords_highlight($oessay). |
|
| '</i></blockquote><hr />'; |
|
| } |
|
| } |
|
| } |
|
| my $order=&get_order($partid,$respid,$symb,$uname,$udom, |
|
| undef,$type,$trial,$rndseed); |
|
| if ($env{'form.lastSub'} eq 'lastonly' || |
|
| ($env{'form.lastSub'} eq 'hdgrade' && |
|
| $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) { |
|
| my $display_part=&get_display_part($partid,$symb); |
|
| $lastsubonly.='<div class="LC_grade_submission_part">'. |
|
| '<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
|
| ' <span class="LC_internal_info">'. |
|
| '('.&mt('Response ID: [_1]',$respid).')'. |
|
| '</span> '; |
|
| my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record); |
|
| if (@$files) { |
|
| if ($hide eq 'anon') { |
|
| $lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files})); |
|
| } else { |
|
| $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />'; |
|
| foreach my $file (@$files) { |
|
| &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 />'; |
|
| } |
|
| if ($hide eq 'anon') { |
|
| $lastsubonly.='<b>'.&mt('Anonymous Survey').'</b>'; |
|
| } 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";} |
|
| $lastsubonly.='</div>'; |
|
| } |
|
| } |
|
| } |
|
| $lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body |
|
| } |
|
| $request->print($lastsubonly); |
|
| } elsif ($env{'form.lastSub'} eq 'datesub') { |
|
| my (undef,$responseType,undef,$parts) = &showResourceInfo($symb); |
|
| $request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom)); |
$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom)); |
| } elsif ($env{'form.lastSub'} =~ /^(last|all)$/) { |
} |
| $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, |
if ($env{'form.lastSub'} =~ /^(last|all)$/) { |
| |
my $identifier = (&canmodify($usec)? $counter : ''); |
| |
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, |
| $env{'request.course.id'}, |
$env{'request.course.id'}, |
| $last,'.submission', |
$last,'.submission', |
| 'Apache::grades::keywords_highlight')); |
'Apache::grades::keywords_highlight', |
| |
$usec,$identifier)); |
| } |
} |
| |
|
| $request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':' |
$request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':' |
| .$udom.'" />'."\n"); |
.$udom.'" />'."\n"); |
| # return if view submission with no grading option |
# return if view submission with no grading option |
| if ($env{'form.showgrading'} eq '' || (!&canmodify($usec))) { |
if (!&canmodify($usec)) { |
| my $toGrade.='<input type="button" value="Grade Student" '. |
$request->print('<p><span class="LC_warning">'.&mt('No grading privileges').'</span></p></div>'); |
| 'onclick="javascript:checksubmit(this.form,\'Grade Student\',\'' |
|
| .$counter.'\');" target="_self" /> '."\n" if (&canmodify($usec)); |
|
| $toGrade.='</div>'."\n"; |
|
| if (($env{'form.command'} eq 'submission') || |
|
| ($env{'form.command'} eq 'processGroup' && $counter == $total)) { |
|
| $toGrade.='</form>'.&show_grading_menu_form($symb); |
|
| } |
|
| $request->print($toGrade); |
|
| return; |
return; |
| } else { |
} else { |
| $request->print('</div>'."\n"); |
$request->print('</div>'."\n"); |
| } |
} |
| |
|
| # essay grading message center |
# grading message center |
| if ($env{'form.handgrade'} eq 'yes') { |
|
| my $result='<div class="LC_grade_message_center">'; |
if ($env{'form.compmsg'}) { |
| |
my $result='<div class="LC_Box">'. |
| $result.='<div class="LC_grade_message_center_header">'. |
'<h3 class="LC_hcell">'.&mt('Send Message').'</h3>'. |
| &mt('Send Message').'</div><div class="LC_grade_message_center_body">'; |
'<div class="LC_grade_message_center_body">'; |
| my ($lastname,$givenn) = split(/,/,$env{'form.fullname'}); |
my ($lastname,$givenn) = split(/,/,$env{'form.fullname'}); |
| my $msgfor = $givenn.' '.$lastname; |
my $msgfor = $givenn.' '.$lastname; |
| if (scalar(@$col_fullnames) > 0) { |
if (scalar(@$col_fullnames) > 0) { |
| my $lastone = pop(@$col_fullnames); |
my $lastone = pop(@$col_fullnames); |
| $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.'; |
$msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.'; |
| } |
} |
| $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript |
$msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript |
| $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n". |
$result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n". |
| '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n"; |
'<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n". |
| $result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter. |
' <a href="javascript:msgCenter(document.SCORE,'.$counter. |
| ',\''.$msgfor.'\');" target="_self">'. |
',\''.$msgfor.'\');" target="_self">'. |
| &mt('Compose message to student').(scalar(@$col_fullnames) >= 1 ? 's' : '').'</a><label> ('. |
&mt('Compose message to student'.(scalar(@$col_fullnames) >= 1 ? 's' : '')).'</a><label> ('. |
| &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'. |
&mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'. |
| '<img src="'.$request->dir_config('lonIconsURL'). |
' <img src="'.$request->dir_config('lonIconsURL'). |
| '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n". |
'/mailbkgrd.gif" width="14" height="10" alt="" name="mailicon'.$counter.'" />'."\n". |
| '<br /> ('. |
'<br /> ('. |
| &mt('Message will be sent when you click on Save & Next below.').")\n"; |
&mt('Message will be sent when you click on Save & Next below.').")\n". |
| $result.='</div></div>'; |
'</div></div>'; |
| $request->print($result); |
$request->print($result); |
| } |
} |
| |
|
| my %seen = (); |
my %seen = (); |
| my @partlist; |
my @partlist; |
| my @gradePartRespid; |
my @gradePartRespid; |
| my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id; |
| |
if ($is_tool) { |
| |
@part_response_id = ([0,'']); |
| |
} else { |
| |
@part_response_id = &flatten_responseType($responseType); |
| |
} |
| $request->print( |
$request->print( |
| '<div class="LC_Box">' |
'<div class="LC_Box">' |
| .'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>' |
.'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>' |
|
Line 2394 KEYWORDS
|
Line 3552 KEYWORDS
|
| my $part_resp = join('_',@{ $part_response_id }); |
my $part_resp = join('_',@{ $part_response_id }); |
| next if ($seen{$partid} > 0); |
next if ($seen{$partid} > 0); |
| $seen{$partid}++; |
$seen{$partid}++; |
| next if ($$handgrade{$part_resp} ne 'yes' |
|
| && $env{'form.lastSub'} eq 'hdgrade'); |
|
| push(@partlist,$partid); |
push(@partlist,$partid); |
| push(@gradePartRespid,$partid.'.'.$respid); |
push(@gradePartRespid,$partid.'.'.$respid); |
| $request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record)); |
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record)); |
|
Line 2446 KEYWORDS
|
Line 3602 KEYWORDS
|
| $endform.="<input type='hidden' value='".&get_increment(). |
$endform.="<input type='hidden' value='".&get_increment(). |
| "' name='increment' />"; |
"' name='increment' />"; |
| $endform.='</td></tr></table></form>'; |
$endform.='</td></tr></table></form>'; |
| $endform.=&show_grading_menu_form($symb); |
|
| $request->print($endform); |
$request->print($endform); |
| } |
} |
| return ''; |
return ''; |
| } |
} |
| |
|
| |
sub show_last_submission { |
| |
my ($uname,$udom,$symb,$essayurl,$responseType,$viewtype,$is_tool,$fullname, |
| |
$record,$coursedesc_by_cid) = @_; |
| |
my ($string,$timestamp,$lastgradetime,$lastsubmittime) = |
| |
&get_last_submission($record,$is_tool); |
| |
|
| |
my ($lastsubonly,$partinfo); |
| |
if ($timestamp eq '') { |
| |
$lastsubonly.='<div class="LC_grade_submissions_body">'.$string->[0].'</div>'; |
| |
} elsif ($is_tool) { |
| |
$lastsubonly = |
| |
'<div class="LC_grade_submissions_body">' |
| |
.'<b>'.&mt('Date Grade Passed Back:').'</b> '.$timestamp."</div>\n"; |
| |
} else { |
| |
my ($shownsubmdate,$showngradedate); |
| |
if ($lastsubmittime && $lastgradetime) { |
| |
$shownsubmdate = &Apache::lonlocal::locallocaltime($lastsubmittime); |
| |
if ($lastgradetime > $lastsubmittime) { |
| |
$showngradedate = &Apache::lonlocal::locallocaltime($lastgradetime); |
| |
} |
| |
} else { |
| |
$shownsubmdate = $timestamp; |
| |
} |
| |
$lastsubonly = |
| |
'<div class="LC_grade_submissions_body">' |
| |
.'<b>'.&mt('Date Submitted:').'</b> '.$shownsubmdate."\n"; |
| |
if ($showngradedate) { |
| |
$lastsubonly .= '<br /><b>'.&mt('Date Graded:').'</b> '.$showngradedate."\n"; |
| |
} |
| |
|
| |
my %seenparts; |
| |
my @part_response_id = &flatten_responseType($responseType); |
| |
foreach my $part (@part_response_id) { |
| |
my ($partid,$respid) = @{ $part }; |
| |
my $display_part=&get_display_part($partid,$symb); |
| |
if ($env{"form.$uname:$udom:$partid:submitted_by"}) { |
| |
if (exists($seenparts{$partid})) { next; } |
| |
$seenparts{$partid}=1; |
| |
$partinfo .= |
| |
'<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
| |
' <b>'.&mt('Collaborative submission by: [_1]', |
| |
'<a href="javascript:viewSubmitter(\''. |
| |
$env{"form.$uname:$udom:$partid:submitted_by"}. |
| |
'\');" target="_self">'. |
| |
$$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a>'). |
| |
'<br />'; |
| |
next; |
| |
} |
| |
my $responsetype = $responseType->{$partid}->{$respid}; |
| |
if (!exists($record->{"resource.$partid.$respid.submission"})) { |
| |
$lastsubonly.="\n".'<div class="LC_grade_submission_part">'. |
| |
'<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
| |
' <span class="LC_internal_info">'. |
| |
'('.&mt('Response ID: [_1]',$respid).')'. |
| |
'</span> '. |
| |
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>'; |
| |
next; |
| |
} |
| |
foreach my $submission (@$string) { |
| |
my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/); |
| |
if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; } |
| |
my ($ressub,$hide,$draft,$subval) = split(/:/,$submission,4); |
| |
# Similarity check |
| |
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'}) { |
| |
my ($oname,$odom,$ocrsid,$oessay,$osim)= |
| |
&most_similar($uname,$udom,$symb,$subval); |
| |
if ($osim) { |
| |
$osim=int($osim*100.0); |
| |
if ($hide eq 'anon') { |
| |
$similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'. |
| |
&mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />'; |
| |
} else { |
| |
$similar='<hr />'; |
| |
if ($essayurl eq 'lib/templates/simpleproblem.problem') { |
| |
$similar .= '<h3><span class="LC_warning">'. |
| |
&mt('Essay is [_1]% similar to an essay by [_2]', |
| |
$osim, |
| |
&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')'). |
| |
'</span></h3>'; |
| |
} else { |
| |
my %old_course_desc; |
| |
if ($ocrsid ne '') { |
| |
if (ref($coursedesc_by_cid->{$ocrsid}) eq 'HASH') { |
| |
%old_course_desc = %{$coursedesc_by_cid->{$ocrsid}}; |
| |
} else { |
| |
my $args; |
| |
if ($ocrsid ne $env{'request.course.id'}) { |
| |
$args = {'one_time' => 1}; |
| |
} |
| |
%old_course_desc = |
| |
&Apache::lonnet::coursedescription($ocrsid,$args); |
| |
$coursedesc_by_cid->{$ocrsid} = \%old_course_desc; |
| |
} |
| |
$similar .= |
| |
'<h3><span class="LC_warning">'. |
| |
&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])', |
| |
$osim, |
| |
&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')', |
| |
$old_course_desc{'description'}, |
| |
$old_course_desc{'num'}, |
| |
$old_course_desc{'domain'}). |
| |
'</span></h3>'; |
| |
} else { |
| |
$similar .= |
| |
'<h3><span class="LC_warning">'. |
| |
&mt('Essay is [_1]% similar to an essay by [_2] in an unknown course', |
| |
$osim, |
| |
&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')'). |
| |
'</span></h3>'; |
| |
} |
| |
} |
| |
$similar .= '<blockquote><i>'. |
| |
&keywords_highlight($oessay). |
| |
'</i></blockquote><hr />'; |
| |
} |
| |
} |
| |
} |
| |
my $order=&get_order($partid,$respid,$symb,$uname,$udom, |
| |
undef,$type,$trial,$rndseed); |
| |
if (($viewtype eq 'lastonly') || |
| |
($viewtype eq 'datesub') || |
| |
($viewtype =~ /^(last|all)$/)) { |
| |
my $display_part=&get_display_part($partid,$symb); |
| |
$lastsubonly.='<div class="LC_grade_submission_part">'. |
| |
'<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
| |
' <span class="LC_internal_info">'. |
| |
'('.&mt('Response ID: [_1]',$respid).')'. |
| |
'</span> '; |
| |
my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record); |
| |
if (@$files) { |
| |
if ($hide eq 'anon') { |
| |
$lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files})); |
| |
} else { |
| |
$lastsubonly.='<br /><br />'.'<b>'.&mt('Submitted Files:').'</b>' |
| |
.'<br /><span class="LC_warning">'; |
| |
if(@$files == 1) { |
| |
$lastsubonly .= &mt('Like all files provided by users, this file may contain viruses!'); |
| |
} else { |
| |
$lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!'); |
| |
} |
| |
$lastsubonly .= '</span>'; |
| |
foreach my $file (@$files) { |
| |
&Apache::lonnet::allowuploaded('/adm/grades',$file); |
| |
$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" alt="" /> '.$file.'</a>'; |
| |
} |
| |
} |
| |
$lastsubonly.='<br />'; |
| |
} |
| |
if ($hide eq 'anon') { |
| |
$lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>'; |
| |
} else { |
| |
$lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>'; |
| |
if ($draft) { |
| |
$lastsubonly.= ' <span class="LC_warning">'.&mt('Draft Copy').'</span>'; |
| |
} |
| |
$subval = |
| |
&cleanRecord($subval,$responsetype,$symb,$partid, |
| |
$respid,$record,$order,undef,$uname,$udom,$type,$trial,$rndseed); |
| |
if ($responsetype eq 'essay') { |
| |
$subval =~ s{\n}{<br />}g; |
| |
} |
| |
$lastsubonly.=$subval."\n"; |
| |
} |
| |
if ($similar) {$lastsubonly.="<br /><br />$similar\n";} |
| |
$lastsubonly.='</div>'; |
| |
} |
| |
} |
| |
} |
| |
$lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body |
| |
} |
| |
return ($lastsubonly,$partinfo); |
| |
} |
| |
|
| sub check_collaborators { |
sub check_collaborators { |
| my ($symb,$uname,$udom,$record,$handgrade,$counter) = @_; |
my ($symb,$uname,$udom,$record,$handgrade,$counter) = @_; |
| my ($result,@col_fullnames); |
my ($result,@col_fullnames); |
|
Line 2468 sub check_collaborators {
|
Line 3803 sub check_collaborators {
|
| (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 2481 sub check_collaborators {
|
Line 3816 sub check_collaborators {
|
| } |
} |
| } |
} |
| if (scalar(@good_collaborators) != 0) { |
if (scalar(@good_collaborators) != 0) { |
| $result.='<br />'.&mt('Collaborators: ').'<ol>'; |
$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); |
|
Line 2510 sub check_collaborators {
|
Line 3845 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,$is_tool)=@_; |
| my (@string,$timestamp,%lasthidden); |
my (@string,$timestamp,$lastgradetime,$lastsubmittime); |
| if ($$returnhash{'version'}) { |
if ($$returnhash{'version'}) { |
| my %lasthash=(); |
my %lasthash=(); |
| my ($version); |
my %prevsolved=(); |
| |
my %solved=(); |
| |
my $version; |
| for ($version=1;$version<=$$returnhash{'version'};$version++) { |
for ($version=1;$version<=$$returnhash{'version'};$version++) { |
| |
my %handgraded = (); |
| foreach my $key (sort(split(/\:/, |
foreach my $key (sort(split(/\:/, |
| $$returnhash{$version.':keys'}))) { |
$$returnhash{$version.':keys'}))) { |
| $lasthash{$key}=$$returnhash{$version.':'.$key}; |
$lasthash{$key}=$$returnhash{$version.':'.$key}; |
| $timestamp = |
if ($key =~ /\.([^.]+)\.regrader$/) { |
| &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'}); |
$handgraded{$1} = 1; |
| |
} elsif ($key =~ /\.portfiles$/) { |
| |
if (($$returnhash{$version.':'.$key} ne '') && |
| |
($$returnhash{$version.':'.$key} !~ /\.\d+\.\w+$/)) { |
| |
$lastsubmittime = $$returnhash{$version.':timestamp'}; |
| |
} |
| |
} elsif ($key =~ /\.submission$/) { |
| |
if ($$returnhash{$version.':'.$key} ne '') { |
| |
$lastsubmittime = $$returnhash{$version.':timestamp'}; |
| |
} |
| |
} elsif ($key =~ /\.([^.]+)\.solved$/) { |
| |
$prevsolved{$1} = $solved{$1}; |
| |
$solved{$1} = $lasthash{$key}; |
| |
} |
| |
} |
| |
foreach my $partid (keys(%handgraded)) { |
| |
if (($prevsolved{$partid} eq 'ungraded_attempted') && |
| |
(($solved{$partid} eq 'incorrect_by_override') || |
| |
($solved{$partid} eq 'correct_by_override'))) { |
| |
$lastgradetime = $$returnhash{$version.':timestamp'}; |
| |
} |
| |
if ($solved{$partid} ne '') { |
| |
$prevsolved{$partid} = $solved{$partid}; |
| |
} |
| } |
} |
| } |
} |
| |
# |
| |
# Timestamp is for last transaction for this resource, which does not |
| |
# necessarily correspond to the time of last submission for problem (or part). |
| |
# |
| |
if ($lasthash{'timestamp'} ne '') { |
| |
$timestamp = &Apache::lonlocal::locallocaltime($lasthash{'timestamp'}); |
| |
} |
| my (%typeparts,%randombytry); |
my (%typeparts,%randombytry); |
| my $showsurv = |
my $showsurv = |
| &Apache::lonnet::allowed('vas',$env{'request.course.id'}); |
&Apache::lonnet::allowed('vas',$env{'request.course.id'}); |
|
Line 2560 sub get_last_submission {
|
Line 3928 sub get_last_submission {
|
| } |
} |
| unless ($hide) { |
unless ($hide) { |
| if (@randomize) { |
if (@randomize) { |
| foreach my $id (@hidden) { |
foreach my $id (@randomize) { |
| if ($key =~ /^\Q$id\E/) { |
if ($key =~ /^\Q$id\E/) { |
| $hide = 'rand'; |
$hide = 'rand'; |
| last; |
last; |
|
Line 2569 sub get_last_submission {
|
Line 3937 sub get_last_submission {
|
| } |
} |
| } |
} |
| 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' ? 1 : 0; |
| '<span class="LC_warning">Draft Copy</span> ' : ''; |
push(@string, join(':', $key, $hide, $draft, ( |
| push(@string, join(':', $key, $hide, $draft.$lasthash{$key})); |
ref($lasthash{$key}) eq 'ARRAY' ? |
| |
join(',', @{$lasthash{$key}}) : $lasthash{$key}) )); |
| } |
} |
| } |
} |
| if (!@string) { |
if (!@string) { |
| |
my $msg; |
| |
if ($is_tool) { |
| |
$msg = &mt('No grade passed back.'); |
| |
} else { |
| |
$msg = &mt('Nothing submitted - no attempts.'); |
| |
} |
| $string[0] = |
$string[0] = |
| '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span>'; |
'<span class="LC_warning">'.$msg.'</span>'; |
| } |
} |
| return (\@string,\$timestamp); |
return (\@string,$timestamp,$lastgradetime,$lastsubmittime); |
| } |
} |
| |
|
| #--- High light keywords, with style choosen by user. |
#--- High light keywords, with style choosen by user. |
|
Line 2594 sub keywords_highlight {
|
Line 3969 sub keywords_highlight {
|
| return $string; |
return $string; |
| } |
} |
| |
|
| |
# For Tasks provide a mechanism to display previous version for one specific student |
| |
|
| |
sub show_previous_task_version { |
| |
my ($request,$symb) = @_; |
| |
if ($symb eq '') { |
| |
$request->print( |
| |
'<span class="LC_error">'. |
| |
&mt('Unable to handle ambiguous references.'). |
| |
'</span>'); |
| |
return ''; |
| |
} |
| |
my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'}); |
| |
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'}); |
| |
if (!&canview($usec)) { |
| |
$request->print( |
| |
'<span class="LC_warning">'. |
| |
&mt('Unable to view previous version for requested student.'). |
| |
' '.&mt('([_1] in section [_2] in course id [_3])', |
| |
$uname.':'.$udom,$usec,$env{'request.course.id'}). |
| |
'</span>'); |
| |
return; |
| |
} |
| |
my $mode = 'both'; |
| |
my $isTask = ($symb =~/\.task$/); |
| |
if ($isTask) { |
| |
if ($env{'form.previousversion'} =~ /^\d+$/) { |
| |
if ($env{'form.fullname'} eq '') { |
| |
$env{'form.fullname'} = |
| |
&Apache::loncommon::plainname($uname,$udom,'lastname'); |
| |
} |
| |
my $probtitle=&Apache::lonnet::gettitle($symb); |
| |
$request->print("\n\n". |
| |
'<div class="LC_grade_show_user">'. |
| |
'<h2>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom). |
| |
'</h2>'."\n"); |
| |
&Apache::lonxml::clear_problem_counter(); |
| |
$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode, |
| |
{'previousversion' => $env{'form.previousversion'} })); |
| |
$request->print("\n</div>"); |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub choose_task_version_form { |
| |
my ($symb,$uname,$udom,$nomenu) = @_; |
| |
my $isTask = ($symb =~/\.task$/); |
| |
my ($current,$version,$result,$js,$displayed,$rowtitle); |
| |
if ($isTask) { |
| |
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'}, |
| |
$udom,$uname); |
| |
if (($record{'resource.0.version'} eq '') || |
| |
($record{'resource.0.version'} < 2)) { |
| |
return ($record{'resource.0.version'}, |
| |
$record{'resource.0.version'},$result,$js); |
| |
} else { |
| |
$current = $record{'resource.0.version'}; |
| |
} |
| |
if ($env{'form.previousversion'}) { |
| |
$displayed = $env{'form.previousversion'}; |
| |
$rowtitle = &mt('Choose another version:') |
| |
} else { |
| |
$displayed = $current; |
| |
$rowtitle = &mt('Show earlier version:'); |
| |
} |
| |
$result = '<div class="LC_left_float">'; |
| |
my $list; |
| |
my $numversions = 0; |
| |
for (my $i=1; $i<=$record{'resource.0.version'}; $i++) { |
| |
if ($i == $current) { |
| |
if (!$env{'form.previousversion'} || $nomenu) { |
| |
next; |
| |
} else { |
| |
$list .= '<option value="'.$i.'">'.&mt('Current').'</option>'."\n"; |
| |
$numversions ++; |
| |
} |
| |
} elsif (defined($record{'resource.'.$i.'.0.status'})) { |
| |
unless ($i == $env{'form.previousversion'}) { |
| |
$numversions ++; |
| |
} |
| |
$list .= '<option value="'.$i.'">'.$i.'</option>'."\n"; |
| |
} |
| |
} |
| |
if ($numversions) { |
| |
$symb = &HTML::Entities::encode($symb,'<>"&'); |
| |
$result .= |
| |
'<form name="getprev" method="post" action=""'. |
| |
' onsubmit="return previousVersion('."'$uname','$udom','$symb','$displayed'".');">'. |
| |
&Apache::loncommon::start_data_table(). |
| |
&Apache::loncommon::start_data_table_row(). |
| |
'<th align="left">'.$rowtitle.'</th>'. |
| |
'<td><select name="version">'. |
| |
'<option>'.&mt('Select').'</option>'. |
| |
$list. |
| |
'</select></td>'. |
| |
&Apache::loncommon::end_data_table_row(); |
| |
unless ($nomenu) { |
| |
$result .= &Apache::loncommon::start_data_table_row(). |
| |
'<th align="left">'.&mt('Open in new window').'</th>'. |
| |
'<td><span class="LC_nobreak">'. |
| |
'<label><input type="radio" name="prevwin" value="1" />'. |
| |
&mt('Yes').'</label>'. |
| |
'<label><input type="radio" name="prevwin" value="0" checked="checked" />'.&mt('No').'</label>'. |
| |
'</span></td>'. |
| |
&Apache::loncommon::end_data_table_row(); |
| |
} |
| |
$result .= |
| |
&Apache::loncommon::start_data_table_row(). |
| |
'<th align="left"> </th>'. |
| |
'<td>'. |
| |
'<input type="submit" name="prevsub" value="'.&mt('Display').'" />'. |
| |
'</td>'. |
| |
&Apache::loncommon::end_data_table_row(). |
| |
&Apache::loncommon::end_data_table(). |
| |
'</form>'; |
| |
$js = &previous_display_javascript($nomenu,$current); |
| |
} elsif ($displayed && $nomenu) { |
| |
$result .= '<a href="javascript:window.close()">'.&mt('Close window').'</a>'; |
| |
} else { |
| |
$result .= &mt('No previous versions to show for this student'); |
| |
} |
| |
$result .= '</div>'; |
| |
} |
| |
return ($current,$displayed,$result,$js); |
| |
} |
| |
|
| |
sub previous_display_javascript { |
| |
my ($nomenu,$current) = @_; |
| |
my $js = <<"JSONE"; |
| |
<script type="text/javascript"> |
| |
// <![CDATA[ |
| |
function previousVersion(uname,udom,symb) { |
| |
var current = '$current'; |
| |
var version = document.getprev.version.options[document.getprev.version.selectedIndex].value; |
| |
var prevstr = new RegExp("^\\\\d+\$"); |
| |
if (!prevstr.test(version)) { |
| |
return false; |
| |
} |
| |
var url = ''; |
| |
if (version == current) { |
| |
url = '/adm/grades?student='+uname+'&userdom='+udom+'&symb='+symb+'&command=submission'; |
| |
} else { |
| |
url = '/adm/grades?student='+uname+'&userdom='+udom+'&symb='+symb+'&command=versionsub&previousversion='+version; |
| |
} |
| |
JSONE |
| |
if ($nomenu) { |
| |
$js .= <<"JSTWO"; |
| |
document.location.href = url; |
| |
JSTWO |
| |
} else { |
| |
$js .= <<"JSTHREE"; |
| |
var newwin = 0; |
| |
for (var i=0; i<document.getprev.prevwin.length; i++) { |
| |
if (document.getprev.prevwin[i].checked == true) { |
| |
newwin = document.getprev.prevwin[i].value; |
| |
} |
| |
} |
| |
if (newwin == 1) { |
| |
var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'; |
| |
url = url+'&inhibitmenu=yes'; |
| |
if (typeof(previousWin) == 'undefined' || previousWin.closed) { |
| |
previousWin = window.open(url,'',options,1); |
| |
} else { |
| |
previousWin.location.href = url; |
| |
} |
| |
previousWin.focus(); |
| |
return false; |
| |
} else { |
| |
document.location.href = url; |
| |
return false; |
| |
} |
| |
JSTHREE |
| |
} |
| |
$js .= <<"ENDJS"; |
| |
return false; |
| |
} |
| |
// ]]> |
| |
</script> |
| |
ENDJS |
| |
|
| |
} |
| |
|
| #--- Called from submission routine |
#--- Called from submission routine |
| sub processHandGrade { |
sub processHandGrade { |
| my ($request) = shift; |
my ($request,$symb) = @_; |
| my $symb = &get_symb($request); |
|
| my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); |
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); |
| my $button = $env{'form.gradeOpt'}; |
my $button = $env{'form.gradeOpt'}; |
| my $ngrade = $env{'form.NCT'}; |
my $ngrade = $env{'form.NCT'}; |
| my $ntstu = $env{'form.NTSTU'}; |
my $ntstu = $env{'form.NTSTU'}; |
| 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 ($res_error,%queueable); |
| |
my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error); |
| |
if ($res_error) { |
| |
$request->print(&navmap_errormsg()); |
| |
return; |
| |
} else { |
| |
foreach my $part (@{$partlist}) { |
| |
if (ref($responseType->{$part}) eq 'HASH') { |
| |
foreach my $id (keys(%{$responseType->{$part}})) { |
| |
if (($responseType->{$part}->{$id} eq 'essay') || |
| |
(lc($handgrade->{$part.'_'.$id}) eq 'yes')) { |
| |
$queueable{$part} = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
|
| if ($button eq 'Save & Next') { |
if ($button eq 'Save & Next') { |
| |
my %needpb = &passbacks_for_symb($cdom,$cnum,$symb); |
| |
my (%skip_passback,%pbsave,%pbcollab); |
| my $ctr = 0; |
my $ctr = 0; |
| while ($ctr < $ngrade) { |
while ($ctr < $ngrade) { |
| my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr}); |
my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr}); |
| my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$symb,$uname,$udom,$ctr); |
my ($errorflag,$pts,$wgt,$numhidden) = |
| |
&saveHandGrade($request,$symb,$uname,$udom,$ctr,undef,undef,\%queueable,\%needpb,\%skip_passback,\%pbsave); |
| if ($errorflag eq 'no_score') { |
if ($errorflag eq 'no_score') { |
| $ctr++; |
$ctr++; |
| next; |
next; |
| } |
} |
| if ($errorflag eq 'not_allowed') { |
if ($errorflag eq 'not_allowed') { |
| $request->print("<span class=\"LC_warning\">Not allowed to modify grades for $uname:$udom</span>"); |
$request->print( |
| |
'<span class="LC_error">' |
| |
.&mt('Not allowed to modify grades for [_1]',"$uname:$udom") |
| |
.'</span>'); |
| $ctr++; |
$ctr++; |
| next; |
next; |
| } |
} |
| |
if ($numhidden) { |
| |
$request->print( |
| |
'<span class="LC_info">' |
| |
.&mt('For [_1]: [quant,_2,transaction] hidden',"$uname:$udom",$numhidden) |
| |
.'</span><br />'); |
| |
} |
| my $includemsg = $env{'form.includemsg'.$ctr}; |
my $includemsg = $env{'form.includemsg'.$ctr}; |
| my ($subject,$message,$msgstatus) = ('','',''); |
my ($subject,$message,$msgstatus) = ('','',''); |
| my $restitle = &Apache::lonnet::gettitle($symb); |
my $restitle = &Apache::lonnet::gettitle($symb); |
|
Line 2637 sub processHandGrade {
|
Line 4223 sub processHandGrade {
|
| if ($env{'form.withgrades'.$ctr}) { |
if ($env{'form.withgrades'.$ctr}) { |
| $message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt; |
$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt; |
| $messagetail = " for <a href=\"". |
$messagetail = " for <a href=\"". |
| $feedurl."?symb=$showsymb\">$env{'form.probTitle'}</a>"; |
$feedurl."?symb=$showsymb\">$restitle</a>"; |
| } |
} |
| $msgstatus = |
$msgstatus = |
| &Apache::lonmsg::user_normal_msg($uname,$udom,$subject, |
&Apache::lonmsg::user_normal_msg($uname,$udom,$subject, |
|
Line 2653 sub processHandGrade {
|
Line 4239 sub processHandGrade {
|
| foreach my $collabstr (@collabstrs) { |
foreach my $collabstr (@collabstrs) { |
| my ($part,@collaborators) = split(/:/,$collabstr); |
my ($part,@collaborators) = split(/:/,$collabstr); |
| foreach my $collaborator (@collaborators) { |
foreach my $collaborator (@collaborators) { |
| my ($errorflag,$pts,$wgt) = |
my ($errorflag,$pts,$wgt,$numchg,$numupdate) = |
| &saveHandGrade($request,$symb,$collaborator,$udom,$ctr, |
&saveHandGrade($request,$symb,$collaborator,$udom,$ctr, |
| $env{'form.unamedom'.$ctr},$part); |
$env{'form.unamedom'.$ctr},$part,\%queueable); |
| if ($errorflag eq 'not_allowed') { |
if ($errorflag eq 'not_allowed') { |
| $request->print("<span class=\"LC_error\">".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom")."</span>"); |
$request->print("<span class=\"LC_error\">".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom")."</span>"); |
| next; |
next; |
| } elsif ($message ne '') { |
} else { |
| my ($baseurl,$showsymb) = |
if ($numchg || $numupdate) { |
| &get_feedurl_and_symb($symb,$collaborator, |
$pbcollab{$collaborator}{$part} = [$pts,$wgt]; |
| $udom); |
} |
| if ($env{'form.withgrades'.$ctr}) { |
if ($message ne '') { |
| $messagetail = " for <a href=\"". |
my ($baseurl,$showsymb) = |
| $baseurl."?symb=$showsymb\">$env{'form.probTitle'}</a>"; |
&get_feedurl_and_symb($symb,$collaborator, |
| |
$udom); |
| |
if ($env{'form.withgrades'.$ctr}) { |
| |
$messagetail = " for <a href=\"". |
| |
$baseurl."?symb=$showsymb\">$restitle</a>"; |
| |
} |
| |
$msgstatus = |
| |
&Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle); |
| } |
} |
| $msgstatus = |
} |
| &Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle); |
|
| } |
|
| } |
} |
| } |
} |
| } |
} |
| $ctr++; |
$ctr++; |
| } |
} |
| |
if ((keys(%pbcollab)) && (keys(%needpb))) { |
| |
foreach my $user (keys(%pbcollab)) { |
| |
my ($clbuname,$clbudom) = split(/:/,$user); |
| |
my $clbusec = &Apache::lonnet::getsection($clbudom,$clbuname,$cdom.'_'.$cnum); |
| |
if (ref($pbcollab{$user}) eq 'HASH') { |
| |
my @clparts = keys(%{$pbcollab{$user}}); |
| |
if (@clparts) { |
| |
my $navmap = Apache::lonnavmaps::navmap->new($clbuname,$clbudom,$clbusec); |
| |
if (ref($navmap)) { |
| |
my $res = $navmap->getBySymb($symb); |
| |
if (ref($res)) { |
| |
my $partlist = $res->parts(); |
| |
if (ref($partlist) eq 'ARRAY') { |
| |
my (%weights,%awardeds,%excuseds); |
| |
foreach my $part (@{$partlist}) { |
| |
if ($res->status($part) eq $res->EXCUSED) { |
| |
$excuseds{$symb}{$part} = 1; |
| |
} else { |
| |
$excuseds{$symb}{$part} = ''; |
| |
} |
| |
if ((exists($pbcollab{$user}{$part})) && (ref($pbcollab{$user}{$part}) eq 'ARRAY')) { |
| |
my $pts = $pbcollab{$user}{$part}[0]; |
| |
my $wt = $pbcollab{$user}{$part}[1]; |
| |
if ($wt) { |
| |
$awardeds{$symb}{$part} = $pts/$wt; |
| |
$weights{$symb}{$part} = $wt; |
| |
} else { |
| |
$awardeds{$symb}{$part} = 0; |
| |
$weights{$symb}{$part} = 0; |
| |
} |
| |
} else { |
| |
$awardeds{$symb}{$part} = $res->awarded($part); |
| |
$weights{$symb}{$part} = $res->weight($part); |
| |
} |
| |
} |
| |
&process_passbacks('handgrade',[$symb],$cdom,$cnum,$clbudom,$clbuname,$clbusec,\%weights, |
| |
\%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| } |
} |
| |
|
| if ($env{'form.handgrade'} eq 'yes') { |
my %keyhash = (); |
| |
if ($numessay) { |
| # Keywords sorted in alphabatical order |
# Keywords sorted in alphabatical order |
| my $loginuser = $env{'user.name'}.':'.$env{'user.domain'}; |
my $loginuser = $env{'user.name'}.':'.$env{'user.domain'}; |
| my %keyhash = (); |
|
| $env{'form.keywords'} =~ s/,\s{0,}|\s+/ /g; |
$env{'form.keywords'} =~ s/,\s{0,}|\s+/ /g; |
| $env{'form.keywords'} =~ s/^\s+|\s+$//; |
$env{'form.keywords'} =~ s/^\s+|\s+$//g; |
| my (@keywords) = sort(split(/\s+/,$env{'form.keywords'})); |
my (@keywords) = sort(split(/\s+/,$env{'form.keywords'})); |
| $env{'form.keywords'} = join(' ',@keywords); |
$env{'form.keywords'} = join(' ',@keywords); |
| $keyhash{$symb.'_keywords'} = $env{'form.keywords'}; |
$keyhash{$symb.'_keywords'} = $env{'form.keywords'}; |
|
Line 2690 sub processHandGrade {
|
Line 4325 sub processHandGrade {
|
| $keyhash{$loginuser.'_kwclr'} = $env{'form.kwclr'}; |
$keyhash{$loginuser.'_kwclr'} = $env{'form.kwclr'}; |
| $keyhash{$loginuser.'_kwsize'} = $env{'form.kwsize'}; |
$keyhash{$loginuser.'_kwsize'} = $env{'form.kwsize'}; |
| $keyhash{$loginuser.'_kwstyle'} = $env{'form.kwstyle'}; |
$keyhash{$loginuser.'_kwstyle'} = $env{'form.kwstyle'}; |
| |
} |
| |
|
| |
if ($env{'form.compmsg'}) { |
| # message center - Order of message gets changed. Blank line is eliminated. |
# message center - Order of message gets changed. Blank line is eliminated. |
| # New messages are saved in env for the next student. |
# New messages are saved in env for the next student. |
| # All messages are saved in nohist_handgrade.db |
# All messages are saved in nohist_handgrade.db |
|
Line 2705 sub processHandGrade {
|
Line 4342 sub processHandGrade {
|
| $ctr = 0; |
$ctr = 0; |
| while ($ctr < $ngrade) { |
while ($ctr < $ngrade) { |
| if ($env{'form.newmsg'.$ctr} ne '') { |
if ($env{'form.newmsg'.$ctr} ne '') { |
| $keyhash{$symb.'_savemsg'.$idx} = $env{'form.newmsg'.$ctr}; |
$keyhash{$symb.'_savemsg'.$idx} = $env{'form.newmsg'.$ctr}; |
| $env{'form.savemsg'.$idx} = $env{'form.newmsg'.$ctr}; |
$env{'form.savemsg'.$idx} = $env{'form.newmsg'.$ctr}; |
| $idx++; |
$idx++; |
| } |
} |
| $ctr++; |
$ctr++; |
| } |
} |
| $env{'form.savemsgN'} = --$idx; |
$env{'form.savemsgN'} = --$idx; |
| $keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'}; |
$keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'}; |
| my $putresult = &Apache::lonnet::put |
|
| ('nohist_handgrade',\%keyhash,$cdom,$cnum); |
|
| } |
} |
| |
if (($numessay) || ($env{'form.compmsg'})) { |
| |
my $putresult = &Apache::lonnet::put |
| |
('nohist_handgrade',\%keyhash,$cdom,$cnum); |
| |
} |
| |
|
| # Called by Save & Refresh from Highlight Attribute Window |
# Called by Save & Refresh from Highlight Attribute Window |
| my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1'); |
my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1'); |
| if ($env{'form.refresh'} eq 'on') { |
if ($env{'form.refresh'} eq 'on') { |
|
Line 2730 sub processHandGrade {
|
Line 4370 sub processHandGrade {
|
| my $processUser = $env{'form.unamedom'.$ctr}; |
my $processUser = $env{'form.unamedom'.$ctr}; |
| ($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser); |
($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser); |
| $env{'form.fullname'} = $$fullname{$processUser}; |
$env{'form.fullname'} = $$fullname{$processUser}; |
| &submission($request,$ctr,$total-1); |
&submission($request,$ctr,$total-1,$symb); |
| $ctr++; |
$ctr++; |
| } |
} |
| return ''; |
return ''; |
| } |
} |
| |
|
| # Go directly to grade student - from submission or link from chart page |
|
| if ($button eq 'Grade Student') { |
|
| (undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb); |
|
| my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}}; |
|
| ($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser); |
|
| $env{'form.fullname'} = $$fullname{$processUser}; |
|
| &submission($request,0,0); |
|
| return ''; |
|
| } |
|
| |
|
| # Get the next/previous one or group of students |
# Get the next/previous one or group of students |
| my $firststu = $env{'form.unamedom0'}; |
my $firststu = $env{'form.unamedom0'}; |
| my $laststu = $env{'form.unamedom'.($ngrade-1)}; |
my $laststu = $env{'form.unamedom'.($ngrade-1)}; |
|
Line 2776 sub processHandGrade {
|
Line 4406 sub processHandGrade {
|
| } |
} |
| $ctr = 0; |
$ctr = 0; |
| @parsedlist = reverse @parsedlist if ($button eq 'Previous'); |
@parsedlist = reverse @parsedlist if ($button eq 'Previous'); |
| 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 2827 sub processHandGrade {
|
Line 4451 sub processHandGrade {
|
| $env{'form.student'} = $uname; |
$env{'form.student'} = $uname; |
| $env{'form.userdom'} = $udom; |
$env{'form.userdom'} = $udom; |
| $env{'form.fullname'} = $$fullname{$_}; |
$env{'form.fullname'} = $$fullname{$_}; |
| &submission($request,$ctr,$total); |
&submission($request,$ctr,$total,$symb); |
| $ctr++; |
$ctr++; |
| } |
} |
| 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.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\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.=&show_grading_menu_form($symb); |
|
| $request->print($the_end); |
$request->print($the_end); |
| } |
} |
| return ''; |
return ''; |
|
Line 2842 sub processHandGrade {
|
Line 4463 sub processHandGrade {
|
| |
|
| #---- Save the score and award for each student, if changed |
#---- Save the score and award for each student, if changed |
| sub saveHandGrade { |
sub saveHandGrade { |
| my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_; |
my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part,$queueable,$needpb,$skip_passback,$pbsave) = @_; |
| my @version_parts; |
my @version_parts; |
| my $usec = &Apache::lonnet::getsection($domain,$stuname, |
my $usec = &Apache::lonnet::getsection($domain,$stuname, |
| $env{'request.course.id'}); |
$env{'request.course.id'}); |
|
Line 2850 sub saveHandGrade {
|
Line 4471 sub saveHandGrade {
|
| my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname); |
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname); |
| my @parts_graded; |
my @parts_graded; |
| my %newrecord = (); |
my %newrecord = (); |
| my ($pts,$wgt) = ('',''); |
my ($pts,$wgt,$totchg,$sendupdate) = ('','',0,0); |
| my %aggregate = (); |
my %aggregate = (); |
| my $aggregateflag = 0; |
my $aggregateflag = 0; |
| |
if ($env{'form.HIDE'.$newflg}) { |
| |
my ($version,$parts) = split(/:/,$env{'form.HIDE'.$newflg},2); |
| |
my $numchgs = &makehidden($version,$parts,\%record,$symb,$domain,$stuname,1); |
| |
$totchg += $numchgs; |
| |
} |
| |
my (%weights,%awardeds,%excuseds); |
| my @parts = split(/:/,$env{'form.partlist'.$newflg}); |
my @parts = split(/:/,$env{'form.partlist'.$newflg}); |
| foreach my $new_part (@parts) { |
foreach my $new_part (@parts) { |
| #collaborator ($submi may vary for different parts |
#collaborator ($submitter may vary for different parts) |
| if ($submitter && $new_part ne $part) { next; } |
if ($submitter && $new_part ne $part) { next; } |
| my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part}; |
my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part}; |
| |
if ($env{'form.WGT'.$newflg.'_'.$new_part} eq '') { |
| |
$weights{$symb}{$new_part} = 1; |
| |
} else { |
| |
$weights{$symb}{$new_part} = $env{'form.WGT'.$newflg.'_'.$new_part}; |
| |
} |
| if ($dropMenu eq 'excused') { |
if ($dropMenu eq 'excused') { |
| |
$excuseds{$symb}{$new_part} = 1; |
| |
$awardeds{$symb}{$new_part} = ''; |
| if ($record{'resource.'.$new_part.'.solved'} ne 'excused') { |
if ($record{'resource.'.$new_part.'.solved'} ne 'excused') { |
| $newrecord{'resource.'.$new_part.'.solved'} = 'excused'; |
$newrecord{'resource.'.$new_part.'.solved'} = 'excused'; |
| if (exists($record{'resource.'.$new_part.'.awarded'})) { |
if (exists($record{'resource.'.$new_part.'.awarded'})) { |
| $newrecord{'resource.'.$new_part.'.awarded'} = ''; |
$newrecord{'resource.'.$new_part.'.awarded'} = ''; |
| } |
} |
| $newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}"; |
$newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}"; |
| |
$sendupdate ++; |
| } |
} |
| } elsif ($dropMenu eq 'reset status' |
} elsif ($dropMenu eq 'reset status' |
| && exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts |
&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts |
|
Line 2888 sub saveHandGrade {
|
Line 4523 sub saveHandGrade {
|
| &decrement_aggs($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus); |
&decrement_aggs($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus); |
| $aggregateflag = 1; |
$aggregateflag = 1; |
| } |
} |
| |
$sendupdate ++; |
| |
$excuseds{$symb}{$new_part} = ''; |
| |
$awardeds{$symb}{$new_part} = ''; |
| } elsif ($dropMenu eq '') { |
} elsif ($dropMenu eq '') { |
| $pts = ($env{'form.GD_BOX'.$newflg.'_'.$new_part} ne '' ? |
$pts = ($env{'form.GD_BOX'.$newflg.'_'.$new_part} ne '' ? |
| $env{'form.GD_BOX'.$newflg.'_'.$new_part} : |
$env{'form.GD_BOX'.$newflg.'_'.$new_part} : |
|
Line 2898 sub saveHandGrade {
|
Line 4536 sub saveHandGrade {
|
| $wgt = $env{'form.WGT'.$newflg.'_'.$new_part} eq '' ? 1 : |
$wgt = $env{'form.WGT'.$newflg.'_'.$new_part} eq '' ? 1 : |
| $env{'form.WGT'.$newflg.'_'.$new_part}; |
$env{'form.WGT'.$newflg.'_'.$new_part}; |
| my $partial= $pts/$wgt; |
my $partial= $pts/$wgt; |
| |
$awardeds{$symb}{$new_part} = $partial; |
| |
$excuseds{$symb}{$new_part} = ''; |
| if ($partial eq $record{'resource.'.$new_part.'.awarded'}) { |
if ($partial eq $record{'resource.'.$new_part.'.awarded'}) { |
| #do not update score for part if not changed. |
#do not update score for part if not changed. |
| &handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord); |
&handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord); |
| next; |
next; |
| } else { |
} else { |
| push(@parts_graded,$new_part); |
push(@parts_graded,$new_part); |
| |
$sendupdate ++; |
| } |
} |
| if ($record{'resource.'.$new_part.'.awarded'} ne $partial) { |
if ($record{'resource.'.$new_part.'.awarded'} ne $partial) { |
| $newrecord{'resource.'.$new_part.'.awarded'} = $partial; |
$newrecord{'resource.'.$new_part.'.awarded'} = $partial; |
|
Line 2949 sub saveHandGrade {
|
Line 4590 sub saveHandGrade {
|
| &Apache::lonnet::cstore(\%newrecord,$symb, |
&Apache::lonnet::cstore(\%newrecord,$symb, |
| $env{'request.course.id'},$domain,$stuname); |
$env{'request.course.id'},$domain,$stuname); |
| &check_and_remove_from_queue(\@parts,\%record,\%newrecord,$symb, |
&check_and_remove_from_queue(\@parts,\%record,\%newrecord,$symb, |
| $cdom,$cnum,$domain,$stuname); |
$cdom,$cnum,$domain,$stuname,$queueable); |
| } |
} |
| if ($aggregateflag) { |
if ($aggregateflag) { |
| &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate, |
&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate, |
| $cdom,$cnum); |
$cdom,$cnum); |
| } |
} |
| return ('',$pts,$wgt); |
if (($sendupdate || $totchg) && (!$submitter)) { |
| |
if ((ref($needpb) eq 'HASH') && |
| |
(keys(%{$needpb}))) { |
| |
&process_passbacks('handgrade',[$symb],$cdom,$cnum,$domain,$stuname,$usec,\%weights, |
| |
\%awardeds,\%excuseds,$needpb,$skip_passback,$pbsave); |
| |
} |
| |
} |
| |
return ('',$pts,$wgt,$totchg,$sendupdate); |
| |
} |
| |
|
| |
sub makehidden { |
| |
my ($version,$parts,$record,$symb,$domain,$stuname,$tolog) = @_; |
| |
return unless (ref($record) eq 'HASH'); |
| |
my %modified; |
| |
my $numchanged = 0; |
| |
if (exists($record->{$version.':keys'})) { |
| |
my $partsregexp = $parts; |
| |
$partsregexp =~ s/,/|/g; |
| |
foreach my $key (split(/\:/,$record->{$version.':keys'})) { |
| |
if ($key =~ /^resource\.(?:$partsregexp)\.([^\.]+)$/) { |
| |
my $item = $1; |
| |
unless (($item eq 'solved') || ($item =~ /^award(|msg|ed)$/)) { |
| |
$modified{$key} = $record->{$version.':'.$key}; |
| |
} |
| |
} elsif ($key =~ m{^(resource\.(?:$partsregexp)\.[^\.]+\.)(.+)$}) { |
| |
$modified{$1.'hidden'.$2} = $record->{$version.':'.$key}; |
| |
} elsif ($key =~ /^(ip|timestamp|host)$/) { |
| |
$modified{$key} = $record->{$version.':'.$key}; |
| |
} |
| |
} |
| |
if (keys(%modified)) { |
| |
if (&Apache::lonnet::putstore($env{'request.course.id'},$symb,$version,\%modified, |
| |
$domain,$stuname,$tolog) eq 'ok') { |
| |
$numchanged ++; |
| |
} |
| |
} |
| |
} |
| |
return $numchanged; |
| } |
} |
| |
|
| sub check_and_remove_from_queue { |
sub check_and_remove_from_queue { |
| my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname) = @_; |
my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname,$queueable) = @_; |
| my @ungraded_parts; |
my @ungraded_parts; |
| foreach my $part (@{$parts}) { |
foreach my $part (@{$parts}) { |
| if ( $record->{ 'resource.'.$part.'.awarded'} eq '' |
if ( $record->{ 'resource.'.$part.'.awarded'} eq '' |
|
Line 2967 sub check_and_remove_from_queue {
|
Line 4645 sub check_and_remove_from_queue {
|
| && $newrecord->{'resource.'.$part.'.awarded'} eq '' |
&& $newrecord->{'resource.'.$part.'.awarded'} eq '' |
| && $newrecord->{'resource.'.$part.'.solved' } ne 'excused' |
&& $newrecord->{'resource.'.$part.'.solved' } ne 'excused' |
| ) { |
) { |
| push(@ungraded_parts, $part); |
if ($queueable->{$part}) { |
| |
push(@ungraded_parts, $part); |
| |
} |
| } |
} |
| } |
} |
| if ( !@ungraded_parts ) { |
if ( !@ungraded_parts ) { |
|
Line 2993 sub handback_files {
|
Line 4673 sub handback_files {
|
| my $part_resp = join('_',@{ $part_response_id }); |
my $part_resp = join('_',@{ $part_response_id }); |
| if (($env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'} =~ /^\d+$/) & ($new_part eq $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++) { |
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' |
| if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) { |
if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) { |
| my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter.'.filename'}; |
my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter.'.filename'}; |
| my ($directory,$answer_file) = |
my ($directory,$answer_file) = |
| ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$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); |
&Apache::lonnet::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, |
| # fix file name |
$domain,$stuname,$getpropath); |
| |
my $version = &Apache::lonnet::get_next_version($answer_name,$answer_ext,$dir_list); |
| |
# fix filename |
| 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'.$counter, |
$newflg.'_'.$part_resp.'_returndoc'.$counter, |
|
Line 3021 sub handback_files {
|
Line 4703 sub handback_files {
|
| $$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.='<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 />'.&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('<br />'.&mt('[_1] will be the uploaded filename [_2]','<span class="LC_info">'.$fname.'</span>','<span class="LC_filename">'.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'</span>')); |
| } |
} |
| } |
} |
| } |
} |
|
Line 3033 sub handback_files {
|
Line 4714 sub handback_files {
|
| $request->print('<br />'); |
$request->print('<br />'); |
| my @what = ($symb,$env{'request.course.id'},'handback'); |
my @what = ($symb,$env{'request.course.id'},'handback'); |
| &Apache::lonnet::mark_as_readonly($domain,$stuname,\@handedback,\@what); |
&Apache::lonnet::mark_as_readonly($domain,$stuname,\@handedback,\@what); |
| my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'}); |
my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'}); |
| my ($subject,$message); |
my ($subject,$message); |
| if (scalar(@handedback) == 1) { |
if (scalar(@handedback) == 1) { |
| $subject = &mt_user($user_lh,'File Handed Back by Instructor'); |
$subject = &mt_user($user_lh,'File Handed Back by Instructor'); |
| |
$message = &mt_user($user_lh,'A file has been returned that was originally submitted in response to: '); |
| } else { |
} else { |
| $subject = &mt_user($user_lh,'Files Handed Back by Instructor'); |
$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 = &mt_user($user_lh,'Files have been returned that were originally submitted in response to: '); |
|
Line 3152 sub version_portfiles {
|
Line 4834 sub version_portfiles {
|
| my $version_parts = join('|',@$v_flag); |
my $version_parts = join('|',@$v_flag); |
| my @returned_keys; |
my @returned_keys; |
| my $parts = join('|', @$parts_graded); |
my $parts = join('|', @$parts_graded); |
| my $portfolio_root = '/userfiles/portfolio'; |
|
| foreach my $key (keys(%$record)) { |
foreach my $key (keys(%$record)) { |
| my $new_portfiles; |
my $new_portfiles; |
| if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) { |
if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) { |
| my @versioned_portfiles; |
my @versioned_portfiles; |
| my @portfiles = split(/\s*,\s*/,$$record{$key}); |
my @portfiles = split(/\s*,\s*/,$$record{$key}); |
| foreach my $file (@portfiles) { |
if (@portfiles) { |
| &Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file); |
&Apache::lonnet::portfiles_versioning($symb,$domain,$stu_name,\@portfiles, |
| my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/); |
\@versioned_portfiles); |
| my ($answer_name,$answer_ver,$answer_ext) = |
|
| &file_name_version_ext($answer_file); |
|
| my $getpropath = 1; |
|
| my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,$stu_name,$getpropath); |
|
| my $version = &get_next_version($answer_name, $answer_ext, \@dir_list); |
|
| my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version); |
|
| if ($new_answer ne 'problem getting file') { |
|
| push(@versioned_portfiles, $directory.$new_answer); |
|
| &Apache::lonnet::mark_as_readonly($domain,$stu_name, |
|
| [$directory.$new_answer], |
|
| [$symb,$env{'request.course.id'},'graded']); |
|
| } |
|
| } |
} |
| $$record{$key} = join(',',@versioned_portfiles); |
$$record{$key} = join(',',@versioned_portfiles); |
| push(@returned_keys,$key); |
push(@returned_keys,$key); |
| } |
} |
| } |
|
| return (@returned_keys); |
|
| } |
|
| |
|
| sub get_next_version { |
|
| my ($answer_name, $answer_ext, $dir_list) = @_; |
|
| my $version; |
|
| foreach my $row (@$dir_list) { |
|
| my ($file) = split(/\&/,$row,2); |
|
| my ($file_name,$file_version,$file_ext) = |
|
| &file_name_version_ext($file); |
|
| if (($file_name eq $answer_name) && |
|
| ($file_ext eq $answer_ext)) { |
|
| # gets here if filename and extension match, regardless of version |
|
| if ($file_version ne '') { |
|
| # a versioned file is found so save it for later |
|
| if ($file_version > $version) { |
|
| $version = $file_version; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| $version ++; |
|
| return($version); |
|
| } |
|
| |
|
| sub version_selected_portfile { |
|
| my ($domain,$stu_name,$directory,$file_name,$version) = @_; |
|
| my ($answer_name,$answer_ver,$answer_ext) = |
|
| &file_name_version_ext($file_name); |
|
| my $new_answer; |
|
| $env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stu_name/portfolio$directory$file_name"); |
|
| if($env{'form.copy'} eq '-1') { |
|
| $new_answer = 'problem getting file'; |
|
| } else { |
|
| $new_answer = $answer_name.'.'.$version.'.'.$answer_ext; |
|
| my $copy_result = &Apache::lonnet::finishuserfileupload( |
|
| $stu_name,$domain,'copy', |
|
| '/portfolio'.$directory.$new_answer); |
|
| } |
|
| return ($new_answer); |
|
| } |
|
| |
|
| sub file_name_version_ext { |
|
| my ($file)=@_; |
|
| my @file_parts = split(/\./, $file); |
|
| my ($name,$version,$ext); |
|
| if (@file_parts > 1) { |
|
| $ext=pop(@file_parts); |
|
| if (@file_parts > 1 && $file_parts[-1] =~ /^\d+$/) { |
|
| $version=pop(@file_parts); |
|
| } |
|
| $name=join('.',@file_parts); |
|
| } else { |
|
| $name=join('.',@file_parts); |
|
| } |
} |
| return($name,$version,$ext); |
return (@returned_keys); |
| } |
} |
| |
|
| #-------------------------------------------------------------------------------------- |
#-------------------------------------------------------------------------------------- |
|
Line 3245 sub viewgrades_js {
|
Line 4859 sub viewgrades_js {
|
| my ($request) = shift; |
my ($request) = shift; |
| |
|
| my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = '); |
my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = '); |
| $request->print(<<VIEWJAVASCRIPT); |
&js_escape(\$alertmsg); |
| <script type="text/javascript" language="javascript"> |
$request->print(&Apache::lonhtmlcommon::scripttag(<<VIEWJAVASCRIPT)); |
| function writePoint(partid,weight,point) { |
function writePoint(partid,weight,point) { |
| var radioButton = document.classgrade["RADVAL_"+partid]; |
var radioButton = document.classgrade["RADVAL_"+partid]; |
| var textbox = document.classgrade["TEXTVAL_"+partid]; |
var textbox = document.classgrade["TEXTVAL_"+partid]; |
|
Line 3407 sub viewgrades_js {
|
Line 5021 sub viewgrades_js {
|
| } |
} |
| } |
} |
| |
|
| </script> |
|
| VIEWJAVASCRIPT |
VIEWJAVASCRIPT |
| } |
} |
| |
|
| #--- show scores for a section or whole class w/ option to change/update a score |
#--- show scores for a section or whole class w/ option to change/update a score |
| sub viewgrades { |
sub viewgrades { |
| my ($request) = shift; |
my ($request,$symb) = @_; |
| |
my ($is_tool,$toolsymb); |
| |
if ($symb =~ /ext\.tool$/) { |
| |
$is_tool = 1; |
| |
$toolsymb = $symb; |
| |
} |
| &viewgrades_js($request); |
&viewgrades_js($request); |
| |
|
| my ($symb) = &get_symb($request); |
|
| #need to make sure we have the correct data for later EXT calls, |
#need to make sure we have the correct data for later EXT calls, |
| #thus invalidate the cache |
#thus invalidate the cache |
| &Apache::lonnet::devalidatecourseresdata( |
&Apache::lonnet::devalidatecourseresdata( |
|
Line 3425 sub viewgrades {
|
Line 5042 sub viewgrades {
|
| &Apache::lonnet::clear_EXT_cache_status(); |
&Apache::lonnet::clear_EXT_cache_status(); |
| |
|
| my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>'; |
my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>'; |
| $result.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n"; |
|
| |
|
| #view individual student submission form - called using Javascript viewOneStudent |
#view individual student submission form - called using Javascript viewOneStudent |
| $result.=&jscriptNform($symb); |
$result.=&jscriptNform($symb); |
|
Line 3436 sub viewgrades {
|
Line 5052 sub viewgrades {
|
| '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
| '<input type="hidden" name="command" value="editgrades" />'."\n". |
'<input type="hidden" name="command" value="editgrades" />'."\n". |
| &build_section_inputs(). |
&build_section_inputs(). |
| '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n". |
|
| '<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"; |
|
| |
|
| my ($common_header,$specific_header); |
#retrieve selected groups |
| if ($env{'form.section'} eq 'all') { |
my (@groups,$group_display); |
| $common_header = &mt('Assign Common Grade to Class'); |
@groups = &Apache::loncommon::get_env_multiple('form.group'); |
| $specific_header = &mt('Assign Grade to Specific Students in Class'); |
if (grep(/^all$/,@groups)) { |
| } elsif ($env{'form.section'} eq 'none') { |
@groups = ('all'); |
| $common_header = &mt('Assign Common Grade to Students in no Section'); |
} elsif (grep(/^none$/,@groups)) { |
| $specific_header = &mt('Assign Grade to Specific Students in no Section'); |
@groups = ('none'); |
| } else { |
} elsif (@groups > 0) { |
| my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
$group_display = join(', ',@groups); |
| $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); |
|
| |
my ($common_header,$specific_header,@sections,$section_display); |
| |
if ($env{'request.course.sec'} ne '') { |
| |
@sections = ($env{'request.course.sec'}); |
| |
} else { |
| |
@sections = &Apache::loncommon::get_env_multiple('form.section'); |
| } |
} |
| $result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table(); |
|
| |
# Check if Save button should be usable |
| |
my $disabled = ' disabled="disabled"'; |
| |
if ($perm{'mgr'}) { |
| |
if (grep(/^all$/,@sections)) { |
| |
undef($disabled); |
| |
} else { |
| |
foreach my $sec (@sections) { |
| |
if (&canmodify($sec)) { |
| |
undef($disabled); |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if (grep(/^all$/,@sections)) { |
| |
@sections = ('all'); |
| |
if ($group_display) { |
| |
$common_header = &mt('Assign Common Grade to Students in Group(s) [_1]',$group_display); |
| |
$specific_header = &mt('Assign Grade to Specific Students in Group(s) [_1]',$group_display); |
| |
} elsif (grep(/^none$/,@groups)) { |
| |
$common_header = &mt('Assign Common Grade to Students not assigned to any groups'); |
| |
$specific_header = &mt('Assign Grade to Specific Students not assigned to any groups'); |
| |
} else { |
| |
$common_header = &mt('Assign Common Grade to Class'); |
| |
$specific_header = &mt('Assign Grade to Specific Students in Class'); |
| |
} |
| |
} elsif (grep(/^none$/,@sections)) { |
| |
@sections = ('none'); |
| |
if ($group_display) { |
| |
$common_header = &mt('Assign Common Grade to Students in no Section and in Group(s) [_1]',$group_display); |
| |
$specific_header = &mt('Assign Grade to Specific Students in no Section and in Group(s)',$group_display); |
| |
} elsif (grep(/^none$/,@groups)) { |
| |
$common_header = &mt('Assign Common Grade to Students in no Section and in no Group'); |
| |
$specific_header = &mt('Assign Grade to Specific Students in no Section and in no Group'); |
| |
} else { |
| |
$common_header = &mt('Assign Common Grade to Students in no Section'); |
| |
$specific_header = &mt('Assign Grade to Specific Students in no Section'); |
| |
} |
| |
} else { |
| |
$section_display = join (", ",@sections); |
| |
if ($group_display) { |
| |
$common_header = &mt('Assign Common Grade to Students in Section(s) [_1], and in Group(s) [_2]', |
| |
$section_display,$group_display); |
| |
$specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1], and in Group(s) [_2]', |
| |
$section_display,$group_display); |
| |
} elsif (grep(/^none$/,@groups)) { |
| |
$common_header = &mt('Assign Common Grade to Students in Section(s) [_1] and no Group',$section_display); |
| |
$specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1] and no Group',$section_display); |
| |
} else { |
| |
$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); |
| |
} |
| |
} |
| |
my %submit_types = &substatus_options(); |
| |
my $submission_status = $submit_types{$env{'form.submitonly'}}; |
| |
|
| |
if ($env{'form.submitonly'} eq 'all') { |
| |
$result.= '<h3>'.$common_header.'</h3>'; |
| |
} else { |
| |
my $text; |
| |
if ($is_tool) { |
| |
$text = &mt('(transaction status: "[_1]")',$submission_status); |
| |
} else { |
| |
$text = &mt('(submission status: "[_1]")',$submission_status); |
| |
} |
| |
$result.= '<h3>'.$common_header.' '.$text.'</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 $res_error; |
my $res_error; |
|
Line 3463 sub viewgrades {
|
Line 5150 sub viewgrades {
|
| my %weight = (); |
my %weight = (); |
| my $ctsparts = 0; |
my $ctsparts = 0; |
| my %seen = (); |
my %seen = (); |
| my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id; |
| |
if ($is_tool) { |
| |
@part_response_id = ([0,'']); |
| |
} else { |
| |
@part_response_id = &flatten_responseType($responseType); |
| |
} |
| 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 }); |
| next if $seen{$partid}; |
next if $seen{$partid}; |
| $seen{$partid}++; |
$seen{$partid}++; |
| my $handgrade=$$handgrade{$part_resp}; |
|
| my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb); |
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb); |
| $weight{$partid} = $wgt eq '' ? '1' : $wgt; |
$weight{$partid} = $wgt eq '' ? '1' : $wgt; |
| |
|
|
Line 3488 sub viewgrades {
|
Line 5179 sub viewgrades {
|
| $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>'. |
| 'onchange="javascript:writeRadText(\''.$partid.'\','. |
'<select name="SELVAL_'.$partid.'" '. |
| $weight{$partid}.')"> '. |
'onchange="javascript:writeRadText(\''.$partid.'\','. |
| |
$weight{$partid}.')"> '. |
| '<option selected="selected"> </option>'. |
'<option selected="selected"> </option>'. |
| '<option value="excused">'.&mt('excused').'</option>'. |
'<option value="excused">'.&mt('excused').'</option>'. |
| '<option value="reset status">'.&mt('reset status').'</option>'. |
'<option value="reset status">'.&mt('reset status').'</option>'. |
|
Line 3514 sub viewgrades {
|
Line 5206 sub viewgrades {
|
| |
|
| #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>'.$specific_header.'</h3>'. |
if ($env{'form.submitonly'} eq 'all') { |
| &Apache::loncommon::start_data_table(). |
$result.= '<h3>'.$specific_header.'</h3>'; |
| |
} else { |
| |
my $text; |
| |
if ($is_tool) { |
| |
$text = &mt('(transaction status: "[_1]")',$submission_status); |
| |
} else { |
| |
$text = &mt('(submission status: "[_1]")',$submission_status); |
| |
} |
| |
$result.= '<h3>'.$specific_header.' '.$text.'</h3>'; |
| |
} |
| |
$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"; |
|
Line 3527 sub viewgrades {
|
Line 5229 sub viewgrades {
|
| my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
| my @partids = (); |
my @partids = (); |
| foreach my $part (@parts) { |
foreach my $part (@parts) { |
| my $display=&Apache::lonnet::metadata($url,$part.'.display'); |
my $display=&Apache::lonnet::metadata($url,$part.'.display',$toolsymb); |
| my $narrowtext = &mt('Tries'); |
my $narrowtext = &mt('Tries'); |
| $display =~ s|^Number of Attempts|$narrowtext <br />|; # makes the column narrower |
$display =~ s|^Number of Attempts|$narrowtext <br />|; # makes the column narrower |
| if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } |
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name',$toolsymb); } |
| my ($partid) = &split_part_type($part); |
my ($partid) = &split_part_type($part); |
| push(@partids,$partid); |
push(@partids,$partid); |
| |
# |
| |
# FIXME: Looks like $display looks at English text |
| |
# |
| my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
| if ($display =~ /^Partial Credit Factor/) { |
if ($display =~ /^Partial Credit Factor/) { |
| $result.='<th>'. |
$result.='<th>'. |
| &mt('Score Part: [_1]<br /> (weight = [_2])', |
&mt('Score Part: [_1][_2](weight = [_3])', |
| $display_part,$weight{$partid}).'</th>'."\n"; |
$display_part,'<br />',$weight{$partid}).'</th>'."\n"; |
| next; |
next; |
| |
|
| } else { |
} else { |
|
Line 3558 sub viewgrades {
|
Line 5263 sub viewgrades {
|
| |
|
| #get info for each student |
#get info for each student |
| #list all the students - with points and grade status |
#list all the students - with points and grade status |
| my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1'); |
my (undef,undef,$fullname) = &getclasslist(\@sections,'1',\@groups); |
| my $ctr = 0; |
my $ctr = 0; |
| foreach (sort |
foreach (sort |
| { |
{ |
|
Line 3567 sub viewgrades {
|
Line 5272 sub viewgrades {
|
| } |
} |
| return $a cmp $b; |
return $a cmp $b; |
| } (keys(%$fullname))) { |
} (keys(%$fullname))) { |
| $ctr++; |
|
| $result.=&viewstudentgrade($symb,$env{'request.course.id'}, |
$result.=&viewstudentgrade($symb,$env{'request.course.id'}, |
| $_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets); |
$_,$$fullname{$_},\@parts,\%weight,\$ctr,\%last_resets,$is_tool); |
| } |
} |
| $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').'"'.$disabled.' '. |
| 'onclick="javascript:submit();" target="_self" /></form>'."\n"; |
'onclick="javascript:submit();" target="_self" /></form>'."\n"; |
| if (scalar(%$fullname) eq 0) { |
if ($ctr == 0) { |
| my $colspan=3+scalar(@parts); |
|
| my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
|
| my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status')); |
my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status')); |
| $result='<span class="LC_warning">'. |
$result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>'. |
| &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.', |
'<span class="LC_warning">'; |
| $section_display, $stu_status). |
if ($env{'form.submitonly'} eq 'all') { |
| '</span>'; |
if (grep(/^all$/,@sections)) { |
| |
if (grep(/^all$/,@groups)) { |
| |
$result .= &mt('There are no students with enrollment status [_1] to modify or grade.', |
| |
$stu_status); |
| |
} elsif (grep(/^none$/,@groups)) { |
| |
$result .= &mt('There are no students with no group assigned and with enrollment status [_1] to modify or grade.', |
| |
$stu_status); |
| |
} else { |
| |
$result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] to modify or grade.', |
| |
$group_display,$stu_status); |
| |
} |
| |
} elsif (grep(/^none$/,@sections)) { |
| |
if (grep(/^all$/,@groups)) { |
| |
$result .= &mt('There are no students in no section with enrollment status [_1] to modify or grade.', |
| |
$stu_status); |
| |
} elsif (grep(/^none$/,@groups)) { |
| |
$result .= &mt('There are no students in no section and no group with enrollment status [_1] to modify or grade.', |
| |
$stu_status); |
| |
} else { |
| |
$result .= &mt('There are no students in no section in group(s) [_1] with enrollment status [_2] to modify or grade.', |
| |
$group_display,$stu_status); |
| |
} |
| |
} else { |
| |
if (grep(/^all$/,@groups)) { |
| |
$result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.', |
| |
$section_display,$stu_status); |
| |
} elsif (grep(/^none$/,@groups)) { |
| |
$result .= &mt('There are no students in section(s) [_1] and no group with enrollment status [_2] to modify or grade.', |
| |
$section_display,$stu_status); |
| |
} else { |
| |
$result .= &mt('There are no students in section(s) [_1] and group(s) [_2] with enrollment status [_3] to modify or grade.', |
| |
$section_display,$group_display,$stu_status); |
| |
} |
| |
} |
| |
} else { |
| |
if (grep(/^all$/,@sections)) { |
| |
if (grep(/^all$/,@groups)) { |
| |
$result .= &mt('There are no students with enrollment status [_1] and submission status "[_2]" to modify or grade.', |
| |
$stu_status,$submission_status); |
| |
} elsif (grep(/^none$/,@groups)) { |
| |
$result .= &mt('There are no students with no group assigned with enrollment status [_1] and submission status "[_2]" to modify or grade.', |
| |
$stu_status,$submission_status); |
| |
} else { |
| |
$result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.', |
| |
$group_display,$stu_status,$submission_status); |
| |
} |
| |
} elsif (grep(/^none$/,@sections)) { |
| |
if (grep(/^all$/,@groups)) { |
| |
$result .= &mt('There are no students in no section with enrollment status [_1] and submission status "[_2]" to modify or grade.', |
| |
$stu_status,$submission_status); |
| |
} elsif (grep(/^none$/,@groups)) { |
| |
$result .= &mt('There are no students in no section and no group with enrollment status [_1] and submission status "[_2]" to modify or grade.', |
| |
$stu_status,$submission_status); |
| |
} else { |
| |
$result .= &mt('There are no students in no section in group(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.', |
| |
$group_display,$stu_status,$submission_status); |
| |
} |
| |
} else { |
| |
if (grep(/^all$/,@groups)) { |
| |
$result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.', |
| |
$section_display,$stu_status,$submission_status); |
| |
} elsif (grep(/^none$/,@groups)) { |
| |
$result .= &mt('There are no students in section(s) [_1] and no group with enrollment status [_2] and submission status "[_3]" to modify or grade.', |
| |
$section_display,$stu_status,$submission_status); |
| |
} else { |
| |
$result .= &mt('There are no students in section(s) [_1] and group(s) [_2] with enrollment status [_3] and submission status "[_4]" to modify or grade.', |
| |
$section_display,$group_display,$stu_status,$submission_status); |
| |
} |
| |
} |
| |
} |
| |
$result .= '</span><br />'; |
| } |
} |
| $result.=&show_grading_menu_form($symb); |
|
| return $result; |
return $result; |
| } |
} |
| |
|
| #--- call by previous routine to display each student |
#--- call by previous routine to display each student who satisfies submission filter. |
| sub viewstudentgrade { |
sub viewstudentgrade { |
| my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_; |
my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets,$is_tool) = @_; |
| my ($uname,$udom) = split(/:/,$student); |
my ($uname,$udom) = split(/:/,$student); |
| my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname); |
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname); |
| my %aggregates = (); |
my $submitonly = $env{'form.submitonly'}; |
| |
unless (($submitonly eq 'all') || ($submitonly eq 'queued')) { |
| |
my %partstatus = (); |
| |
if (ref($parts) eq 'ARRAY') { |
| |
foreach my $apart (@{$parts}) { |
| |
my ($part,$type) = &split_part_type($apart); |
| |
my ($status,undef) = split(/_/,$record{"resource.$part.solved"},2); |
| |
$status = 'nothing' if ($status eq ''); |
| |
$partstatus{$part} = $status; |
| |
my $subkey = "resource.$part.submitted_by"; |
| |
$partstatus{$subkey} = $record{$subkey} if ($record{$subkey} ne ''); |
| |
} |
| |
my $submitted = 0; |
| |
my $graded = 0; |
| |
my $incorrect = 0; |
| |
foreach my $key (keys(%partstatus)) { |
| |
$submitted = 1 if ($partstatus{$key} ne 'nothing'); |
| |
$graded = 1 if ($partstatus{$key} =~ /^ungraded/); |
| |
$incorrect = 1 if ($partstatus{$key} =~ /^incorrect/); |
| |
|
| |
my $partid = (split(/\./,$key))[1]; |
| |
if ($partstatus{'resource.'.$partid.'.'.$key.'.submitted_by'} ne '') { |
| |
$submitted = 0; |
| |
} |
| |
} |
| |
return if (!$submitted && ($submitonly eq 'yes' || |
| |
$submitonly eq 'incorrect' || |
| |
$submitonly eq 'graded')); |
| |
return if (!$graded && ($submitonly eq 'graded')); |
| |
return if (!$incorrect && $submitonly eq 'incorrect'); |
| |
} |
| |
} |
| |
if ($submitonly eq 'queued') { |
| |
my ($cdom,$cnum) = split(/_/,$courseid); |
| |
my %queue_status = |
| |
&Apache::bridgetask::get_student_status($symb,$cdom,$cnum, |
| |
$udom,$uname); |
| |
return if (!defined($queue_status{'gradingqueue'})); |
| |
} |
| |
$$ctr++; |
| |
my %aggregates = (); |
| my $result=&Apache::loncommon::start_data_table_row().'<td align="right">'. |
my $result=&Apache::loncommon::start_data_table_row().'<td align="right">'. |
| '<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'. |
'<input type="hidden" name="ctr'.($$ctr-1).'" value="'.$student.'" />'. |
| "\n".$ctr.' </td><td> '. |
"\n".$$ctr.' </td><td> '. |
| '<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom. |
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom. |
| '\');" target="_self">'.$fullname.'</a> '. |
'\');" target="_self">'.$fullname.'</a> '. |
| '<span class="LC_internal_info">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</span></td>'."\n"; |
'<span class="LC_internal_info">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</span></td>'."\n"; |
|
Line 3608 sub viewstudentgrade {
|
Line 5419 sub viewstudentgrade {
|
| my ($aggtries,$totaltries); |
my ($aggtries,$totaltries); |
| unless (exists($aggregates{$part})) { |
unless (exists($aggregates{$part})) { |
| $totaltries = $record{'resource.'.$part.'.tries'}; |
$totaltries = $record{'resource.'.$part.'.tries'}; |
| |
|
| $aggtries = $totaltries; |
$aggtries = $totaltries; |
| if ($$last_resets{$part}) { |
if ($$last_resets{$part}) { |
| $aggtries = &get_num_tries(\%record,$$last_resets{$part}, |
$aggtries = &get_num_tries(\%record,$$last_resets{$part}, |
|
Line 3656 sub viewstudentgrade {
|
Line 5466 sub viewstudentgrade {
|
| #--- change scores for all the students in a section/class |
#--- change scores for all the students in a section/class |
| # record does not get update if unchanged |
# record does not get update if unchanged |
| sub editgrades { |
sub editgrades { |
| my ($request) = @_; |
my ($request,$symb) = @_; |
| |
my $toolsymb; |
| |
if ($symb =~ /ext\.tool$/) { |
| |
$toolsymb = $symb; |
| |
} |
| |
|
| my $symb=&get_symb($request); |
|
| my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
| my $title='<h2>'.&mt('Current Grade Status').'</h2>'; |
my $title='<h2>'.&mt('Current Grade Status').'</h2>'; |
| $title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n"; |
$title.='<h4><b>'.&mt('Section:').'</b> '.$section_display.'</h4>'."\n"; |
| $title.='<h4>'.&mt('<b>Section: </b>[_1]',$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 3678 sub editgrades {
|
Line 5490 sub editgrades {
|
| ); |
); |
| my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0'); |
my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0'); |
| |
|
| |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| |
my %needpb = &passbacks_for_symb($cdom,$cnum,$symb); |
| |
|
| my (@partid); |
my (@partid); |
| my %weight = (); |
my %weight = (); |
| my %columns = (); |
my %columns = (); |
|
Line 3696 sub editgrades {
|
Line 5512 sub editgrades {
|
| $ctr++; |
$ctr++; |
| } |
} |
| my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); |
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); |
| |
my $totcolspan = 0; |
| foreach my $partid (@partid) { |
foreach my $partid (@partid) { |
| $header .= '<th align="center">'.&mt('Old Score').'</th>'. |
$header .= '<th align="center">'.&mt('Old Score').'</th>'. |
| '<th align="center">'.&mt('New Score').'</th>'; |
'<th align="center">'.&mt('New Score').'</th>'; |
|
Line 3704 sub editgrades {
|
Line 5521 sub editgrades {
|
| my ($part,$type) = &split_part_type($stores); |
my ($part,$type) = &split_part_type($stores); |
| 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',$toolsymb); |
| $display =~ s/\[Part: \Q$part\E\]//; |
$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/; |
|
Line 3712 sub editgrades {
|
Line 5529 sub editgrades {
|
| '<th align="center">'.&mt('New').' '.$display.'</th>'; |
'<th align="center">'.&mt('New').' '.$display.'</th>'; |
| $columns{$partid}+=2; |
$columns{$partid}+=2; |
| } |
} |
| |
$totcolspan += $columns{$partid}; |
| } |
} |
| foreach my $partid (@partid) { |
foreach my $partid (@partid) { |
| my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
|
Line 3726 sub editgrades {
|
Line 5544 sub editgrades {
|
| &Apache::loncommon::end_data_table_header_row(); |
&Apache::loncommon::end_data_table_header_row(); |
| my @noupdate; |
my @noupdate; |
| my ($updateCtr,$noupdateCtr) = (1,1); |
my ($updateCtr,$noupdateCtr) = (1,1); |
| |
my ($got_types,%queueable,%pbsave,%skip_passback); |
| for ($i=0; $i<$env{'form.total'}; $i++) { |
for ($i=0; $i<$env{'form.total'}; $i++) { |
| my $line; |
|
| my $user = $env{'form.ctr'.$i}; |
my $user = $env{'form.ctr'.$i}; |
| my ($uname,$udom)=split(/:/,$user); |
my ($uname,$udom)=split(/:/,$user); |
| my %newrecord; |
my %newrecord; |
| my $updateflag = 0; |
my $updateflag = 0; |
| $line .= '<td>'.&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>'; |
|
| my $usec=$classlist->{"$uname:$udom"}[5]; |
my $usec=$classlist->{"$uname:$udom"}[5]; |
| if (!&canmodify($usec)) { |
my $canmodify = &canmodify($usec); |
| my $numcols=scalar(@partid)*4+2; |
my $line = '<td'.($canmodify?'':' colspan="2"').'>'. |
| |
&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>'; |
| |
if (!$canmodify) { |
| push(@noupdate, |
push(@noupdate, |
| $line."<td colspan=\"$numcols\"><span class=\"LC_warning\">". |
$line."<td colspan=\"$totcolspan\"><span class=\"LC_warning\">". |
| &mt('Not allowed to modify student')."</span></td></tr>"); |
&mt('Not allowed to modify student')."</span></td>"); |
| next; |
next; |
| } |
} |
| my %aggregate = (); |
my %aggregate = (); |
| my $aggregateflag = 0; |
my $aggregateflag = 0; |
| $user=~s/:/_/; # colon doen't work in javascript for names |
$user=~s/:/_/; # colon doen't work in javascript for names |
| |
my (%weights,%awardeds,%excuseds); |
| foreach (@partid) { |
foreach (@partid) { |
| my $old_aw = $env{'form.GD_'.$user.'_'.$_.'_awarded_s'}; |
my $old_aw = $env{'form.GD_'.$user.'_'.$_.'_awarded_s'}; |
| my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1); |
my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1); |
|
Line 3752 sub editgrades {
|
Line 5572 sub editgrades {
|
| my $awarded = $env{'form.GD_'.$user.'_'.$_.'_awarded'}; |
my $awarded = $env{'form.GD_'.$user.'_'.$_.'_awarded'}; |
| my $pcr = $awarded/($weight{$_} ne '0' ? $weight{$_} : 1); |
my $pcr = $awarded/($weight{$_} ne '0' ? $weight{$_} : 1); |
| my $partial = $awarded eq '' ? '' : $pcr; |
my $partial = $awarded eq '' ? '' : $pcr; |
| |
$awardeds{$symb}{$_} = $partial; |
| my $score; |
my $score; |
| if ($partial eq '') { |
if ($partial eq '') { |
| $score = $scoreptr{$env{'form.GD_'.$user.'_'.$_.'_solved_s'}}; |
$score = $scoreptr{$env{'form.GD_'.$user.'_'.$_.'_solved_s'}}; |
|
Line 3792 sub editgrades {
|
Line 5613 sub editgrades {
|
| |
|
| |
|
| my $partid=$_; |
my $partid=$_; |
| |
if ($score eq 'excused') { |
| |
$excuseds{$symb}{$partid} = 1; |
| |
} else { |
| |
$excuseds{$symb}{$partid} = ''; |
| |
} |
| foreach my $stores (@parts) { |
foreach my $stores (@parts) { |
| my ($part,$type) = &split_part_type($stores); |
my ($part,$type) = &split_part_type($stores); |
| if ($part !~ m/^\Q$partid\E/) { next;} |
if ($part !~ m/^\Q$partid\E/) { next;} |
|
Line 3809 sub editgrades {
|
Line 5635 sub editgrades {
|
| } |
} |
| $line.="\n"; |
$line.="\n"; |
| |
|
| my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
| my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
| |
|
| if ($updateflag) { |
if ($updateflag) { |
| $count++; |
$count++; |
| &Apache::lonnet::cstore(\%newrecord,$symb,$env{'request.course.id'}, |
&Apache::lonnet::cstore(\%newrecord,$symb,$env{'request.course.id'}, |
|
Line 3825 sub editgrades {
|
Line 5648 sub editgrades {
|
| $udom,$uname); |
$udom,$uname); |
| my $all_graded = 1; |
my $all_graded = 1; |
| my $none_graded = 1; |
my $none_graded = 1; |
| |
unless ($got_types) { |
| |
my $error; |
| |
my ($plist,$handgrd,$resptype) = &response_type($symb,\$error); |
| |
unless ($error) { |
| |
foreach my $part (@parts) { |
| |
if (ref($resptype->{$part}) eq 'HASH') { |
| |
foreach my $id (keys(%{$resptype->{$part}})) { |
| |
if (($resptype->{$part}->{$id} eq 'essay') || |
| |
(lc($handgrd->{$part.'_'.$id}) eq 'yes')) { |
| |
$queueable{$part} = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
$got_types = 1; |
| |
} |
| foreach my $part (@parts) { |
foreach my $part (@parts) { |
| if ( $record{'resource.'.$part.'.awarded'} eq '' ) { |
if ($queueable{$part}) { |
| $all_graded = 0; |
if ( $record{'resource.'.$part.'.awarded'} eq '' ) { |
| } else { |
$all_graded = 0; |
| $none_graded = 0; |
} else { |
| |
$none_graded = 0; |
| |
} |
| } |
} |
| } |
} |
| |
|
| if ($all_graded || $none_graded) { |
if ($all_graded || $none_graded) { |
| &Apache::bridgetask::remove_from_queue('gradingqueue', |
&Apache::bridgetask::remove_from_queue('gradingqueue', |
| $symb,$cdom,$cnum, |
$symb,$cdom,$cnum, |
|
Line 3844 sub editgrades {
|
Line 5686 sub editgrades {
|
| '<td align="right"> '.$updateCtr.' </td>'.$line. |
'<td align="right"> '.$updateCtr.' </td>'.$line. |
| &Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
| $updateCtr++; |
$updateCtr++; |
| |
if (keys(%needpb)) { |
| |
$weights{$symb} = \%weight; |
| |
&process_passbacks('editgrades',[$symb],$cdom,$cnum,$udom,$uname,$usec,\%weights, |
| |
\%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave); |
| |
} |
| } else { |
} else { |
| push(@noupdate, |
push(@noupdate, |
| '<td align="right"> '.$noupdateCtr.' </td>'.$line); |
'<td align="right"> '.$noupdateCtr.' </td>'.$line); |
|
Line 3855 sub editgrades {
|
Line 5702 sub editgrades {
|
| } |
} |
| } |
} |
| if (@noupdate) { |
if (@noupdate) { |
| # my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3; |
my $numcols=$totcolspan+2; |
| my $numcols=scalar(@partid)*4+2; |
|
| $result .= &Apache::loncommon::start_data_table_row('LC_empty_row'). |
$result .= &Apache::loncommon::start_data_table_row('LC_empty_row'). |
| '<td align="center" colspan="'.$numcols.'">'. |
'<td align="center" colspan="'.$numcols.'">'. |
| &mt('No Changes Occurred For the Students Below'). |
&mt('No Changes Occurred For the Students Below'). |
|
Line 3869 sub editgrades {
|
Line 5715 sub editgrades {
|
| &Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
| } |
} |
| } |
} |
| $result .= &Apache::loncommon::end_data_table(). |
$result .= &Apache::loncommon::end_data_table(); |
| &show_grading_menu_form($symb); |
|
| my $msg = '<p><b>'. |
my $msg = '<p><b>'. |
| &mt('Number of records updated = [_1] for [quant,_2,student].', |
&mt('Number of records updated = [_1] for [quant,_2,student].', |
| $rec_update,$count).'</b><br />'. |
$rec_update,$count).'</b><br />'. |
|
Line 3898 sub split_part_type {
|
Line 5743 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 the student/employee ID'); |
my $error1=&mt('You need to specify the username, the student/employee ID, or the clicker 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'); |
| |
&js_escape(\$error1); |
| |
&js_escape(\$error2); |
| return(<<ENDPICK); |
return(<<ENDPICK); |
| function verify(vf) { |
function verify(vf) { |
| var foundsomething=0; |
var foundsomething=0; |
| var founduname=0; |
var founduname=0; |
| var foundID=0; |
var foundID=0; |
| |
var foundclicker=0; |
| for (i=0;i<=vf.nfields.value;i++) { |
for (i=0;i<=vf.nfields.value;i++) { |
| tw=eval('vf.f'+i+'.selectedIndex'); |
tw=eval('vf.f'+i+'.selectedIndex'); |
| if (i==0 && tw!=0) { foundID=1; } |
if (i==0 && tw!=0) { foundID=1; } |
| if (i==1 && tw!=0) { founduname=1; } |
if (i==1 && tw!=0) { founduname=1; } |
| if (i!=0 && i!=1 && i!=2 && tw!=0) { foundsomething=1; } |
if (i==2 && tw!=0) { foundclicker=1; } |
| |
if (i!=0 && i!=1 && i!=2 && i!=3 && tw!=0) { foundsomething=1; } |
| } |
} |
| if (founduname==0 && foundID==0) { |
if (founduname==0 && foundID==0 && foundclicker==0) { |
| alert('$error1'); |
alert('$error1'); |
| return; |
return; |
| } |
} |
|
Line 3938 ENDPICK
|
Line 5787 ENDPICK
|
| } |
} |
| |
|
| sub csvupload_javascript_forward_associate { |
sub csvupload_javascript_forward_associate { |
| my $error1=&mt('You need to specify the username or the student/employee ID'); |
my $error1=&mt('You need to specify the username, the student/employee ID, or the clicker 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'); |
| |
&js_escape(\$error1); |
| |
&js_escape(\$error2); |
| return(<<ENDPICK); |
return(<<ENDPICK); |
| function verify(vf) { |
function verify(vf) { |
| var foundsomething=0; |
var foundsomething=0; |
| var founduname=0; |
var founduname=0; |
| var foundID=0; |
var foundID=0; |
| |
var foundclicker=0; |
| for (i=0;i<=vf.nfields.value;i++) { |
for (i=0;i<=vf.nfields.value;i++) { |
| tw=eval('vf.f'+i+'.selectedIndex'); |
tw=eval('vf.f'+i+'.selectedIndex'); |
| if (tw==1) { foundID=1; } |
if (tw==1) { foundID=1; } |
| if (tw==2) { founduname=1; } |
if (tw==2) { founduname=1; } |
| if (tw>3) { foundsomething=1; } |
if (tw==3) { foundclicker=1; } |
| |
if (tw>4) { foundsomething=1; } |
| } |
} |
| if (founduname==0 && foundID==0) { |
if (founduname==0 && foundID==0 && ƒoundclicker==0) { |
| alert('$error1'); |
alert('$error1'); |
| return; |
return; |
| } |
} |
|
Line 3983 sub csvuploadmap_header {
|
Line 5836 sub csvuploadmap_header {
|
| $javascript=&csvupload_javascript_forward_associate(); |
$javascript=&csvupload_javascript_forward_associate(); |
| } |
} |
| |
|
| my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}); |
|
| my $checked=(($env{'form.noFirstLine'})?' checked="checked"':''); |
|
| my $ignore=&mt('Ignore First Line'); |
|
| $symb = &Apache::lonenc::check_encrypt($symb); |
$symb = &Apache::lonenc::check_encrypt($symb); |
| |
$request->print('<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">'. |
| |
&mt('Total number of records found in file: [_1]',$distotal).'<hr />'. |
| |
&mt('Associate entries from the uploaded file with as many fields as you can.')); |
| |
my $reverse=&mt("Reverse Association"); |
| $request->print(<<ENDPICK); |
$request->print(<<ENDPICK); |
| <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
<br /> |
| <h3><span class="LC_info">Uploading Class Grades</span></h3> |
<input type="button" value="$reverse" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" /> |
| $result |
|
| <hr /> |
|
| <h3>Identify fields</h3> |
|
| 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 |
|
| 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);" /> |
|
| <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" /> |
| <input type="hidden" name="datatoken" value="$datatoken" /> |
<input type="hidden" name="datatoken" value="$datatoken" /> |
|
Line 4006 to this page if the data selected is ins
|
Line 5852 to this page if the data selected is ins
|
| <input type="hidden" name="upfile_associate" |
<input type="hidden" name="upfile_associate" |
| value="$env{'form.upfile_associate'}" /> |
value="$env{'form.upfile_associate'}" /> |
| <input type="hidden" name="symb" value="$symb" /> |
<input type="hidden" name="symb" value="$symb" /> |
| <input type="hidden" name="saveState" value="$env{'form.saveState'}" /> |
|
| <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" /> |
|
| <input type="hidden" name="command" value="csvuploadoptions" /> |
<input type="hidden" name="command" value="csvuploadoptions" /> |
| <hr /> |
<hr /> |
| <script type="text/javascript" language="Javascript"> |
|
| $javascript |
|
| </script> |
|
| ENDPICK |
ENDPICK |
| |
$request->print(&Apache::lonhtmlcommon::scripttag($javascript)); |
| return ''; |
return ''; |
| |
|
| } |
} |
| |
|
| sub csvupload_fields { |
sub csvupload_fields { |
| my ($symb,$errorref) = @_; |
my ($symb,$errorref) = @_; |
| |
my $toolsymb; |
| |
if ($symb =~ /ext\.tool$/) { |
| |
$toolsymb = $symb; |
| |
} |
| my (@parts) = &getpartlist($symb,$errorref); |
my (@parts) = &getpartlist($symb,$errorref); |
| if (ref($errorref)) { |
if (ref($errorref)) { |
| if ($$errorref) { |
if ($$errorref) { |
|
Line 4029 sub csvupload_fields {
|
Line 5875 sub csvupload_fields {
|
| |
|
| my @fields=(['ID','Student/Employee ID'], |
my @fields=(['ID','Student/Employee ID'], |
| ['username','Student Username'], |
['username','Student Username'], |
| |
['clicker','Clicker ID'], |
| ['domain','Student Domain']); |
['domain','Student Domain']); |
| my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); |
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); |
| foreach my $part (sort(@parts)) { |
foreach my $part (sort(@parts)) { |
| my @datum; |
my @datum; |
| my $display=&Apache::lonnet::metadata($url,$part.'.display'); |
my $display=&Apache::lonnet::metadata($url,$part.'.display',$toolsymb); |
| my $name=$part; |
my $name=$part; |
| if (!$display) { $display = $name; } |
if (!$display) { $display = $name; } |
| @datum=($name,$display); |
@datum=($name,$display); |
| if ($name=~/^stores_(.*)_awarded/) { |
if ($name=~/^stores_(.*)_awarded/) { |
| push(@fields,['stores_'.$1.'_points',"Points [Part: $1]"]); |
push(@fields,['stores_'.$1.'_points',"Points [Part: $1]"]); |
|
Line 4047 sub csvupload_fields {
|
Line 5894 sub csvupload_fields {
|
| |
|
| sub csvuploadmap_footer { |
sub csvuploadmap_footer { |
| my ($request,$i,$keyfields) =@_; |
my ($request,$i,$keyfields) =@_; |
| |
my $buttontext = &mt('Assign Grades'); |
| $request->print(<<ENDPICK); |
$request->print(<<ENDPICK); |
| </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="$buttontext" /><br /> |
| </form> |
</form> |
| ENDPICK |
ENDPICK |
| } |
} |
| |
|
| sub checkforfile_js { |
sub checkforfile_js { |
| 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.'); |
| my $result =<<CSVFORMJS; |
&js_escape(\$alertmsg); |
| <script type="text/javascript" language="javascript"> |
my $result = &Apache::lonhtmlcommon::scripttag(<<CSVFORMJS); |
| function checkUpload(formname) { |
function checkUpload(formname) { |
| if (formname.upfile.value == "") { |
if (formname.upfile.value == "") { |
| alert("$alertmsg"); |
alert("$alertmsg"); |
|
Line 4067 sub checkforfile_js {
|
Line 5915 sub checkforfile_js {
|
| } |
} |
| formname.submit(); |
formname.submit(); |
| } |
} |
| </script> |
|
| CSVFORMJS |
CSVFORMJS |
| return $result; |
return $result; |
| } |
} |
| |
|
| sub upcsvScores_form { |
sub upcsvScores_form { |
| my ($request) = shift; |
my ($request,$symb) = @_; |
| my ($symb)=&get_symb($request); |
|
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| my $result=&checkforfile_js(); |
my $result=&checkforfile_js(); |
| $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb); |
$result.=&Apache::loncommon::start_data_table(). |
| my ($table) = &showResourceInfo($symb,$env{'form.probTitle'}); |
&Apache::loncommon::start_data_table_header_row(). |
| $result.=$table; |
'<th>'.&mt('Specify a file containing the class scores for current resource.').'</th>'. |
| $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n"; |
&Apache::loncommon::end_data_table_header_row(). |
| $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n"; |
&Apache::loncommon::start_data_table_row().'<td>'; |
| $result.=' <b>'.&mt('Specify a file containing the class scores for current resource.'). |
|
| '</b></td></tr>'."\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 4093 sub upcsvScores_form {
|
Line 5936 sub upcsvScores_form {
|
| <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
| <input type="hidden" name="symb" value="$symb" /> |
<input type="hidden" name="symb" value="$symb" /> |
| <input type="hidden" name="command" value="csvuploadmap" /> |
<input type="hidden" name="command" value="csvuploadmap" /> |
| <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" /> |
|
| <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> |
|
| </form> |
</form> |
| ENDUPFORM |
ENDUPFORM |
| $result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV", |
$result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV", |
| &mt("How do I create a CSV file from a spreadsheet")) |
&mt("How do I create a CSV file from a spreadsheet")). |
| .'</td></tr></table>'."\n"; |
'</td>'. |
| $result.='</td></tr></table><br /><br />'."\n"; |
&Apache::loncommon::end_data_table_row(). |
| $result.=&show_grading_menu_form($symb); |
&Apache::loncommon::end_data_table(); |
| return $result; |
return $result; |
| } |
} |
| |
|
| |
|
| sub csvuploadmap { |
sub csvuploadmap { |
| my ($request)= @_; |
my ($request,$symb) = @_; |
| my ($symb)=&get_symb($request); |
|
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| |
|
| my $datatoken; |
my $datatoken; |
| if (!$env{'form.datatoken'}) { |
if (!$env{'form.datatoken'}) { |
| $datatoken=&Apache::loncommon::upfile_store($request); |
$datatoken=&Apache::loncommon::upfile_store($request); |
| } else { |
} else { |
| $datatoken=$env{'form.datatoken'}; |
$datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'}); |
| &Apache::loncommon::load_tmp_file($request); |
if ($datatoken ne '') { |
| |
&Apache::loncommon::load_tmp_file($request,$datatoken); |
| |
} |
| } |
} |
| my @records=&Apache::loncommon::upfile_record_sep(); |
my @records=&Apache::loncommon::upfile_record_sep(); |
| if ($env{'form.noFirstLine'}) { shift(@records); } |
|
| &csvuploadmap_header($request,$symb,$datatoken,$#records+1); |
&csvuploadmap_header($request,$symb,$datatoken,$#records+1); |
| my ($i,$keyfields); |
my ($i,$keyfields); |
| if (@records) { |
if (@records) { |
|
Line 4152 sub csvuploadmap {
|
Line 5992 sub csvuploadmap {
|
| } |
} |
| } |
} |
| &csvuploadmap_footer($request,$i,$keyfields); |
&csvuploadmap_footer($request,$i,$keyfields); |
| $request->print(&show_grading_menu_form($symb)); |
|
| |
|
| return ''; |
return ''; |
| } |
} |
| |
|
| sub csvuploadoptions { |
sub csvuploadoptions { |
| my ($request)= @_; |
my ($request,$symb)= @_; |
| my ($symb)=&get_symb($request); |
my $overwrite=&mt('Overwrite any existing score'); |
| my $checked=(($env{'form.noFirstLine'})?'1':'0'); |
|
| my $ignore=&mt('Ignore First Line'); |
|
| $request->print(<<ENDPICK); |
$request->print(<<ENDPICK); |
| <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
| <h3><span class="LC_info">Uploading Class Grade Options</span></h3> |
|
| <input type="hidden" name="command" value="csvuploadassign" /> |
<input type="hidden" name="command" value="csvuploadassign" /> |
| <!-- |
|
| <p> |
|
| <label> |
|
| <input type="checkbox" name="show_full_results" /> |
|
| Show a table of all changes |
|
| </label> |
|
| </p> |
|
| --> |
|
| <p> |
<p> |
| <label> |
<label> |
| <input type="checkbox" name="overwite_scores" checked="checked" /> |
<input type="checkbox" name="overwite_scores" checked="checked" /> |
| Overwrite any existing score |
$overwrite |
| </label> |
</label> |
| </p> |
</p> |
| ENDPICK |
ENDPICK |
| my %fields=&get_fields(); |
my %fields=&get_fields(); |
| if (!defined($fields{'domain'})) { |
if (!defined($fields{'domain'})) { |
| my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain'); |
my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain'); |
| $request->print("\n<p> Users are in domain: ".$domform."</p>\n"); |
$request->print("\n<p>".&mt('Users are in domain: [_1]',$domform)."</p>\n"); |
| } |
} |
| foreach my $key (sort(keys(%env))) { |
foreach my $key (sort(keys(%env))) { |
| if ($key !~ /^form\.(.*)$/) { next; } |
if ($key !~ /^form\.(.*)$/) { next; } |
|
Line 4195 ENDPICK
|
Line 6023 ENDPICK
|
| } |
} |
| # FIXME do a check for any duplicated user ids... |
# FIXME do a check for any duplicated user ids... |
| # FIXME do a check for any invalid user ids?... |
# FIXME do a check for any invalid user ids?... |
| $request->print('<input type="submit" value="Assign Grades" /><br /> |
$request->print('<input type="submit" value="'.&mt('Assign Grades').'" /><br /> |
| <hr /></form>'."\n"); |
<hr /></form>'."\n"); |
| $request->print(&show_grading_menu_form($symb)); |
|
| return ''; |
return ''; |
| } |
} |
| |
|
|
Line 4219 sub get_fields {
|
Line 6046 sub get_fields {
|
| } |
} |
| |
|
| sub csvuploadassign { |
sub csvuploadassign { |
| my ($request)= @_; |
my ($request,$symb) = @_; |
| my ($symb)=&get_symb($request); |
|
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| my $error_msg = ''; |
my $error_msg = ''; |
| &Apache::loncommon::load_tmp_file($request); |
my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'}); |
| |
if ($datatoken ne '') { |
| |
&Apache::loncommon::load_tmp_file($request,$datatoken); |
| |
} |
| my @gradedata = &Apache::loncommon::upfile_record_sep(); |
my @gradedata = &Apache::loncommon::upfile_record_sep(); |
| if ($env{'form.noFirstLine'}) { shift(@gradedata); } |
|
| my %fields=&get_fields(); |
my %fields=&get_fields(); |
| $request->print('<h3>Assigning Grades</h3>'); |
|
| my $courseid=$env{'request.course.id'}; |
my $courseid=$env{'request.course.id'}; |
| |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| my ($classlist) = &getclasslist('all',0); |
my ($classlist) = &getclasslist('all',0); |
| my @notallowed; |
my @notallowed; |
| my @skipped; |
my @skipped; |
| my @warnings; |
my @warnings; |
| my $countdone=0; |
my $countdone=0; |
| |
my @parts; |
| |
my %needpb = &passbacks_for_symb($cdom,$cnum,$symb); |
| |
my $passback; |
| |
if (keys(%needpb)) { |
| |
$passback = 1; |
| |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
if (ref($navmap)) { |
| |
my $res = $navmap->getBySymb($symb); |
| |
if (ref($res)) { |
| |
my $partlist = $res->parts(); |
| |
if (ref($partlist) eq 'ARRAY') { |
| |
@parts = sort(@{$partlist}); |
| |
} |
| |
} |
| |
} else { |
| |
return &navmap_errormsg(); |
| |
} |
| |
} |
| |
my (%skip_passback,%pbsave,%weights,%awardeds,%excuseds); |
| |
|
| foreach my $grade (@gradedata) { |
foreach my $grade (@gradedata) { |
| my %entries=&Apache::loncommon::record_sep($grade); |
my %entries=&Apache::loncommon::record_sep($grade); |
| my $domain; |
my $domain; |
|
Line 4248 sub csvuploadassign {
|
Line 6097 sub csvuploadassign {
|
| if (!$username) { |
if (!$username) { |
| my $id=$entries{$fields{'ID'}}; |
my $id=$entries{$fields{'ID'}}; |
| $id=~s/\s//g; |
$id=~s/\s//g; |
| my %ids=&Apache::lonnet::idget($domain,$id); |
if ($id ne '') { |
| $username=$ids{$id}; |
my %ids=&Apache::lonnet::idget($domain,[$id]); |
| |
$username=$ids{$id}; |
| |
} else { |
| |
if ($entries{$fields{'clicker'}}) { |
| |
my $clicker = $entries{$fields{'clicker'}}; |
| |
$clicker=~s/\s//g; |
| |
if ($clicker ne '') { |
| |
my %clickers = &Apache::lonnet::idget($domain,[$clicker],'clickers'); |
| |
if ($clickers{$clicker} ne '') { |
| |
my $match = 0; |
| |
my @inclass; |
| |
foreach my $poss (split(/,/,$clickers{$clicker})) { |
| |
if (exists($$classlist{"$poss:$domain"})) { |
| |
$username = $poss; |
| |
push(@inclass,$poss); |
| |
$match ++; |
| |
|
| |
} |
| |
} |
| |
if ($match > 1) { |
| |
undef($username); |
| |
$request->print('<p class="LC_warning">'. |
| |
&mt('Score not saved for clicker: [_1] (matched multiple usernames: [_2])', |
| |
$clicker,join(', ',@inclass)).'</p>'); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| } |
} |
| if (!exists($$classlist{"$username:$domain"})) { |
if (!exists($$classlist{"$username:$domain"})) { |
| my $id=$entries{$fields{'ID'}}; |
my $id=$entries{$fields{'ID'}}; |
| $id=~s/\s//g; |
$id=~s/\s//g; |
| if ($id) { |
my $clicker = $entries{$fields{'clicker'}}; |
| |
$clicker=~s/\s//g; |
| |
if ($clicker) { |
| |
push(@skipped,"$clicker:$domain"); |
| |
} elsif ($id) { |
| push(@skipped,"$id:$domain"); |
push(@skipped,"$id:$domain"); |
| } else { |
} else { |
| push(@skipped,"$username:$domain"); |
push(@skipped,"$username:$domain"); |
|
Line 4276 sub csvuploadassign {
|
Line 6157 sub csvuploadassign {
|
| my $part=$1; |
my $part=$1; |
| my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight', |
my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight', |
| $symb,$domain,$username); |
$symb,$domain,$username); |
| |
$weights{$symb}{$part} = $wgt; |
| if ($wgt) { |
if ($wgt) { |
| $entries{$fields{$dest}}=~s/\s//g; |
$entries{$fields{$dest}}=~s/\s//g; |
| my $pcr=$entries{$fields{$dest}} / $wgt; |
my $pcr=$entries{$fields{$dest}} / $wgt; |
| |
if ($passback) { |
| |
$awardeds{$symb}{$part} = $pcr; |
| |
$excuseds{$symb}{$part} = ''; |
| |
} |
| my $award=($pcr == 0) ? 'incorrect_by_override' |
my $award=($pcr == 0) ? 'incorrect_by_override' |
| : 'correct_by_override'; |
: 'correct_by_override'; |
| if ($pcr>1) { |
if ($pcr>1) { |
| push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain")); |
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; |
|
Line 4298 sub csvuploadassign {
|
Line 6184 sub csvuploadassign {
|
| if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} } |
if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} } |
| if ($dest=~/stores_(.*)_solved/) { if ($points{$1}) {next;} } |
if ($dest=~/stores_(.*)_solved/) { if ($points{$1}) {next;} } |
| my $store_key=$dest; |
my $store_key=$dest; |
| |
if ($passback) { |
| |
if ($store_key=~/stores_(.*)_(awarded|solved)/) { |
| |
my ($part,$key) = ($1,$2); |
| |
unless ((ref($weights{$symb}) eq 'HASH') && (exists($weights{$symb}{$part}))) { |
| |
$weights{$symb}{$part} = &Apache::lonnet::EXT('resource.'.$part.'.weight', |
| |
$symb,$domain,$username); |
| |
} |
| |
if ($key eq 'awarded') { |
| |
$awardeds{$symb}{$part} = $entries{$fields{$dest}}; |
| |
} elsif ($key eq 'solved') { |
| |
if ($entries{$fields{$dest}} =~ /^excused/) { |
| |
$excuseds{$symb}{$part} = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| $store_key=~s/^stores/resource/; |
$store_key=~s/^stores/resource/; |
| $store_key=~s/_/\./g; |
$store_key=~s/_/\./g; |
| $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 4311 sub csvuploadassign {
|
Line 6213 sub csvuploadassign {
|
| $env{'request.course.id'}, |
$env{'request.course.id'}, |
| $domain,$username); |
$domain,$username); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| |
# Successfully stored |
| $request->print('.'); |
$request->print('.'); |
| # Remove from grading queue |
# Remove from grading queue |
| &Apache::bridgetask::remove_from_queue('gradingqueue',$symb, |
&Apache::bridgetask::remove_from_queue('gradingqueue',$symb,$cdom,$cnum, |
| $env{'course.'.$env{'request.course.id'}.'.domain'}, |
$domain,$username); |
| $env{'course.'.$env{'request.course.id'}.'.num'}, |
$countdone++; |
| $domain,$username); |
if ($passback) { |
| } else { |
my @parts_in_upload; |
| |
if (ref($weights{$symb}) eq 'HASH') { |
| |
@parts_in_upload = sort(keys(%{$weights{$symb}})); |
| |
} |
| |
my @diffs = &Apache::loncommon::compare_arrays(\@parts_in_upload,\@parts); |
| |
if (@diffs > 0) { |
| |
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$username); |
| |
foreach my $part (@parts) { |
| |
next if (grep(/^\Q$part\E$/,@parts_in_upload)); |
| |
$weights{$symb}{$part} = &Apache::lonnet::EXT('resource.'.$part.'.weight', |
| |
$symb,$domain,$username); |
| |
if ($record{"resource.$part.solved"} =~/^excused/) { |
| |
$excuseds{$symb}{$part} = 1; |
| |
} else { |
| |
$excuseds{$symb}{$part} = ''; |
| |
} |
| |
$awardeds{$symb}{$part} = $record{"resource.$part.awarded"}; |
| |
} |
| |
} |
| |
&process_passbacks('csvupload',[$symb],$cdom,$cnum,$domain,$username,$usec,\%weights, |
| |
\%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave); |
| |
} |
| |
} 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]", |
| "$username:$domain",$result)."</span></p>"); |
"$username:$domain",$result)."</span></p>"); |
| } |
} |
| $request->rflush(); |
$request->rflush(); |
| $countdone++; |
|
| } |
} |
| } |
} |
| $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0)); |
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0)); |
|
Line 4340 sub csvuploadassign {
|
Line 6264 sub csvuploadassign {
|
| $request->print(join(', ',@notallowed)); |
$request->print(join(', ',@notallowed)); |
| } |
} |
| $request->print("<br />\n"); |
$request->print("<br />\n"); |
| $request->print(&show_grading_menu_form($symb)); |
|
| return $error_msg; |
return $error_msg; |
| } |
} |
| #------------- end of section for handling csv file upload --------- |
#------------- end of section for handling csv file upload --------- |
|
Line 4351 sub csvuploadassign {
|
Line 6274 sub csvuploadassign {
|
| # |
# |
| #--- Select a page/sequence and a student to grade |
#--- Select a page/sequence and a student to grade |
| sub pickStudentPage { |
sub pickStudentPage { |
| my ($request) = shift; |
my ($request,$symb) = @_; |
| |
|
| my $alertmsg = &mt('Please select the student you wish to grade.'); |
my $alertmsg = &mt('Please select the student you wish to grade.'); |
| $request->print(<<LISTJAVASCRIPT); |
&js_escape(\$alertmsg); |
| <script type="text/javascript" language="javascript"> |
$request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT)); |
| |
|
| function checkPickOne(formname) { |
function checkPickOne(formname) { |
| if (radioSelection(formname.student) == null) { |
if (radioSelection(formname.student) == null) { |
|
Line 4368 function checkPickOne(formname) {
|
Line 6291 function checkPickOne(formname) {
|
| formname.submit(); |
formname.submit(); |
| } |
} |
| |
|
| </script> |
|
| LISTJAVASCRIPT |
LISTJAVASCRIPT |
| &commonJSfunctions($request); |
&commonJSfunctions($request); |
| my ($symb) = &get_symb($request); |
|
| 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 $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 $result='<h3><span class="LC_info"> '. |
my $result='<h3><span class="LC_info"> '. |
| &mt('Manual Grading by Page or Sequence').'</span></h3>'; |
&mt('Manual Grading by Page or Sequence').'</span></h3>'; |
|
Line 4389 LISTJAVASCRIPT
|
Line 6312 LISTJAVASCRIPT
|
| my ($curpage) =&Apache::lonnet::decode_symb($symb); |
my ($curpage) =&Apache::lonnet::decode_symb($symb); |
| # my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); |
# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); |
| # my $type=($curpage =~ /\.(page|sequence)/); |
# my $type=($curpage =~ /\.(page|sequence)/); |
| my $select = '<select name="selectpage">'."\n"; |
|
| |
# Collection of hidden fields |
| my $ctr=0; |
my $ctr=0; |
| foreach (@$titles) { |
foreach (@$titles) { |
| my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
| $select.='<option value="'.$ctr.'" '. |
$result.='<input type="hidden" name="page'.$ctr.'" value="'.$$symbx{$_}.'" />'."\n"; |
| ($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : ''). |
$result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n"; |
| '>'.$showtitle.'</option>'."\n"; |
$ctr++; |
| $ctr++; |
|
| } |
} |
| $select.= '</select>'; |
$result.='<input type="hidden" name="page" />'."\n". |
| $result.=' <b>'.&mt('Problems from').':</b> '.$select."<br />\n"; |
'<input type="hidden" name="title" />'."\n"; |
| |
|
| |
$result.=&build_section_inputs(); |
| |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
| |
$result.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n". |
| |
'<input type="hidden" name="command" value="displayPage" />'."\n". |
| |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n"; |
| |
|
| |
# Show grading options |
| |
$result.=&Apache::lonhtmlcommon::start_pick_box(); |
| |
my $select = '<select name="selectpage">'."\n"; |
| $ctr=0; |
$ctr=0; |
| foreach (@$titles) { |
foreach (@$titles) { |
| my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
| $result.='<input type="hidden" name="page'.$ctr.'" value="'.$$symbx{$_}.'" />'."\n"; |
$select.='<option value="'.$ctr.'"'. |
| $result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n"; |
($$symbx{$_} =~ /$curpage$/ ? ' selected="selected"' : ''). |
| |
'>'.$showtitle.'</option>'."\n"; |
| $ctr++; |
$ctr++; |
| } |
} |
| $result.='<input type="hidden" name="page" />'."\n". |
$select.= '</select>'; |
| '<input type="hidden" name="title" />'."\n"; |
|
| |
|
| my $options = |
$result.= |
| '<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n". |
&Apache::lonhtmlcommon::row_title(&mt('Problems from')) |
| '<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n"; |
.$select |
| $result.=' <b>'.&mt('View Problem Text').': </b>'.$options; |
.&Apache::lonhtmlcommon::row_closure(); |
| |
|
| $options = |
$result.= |
| '<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n". |
&Apache::lonhtmlcommon::row_title(&mt('View Problem Text')) |
| '<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n". |
.'<label><input type="radio" name="vProb" value="no"' |
| '<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n"; |
.' checked="checked" /> '.&mt('no').' </label>'."\n" |
| $result.=' <b>'.&mt('Submissions').': </b>'.$options; |
.'<label><input type="radio" name="vProb" value="yes" />' |
| |
.&mt('yes').'</label>'."\n" |
| |
.&Apache::lonhtmlcommon::row_closure(); |
| |
|
| |
$result.= |
| |
&Apache::lonhtmlcommon::row_title(&mt('View Submissions')) |
| |
.'<label><input type="radio" name="lastSub" value="none" /> ' |
| |
.&mt('none').' </label>'."\n" |
| |
.'<label><input type="radio" name="lastSub" value="datesub"' |
| |
.' checked="checked" /> '.&mt('all submissions').'</label>'."\n" |
| |
.'<label><input type="radio" name="lastSub" value="all" /> ' |
| |
.&mt('all submissions with details').' </label>' |
| |
.&Apache::lonhtmlcommon::row_closure(); |
| |
|
| $result.=&build_section_inputs(); |
$result.= |
| my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
&Apache::lonhtmlcommon::row_title(&mt('Use CODE')) |
| $result.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n". |
.'<input type="text" name="CODE" value="" />' |
| '<input type="hidden" name="command" value="displayPage" />'."\n". |
.&Apache::lonhtmlcommon::row_closure(1) |
| '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
.&Apache::lonhtmlcommon::end_pick_box(); |
| '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n"; |
|
| |
|
| $result.=' <b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n"; |
# Show list of students to select for grading |
| |
$result.='<br /><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 4445 LISTJAVASCRIPT
|
Line 6387 LISTJAVASCRIPT
|
| '<th>'.&nameUserString('header').'</th>'. |
'<th>'.&nameUserString('header').'</th>'. |
| &Apache::loncommon::end_data_table_header_row(); |
&Apache::loncommon::end_data_table_header_row(); |
| |
|
| my (undef,undef,$fullname) = &getclasslist($getsec,'1'); |
my (undef,undef,$fullname) = &getclasslist($getsec,'1',$getgroup); |
| my $ptr = 1; |
my $ptr = 1; |
| foreach my $student (sort |
foreach my $student (sort |
| { |
{ |
|
Line 4473 LISTJAVASCRIPT
|
Line 6415 LISTJAVASCRIPT
|
| $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); |
|
| $request->print($studentTable); |
$request->print($studentTable); |
| |
|
| return ''; |
return ''; |
|
Line 4496 sub getSymbMap {
|
Line 6437 sub getSymbMap {
|
| my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); }, |
my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); }, |
| 1,0,1); |
1,0,1); |
| for my $sequence ($navmap->getById('0.0'), @sequences) { |
for my $sequence ($navmap->getById('0.0'), @sequences) { |
| if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) { |
if ($navmap->hasResource($sequence, sub { shift->is_gradable(); }, 0) ) { |
| my $title = $minder.'.'. |
my $title = $minder.'.'. |
| &HTML::Entities::encode($sequence->compTitle(),'"\'&'); |
&HTML::Entities::encode($sequence->compTitle(),'"\'&'); |
| push(@titles, $title); # minder in case two titles are identical |
push(@titles, $title); # minder in case two titles are identical |
|
Line 4510 sub getSymbMap {
|
Line 6451 sub getSymbMap {
|
| # |
# |
| #--- Displays a page/sequence w/wo problems, w/wo submissions |
#--- Displays a page/sequence w/wo problems, w/wo submissions |
| sub displayPage { |
sub displayPage { |
| my ($request) = shift; |
my ($request,$symb) = @_; |
| |
|
| my ($symb) = &get_symb($request); |
|
| 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 $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; |
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; |
|
Line 4529 sub displayPage {
|
Line 6468 sub displayPage {
|
| &Apache::lonnet::clear_EXT_cache_status(); |
&Apache::lonnet::clear_EXT_cache_status(); |
| |
|
| if (!&canview($usec)) { |
if (!&canview($usec)) { |
| $request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>'); |
$request->print( |
| $request->print(&show_grading_menu_form($symb)); |
'<span class="LC_warning">'. |
| return; |
&mt('Unable to view requested student. ([_1])', |
| |
$env{'form.student'}). |
| |
'</span>'); |
| |
return; |
| } |
} |
| my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>'; |
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>'; |
| $result.='<h3> '.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)). |
$result.='<h3> '.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)). |
|
Line 4548 sub displayPage {
|
Line 6490 sub displayPage {
|
| my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| unless (ref($navmap)) { |
unless (ref($navmap)) { |
| $request->print(&navmap_errormsg()); |
$request->print(&navmap_errormsg()); |
| $request->print(&show_grading_menu_form($symb)); |
|
| return; |
return; |
| } |
} |
| my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'}); |
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'}); |
| my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
| if (!$map) { |
if (!$map) { |
| $request->print('<span class="LC_warning">'.&mt('Unable to view requested sequence. ([_1])',$resUrl).'</span>'); |
$request->print('<span class="LC_warning">'.&mt('Unable to view requested sequence. ([_1])',$resUrl).'</span>'); |
| $request->print(&show_grading_menu_form($symb)); |
|
| return; |
return; |
| } |
} |
| my $iterator = $navmap->getIterator($map->map_start(), |
my $iterator = $navmap->getIterator($map->map_start(), |
|
Line 4568 sub displayPage {
|
Line 6508 sub displayPage {
|
| '<input type="hidden" name="page" value="'.$pageTitle.'" />'."\n". |
'<input type="hidden" name="page" value="'.$pageTitle.'" />'."\n". |
| '<input type="hidden" name="title" value="'.$env{'form.title'}.'" />'."\n". |
'<input type="hidden" name="title" value="'.$env{'form.title'}.'" />'."\n". |
| '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
| '<input type="hidden" name="overRideScore" value="no" />'."\n". |
'<input type="hidden" name="overRideScore" value="no" />'."\n"; |
| '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n"; |
|
| |
|
| if (defined($env{'form.CODE'})) { |
if (defined($env{'form.CODE'})) { |
| $studentTable.= |
$studentTable.= |
|
Line 4583 sub displayPage {
|
Line 6522 sub displayPage {
|
| '</span>'."\n". |
'</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>'.&mt('Prob.').'</th>'. |
| '<th> '.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'. |
'<th> '.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'. |
| &Apache::loncommon::end_data_table_header_row(); |
&Apache::loncommon::end_data_table_header_row(); |
| |
|
|
Line 4595 sub displayPage {
|
Line 6534 sub displayPage {
|
| if($curRes == $iterator->BEGIN_MAP) { $depth++; } |
if($curRes == $iterator->BEGIN_MAP) { $depth++; } |
| if($curRes == $iterator->END_MAP) { $depth--; } |
if($curRes == $iterator->END_MAP) { $depth--; } |
| |
|
| if (ref($curRes) && $curRes->is_problem()) { |
if (ref($curRes) && $curRes->is_gradable()) { |
| my $parts = $curRes->parts(); |
my $parts = $curRes->parts(); |
| my $title = $curRes->compTitle(); |
my $title = $curRes->compTitle(); |
| my $symbx = $curRes->symb(); |
my $symbx = $curRes->symb(); |
| |
my $is_tool = ($symbx =~ /ext\.tool$/); |
| $studentTable.= |
$studentTable.= |
| &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">'; |
| my %form = ('CODE' => $env{'form.CODE'},); |
my %form = ('CODE' => $env{'form.CODE'},); |
| if ($env{'form.vProb'} eq 'yes' ) { |
if ($is_tool) { |
| $studentTable.=&show_problem($request,$symbx,$uname,$udom,1, |
$studentTable.=' <b>'.$title.'</b><br />'; |
| undef,'both',\%form); |
} else { |
| } else { |
if ($env{'form.vProb'} eq 'yes' ) { |
| my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form); |
$studentTable.=&show_problem($request,$symbx,$uname,$udom,1, |
| $companswer =~ s|<form(.*?)>||g; |
undef,'both',\%form); |
| $companswer =~ s|</form>||g; |
} else { |
| # while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a> |
my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form); |
| # $companswer =~ s/$1/ /ms; |
$companswer =~ s|<form(.*?)>||g; |
| # $request->print('match='.$1."<br />\n"); |
$companswer =~ s|</form>||g; |
| # } |
# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a> |
| # $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g; |
# $companswer =~ s/$1/ /ms; |
| $studentTable.=' <b>'.$title.'</b> <br /> <b>'.&mt('Correct answer').':</b><br />'.$companswer; |
# $request->print('match='.$1."<br />\n"); |
| |
# } |
| |
# $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g; |
| |
$studentTable.=' <b>'.$title.'</b> <br /> <b>'.&mt('Correct answer').':</b><br />'.$companswer; |
| |
} |
| } |
} |
| |
|
| my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); |
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); |
| |
|
| if ($env{'form.lastSub'} eq 'datesub') { |
if ($env{'form.lastSub'} eq 'datesub') { |
| if ($record{'version'} eq '') { |
if ($record{'version'} eq '') { |
| $studentTable.='<br /> <span class="LC_warning">'.&mt('No recorded submission for this problem.').'</span><br />'; |
my $msg = &mt('No recorded submission for this problem.'); |
| |
if ($is_tool) { |
| |
$msg = &mt('No recorded transactions for this external tool'); |
| |
} |
| |
$studentTable.='<br /> <span class="LC_warning">'.$msg.'</span><br />'; |
| } else { |
} else { |
| my %responseType = (); |
my %responseType = (); |
| foreach my $partid (@{$parts}) { |
foreach my $partid (@{$parts}) { |
|
Line 4641 sub displayPage {
|
Line 6589 sub displayPage {
|
| $responseType{$partid} = \%responseIds; |
$responseType{$partid} = \%responseIds; |
| } |
} |
| $studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom); |
$studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom); |
| |
|
| } |
} |
| } elsif ($env{'form.lastSub'} eq 'all') { |
} elsif ($env{'form.lastSub'} eq 'all') { |
| my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : ''); |
my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : ''); |
| |
my $identifier = (&canmodify($usec)? $prob : ''); |
| $studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom, |
$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom, |
| $env{'request.course.id'}, |
$env{'request.course.id'}, |
| '','.submission'); |
'','.submission',undef, |
| |
$usec,$identifier); |
| |
|
| } |
} |
| if (&canmodify($usec)) { |
if (&canmodify($usec)) { |
|
Line 4665 sub displayPage {
|
Line 6614 sub displayPage {
|
| } |
} |
| $curRes = $iterator->next(); |
$curRes = $iterator->next(); |
| } |
} |
| |
my $disabled; |
| |
unless (&canmodify($usec)) { |
| |
$disabled = ' disabled="disabled"'; |
| |
} |
| |
|
| $studentTable.= |
$studentTable.= |
| '</table>'."\n". |
'</table>'."\n". |
| '<input type="button" value="'.&mt('Save').'" '. |
'<input type="button" value="'.&mt('Save').'"'.$disabled.' '. |
| 'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'. |
'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'. |
| '</form>'."\n"; |
'</form>'."\n"; |
| $studentTable.=&show_grading_menu_form($symb); |
|
| $request->print($studentTable); |
$request->print($studentTable); |
| |
|
| return ''; |
return ''; |
|
Line 4681 sub displaySubByDates {
|
Line 6633 sub displaySubByDates {
|
| my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_; |
my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_; |
| my $isCODE=0; |
my $isCODE=0; |
| my $isTask = ($symb =~/\.task$/); |
my $isTask = ($symb =~/\.task$/); |
| |
my $is_tool = ($symb =~/\.tool$/); |
| if (exists($record->{'resource.CODE'})) { $isCODE=1; } |
if (exists($record->{'resource.CODE'})) { $isCODE=1; } |
| my $studentTable=&Apache::loncommon::start_data_table(). |
my $studentTable=&Apache::loncommon::start_data_table(). |
| &Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
| '<th>'.&mt('Date/Time').'</th>'. |
'<th>'.&mt('Date/Time').'</th>'. |
| ($isCODE?'<th>'.&mt('CODE').'</th>':''). |
($isCODE?'<th>'.&mt('CODE').'</th>':''). |
| '<th>'.&mt('Submission').'</th>'. |
($isTask?'<th>'.&mt('Version').'</th>':''). |
| |
'<th>'.($is_tool?&mt('Grade'):&mt('Submission')).'</th>'. |
| '<th>'.&mt('Status').'</th>'. |
'<th>'.&mt('Status').'</th>'. |
| &Apache::loncommon::end_data_table_header_row(); |
&Apache::loncommon::end_data_table_header_row(); |
| my ($version); |
my ($version); |
|
Line 4694 sub displaySubByDates {
|
Line 6648 sub displaySubByDates {
|
| my %orders; |
my %orders; |
| $mark{'correct_by_student'} = $checkIcon; |
$mark{'correct_by_student'} = $checkIcon; |
| if (!exists($$record{'1:timestamp'})) { |
if (!exists($$record{'1:timestamp'})) { |
| return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />'; |
if ($is_tool) { |
| |
return '<br /> <span class="LC_warning">'.&mt('No grade passed back.').'</span><br />'; |
| |
} else { |
| |
return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />'; |
| |
} |
| } |
} |
| |
|
| my $interaction; |
my $interaction; |
| my $no_increment = 1; |
my $no_increment = 1; |
| my %lastrndseed; |
my (%lastrndseed,%lasttype); |
| 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'}); |
| if (exists($$record{$version.':resource.0.version'})) { |
if (exists($$record{$version.':resource.0.version'})) { |
| $interaction = $$record{$version.':resource.0.version'}; |
$interaction = $$record{$version.':resource.0.version'}; |
| } |
} |
| |
if ($isTask && $env{'form.previousversion'}) { |
| |
next unless ($interaction == $env{'form.previousversion'}); |
| |
} |
| my $where = ($isTask ? "$version:resource.$interaction" |
my $where = ($isTask ? "$version:resource.$interaction" |
| : "$version:resource"); |
: "$version:resource"); |
| $studentTable.=&Apache::loncommon::start_data_table_row(). |
$studentTable.=&Apache::loncommon::start_data_table_row(). |
|
Line 4714 sub displaySubByDates {
|
Line 6674 sub displaySubByDates {
|
| if ($isCODE) { |
if ($isCODE) { |
| $studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>'; |
$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>'; |
| } |
} |
| |
if ($isTask) { |
| |
$studentTable.='<td>'.$interaction.'</td>'; |
| |
} |
| my @versionKeys = split(/\:/,$$record{$version.':keys'}); |
my @versionKeys = split(/\:/,$$record{$version.':keys'}); |
| my @displaySub = (); |
my @displaySub = (); |
| foreach my $partid (@{$parts}) { |
foreach my $partid (@{$parts}) { |
|
Line 4722 sub displaySubByDates {
|
Line 6685 sub displaySubByDates {
|
| if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) { |
if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) { |
| $hidden = 1; |
$hidden = 1; |
| } |
} |
| my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys) |
my @matchKey; |
| : sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys)); |
if ($isTask) { |
| |
@matchKey = sort(grep(/^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)); |
| |
} elsif ($is_tool) { |
| |
@matchKey = sort(grep(/^resource\.\Q$partid\E\.awarded$/,@versionKeys)); |
| |
} else { |
| |
@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); |
| 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 '') { |
| |
if ($is_tool) { |
| my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/) |
$displaySub[0].=$$record{"$version:resource.$partid.awarded"}; |
| : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/)); |
|
| $displaySub[0].='<span class="LC_nobreak"'; |
|
| $displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>' |
|
| .' <span class="LC_internal_info">' |
|
| .'('.&mt('Response ID: [_1]',$responseId).')' |
|
| .'</span>' |
|
| .' <b>'; |
|
| if ($hidden) { |
|
| $displaySub[0].= &mt('Anonymous Survey').'</b>'; |
|
| } else { |
} else { |
| my ($trial,$rndseed,$newvariation); |
my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/) |
| if ($type eq 'randomizetry') { |
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/)); |
| $trial = $$record{"$where.$partid.tries"}; |
$displaySub[0].='<span class="LC_nobreak">'; |
| $rndseed = $$record{"$where.$partid.rndseed"}; |
$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</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) { |
| $$record{"$where.$partid.tries"}); |
$displaySub[0].= &mt('Anonymous Survey').'</b>'; |
| if ($rndseed || $lastrndseed{$partid}) { |
} else { |
| if ($rndseed ne $lastrndseed{$partid}) { |
my ($trial,$rndseed,$newvariation); |
| $newvariation = ' ('.&mt('New variation this try').')'; |
if ($type eq 'randomizetry') { |
| } |
$trial = $$record{"$where.$partid.tries"}; |
| |
$rndseed = $$record{"$where.$partid.rndseed"}; |
| } |
} |
| } |
if ($$record{"$where.$partid.tries"} eq '') { |
| my $responseType=($isTask ? 'Task' |
$displaySub[0].=&mt('Trial not counted'); |
| |
} else { |
| |
$displaySub[0].=&mt('Trial: [_1]', |
| |
$$record{"$where.$partid.tries"}); |
| |
if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) { |
| |
if (($rndseed ne $lastrndseed{$partid}) && |
| |
(($type eq 'randomizetry') || ($lasttype{$partid} eq 'randomizetry'))) { |
| |
$newvariation = ' ('.&mt('New variation this try').')'; |
| |
} |
| |
} |
| |
$lastrndseed{$partid} = $rndseed; |
| |
$lasttype{$partid} = $type; |
| |
} |
| |
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})) || ($trial)) { |
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,$type,$trial,$rndseed); |
$no_increment,$type,$trial,$rndseed); |
| } |
} |
| $displaySub[0].='</b>'.$newvariation.'</span>'; # /nobreak |
$displaySub[0].='</b>'.$newvariation.'</span>'; # /nobreak |
| $displaySub[0].=' '. |
$displaySub[0].=' '. |
| &cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'<br />'; |
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'<br />'; |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 4783 sub displaySubByDates {
|
Line 6757 sub displaySubByDates {
|
| lc($$record{"$where.$partid.award"}).' '. |
lc($$record{"$where.$partid.award"}).' '. |
| $mark{$$record{"$where.$partid.solved"}}. |
$mark{$$record{"$where.$partid.solved"}}. |
| '<br />'; |
'<br />'; |
| |
} elsif (($is_tool) && (exists($$record{"$version:resource.$partid.solved"}))) { |
| |
if ($$record{"$version:resource.$partid.solved"} =~ /^(in|)correct_by_passback$/) { |
| |
$displaySub[1].=&mt('Grade passed back by external tool'); |
| |
} |
| } |
} |
| if (exists $$record{"$where.$partid.regrader"}) { |
if (exists $$record{"$where.$partid.regrader"}) { |
| $displaySub[2].=$$record{"$where.$partid.regrader"}. |
$displaySub[2].=$$record{"$where.$partid.regrader"}; |
| ' (<b>'.&mt('Part').':</b> '.$display_part.')'; |
unless ($is_tool) { |
| |
$displaySub[2].=' (<b>'.&mt('Part').':</b> '.$display_part.')'; |
| |
} |
| } elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) { |
} elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) { |
| $displaySub[2].= |
$displaySub[2].= |
| $$record{"$version:resource.$partid.regrader"}. |
$$record{"$version:resource.$partid.regrader"}; |
| ' (<b>'.&mt('Part').':</b> '.$display_part.')'; |
unless ($is_tool) { |
| |
$displaySub[2].=' (<b>'.&mt('Part').':</b> '.$display_part.')'; |
| |
} |
| } |
} |
| } |
} |
| # needed because old essay regrader has not parts info |
# needed because old essay regrader has not parts info |
|
Line 4809 sub displaySubByDates {
|
Line 6791 sub displaySubByDates {
|
| } |
} |
| |
|
| sub updateGradeByPage { |
sub updateGradeByPage { |
| my ($request) = shift; |
my ($request,$symb) = @_; |
| |
|
| my $cdom = $env{"course.$env{'request.course.id'}.domain"}; |
my $cdom = $env{"course.$env{'request.course.id'}.domain"}; |
| my $cnum = $env{"course.$env{'request.course.id'}.num"}; |
my $cnum = $env{"course.$env{'request.course.id'}.num"}; |
|
Line 4820 sub updateGradeByPage {
|
Line 6802 sub updateGradeByPage {
|
| my $usec=$classlist->{$env{'form.student'}}[5]; |
my $usec=$classlist->{$env{'form.student'}}[5]; |
| if (!&canmodify($usec)) { |
if (!&canmodify($usec)) { |
| $request->print('<span class="LC_warning">'.&mt('Unable to modify requested student ([_1])',$env{'form.student'}).'</span>'); |
$request->print('<span class="LC_warning">'.&mt('Unable to modify requested student ([_1])',$env{'form.student'}).'</span>'); |
| $request->print(&show_grading_menu_form($env{'form.symb'})); |
|
| return; |
return; |
| } |
} |
| my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>'; |
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>'; |
|
Line 4839 sub updateGradeByPage {
|
Line 6820 sub updateGradeByPage {
|
| my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
| if (!$map) { |
if (!$map) { |
| $request->print('<span class="LC_warning">'.&mt('Unable to grade requested sequence ([_1]).',$resUrl).'</span>'); |
$request->print('<span class="LC_warning">'.&mt('Unable to grade requested sequence ([_1]).',$resUrl).'</span>'); |
| my ($symb)=&get_symb($request); |
|
| $request->print(&show_grading_menu_form($symb)); |
|
| return; |
return; |
| } |
} |
| my $iterator = $navmap->getIterator($map->map_start(), |
my $iterator = $navmap->getIterator($map->map_start(), |
|
Line 4857 sub updateGradeByPage {
|
Line 6836 sub updateGradeByPage {
|
| |
|
| $iterator->next(); # skip the first BEGIN_MAP |
$iterator->next(); # skip the first BEGIN_MAP |
| my $curRes = $iterator->next(); # for "current resource" |
my $curRes = $iterator->next(); # for "current resource" |
| my ($depth,$question,$prob,$changeflag)= (1,1,1,0); |
my ($depth,$question,$prob,$changeflag,$hideflag)= (1,1,1,0,0); |
| |
my (@updates,%weights,%excuseds,%awardeds,@symbs_in_map); |
| while ($depth > 0) { |
while ($depth > 0) { |
| if($curRes == $iterator->BEGIN_MAP) { $depth++; } |
if($curRes == $iterator->BEGIN_MAP) { $depth++; } |
| if($curRes == $iterator->END_MAP) { $depth--; } |
if($curRes == $iterator->END_MAP) { $depth--; } |
|
Line 4866 sub updateGradeByPage {
|
Line 6846 sub updateGradeByPage {
|
| my $parts = $curRes->parts(); |
my $parts = $curRes->parts(); |
| my $title = $curRes->compTitle(); |
my $title = $curRes->compTitle(); |
| my $symbx = $curRes->symb(); |
my $symbx = $curRes->symb(); |
| |
push(@symbs_in_map,$symbx); |
| $studentTable.= |
$studentTable.= |
| &Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
| '<td align="center" valign="top" >'.$prob. |
'<td align="center" valign="top" >'.$prob. |
|
Line 4878 sub updateGradeByPage {
|
Line 6859 sub updateGradeByPage {
|
| my @displayPts=(); |
my @displayPts=(); |
| my %aggregate = (); |
my %aggregate = (); |
| my $aggregateflag = 0; |
my $aggregateflag = 0; |
| |
my %queueable; |
| |
if ($env{'form.HIDE'.$prob}) { |
| |
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); |
| |
my ($version,$parts) = split(/:/,$env{'form.HIDE'.$prob},2); |
| |
my $numchgs = &makehidden($version,$parts,\%record,$symbx,$udom,$uname,1); |
| |
if ($numchgs) { |
| |
push(@updates,$symbx); |
| |
} |
| |
$hideflag += $numchgs; |
| |
} |
| foreach my $partid (@{$parts}) { |
foreach my $partid (@{$parts}) { |
| my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid}; |
my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid}; |
| my $oldpts = $env{'form.oldpts'.$question.'_'.$partid}; |
my $oldpts = $env{'form.oldpts'.$question.'_'.$partid}; |
| |
my @types = $curRes->responseType($partid); |
| |
if (grep(/^essay$/,@types)) { |
| |
$queueable{$partid} = 1; |
| |
} else { |
| |
my @ids = $curRes->responseIds($partid); |
| |
for (my $i=0; $i < scalar(@ids); $i++) { |
| |
my $hndgrd = &Apache::lonnet::EXT('resource.'.$partid.'_'.$ids[$i]. |
| |
'.handgrade',$symb); |
| |
if (lc($hndgrd) eq 'yes') { |
| |
$queueable{$partid} = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| my $wgt = $env{'form.WGT'.$question.'_'.$partid} != 0 ? |
my $wgt = $env{'form.WGT'.$question.'_'.$partid} != 0 ? |
| $env{'form.WGT'.$question.'_'.$partid} : 1; |
$env{'form.WGT'.$question.'_'.$partid} : 1; |
| |
$weights{$symbx}{$partid} = $wgt; |
| |
$excuseds{$symbx}{$partid} = ''; |
| my $partial = $newpts/$wgt; |
my $partial = $newpts/$wgt; |
| my $score; |
my $score; |
| if ($partial > 0) { |
if ($partial > 0) { |
|
Line 4895 sub updateGradeByPage {
|
Line 6901 sub updateGradeByPage {
|
| if ($dropMenu eq 'excused') { |
if ($dropMenu eq 'excused') { |
| $partial = ''; |
$partial = ''; |
| $score = 'excused'; |
$score = 'excused'; |
| |
$excuseds{$symbx}{$partid} = 1; |
| } elsif ($dropMenu eq 'reset status' |
} elsif ($dropMenu eq 'reset status' |
| && $env{'form.solved'.$question.'_'.$partid} ne '') { #update only if previous record exists |
&& $env{'form.solved'.$question.'_'.$partid} ne '') { #update only if previous record exists |
| $newrecord{'resource.'.$partid.'.tries'} = 0; |
$newrecord{'resource.'.$partid.'.tries'} = 0; |
|
Line 4922 sub updateGradeByPage {
|
Line 6929 sub updateGradeByPage {
|
| (($score eq 'excused') ? 'excused' : $newpts). |
(($score eq 'excused') ? 'excused' : $newpts). |
| ' <br />'; |
' <br />'; |
| $question++; |
$question++; |
| |
if (($newpts eq '') || ($partial eq '')) { |
| |
$awardeds{$symbx}{$partid} = 0; |
| |
} else { |
| |
$awardeds{$symbx}{$partid} = $partial; |
| |
} |
| next if ($dropMenu eq 'reset status' || ($newpts eq $oldpts && $score ne 'excused')); |
next if ($dropMenu eq 'reset status' || ($newpts eq $oldpts && $score ne 'excused')); |
| |
|
| $newrecord{'resource.'.$partid.'.awarded'} = $partial if $partial ne ''; |
$newrecord{'resource.'.$partid.'.awarded'} = $partial if $partial ne ''; |
|
Line 4947 sub updateGradeByPage {
|
Line 6959 sub updateGradeByPage {
|
| $env{'request.course.id'}, |
$env{'request.course.id'}, |
| $udom,$uname); |
$udom,$uname); |
| &check_and_remove_from_queue($parts,\%record,undef,$symbx, |
&check_and_remove_from_queue($parts,\%record,undef,$symbx, |
| $cdom,$cnum,$udom,$uname); |
$cdom,$cnum,$udom,$uname,\%queueable); |
| } |
} |
| |
|
| if ($aggregateflag) { |
if ($aggregateflag) { |
|
Line 4961 sub updateGradeByPage {
|
Line 6973 sub updateGradeByPage {
|
| &Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
| |
|
| $prob++; |
$prob++; |
| |
if ($changeflag) { |
| |
push(@updates,$symbx); |
| |
} |
| } |
} |
| $curRes = $iterator->next(); |
$curRes = $iterator->next(); |
| } |
} |
| |
|
| $studentTable.=&Apache::loncommon::end_data_table(); |
$studentTable.=&Apache::loncommon::end_data_table(); |
| $studentTable.=&show_grading_menu_form($env{'form.symb'}); |
|
| my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') : |
my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') : |
| &mt('The scores were changed for [quant,_1,problem].', |
&mt('The scores were changed for [quant,_1,problem].', |
| $changeflag)); |
$changeflag).'<br />'); |
| $request->print($grademsg.$studentTable); |
my $hidemsg=($hideflag == 0 ? '' : |
| |
&mt('Submissions were marked "hidden" for [quant,_1,transaction].', |
| |
$hideflag).'<br />'); |
| |
$request->print($hidemsg.$grademsg.$studentTable); |
| |
|
| |
if (@updates) { |
| |
my (@allsymbs,$mapsymb,@recurseup,%parentmapsymbs,%possmappb,%possrespb); |
| |
@allsymbs = @updates; |
| |
if (ref($map)) { |
| |
$mapsymb = $map->symb(); |
| |
push(@allsymbs,$mapsymb); |
| |
@recurseup = $navmap->recurseup_maps($map->src,1); |
| |
} |
| |
if (@recurseup) { |
| |
push(@allsymbs,@recurseup); |
| |
map { $parentmapsymbs{$_} = 1; } @recurseup; |
| |
} |
| |
my %passback = &Apache::lonnet::get('nohist_linkprot_passback',\@allsymbs,$cdom,$cnum); |
| |
my (%uniqsymbs,$use_symbs_in_map,%launch_to_symb); |
| |
if (keys(%passback)) { |
| |
foreach my $possible (keys(%passback)) { |
| |
if (ref($passback{$possible}) eq 'HASH') { |
| |
if ($possible eq $mapsymb) { |
| |
foreach my $launcher (keys(%{$passback{$possible}})) { |
| |
$possmappb{$launcher} = 1; |
| |
$launch_to_symb{$launcher} = $possible; |
| |
} |
| |
$use_symbs_in_map = 1; |
| |
} elsif (exists($parentmapsymbs{$possible})) { |
| |
foreach my $launcher (keys(%{$passback{$possible}})) { |
| |
my ($linkuri,$linkprotector,$scope) = split(/\0/,$launcher); |
| |
if ($scope eq 'rec') { |
| |
$possmappb{$launcher} = 1; |
| |
$use_symbs_in_map = 1; |
| |
$launch_to_symb{$launcher} = $possible; |
| |
} |
| |
} |
| |
} elsif (grep(/^\Q$possible$\E$/,@updates)) { |
| |
foreach my $launcher (keys(%{$passback{$possible}})) { |
| |
$possrespb{$launcher} = 1; |
| |
$launch_to_symb{$launcher} = $possible; |
| |
} |
| |
$uniqsymbs{$possible} = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($use_symbs_in_map) { |
| |
map { $uniqsymbs{$_} = 1; } @symbs_in_map; |
| |
} |
| |
my @posslaunchers; |
| |
if (keys(%possmappb)) { |
| |
push(@posslaunchers,keys(%possmappb)); |
| |
} |
| |
if (keys(%possrespb)) { |
| |
push(@posslaunchers,keys(%possrespb)); |
| |
} |
| |
if (@posslaunchers) { |
| |
my (%pbsave,%skip_passback,%needpb); |
| |
my %pbids = &Apache::lonnet::get('nohist_'.$cdom.'_'.$cnum.'_linkprot_pb',\@posslaunchers,$udom,$uname); |
| |
foreach my $key (keys(%pbids)) { |
| |
if (ref($pbids{$key}) eq 'ARRAY') { |
| |
if ($launch_to_symb{$key}) { |
| |
$needpb{$key} = $launch_to_symb{$key}; |
| |
} |
| |
} |
| |
} |
| |
my @symbs = keys(%uniqsymbs); |
| |
&process_passbacks('updatebypage',\@symbs,$cdom,$cnum,$udom,$uname,$usec,\%weights, |
| |
\%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave,\%pbids); |
| |
if (@Apache::grades::ltipassback) { |
| |
unless ($registered_cleanup) { |
| |
my $handlers = $request->get_handlers('PerlCleanupHandler'); |
| |
$request->set_handlers('PerlCleanupHandler' => |
| |
[\&Apache::grades::make_passback,@{$handlers}]); |
| |
$registered_cleanup=1; |
| |
} |
| |
} |
| |
} |
| |
} |
| return ''; |
return ''; |
| } |
} |
| |
|
| |
sub make_passback { |
| |
if (@Apache::grades::ltipassback) { |
| |
my $lonhost = $Apache::lonnet::perlvar{'lonHostID'}; |
| |
my $ip = &Apache::lonnet::get_host_ip($lonhost); |
| |
foreach my $item (@Apache::grades::ltipassback) { |
| |
&Apache::lonhomework::run_passback($item,$lonhost,$ip); |
| |
} |
| |
undef(@Apache::grades::ltipassback); |
| |
} |
| |
} |
| |
|
| #-------- end of section for handling grading by page/sequence --------- |
#-------- end of section for handling grading by page/sequence --------- |
| # |
# |
| #------------------------------------------------------------------- |
#------------------------------------------------------------------- |
|
Line 5005 like.
|
Line 7108 like.
|
| Next each scanline is checked for any errors of either 'missing |
Next each scanline is checked for any errors of either 'missing |
| 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 than one letter picked), invalid or duplicated CODE, |
| invalid student/employee 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 |
|
Line 5044 the homework problem.
|
Line 7147 the homework problem.
|
| |
|
| sub defaultFormData { |
sub defaultFormData { |
| my ($symb)=@_; |
my ($symb)=@_; |
| return '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
return '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'; |
| '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n". |
|
| '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n"; |
|
| } |
} |
| |
|
| |
|
|
Line 5095 my %subdivided_bubble_lines; # no.
|
Line 7196 my %subdivided_bubble_lines; # no.
|
| |
|
| my %responsetype_per_response; # responsetype for each response |
my %responsetype_per_response; # responsetype for each response |
| |
|
| |
my %masterseq_id_responsenum; # src_id (e.g., 12.3_0.11 etc.) for each |
| |
# numbered response. Needed when randomorder |
| |
# or randompick are in use. Key is ID, value |
| |
# is response number. |
| |
|
| # Save and restore the bubble lines array to the form env. |
# Save and restore the bubble lines array to the form env. |
| |
|
| |
|
|
Line 5108 sub save_bubble_lines {
|
Line 7214 sub save_bubble_lines {
|
| $env{"form.scantron.responsetype.$line"} = |
$env{"form.scantron.responsetype.$line"} = |
| $responsetype_per_response{$line}; |
$responsetype_per_response{$line}; |
| } |
} |
| |
foreach my $resid (keys(%masterseq_id_responsenum)) { |
| |
my $line = $masterseq_id_responsenum{$resid}; |
| |
$env{"form.scantron.residpart.$line"} = $resid; |
| |
} |
| } |
} |
| |
|
| |
|
| sub restore_bubble_lines { |
sub restore_bubble_lines { |
| my $line = 0; |
my $line = 0; |
| %bubble_lines_per_response = (); |
%bubble_lines_per_response = (); |
| |
%masterseq_id_responsenum = (); |
| while ($env{"form.scantron.bubblelines.$line"}) { |
while ($env{"form.scantron.bubblelines.$line"}) { |
| my $value = $env{"form.scantron.bubblelines.$line"}; |
my $value = $env{"form.scantron.bubblelines.$line"}; |
| $bubble_lines_per_response{$line} = $value; |
$bubble_lines_per_response{$line} = $value; |
|
Line 5123 sub restore_bubble_lines {
|
Line 7234 sub restore_bubble_lines {
|
| $env{"form.scantron.sub_bubblelines.$line"}; |
$env{"form.scantron.sub_bubblelines.$line"}; |
| $responsetype_per_response{$line} = |
$responsetype_per_response{$line} = |
| $env{"form.scantron.responsetype.$line"}; |
$env{"form.scantron.responsetype.$line"}; |
| |
my $id = $env{"form.scantron.residpart.$line"}; |
| |
$masterseq_id_responsenum{$id} = $line; |
| $line++; |
$line++; |
| } |
} |
| } |
} |
| |
|
| # Given the parsed scanline, get the response for |
|
| # 'answer' number n: |
|
| |
|
| sub get_response_bubbles { |
|
| my ($parsed_line, $response) = @_; |
|
| |
|
| my $bubble_line = $first_bubble_line{$response-1} +1; |
|
| my $bubble_lines= $bubble_lines_per_response{$response-1}; |
|
| |
|
| my $selected = ""; |
|
| |
|
| for (my $bline = 0; $bline < $bubble_lines; $bline++) { |
|
| $selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":"; |
|
| $bubble_line++; |
|
| } |
|
| return $selected; |
|
| } |
|
| |
|
| =pod |
=pod |
| |
|
| =item scantron_filenames |
=item scantron_filenames |
|
Line 5157 sub scantron_filenames {
|
Line 7252 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 5203 sub scantron_uploads {
|
Line 7300 sub scantron_uploads {
|
| sub scantron_scantab { |
sub scantron_scantab { |
| my $result='<select name="scantron_format">'."\n"; |
my $result='<select name="scantron_format">'."\n"; |
| $result.='<option></option>'."\n"; |
$result.='<option></option>'."\n"; |
| my @lines = &get_scantronformat_file(); |
my @lines = &Apache::lonnet::get_scantronformat_file(); |
| if (@lines > 0) { |
if (@lines > 0) { |
| foreach my $line (@lines) { |
foreach my $line (@lines) { |
| next if (($line =~ /^\#/) || ($line eq '')); |
next if (($line =~ /^\#/) || ($line eq '')); |
|
Line 5215 sub scantron_scantab {
|
Line 7312 sub scantron_scantab {
|
| return $result; |
return $result; |
| } |
} |
| |
|
| =pod |
|
| |
|
| =item get_scantronformat_file |
|
| |
|
| Returns an array containing lines from the scantron format file for |
|
| the domain of the course. |
|
| |
|
| If a url for a custom.tab file is listed in domain's configuration.db, |
|
| lines are from this file. |
|
| |
|
| Otherwise, if a default.tab has been published in RES space by the |
|
| domainconfig user, lines are from this file. |
|
| |
|
| Otherwise, fall back to getting lines from the legacy file on the |
|
| local server: /home/httpd/lonTabs/default_scantronformat.tab |
|
| |
|
| =cut |
|
| |
|
| sub get_scantronformat_file { |
|
| my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
| my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$cdom); |
|
| my $gottab = 0; |
|
| my @lines; |
|
| if (ref($domconfig{'scantron'}) eq 'HASH') { |
|
| if ($domconfig{'scantron'}{'scantronformat'} ne '') { |
|
| my $formatfile = &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.$domconfig{'scantron'}{'scantronformat'}); |
|
| if ($formatfile ne '-1') { |
|
| @lines = split("\n",$formatfile,-1); |
|
| $gottab = 1; |
|
| } |
|
| } |
|
| } |
|
| if (!$gottab) { |
|
| my $confname = $cdom.'-domainconfig'; |
|
| my $default = $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cdom.'/'.$confname.'/default.tab'; |
|
| my $formatfile = &Apache::lonnet::getfile($default); |
|
| if ($formatfile ne '-1') { |
|
| @lines = split("\n",$formatfile,-1); |
|
| $gottab = 1; |
|
| } |
|
| } |
|
| if (!$gottab) { |
|
| my @domains = &Apache::lonnet::current_machine_domains(); |
|
| if (grep(/^\Q$cdom\E$/,@domains)) { |
|
| my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); |
|
| @lines = <$fh>; |
|
| close($fh); |
|
| } else { |
|
| my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab'); |
|
| @lines = <$fh>; |
|
| close($fh); |
|
| } |
|
| } |
|
| return @lines; |
|
| } |
|
| |
|
| =pod |
=pod |
| |
|
| =item scantron_CODElist |
=item scantron_CODElist |
|
Line 5332 sub scantron_CODEunique {
|
Line 7373 sub scantron_CODEunique {
|
| =cut |
=cut |
| |
|
| sub scantron_selectphase { |
sub scantron_selectphase { |
| my ($r,$file2grade) = @_; |
my ($r,$file2grade,$symb) = @_; |
| my ($symb)=&get_symb($r); |
|
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| my $map_error; |
my $map_error; |
| my $sequence_selector=&getSequenceDropDown($symb,\$map_error); |
my $sequence_selector=&getSequenceDropDown($symb,\$map_error); |
|
Line 5342 sub scantron_selectphase {
|
Line 7382 sub scantron_selectphase {
|
| return; |
return; |
| } |
} |
| my $default_form_data=&defaultFormData($symb); |
my $default_form_data=&defaultFormData($symb); |
| my $grading_menu_button=&show_grading_menu_form($symb); |
|
| my $file_selector=&scantron_uploads($file2grade); |
my $file_selector=&scantron_uploads($file2grade); |
| my $format_selector=&scantron_scantab(); |
my $format_selector=&scantron_scantab(); |
| my $CODE_selector=&scantron_CODElist(); |
my $CODE_selector=&scantron_CODElist(); |
|
Line 5351 sub scantron_selectphase {
|
Line 7390 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. |
| |
|
| $r->print(' |
$r->print(' |
| <br /> |
<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 $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'}; |
| $r->print(' |
my $csec= $env{'request.course.sec'}; |
| <script type="text/javascript" language="javascript"> |
my $alertmsg = &mt('Please use the browse button to select a file from your local directory.'); |
| |
&js_escape(\$alertmsg); |
| |
my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom); |
| |
$r->print(&Apache::lonhtmlcommon::scripttag(' |
| 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("'.$alertmsg.'"); |
| return false; |
return false; |
| } |
} |
| formname.submit(); |
formname.submit(); |
| } |
}'."\n".$formatjs)); |
| </script> |
$r->print(' |
| |
|
| <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post"> |
| '.$default_form_data.' |
'.$default_form_data.' |
| <input name="courseid" type="hidden" value="'.$cnum.'" /> |
<input name="courseid" type="hidden" value="'.$cnum.'" /> |
| |
<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" /> |
| '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').' |
'.&Apache::loncommon::start_data_table('LC_scantron_action').' |
| <br /> |
'.&Apache::loncommon::start_data_table_header_row().' |
| <input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" /> |
<th> |
| </form> |
'.&mt('Specify a bubblesheet data file to upload.').' |
| '); |
</th> |
| |
'.&Apache::loncommon::end_data_table_header_row().' |
| |
'.&Apache::loncommon::start_data_table_row().' |
| |
<td> |
| |
'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'<br />'."\n"); |
| |
if ($formatoptions) { |
| |
$r->print('</td> |
| |
'.&Apache::loncommon::end_data_table_row().' |
| |
'.&Apache::loncommon::start_data_table_row().' |
| |
<td>'.$formattitle.(' 'x2).$formatoptions.' |
| |
</td> |
| |
'.&Apache::loncommon::end_data_table_row().' |
| |
'.&Apache::loncommon::start_data_table_row().' |
| |
<td>' |
| |
); |
| |
} else { |
| |
$r->print(' <br />'); |
| |
} |
| |
$r->print('<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" /> |
| |
</td> |
| |
'.&Apache::loncommon::end_data_table_row().' |
| |
'.&Apache::loncommon::end_data_table().' |
| |
</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: |
|
Line 5472 sub scantron_selectphase {
|
Line 7521 sub scantron_selectphase {
|
| |
|
| &Apache::lonpickcode::code_list($r,2); |
&Apache::lonpickcode::code_list($r,2); |
| |
|
| $r->print('<br /><form method="post" name="checkscantron">'. |
$r->print('<br /><form method="post" name="checkscantron" action="">'. |
| $default_form_data."\n". |
$default_form_data."\n". |
| &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". |
|
Line 5504 sub scantron_selectphase {
|
Line 7553 sub scantron_selectphase {
|
| &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". |
| '</form><br />'); |
'</form><br />'); |
| $r->print($grading_menu_button); |
|
| return; |
return; |
| } |
} |
| |
|
| =pod |
|
| |
|
| =item get_scantron_config |
|
| |
|
| Parse and return the scantron configuration line selected as a |
|
| hash of configuration file fields. |
|
| |
|
| Arguments: |
|
| which - the name of the configuration to parse from the file. |
|
| |
|
| |
|
| Returns: |
|
| If the named configuration is not in the file, an empty |
|
| hash is returned. |
|
| a hash with the fields |
|
| name - internal name for the this configuration setup |
|
| description - text to display to operator that describes this config |
|
| CODElocation - if 0 or the string 'none' |
|
| - no CODE exists for this config |
|
| if -1 || the string 'letter' |
|
| - a CODE exists for this config and is |
|
| a string of letters |
|
| Unsupported value (but planned for future support) |
|
| if a positive integer |
|
| - The CODE exists as the first n items from |
|
| the question section of the form |
|
| if the string 'number' |
|
| - The CODE exists for this config and is |
|
| a string of numbers |
|
| CODEstart - (only matter if a CODE exists) column in the line where |
|
| the CODE starts |
|
| CODElength - length of the CODE |
|
| IDstart - column where the student/employee ID starts |
|
| IDlength - length of the student/employee ID info |
|
| Qstart - column where the information from the bubbled |
|
| 'questions' start |
|
| Qlength - number of columns comprising a single bubble line from |
|
| the sheet. (usually either 1 or 10) |
|
| Qon - either a single character representing the character used |
|
| to signal a bubble was chosen in the positional setup, or |
|
| the string 'letter' if the letter of the chosen bubble is |
|
| in the final, or 'number' if a number representing the |
|
| chosen bubble is in the file (1->A 0->J) |
|
| Qoff - the character used to represent that a bubble was |
|
| left blank |
|
| PaperID - if the scanning process generates a unique number for each |
|
| sheet scanned the column that this ID number starts in |
|
| PaperIDlength - number of columns that comprise the unique ID number |
|
| for the sheet of paper |
|
| FirstName - column that the first name starts in |
|
| FirstNameLength - number of columns that the first name spans |
|
| |
|
| LastName - column that the last name starts in |
|
| LastNameLength - number of columns that the last name spans |
|
| |
|
| =cut |
|
| |
|
| sub get_scantron_config { |
|
| my ($which) = @_; |
|
| my @lines = &get_scantronformat_file(); |
|
| my %config; |
|
| #FIXME probably should move to XML it has already gotten a bit much now |
|
| foreach my $line (@lines) { |
|
| my ($name,$descrip)=split(/:/,$line); |
|
| if ($name ne $which ) { next; } |
|
| chomp($line); |
|
| my @config=split(/:/,$line); |
|
| $config{'name'}=$config[0]; |
|
| $config{'description'}=$config[1]; |
|
| $config{'CODElocation'}=$config[2]; |
|
| $config{'CODEstart'}=$config[3]; |
|
| $config{'CODElength'}=$config[4]; |
|
| $config{'IDstart'}=$config[5]; |
|
| $config{'IDlength'}=$config[6]; |
|
| $config{'Qstart'}=$config[7]; |
|
| $config{'Qlength'}=$config[8]; |
|
| $config{'Qoff'}=$config[9]; |
|
| $config{'Qon'}=$config[10]; |
|
| $config{'PaperID'}=$config[11]; |
|
| $config{'PaperIDlength'}=$config[12]; |
|
| $config{'FirstName'}=$config[13]; |
|
| $config{'FirstNamelength'}=$config[14]; |
|
| $config{'LastName'}=$config[15]; |
|
| $config{'LastNamelength'}=$config[16]; |
|
| last; |
|
| } |
|
| return %config; |
|
| } |
|
| |
|
| =pod |
=pod |
| |
|
| =item username_to_idmap |
=item username_to_idmap |
| |
|
| creates a hash keyed by student/employee 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. If a single ID occurs for more than one student, |
| |
the status of the student is checked, and if Active, the value in the hash |
| |
will be set to the Active student. |
| |
|
| Arguments: |
Arguments: |
| |
|
|
Line 5620 sub username_to_idmap {
|
Line 7581 sub username_to_idmap {
|
| my ($classlist)= @_; |
my ($classlist)= @_; |
| my %idmap; |
my %idmap; |
| foreach my $student (keys(%$classlist)) { |
foreach my $student (keys(%$classlist)) { |
| $idmap{$classlist->{$student}->[&Apache::loncoursedata::CL_ID]}= |
my $id = $classlist->{$student}->[&Apache::loncoursedata::CL_ID]; |
| $student; |
unless ($id eq '') { |
| |
if (!exists($idmap{$id})) { |
| |
$idmap{$id} = $student; |
| |
} else { |
| |
my $status = $classlist->{$student}->[&Apache::loncoursedata::CL_STATUS]; |
| |
if ($status eq 'Active') { |
| |
$idmap{$id} = $student; |
| |
} |
| |
} |
| |
} |
| } |
} |
| return %idmap; |
return %idmap; |
| } |
} |
|
Line 5633 sub username_to_idmap {
|
Line 7603 sub username_to_idmap {
|
| Process a requested correction to a scanline. |
Process a requested correction to a scanline. |
| |
|
| Arguments: |
Arguments: |
| $scantron_config - hash from &get_scantron_config() |
$scantron_config - hash from &Apache::lonnet::get_scantron_config() |
| $scan_data - hash of correction information |
$scan_data - hash of correction information |
| (see &scantron_getfile()) |
(see &scantron_getfile()) |
| $line - existing scanline |
$line - existing scanline |
|
Line 5793 sub digits_to_letters {
|
Line 7763 sub digits_to_letters {
|
| |
|
| =item scantron_parse_scanline |
=item scantron_parse_scanline |
| |
|
| Decodes a scanline from the selected scantron file |
Decodes a scanline from the selected bubblesheet file |
| |
|
| Arguments: |
Arguments: |
| line - The text of the scantron file line to process |
line - The text of the bubblesheet file line to process |
| whichline - Line number |
whichline - Line number |
| scantron_config - Hash describing the format of the scantron lines. |
scantron_config - Hash describing the format of the bubblesheet lines. |
| scan_data - Hash of extra information about the scanline |
scan_data - Hash of extra information about the scanline |
| (see scantron_getfile for more information) |
(see scantron_getfile for more information) |
| just_header - True if should not process question answers but only |
just_header - True if should not process question answers but only |
| the stuff to the left of the answers. |
the stuff to the left of the answers. |
| |
randomorder - True if randomorder in use |
| |
randompick - True if randompick in use |
| |
sequence - Exam folder URL |
| |
master_seq - Ref to array containing symbs in exam folder |
| |
symb_to_resource - Ref to hash of symbs for resources in exam folder |
| |
(corresponding values are resource objects) |
| |
partids_by_symb - Ref to hash of symb -> array ref of partIDs |
| |
orderedforcode - Ref to hash of arrays. keys are CODEs and values |
| |
are refs to an array of resource objects, ordered |
| |
according to order used for CODE, when randomorder |
| |
and or randompick are in use. |
| |
respnumlookup - Ref to hash mapping question numbers in bubble lines |
| |
for current line to question number used for same question |
| |
in "Master Sequence" (as seen by Course Coordinator). |
| |
startline - Ref to hash where key is question number (0 is first) |
| |
and value is number of first bubble line for current |
| |
student or code-based randompick and/or randomorder. |
| |
totalref - Ref of scalar used to score total number of bubble |
| |
lines needed for responses in a scan line (used when |
| |
randompick in use. |
| |
|
| Returns: |
Returns: |
| Hash containing the result of parsing the scanline |
Hash containing the result of parsing the scanline |
| |
|
|
Line 5847 sub digits_to_letters {
|
Line 7838 sub digits_to_letters {
|
| =cut |
=cut |
| |
|
| sub scantron_parse_scanline { |
sub scantron_parse_scanline { |
| my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_; |
my ($line,$whichline,$scantron_config,$scan_data,$just_header,$idmap, |
| |
$randomorder,$randompick,$sequence,$master_seq,$symb_to_resource, |
| |
$partids_by_symb,$orderedforcode,$respnumlookup,$startline,$totalref)=@_; |
| |
|
| my %record; |
my %record; |
| my $lastpos = $env{'form.scantron_maxbubble'}*$$scantron_config{'Qlength'}; |
my $data=substr($line,0,$$scantron_config{'Qstart'}-1); # stuff before answers |
| my $questions=substr($line,$$scantron_config{'Qstart'}-1,$lastpos); # Answers |
|
| 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')) { |
| if ($$scantron_config{'CODElocation'} < 0 || |
if ($$scantron_config{'CODElocation'} < 0 || |
|
Line 5888 sub scantron_parse_scanline {
|
Line 7879 sub scantron_parse_scanline {
|
| my $questnum=0; |
my $questnum=0; |
| my $ansnum =1; # Multiple 'answer lines'/question. |
my $ansnum =1; # Multiple 'answer lines'/question. |
| |
|
| |
my $lastpos = $env{'form.scantron_maxbubble'}*$$scantron_config{'Qlength'}; |
| |
if ($randompick || $randomorder) { |
| |
my $total = &get_respnum_lookups($sequence,$scan_data,$idmap,$line,\%record, |
| |
$master_seq,$symb_to_resource, |
| |
$partids_by_symb,$orderedforcode, |
| |
$respnumlookup,$startline); |
| |
if ($total) { |
| |
$lastpos = $total*$$scantron_config{'Qlength'}; |
| |
} |
| |
if (ref($totalref)) { |
| |
$$totalref = $total; |
| |
} |
| |
} |
| |
my $questions=substr($line,$$scantron_config{'Qstart'}-1,$lastpos); # Answers |
| chomp($questions); # Get rid of any trailing \n. |
chomp($questions); # Get rid of any trailing \n. |
| $questions =~ s/\r$//; # Get rid of trailing \r too (MAC or Win uploads). |
$questions =~ s/\r$//; # Get rid of trailing \r too (MAC or Win uploads). |
| while (length($questions)) { |
while (length($questions)) { |
| my $answers_needed = $bubble_lines_per_response{$questnum}; |
my $answers_needed; |
| |
if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) { |
| |
$answers_needed = $bubble_lines_per_response{$respnumlookup->{$questnum}}; |
| |
} else { |
| |
$answers_needed = $bubble_lines_per_response{$questnum}; |
| |
} |
| my $answer_length = ($$scantron_config{'Qlength'} * $answers_needed) |
my $answer_length = ($$scantron_config{'Qlength'} * $answers_needed) |
| || 1; |
|| 1; |
| $questnum++; |
$questnum++; |
|
Line 5900 sub scantron_parse_scanline {
|
Line 7910 sub scantron_parse_scanline {
|
| $questions = substr($questions,$answer_length); |
$questions = substr($questions,$answer_length); |
| if (length($currentquest) < $answer_length) { next; } |
if (length($currentquest) < $answer_length) { next; } |
| |
|
| if ($subdivided_bubble_lines{$questnum-1} =~ /,/) { |
my $subdivided; |
| |
if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) { |
| |
$subdivided = $subdivided_bubble_lines{$respnumlookup->{$questnum-1}}; |
| |
} else { |
| |
$subdivided = $subdivided_bubble_lines{$questnum-1}; |
| |
} |
| |
if ($subdivided =~ /,/) { |
| my $subquestnum = 1; |
my $subquestnum = 1; |
| my $subquestions = $currentquest; |
my $subquestions = $currentquest; |
| my @subanswers_needed = |
my @subanswers_needed = split(/,/,$subdivided); |
| split(/,/,$subdivided_bubble_lines{$questnum-1}); |
|
| foreach my $subans (@subanswers_needed) { |
foreach my $subans (@subanswers_needed) { |
| my $subans_length = |
my $subans_length = |
| ($$scantron_config{'Qlength'} * $subans) || 1; |
($$scantron_config{'Qlength'} * $subans) || 1; |
|
Line 5915 sub scantron_parse_scanline {
|
Line 7930 sub scantron_parse_scanline {
|
| ($$scantron_config{'Qon'} eq 'number')) { |
($$scantron_config{'Qon'} eq 'number')) { |
| $ansnum = &scantron_validator_lettnum($ansnum, |
$ansnum = &scantron_validator_lettnum($ansnum, |
| $questnum,$quest_id,$subans,$currsubquest,$whichline, |
$questnum,$quest_id,$subans,$currsubquest,$whichline, |
| \@alphabet,\%record,$scantron_config,$scan_data); |
\@alphabet,\%record,$scantron_config,$scan_data, |
| |
$randomorder,$randompick,$respnumlookup); |
| } else { |
} else { |
| $ansnum = &scantron_validator_positional($ansnum, |
$ansnum = &scantron_validator_positional($ansnum, |
| $questnum,$quest_id,$subans,$currsubquest,$whichline, \@alphabet,\%record,$scantron_config,$scan_data); |
$questnum,$quest_id,$subans,$currsubquest,$whichline, |
| |
\@alphabet,\%record,$scantron_config,$scan_data, |
| |
$randomorder,$randompick,$respnumlookup); |
| } |
} |
| $subquestnum ++; |
$subquestnum ++; |
| } |
} |
|
Line 5927 sub scantron_parse_scanline {
|
Line 7945 sub scantron_parse_scanline {
|
| ($$scantron_config{'Qon'} eq 'number')) { |
($$scantron_config{'Qon'} eq 'number')) { |
| $ansnum = &scantron_validator_lettnum($ansnum,$questnum, |
$ansnum = &scantron_validator_lettnum($ansnum,$questnum, |
| $quest_id,$answers_needed,$currentquest,$whichline, |
$quest_id,$answers_needed,$currentquest,$whichline, |
| \@alphabet,\%record,$scantron_config,$scan_data); |
\@alphabet,\%record,$scantron_config,$scan_data, |
| |
$randomorder,$randompick,$respnumlookup); |
| } else { |
} else { |
| $ansnum = &scantron_validator_positional($ansnum,$questnum, |
$ansnum = &scantron_validator_positional($ansnum,$questnum, |
| $quest_id,$answers_needed,$currentquest,$whichline, |
$quest_id,$answers_needed,$currentquest,$whichline, |
| \@alphabet,\%record,$scantron_config,$scan_data); |
\@alphabet,\%record,$scantron_config,$scan_data, |
| |
$randomorder,$randompick,$respnumlookup); |
| } |
} |
| } |
} |
| } |
} |
|
Line 5939 sub scantron_parse_scanline {
|
Line 7959 sub scantron_parse_scanline {
|
| return \%record; |
return \%record; |
| } |
} |
| |
|
| |
sub get_master_seq { |
| |
my ($resources,$master_seq,$symb_to_resource,$need_symb_in_map,$symb_for_examcode) = @_; |
| |
return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') && |
| |
(ref($symb_to_resource) eq 'HASH')); |
| |
if ($need_symb_in_map) { |
| |
return unless (ref($symb_for_examcode) eq 'HASH'); |
| |
} |
| |
my $resource_error; |
| |
foreach my $resource (@{$resources}) { |
| |
my $ressymb; |
| |
if (ref($resource)) { |
| |
$ressymb = $resource->symb(); |
| |
push(@{$master_seq},$ressymb); |
| |
$symb_to_resource->{$ressymb} = $resource; |
| |
if ($need_symb_in_map) { |
| |
unless ($resource->is_map()) { |
| |
my $map=(&Apache::lonnet::decode_symb($ressymb))[0]; |
| |
unless (exists($symb_for_examcode->{$map})) { |
| |
$symb_for_examcode->{$map} = $ressymb; |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
$resource_error = 1; |
| |
last; |
| |
} |
| |
} |
| |
return $resource_error; |
| |
} |
| |
|
| |
sub get_respnum_lookups { |
| |
my ($sequence,$scan_data,$idmap,$line,$record,$master_seq,$symb_to_resource, |
| |
$partids_by_symb,$orderedforcode,$respnumlookup,$startline) = @_; |
| |
return unless ((ref($record) eq 'HASH') && (ref($master_seq) eq 'ARRAY') && |
| |
(ref($symb_to_resource) eq 'HASH') && (ref($partids_by_symb) eq 'HASH') && |
| |
(ref($orderedforcode) eq 'HASH') && (ref($respnumlookup) eq 'HASH') && |
| |
(ref($startline) eq 'HASH')); |
| |
my ($user,$scancode); |
| |
if ((exists($record->{'scantron.CODE'})) && |
| |
(&Apache::lonnet::validCODE($record->{'scantron.CODE'}))) { |
| |
$scancode = $record->{'scantron.CODE'}; |
| |
} else { |
| |
$user = &scantron_find_student($record,$scan_data,$idmap,$line); |
| |
} |
| |
my @mapresources = |
| |
&users_order($user,$scancode,$sequence,$master_seq,$symb_to_resource, |
| |
$orderedforcode); |
| |
my $total = 0; |
| |
my $count = 0; |
| |
foreach my $resource (@mapresources) { |
| |
my $id = $resource->id(); |
| |
my $symb = $resource->symb(); |
| |
if (ref($partids_by_symb->{$symb}) eq 'ARRAY') { |
| |
foreach my $partid (@{$partids_by_symb->{$symb}}) { |
| |
my $respnum = $masterseq_id_responsenum{$id.'_'.$partid}; |
| |
if ($respnum ne '') { |
| |
$respnumlookup->{$count} = $respnum; |
| |
$startline->{$count} = $total; |
| |
$total += $bubble_lines_per_response{$respnum}; |
| |
$count ++; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return $total; |
| |
} |
| |
|
| sub scantron_validator_lettnum { |
sub scantron_validator_lettnum { |
| my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,$whichline, |
my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,$whichline, |
| $alphabet,$record,$scantron_config,$scan_data) = @_; |
$alphabet,$record,$scantron_config,$scan_data,$randomorder, |
| |
$randompick,$respnumlookup) = @_; |
| |
|
| # Qon 'letter' implies for each slot in currquest we have: |
# Qon 'letter' implies for each slot in currquest we have: |
| # ? or * for doubles, a letter in A-Z for a bubble, and |
# ? or * for doubles, a letter in A-Z for a bubble, and |
|
Line 5960 sub scantron_validator_lettnum {
|
Line 8048 sub scantron_validator_lettnum {
|
| $matchon = '\d'; |
$matchon = '\d'; |
| } |
} |
| my $occurrences = 0; |
my $occurrences = 0; |
| if (($responsetype_per_response{$questnum-1} eq 'essayresponse') || |
my $responsenum = $questnum-1; |
| ($responsetype_per_response{$questnum-1} eq 'formularesponse') || |
if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) { |
| ($responsetype_per_response{$questnum-1} eq 'stringresponse') || |
$responsenum = $respnumlookup->{$questnum-1} |
| ($responsetype_per_response{$questnum-1} eq 'imageresponse') || |
} |
| ($responsetype_per_response{$questnum-1} eq 'reactionresponse') || |
if (($responsetype_per_response{$responsenum} eq 'essayresponse') || |
| ($responsetype_per_response{$questnum-1} eq 'organicresponse')) { |
($responsetype_per_response{$responsenum} eq 'formularesponse') || |
| |
($responsetype_per_response{$responsenum} eq 'stringresponse') || |
| |
($responsetype_per_response{$responsenum} eq 'imageresponse') || |
| |
($responsetype_per_response{$responsenum} eq 'reactionresponse') || |
| |
($responsetype_per_response{$responsenum} eq 'organicresponse')) { |
| my @singlelines = split('',$currquest); |
my @singlelines = split('',$currquest); |
| foreach my $entry (@singlelines) { |
foreach my $entry (@singlelines) { |
| $occurrences = &occurence_count($entry,$matchon); |
$occurrences = &occurence_count($entry,$matchon); |
| if ($occurrences > 1) { |
if ($occurrences > 1) { |
| last; |
last; |
| } |
} |
| } |
} |
| } else { |
} else { |
| $occurrences = &occurence_count($currquest,$matchon); |
$occurrences = &occurence_count($currquest,$matchon); |
| } |
} |
|
Line 6020 sub scantron_validator_lettnum {
|
Line 8112 sub scantron_validator_lettnum {
|
| |
|
| sub scantron_validator_positional { |
sub scantron_validator_positional { |
| my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest, |
my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest, |
| $whichline,$alphabet,$record,$scantron_config,$scan_data) = @_; |
$whichline,$alphabet,$record,$scantron_config,$scan_data, |
| |
$randomorder,$randompick,$respnumlookup) = @_; |
| |
|
| # Otherwise there's a positional notation; |
# Otherwise there's a positional notation; |
| # each bubble line requires Qlength items, and there are filled in |
# each bubble line requires Qlength items, and there are filled in |
|
Line 6062 sub scantron_validator_positional {
|
Line 8155 sub scantron_validator_positional {
|
| # record all the bubbles filled in as well as the |
# record all the bubbles filled in as well as the |
| # fact this response consists of multiple bubbles. |
# fact this response consists of multiple bubbles. |
| # |
# |
| if (($responsetype_per_response{$questnum-1} eq 'essayresponse') || |
my $responsenum = $questnum-1; |
| ($responsetype_per_response{$questnum-1} eq 'formularesponse') || |
if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) { |
| ($responsetype_per_response{$questnum-1} eq 'stringresponse') || |
$responsenum = $respnumlookup->{$questnum-1} |
| ($responsetype_per_response{$questnum-1} eq 'imageresponse') || |
} |
| ($responsetype_per_response{$questnum-1} eq 'reactionresponse') || |
if (($responsetype_per_response{$responsenum} eq 'essayresponse') || |
| ($responsetype_per_response{$questnum-1} eq 'organicresponse')) { |
($responsetype_per_response{$responsenum} eq 'formularesponse') || |
| |
($responsetype_per_response{$responsenum} eq 'stringresponse') || |
| |
($responsetype_per_response{$responsenum} eq 'imageresponse') || |
| |
($responsetype_per_response{$responsenum} eq 'reactionresponse') || |
| |
($responsetype_per_response{$responsenum} eq 'organicresponse')) { |
| my $doubleerror = 0; |
my $doubleerror = 0; |
| while (($currquest >= $$scantron_config{'Qlength'}) && |
while (($currquest >= $$scantron_config{'Qlength'}) && |
| (!$doubleerror)) { |
(!$doubleerror)) { |
|
Line 6200 sub scantron_filter {
|
Line 8297 sub scantron_filter {
|
| |
|
| sub scantron_process_corrections { |
sub scantron_process_corrections { |
| my ($r) = @_; |
my ($r) = @_; |
| my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
| my ($scanlines,$scan_data)=&scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
| my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&Apache::loncoursedata::get_classlist(); |
| my $which=$env{'form.scantron_line'}; |
my $which=$env{'form.scantron_line'}; |
|
Line 6249 sub scantron_process_corrections {
|
Line 8346 sub scantron_process_corrections {
|
| } |
} |
| } |
} |
| if ($err) { |
if ($err) { |
| $r->print("<span class=\"LC_warning\">Unable to accept last correction, an error occurred :$errmsg:</span>"); |
$r->print( |
| |
'<p class="LC_error">' |
| |
.&mt('Unable to accept last correction, an error occurred: [_1]', |
| |
$errmsg) |
| |
.'</p>'); |
| } else { |
} else { |
| &scantron_put_line($scanlines,$scan_data,$which,$line,$skip); |
&scantron_put_line($scanlines,$scan_data,$which,$line,$skip); |
| &scantron_putfile($scanlines,$scan_data); |
&scantron_putfile($scanlines,$scan_data); |
|
Line 6363 sub check_for_error {
|
Line 8464 sub check_for_error {
|
| =cut |
=cut |
| |
|
| sub scantron_warning_screen { |
sub scantron_warning_screen { |
| my ($button_text)=@_; |
my ($button_text,$symb)=@_; |
| my $title=&Apache::lonnet::gettitle($env{'form.selectpage'}); |
my $title=&Apache::lonnet::gettitle($env{'form.selectpage'}); |
| my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
| my $CODElist; |
my $CODElist; |
| if ($scantron_config{'CODElocation'} && |
if ($scantron_config{'CODElocation'} && |
| $scantron_config{'CODEstart'} && |
$scantron_config{'CODEstart'} && |
| $scantron_config{'CODElength'}) { |
$scantron_config{'CODElength'}) { |
| $CODElist=$env{'form.scantron_CODElist'}; |
$CODElist=$env{'form.scantron_CODElist'}; |
| if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; } |
if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">'.&mt('None').'</span>'; } |
| $CODElist= |
$CODElist= |
| '<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>'; |
| } |
} |
| return (' |
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 ' |
| <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> |
| </p> |
</p> |
| <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 /> |
<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)).'</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> |
| <p> '.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').'</p> |
'; |
| |
|
| <br /> |
|
| '); |
|
| } |
} |
| |
|
| =pod |
=pod |
|
Line 6404 sub scantron_warning_screen {
|
Line 8508 sub scantron_warning_screen {
|
| =cut |
=cut |
| |
|
| sub scantron_do_warning { |
sub scantron_do_warning { |
| my ($r)=@_; |
my ($r,$symb)=@_; |
| my ($symb)=&get_symb($r); |
|
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| my $default_form_data=&defaultFormData($symb); |
my $default_form_data=&defaultFormData($symb); |
| $r->print(&scantron_form_start().$default_form_data); |
$r->print(&scantron_form_start().$default_form_data); |
|
Line 6418 sub scantron_do_warning {
|
Line 8521 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'); |
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(); |
| $r->print(' |
$r->print(' |
| '.$warning.' |
'.$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" /> |
| '); |
'); |
| } |
} |
| $r->print("</form><br />".&show_grading_menu_form($symb)); |
$r->print("</form><br />"); |
| return ''; |
return ''; |
| } |
} |
| |
|
|
Line 6467 SCANTRONFORM
|
Line 8614 SCANTRONFORM
|
| '<input type="hidden" name="scantron.sub_bubblelines.'.$line.'" value="'.$env{"form.scantron.sub_bubblelines.$line"}.'" />'."\n"; |
'<input type="hidden" name="scantron.sub_bubblelines.'.$line.'" value="'.$env{"form.scantron.sub_bubblelines.$line"}.'" />'."\n"; |
| $chunk .= |
$chunk .= |
| '<input type="hidden" name="scantron.responsetype.'.$line.'" value="'.$env{"form.scantron.responsetype.$line"}.'" />'."\n"; |
'<input type="hidden" name="scantron.responsetype.'.$line.'" value="'.$env{"form.scantron.responsetype.$line"}.'" />'."\n"; |
| |
$chunk .= |
| |
'<input type="hidden" name="scantron.residpart.'.$line.'" value="'.$env{"form.scantron.residpart.$line"}.'" />'."\n"; |
| $result .= $chunk; |
$result .= $chunk; |
| $line++; |
$line++; |
| } |
} |
| return $result; |
return $result; |
| } |
} |
| |
|
|
Line 6486 SCANTRONFORM
|
Line 8635 SCANTRONFORM
|
| =cut |
=cut |
| |
|
| sub scantron_validate_file { |
sub scantron_validate_file { |
| my ($r) = @_; |
my ($r,$symb) = @_; |
| my ($symb)=&get_symb($r); |
|
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| my $default_form_data=&defaultFormData($symb); |
my $default_form_data=&defaultFormData($symb); |
| |
|
| # do the detection of only doing skipped records first befroe we delete |
# do the detection of only doing skipped records first before we delete |
| # them when doing the corrections reset |
# them when doing the corrections reset |
| if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') { |
if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') { |
| &reset_skipping_status(); |
&reset_skipping_status(); |
|
Line 6511 sub scantron_validate_file {
|
Line 8659 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; |
| my $max_bubble=&scantron_get_maxbubble(\$nav_error); |
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
| |
my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config); |
| if ($nav_error) { |
if ($nav_error) { |
| $r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
| return ''; |
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 6532 sub scantron_validate_file {
|
Line 8715 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)) { |
| $r->print(&mt('Validating '.$validate_phases[$currentphase]).'<br />'); |
$r->print(&mt('Validating '.$validate_phases[$currentphase]).'<br />'); |
| $r->rflush(); |
$r->rflush(); |
| |
|
| my $which="scantron_validate_".$validate_phases[$currentphase]; |
my $which="scantron_validate_".$validate_phases[$currentphase]; |
| { |
{ |
| 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'); |
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 6555 sub scantron_validate_file {
|
Line 8755 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 bubblesheet data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'. |
&mt('Otherwise, Grade/Manage/Review Bubblesheets [_1] Review bubblesheet data can be used once 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 6567 sub scantron_validate_file {
|
Line 8767 sub scantron_validate_file {
|
| $r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' → " />'); |
$r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' → " />'); |
| $r->print(' '.&mt('this error').' <br />'); |
$r->print(' '.&mt('this error').' <br />'); |
| |
|
| $r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>"); |
$r->print('<p>'.&mt('Or 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>'); |
| } else { |
} else { |
| if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') { |
if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') { |
| $r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' →" onclick="javascript:verify_bubble_radio(this.form)" />'); |
$r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' →" onclick="javascript:verify_bubble_radio(this.form)" />'); |
|
Line 6579 sub scantron_validate_file {
|
Line 8779 sub scantron_validate_file {
|
| $r->print(" ".&mt("this scanline saving it for later.")); |
$r->print(" ".&mt("this scanline saving it for later.")); |
| } |
} |
| } |
} |
| $r->print(" </form><br />".&show_grading_menu_form($symb)); |
$r->print(" </form><br />"); |
| return ''; |
return ''; |
| } |
} |
| |
|
|
Line 6946 sub scantron_validate_sequence {
|
Line 9146 sub scantron_validate_sequence {
|
| my @resources= |
my @resources= |
| $navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0); |
$navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0); |
| if (@resources) { |
if (@resources) { |
| $r->print("<p>".&mt('Some resources in the sequence currently are not set to exam mode. Grading these resources currently may not work correctly.')."</p>"); |
$r->print( |
| |
'<p class="LC_warning">' |
| |
.&mt('Some resources in the sequence currently are not set to' |
| |
.' bubblesheet exam mode. Grading these resources currently may not' |
| |
.' work correctly.') |
| |
.'</p>' |
| |
); |
| return (1,$currentphase); |
return (1,$currentphase); |
| } |
} |
| } |
} |
|
Line 6957 sub scantron_validate_sequence {
|
Line 9163 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=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
| my ($scanlines,$scan_data)=&scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
| |
|
| my $nav_error; |
my $nav_error; |
| &scantron_get_maxbubble(\$nav_error); # parse needs the bubble_lines.. array. |
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the bubble_lines.. array. |
| if ($nav_error) { |
if ($nav_error) { |
| $r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
| return(1,$currentphase); |
return(1,$currentphase); |
| } |
} |
| |
|
| 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 6987 sub scantron_validate_ID {
|
Line 9195 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 7002 sub scantron_validate_ID {
|
Line 9238 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, |
| |
$randomorder,$randompick,$respnumlookup,$startline)=@_; |
| #FIXME in the case of a duplicated ID the previous line, probably need |
#FIXME in the case of a duplicated ID the previous line, probably need |
| #to show both the current line and the previous one and allow skipping |
#to show both the current line and the previous one and allow skipping |
| #the previous one or the current one |
#the previous one or the current one |
|
Line 7051 sub scantron_get_correction {
|
Line 9354 sub scantron_get_correction {
|
| .&mt('The ID on the form is [_1]', |
.&mt('The ID on the form is [_1]', |
| "<tt>$$scan_record{'scantron.ID'}</tt>") |
"<tt>$$scan_record{'scantron.ID'}</tt>") |
| .'<br />' |
.'<br />' |
| .&mt('The name on the paper is [_2], [_3]', |
.&mt('The name on the paper is [_1], [_2]', |
| $$scan_record{'scantron.LastName'}, |
$$scan_record{'scantron.LastName'}, |
| $$scan_record{'scantron.FirstName'}) |
$$scan_record{'scantron.FirstName'}) |
| .'</p>'; |
.'</p>'; |
|
Line 7064 sub scantron_get_correction {
|
Line 9367 sub scantron_get_correction {
|
| |
|
| if ($error =~ /ID$/) { |
if ($error =~ /ID$/) { |
| if ($error eq 'incorrectID') { |
if ($error eq 'incorrectID') { |
| $r->print('<p class="LC_warning">'.&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 class="LC_warning">'.&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 7077 sub scantron_get_correction {
|
Line 9380 sub scantron_get_correction {
|
| $r->print(&Apache::loncommon::selectstudent_link('scantronupload', |
$r->print(&Apache::loncommon::selectstudent_link('scantronupload', |
| 'scantron_username','scantron_domain')); |
'scantron_username','scantron_domain')); |
| $r->print(": <input type='text' name='scantron_username' value='' />"); |
$r->print(": <input type='text' name='scantron_username' value='' />"); |
| $r->print("\n@". |
$r->print("\n:\n". |
| &Apache::loncommon::select_dom_form($env{'request.role.domain'},'scantron_domain')); |
&Apache::loncommon::select_dom_form($env{'request.role.domain'},'scantron_domain')); |
| |
|
| $r->print('</li>'); |
$r->print('</li>'); |
|
Line 7087 sub scantron_get_correction {
|
Line 9390 sub scantron_get_correction {
|
| } elsif ($error eq 'duplicateCODE') { |
} elsif ($error eq 'duplicateCODE') { |
| $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 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 [_1]', |
$r->print("<p>".&mt('The CODE on the form is [_1]', |
| "<tt>'$$scan_record{'scantron.CODE'}'</tt>") |
"<tt>'$$scan_record{'scantron.CODE'}'</tt>") |
| ."</p>\n"); |
."</p>\n"); |
| $r->print($message); |
$r->print($message); |
| $r->print("<p>".&mt("How should I handle this?")."</p>\n"); |
$r->print("<p>".&mt("How should I handle this?")."</p>\n"); |
|
Line 7124 sub scantron_get_correction {
|
Line 9427 sub scantron_get_correction {
|
| $r->print("\n<br />"); |
$r->print("\n<br />"); |
| } |
} |
| |
|
| $r->print(<<ENDSCRIPT); |
$r->print(&Apache::lonhtmlcommon::scripttag(<<ENDSCRIPT)); |
| <script type="text/javascript"> |
|
| function change_radio(field) { |
function change_radio(field) { |
| var slct=document.scantronupload.scantron_CODE_resolution; |
var slct=document.scantronupload.scantron_CODE_resolution; |
| var i; |
var i; |
|
Line 7133 function change_radio(field) {
|
Line 9435 function change_radio(field) {
|
| if (slct[i].value==field) { slct[i].checked=true; } |
if (slct[i].value==field) { slct[i].checked=true; } |
| } |
} |
| } |
} |
| </script> |
|
| ENDSCRIPT |
ENDSCRIPT |
| my $href="/adm/pickcode?". |
my $href="/adm/pickcode?". |
| "form=".&escape("scantronupload"). |
"form=".&escape("scantronupload"). |
|
Line 7163 ENDSCRIPT
|
Line 9464 ENDSCRIPT
|
| # 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: |
| |
|
| my $line_list = &questions_to_line_list($arg); |
my $line_list = &questions_to_line_list($arg,$randomorder,$randompick, |
| |
$respnumlookup,$startline); |
| |
|
| $r->print('<input type="hidden" name="scantron_questions" value="'. |
$r->print('<input type="hidden" name="scantron_questions" value="'. |
| $line_list.'" />'); |
$line_list.'" />'); |
|
Line 7171 ENDSCRIPT
|
Line 9473 ENDSCRIPT
|
| $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>"); |
| foreach my $question (@{$arg}) { |
foreach my $question (@{$arg}) { |
| my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
| $scan_record, $error); |
$scan_record, $error, |
| |
$randomorder,$randompick, |
| |
$respnumlookup,$startline); |
| push(@lines_to_correct,@linenums); |
push(@lines_to_correct,@linenums); |
| } |
} |
| $r->print(&verify_bubbles_checked(@lines_to_correct)); |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
| } elsif ($error eq 'missingbubble') { |
} elsif ($error eq 'missingbubble') { |
| $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('<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 7184 ENDSCRIPT
|
Line 9488 ENDSCRIPT
|
| # The form field scantron_questions is actually a list of line numbers not |
# The form field scantron_questions is actually a list of line numbers not |
| # a list of question numbers. Therefore: |
# a list of question numbers. Therefore: |
| # |
# |
| |
|
| my $line_list = &questions_to_line_list($arg); |
my $line_list = &questions_to_line_list($arg,$randomorder,$randompick, |
| |
$respnumlookup,$startline); |
| |
|
| $r->print('<input type="hidden" name="scantron_questions" value="'. |
$r->print('<input type="hidden" name="scantron_questions" value="'. |
| $line_list.'" />'); |
$line_list.'" />'); |
| foreach my $question (@{$arg}) { |
foreach my $question (@{$arg}) { |
| my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
my @linenums = &prompt_for_corrections($r,$question,$scan_config, |
| $scan_record, $error); |
$scan_record, $error, |
| |
$randomorder,$randompick, |
| |
$respnumlookup,$startline); |
| push(@lines_to_correct,@linenums); |
push(@lines_to_correct,@linenums); |
| } |
} |
| $r->print(&verify_bubbles_checked(@lines_to_correct)); |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
|
Line 7205 sub verify_bubbles_checked {
|
Line 9512 sub verify_bubbles_checked {
|
| my (@ansnums) = @_; |
my (@ansnums) = @_; |
| my $ansnumstr = join('","',@ansnums); |
my $ansnumstr = join('","',@ansnums); |
| my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines."); |
my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines."); |
| my $output = (<<ENDSCRIPT); |
&js_escape(\$warning); |
| <script type="text/javascript"> |
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 7229 function verify_bubble_radio(form) {
|
Line 9536 function verify_bubble_radio(form) {
|
| } |
} |
| form.submit(); |
form.submit(); |
| } |
} |
| </script> |
|
| ENDSCRIPT |
ENDSCRIPT |
| return $output; |
return $output; |
| } |
} |
|
Line 7244 used to fill in the scantron_questions f
|
Line 9550 used to fill in the scantron_questions f
|
| |
|
| Arguments: |
Arguments: |
| questions - Reference to an array of questions. |
questions - Reference to an array of questions. |
| |
randomorder - True if randomorder in use. |
| |
randompick - True if randompick in use. |
| |
respnumlookup - Reference to HASH mapping question numbers in bubble lines |
| |
for current line to question number used for same question |
| |
in "Master Seqence" (as seen by Course Coordinator). |
| |
startline - Reference to hash where key is question number (0 is first) |
| |
and key is number of first bubble line for current student |
| |
or code-based randompick and/or randomorder. |
| |
|
| =cut |
=cut |
| |
|
| |
|
| sub questions_to_line_list { |
sub questions_to_line_list { |
| my ($questions) = @_; |
my ($questions,$randomorder,$randompick,$respnumlookup,$startline) = @_; |
| my @lines; |
my @lines; |
| |
|
| foreach my $item (@{$questions}) { |
foreach my $item (@{$questions}) { |
|
Line 7258 sub questions_to_line_list {
|
Line 9572 sub questions_to_line_list {
|
| if ($item =~ /^(\d+)\.(\d+)$/) { |
if ($item =~ /^(\d+)\.(\d+)$/) { |
| $question = $1; |
$question = $1; |
| my $subquestion = $2; |
my $subquestion = $2; |
| $first = $first_bubble_line{$question-1} + 1; |
my $responsenum = $question-1; |
| my @subans = split(/,/,$subdivided_bubble_lines{$question-1}); |
if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) { |
| |
$responsenum = $respnumlookup->{$question-1}; |
| |
if (ref($startline) eq 'HASH') { |
| |
$first = $startline->{$question-1} + 1; |
| |
} |
| |
} else { |
| |
$first = $first_bubble_line{$responsenum} + 1; |
| |
} |
| |
my @subans = split(/,/,$subdivided_bubble_lines{$responsenum}); |
| my $subcount = 1; |
my $subcount = 1; |
| while ($subcount<$subquestion) { |
while ($subcount<$subquestion) { |
| $first += $subans[$subcount-1]; |
$first += $subans[$subcount-1]; |
|
Line 7267 sub questions_to_line_list {
|
Line 9589 sub questions_to_line_list {
|
| } |
} |
| $count = $subans[$subquestion-1]; |
$count = $subans[$subquestion-1]; |
| } else { |
} else { |
| $first = $first_bubble_line{$question-1} + 1; |
my $responsenum = $question-1; |
| $count = $bubble_lines_per_response{$question-1}; |
if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) { |
| |
$responsenum = $respnumlookup->{$question-1}; |
| |
if (ref($startline) eq 'HASH') { |
| |
$first = $startline->{$question-1} + 1; |
| |
} |
| |
} else { |
| |
$first = $first_bubble_line{$responsenum} + 1; |
| |
} |
| |
$count = $bubble_lines_per_response{$responsenum}; |
| } |
} |
| $last = $first+$count-1; |
$last = $first+$count-1; |
| push(@lines, ($first..$last)); |
push(@lines, ($first..$last)); |
|
Line 7290 for multi and missing bubble cases).
|
Line 9620 for multi and missing bubble cases).
|
| $scan_config - The scantron file configuration hash. |
$scan_config - The scantron file configuration hash. |
| $scan_record - Reference to the hash that has the the parsed scanlines. |
$scan_record - Reference to the hash that has the the parsed scanlines. |
| $error - Type of error |
$error - Type of error |
| |
$randomorder - True if randomorder in use. |
| |
$randompick - True if randompick in use. |
| |
$respnumlookup - Reference to HASH mapping question numbers in bubble lines |
| |
for current line to question number used for same question |
| |
in "Master Seqence" (as seen by Course Coordinator). |
| |
$startline - Reference to hash where key is question number (0 is first) |
| |
and value is number of first bubble line for current student |
| |
or code-based randompick and/or randomorder. |
| |
|
| |
|
| Implicit inputs: |
Implicit inputs: |
| %bubble_lines_per_response - Starting line numbers for each question. |
%bubble_lines_per_response - Starting line numbers for each question. |
|
Line 7314 for multi and missing bubble cases).
|
Line 9653 for multi and missing bubble cases).
|
| =cut |
=cut |
| |
|
| sub prompt_for_corrections { |
sub prompt_for_corrections { |
| my ($r, $question, $scan_config, $scan_record, $error) = @_; |
my ($r, $question, $scan_config, $scan_record, $error, $randomorder, |
| |
$randompick, $respnumlookup, $startline) = @_; |
| my ($current_line,$lines); |
my ($current_line,$lines); |
| my @linenums; |
my @linenums; |
| my $questionnum = $question; |
my $questionnum = $question; |
| |
my ($first,$responsenum); |
| if ($question =~ /^(\d+)\.(\d+)$/) { |
if ($question =~ /^(\d+)\.(\d+)$/) { |
| $question = $1; |
$question = $1; |
| $current_line = $first_bubble_line{$question-1} + 1 ; |
|
| my $subquestion = $2; |
my $subquestion = $2; |
| my @subans = split(/,/,$subdivided_bubble_lines{$question-1}); |
if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) { |
| |
$responsenum = $respnumlookup->{$question-1}; |
| |
if (ref($startline) eq 'HASH') { |
| |
$first = $startline->{$question-1}; |
| |
} |
| |
} else { |
| |
$responsenum = $question-1; |
| |
$first = $first_bubble_line{$responsenum}; |
| |
} |
| |
$current_line = $first + 1 ; |
| |
my @subans = split(/,/,$subdivided_bubble_lines{$responsenum}); |
| my $subcount = 1; |
my $subcount = 1; |
| while ($subcount<$subquestion) { |
while ($subcount<$subquestion) { |
| $current_line += $subans[$subcount-1]; |
$current_line += $subans[$subcount-1]; |
|
Line 7330 sub prompt_for_corrections {
|
Line 9680 sub prompt_for_corrections {
|
| } |
} |
| $lines = $subans[$subquestion-1]; |
$lines = $subans[$subquestion-1]; |
| } else { |
} else { |
| $current_line = $first_bubble_line{$question-1} + 1 ; |
if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) { |
| $lines = $bubble_lines_per_response{$question-1}; |
$responsenum = $respnumlookup->{$question-1}; |
| |
if (ref($startline) eq 'HASH') { |
| |
$first = $startline->{$question-1}; |
| |
} |
| |
} else { |
| |
$responsenum = $question-1; |
| |
$first = $first_bubble_line{$responsenum}; |
| |
} |
| |
$current_line = $first + 1; |
| |
$lines = $bubble_lines_per_response{$responsenum}; |
| } |
} |
| if ($lines > 1) { |
if ($lines > 1) { |
| $r->print(&mt('The group of bubble lines below responds to a single question.').'<br />'); |
$r->print(&mt('The group of bubble lines below responds to a single question.').'<br />'); |
| if (($responsetype_per_response{$question-1} eq 'essayresponse') || |
if (($responsetype_per_response{$responsenum} eq 'essayresponse') || |
| ($responsetype_per_response{$question-1} eq 'formularesponse') || |
($responsetype_per_response{$responsenum} eq 'formularesponse') || |
| ($responsetype_per_response{$question-1} eq 'stringresponse') || |
($responsetype_per_response{$responsenum} eq 'stringresponse') || |
| ($responsetype_per_response{$question-1} eq 'imageresponse') || |
($responsetype_per_response{$responsenum} eq 'imageresponse') || |
| ($responsetype_per_response{$question-1} eq 'reactionresponse') || |
($responsetype_per_response{$responsenum} eq 'reactionresponse') || |
| ($responsetype_per_response{$question-1} eq 'organicresponse')) { |
($responsetype_per_response{$responsenum} 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 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 />'); |
$r->print( |
| |
&mt("Although this particular question type requires handgrading, the instructions for this question in the bubblesheet 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 />"); |
| } |
} |
| } |
} |
| for (my $i =0; $i < $lines; $i++) { |
for (my $i =0; $i < $lines; $i++) { |
| my $selected = $$scan_record{"scantron.$current_line.answer"}; |
my $selected = $$scan_record{"scantron.$current_line.answer"}; |
| &scantron_bubble_selector($r,$scan_config,$current_line, |
&scantron_bubble_selector($r,$scan_config,$current_line, |
| $questionnum,$error,split('', $selected)); |
$questionnum,$error,split('', $selected)); |
| push(@linenums,$current_line); |
push(@linenums,$current_line); |
| $current_line++; |
$current_line++; |
|
Line 7368 sub prompt_for_corrections {
|
Line 9736 sub prompt_for_corrections {
|
| |
|
| Arguments: |
Arguments: |
| $r - Apache request object |
$r - Apache request object |
| $scan_config - hash from &get_scantron_config() |
$scan_config - hash from &Apache::lonnet::get_scantron_config() |
| $line - Number of the line being displayed. |
$line - Number of the line being displayed. |
| $questionnum - Question number (may include subquestion) |
$questionnum - Question number (may include subquestion) |
| $error - Type of error. |
$error - Type of error. |
|
Line 7381 sub scantron_bubble_selector {
|
Line 9749 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 7520 sub get_codes {
|
Line 9900 sub get_codes {
|
| |
|
| sub scantron_validate_CODE { |
sub scantron_validate_CODE { |
| my ($r,$currentphase) = @_; |
my ($r,$currentphase) = @_; |
| my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
| if ($scantron_config{'CODElocation'} && |
if ($scantron_config{'CODElocation'} && |
| $scantron_config{'CODEstart'} && |
$scantron_config{'CODEstart'} && |
| $scantron_config{'CODElength'}) { |
$scantron_config{'CODElength'}) { |
|
Line 7536 sub scantron_validate_CODE {
|
Line 9916 sub scantron_validate_CODE {
|
| my %allcodes=&get_codes(); |
my %allcodes=&get_codes(); |
| |
|
| my $nav_error; |
my $nav_error; |
| &scantron_get_maxbubble(\$nav_error); # parse needs the lines per response array. |
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the lines per response array. |
| if ($nav_error) { |
if ($nav_error) { |
| $r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
| return(1,$currentphase); |
return(1,$currentphase); |
|
Line 7590 sub scantron_validate_doublebubble {
|
Line 9970 sub scantron_validate_doublebubble {
|
| #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 (undef,undef,$sequence)= |
| |
&Apache::lonnet::decode_symb($env{'form.selectpage'}); |
| |
|
| #get scantron line setup |
#get scantron line setup |
| my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
| my ($scanlines,$scan_data)=&scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
| |
|
| |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
unless (ref($navmap)) { |
| |
$r->print(&navmap_errormsg()); |
| |
return(1,$currentphase); |
| |
} |
| |
my $map=$navmap->getResourceByUrl($sequence); |
| |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
| |
my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb, |
| |
%grader_randomlists_by_symb,%orderedforcode,%respnumlookup,%startline); |
| |
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); |
| |
|
| my $nav_error; |
my $nav_error; |
| &scantron_get_maxbubble(\$nav_error); # parse needs the bubble line array. |
if (ref($map)) { |
| |
$randomorder = $map->randomorder(); |
| |
$randompick = $map->randompick(); |
| |
unless ($randomorder || $randompick) { |
| |
foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) { |
| |
if ($res->randomorder()) { |
| |
$randomorder = 1; |
| |
} |
| |
if ($res->randompick()) { |
| |
$randompick = 1; |
| |
} |
| |
last if ($randomorder || $randompick); |
| |
} |
| |
} |
| |
if ($randomorder || $randompick) { |
| |
$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource); |
| |
if ($nav_error) { |
| |
$r->print(&navmap_errormsg()); |
| |
return(1,$currentphase); |
| |
} |
| |
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
| |
\%grader_randomlists_by_symb,$bubbles_per_row); |
| |
} |
| |
} else { |
| |
$r->print(&navmap_errormsg()); |
| |
return(1,$currentphase); |
| |
} |
| |
|
| |
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the bubble line array. |
| if ($nav_error) { |
if ($nav_error) { |
| $r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
| return(1,$currentphase); |
return(1,$currentphase); |
|
Line 7605 sub scantron_validate_doublebubble {
|
Line 10027 sub scantron_validate_doublebubble {
|
| 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; } |
| my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
| $scan_data); |
$scan_data,undef,\%idmap,$randomorder, |
| |
$randompick,$sequence,\@master_seq, |
| |
\%symb_to_resource,\%grader_partids_by_symb, |
| |
\%orderedforcode,\%respnumlookup,\%startline); |
| if (!defined($$scan_record{'scantron.doubleerror'})) { next; } |
if (!defined($$scan_record{'scantron.doubleerror'})) { next; } |
| &scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line, |
&scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line, |
| 'doublebubble', |
'doublebubble', |
| $$scan_record{'scantron.doubleerror'}); |
$$scan_record{'scantron.doubleerror'}, |
| |
$randomorder,$randompick,\%respnumlookup,\%startline); |
| return (1,$currentphase); |
return (1,$currentphase); |
| } |
} |
| return (0,$currentphase+1); |
return (0,$currentphase+1); |
|
Line 7617 sub scantron_validate_doublebubble {
|
Line 10043 sub scantron_validate_doublebubble {
|
| |
|
| |
|
| sub scantron_get_maxbubble { |
sub scantron_get_maxbubble { |
| my ($nav_error) = @_; |
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 7636 sub scantron_get_maxbubble {
|
Line 10062 sub scantron_get_maxbubble {
|
| } |
} |
| 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(); |
| |
|
|
Line 7647 sub scantron_get_maxbubble {
|
Line 10074 sub scantron_get_maxbubble {
|
| %first_bubble_line = (); |
%first_bubble_line = (); |
| %subdivided_bubble_lines = (); |
%subdivided_bubble_lines = (); |
| %responsetype_per_response = (); |
%responsetype_per_response = (); |
| |
%masterseq_id_responsenum = (); |
| |
|
| 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 $resid = $resource->id(); |
| |
my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname, |
| |
$udom,undef,$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 7680 sub scantron_get_maxbubble {
|
Line 10110 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 7693 sub scantron_get_maxbubble {
|
Line 10124 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; |
| $responsetype_per_response{$response_number} = |
$responsetype_per_response{$response_number} = |
| $analysis->{$part_id.'.type'}; |
$analysis->{$part_id.'.type'}; |
| |
$masterseq_id_responsenum{$resid.'_'.$part_id} = $response_number; |
| $response_number++; |
$response_number++; |
| |
|
| $bubble_line += $lines; |
$bubble_line += $lines; |
|
Line 7714 sub scantron_get_maxbubble {
|
Line 10146 sub scantron_get_maxbubble {
|
| return $env{'form.scantron_maxbubble'}; |
return $env{'form.scantron_maxbubble'}; |
| } |
} |
| |
|
| |
sub bubblesheet_bubbles_per_row { |
| |
my ($scantron_config) = @_; |
| |
my $bubbles_per_row; |
| |
if (ref($scantron_config) eq 'HASH') { |
| |
$bubbles_per_row = $scantron_config->{'BubblesPerRow'}; |
| |
} |
| |
if ((!$bubbles_per_row) || ($bubbles_per_row < 1)) { |
| |
$bubbles_per_row = 10; |
| |
} |
| |
return $bubbles_per_row; |
| |
} |
| |
|
| sub scantron_validate_missingbubbles { |
sub scantron_validate_missingbubbles { |
| my ($r,$currentphase) = @_; |
my ($r,$currentphase) = @_; |
| #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 (undef,undef,$sequence)= |
| |
&Apache::lonnet::decode_symb($env{'form.selectpage'}); |
| |
|
| #get scantron line setup |
#get scantron line setup |
| my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
| my ($scanlines,$scan_data)=&scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
| |
|
| |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
unless (ref($navmap)) { |
| |
$r->print(&navmap_errormsg()); |
| |
return(1,$currentphase); |
| |
} |
| |
|
| |
my $map=$navmap->getResourceByUrl($sequence); |
| |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
| |
my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb, |
| |
%grader_randomlists_by_symb,%orderedforcode,%respnumlookup,%startline); |
| |
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); |
| |
|
| my $nav_error; |
my $nav_error; |
| my $max_bubble=&scantron_get_maxbubble(\$nav_error); |
if (ref($map)) { |
| |
$randomorder = $map->randomorder(); |
| |
$randompick = $map->randompick(); |
| |
unless ($randomorder || $randompick) { |
| |
foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) { |
| |
if ($res->randomorder()) { |
| |
$randomorder = 1; |
| |
} |
| |
if ($res->randompick()) { |
| |
$randompick = 1; |
| |
} |
| |
last if ($randomorder || $randompick); |
| |
} |
| |
} |
| |
if ($randomorder || $randompick) { |
| |
$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource); |
| |
if ($nav_error) { |
| |
$r->print(&navmap_errormsg()); |
| |
return(1,$currentphase); |
| |
} |
| |
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
| |
\%grader_randomlists_by_symb,$bubbles_per_row); |
| |
} |
| |
} else { |
| |
$r->print(&navmap_errormsg()); |
| |
return(1,$currentphase); |
| |
} |
| |
|
| |
|
| |
my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config); |
| if ($nav_error) { |
if ($nav_error) { |
| |
$r->print(&navmap_errormsg()); |
| return(1,$currentphase); |
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); |
| if ($line=~/^[\s\cz]*$/) { next; } |
if ($line=~/^[\s\cz]*$/) { next; } |
| my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
my $scan_record = |
| $scan_data); |
&scantron_parse_scanline($line,$i,\%scantron_config,$scan_data,undef,\%idmap, |
| |
$randomorder,$randompick,$sequence,\@master_seq, |
| |
\%symb_to_resource,\%grader_partids_by_symb, |
| |
\%orderedforcode,\%respnumlookup,\%startline); |
| if (!defined($$scan_record{'scantron.missingerror'})) { next; } |
if (!defined($$scan_record{'scantron.missingerror'})) { next; } |
| my @to_correct; |
my @to_correct; |
| |
|
|
Line 7744 sub scantron_validate_missingbubbles {
|
Line 10237 sub scantron_validate_missingbubbles {
|
| if ($missing =~ /^(\d+)\.(\d+)$/) { |
if ($missing =~ /^(\d+)\.(\d+)$/) { |
| my $question = $1; |
my $question = $1; |
| my $subquestion = $2; |
my $subquestion = $2; |
| if (!defined($first_bubble_line{$question -1})) { next; } |
my ($first,$responsenum); |
| my $first = $first_bubble_line{$question-1}; |
if ($randomorder || $randompick) { |
| my @subans = split(/,/,$subdivided_bubble_lines{$question-1}); |
$responsenum = $respnumlookup{$question-1}; |
| |
$first = $startline{$question-1}; |
| |
} else { |
| |
$responsenum = $question-1; |
| |
$first = $first_bubble_line{$responsenum}; |
| |
} |
| |
if (!defined($first)) { next; } |
| |
my @subans = split(/,/,$subdivided_bubble_lines{$responsenum}); |
| my $subcount = 1; |
my $subcount = 1; |
| while ($subcount<$subquestion) { |
while ($subcount<$subquestion) { |
| $first += $subans[$subcount-1]; |
$first += $subans[$subcount-1]; |
|
Line 7755 sub scantron_validate_missingbubbles {
|
Line 10255 sub scantron_validate_missingbubbles {
|
| my $count = $subans[$subquestion-1]; |
my $count = $subans[$subquestion-1]; |
| $lastbubble = $first + $count; |
$lastbubble = $first + $count; |
| } else { |
} else { |
| if (!defined($first_bubble_line{$missing - 1})) { next; } |
my ($first,$responsenum); |
| $lastbubble = $first_bubble_line{$missing - 1} + $bubble_lines_per_response{$missing - 1}; |
if ($randomorder || $randompick) { |
| |
$responsenum = $respnumlookup{$missing-1}; |
| |
$first = $startline{$missing-1}; |
| |
} else { |
| |
$responsenum = $missing-1; |
| |
$first = $first_bubble_line{$responsenum}; |
| |
} |
| |
if (!defined($first)) { next; } |
| |
$lastbubble = $first + $bubble_lines_per_response{$responsenum}; |
| } |
} |
| if ($lastbubble > $max_bubble) { next; } |
if ($lastbubble > $max_bubble) { next; } |
| push(@to_correct,$missing); |
push(@to_correct,$missing); |
| } |
} |
| if (@to_correct) { |
if (@to_correct) { |
| &scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
&scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
| $line,'missingbubble',\@to_correct); |
$line,'missingbubble',\@to_correct, |
| |
$randomorder,$randompick,\%respnumlookup, |
| |
\%startline); |
| return (1,$currentphase); |
return (1,$currentphase); |
| } |
} |
| |
|
|
Line 7771 sub scantron_validate_missingbubbles {
|
Line 10281 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=&Apache::lonnet::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" />'.&mt('0 points').'</label></p>'; |
| |
} |
| |
return; |
| |
} |
| |
|
| sub scantron_process_students { |
sub scantron_process_students { |
| my ($r) = @_; |
my ($r,$symb) = @_; |
| |
|
| my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'}); |
my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'}); |
| my ($symb)=&get_symb($r); |
|
| if (!$symb) { |
if (!$symb) { |
| return ''; |
return ''; |
| } |
} |
| my $default_form_data=&defaultFormData($symb); |
my $default_form_data=&defaultFormData($symb); |
| |
|
| my %scantron_config=&get_scantron_config($env{'form.scantron_format'}); |
my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
| |
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); |
| my ($scanlines,$scan_data)=&scantron_getfile(); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
| my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&Apache::loncoursedata::get_classlist(); |
| my %idmap=&username_to_idmap($classlist); |
my %idmap=&username_to_idmap($classlist); |
|
Line 7790 sub scantron_process_students {
|
Line 10335 sub scantron_process_students {
|
| unless (ref($navmap)) { |
unless (ref($navmap)) { |
| $r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
| return ''; |
return ''; |
| } |
} |
| my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
| my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb, |
| my (%grader_partids_by_symb,%grader_randomlists_by_symb); |
%grader_randomlists_by_symb,%symb_for_examcode); |
| &graders_resources_pass(\@resources,\%grader_partids_by_symb, |
if (ref($map)) { |
| \%grader_randomlists_by_symb); |
$randomorder = $map->randomorder(); |
| my $resource_error; |
$randompick = $map->randompick(); |
| foreach my $resource (@resources) { |
unless ($randomorder || $randompick) { |
| my $ressymb; |
foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) { |
| if (ref($resource)) { |
if ($res->randomorder()) { |
| $ressymb = $resource->symb(); |
$randomorder = 1; |
| } else { |
} |
| $resource_error = 1; |
if ($res->randompick()) { |
| last; |
$randompick = 1; |
| } |
} |
| my ($analysis,$parts) = |
last if ($randomorder || $randompick); |
| &scantron_partids_tograde($resource,$env{'request.course.id'}, |
|
| $env{'user.name'},$env{'user.domain'},1); |
|
| $grader_partids_by_symb{$ressymb} = $parts; |
|
| if (ref($analysis) eq 'HASH') { |
|
| if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
|
| $grader_randomlists_by_symb{$ressymb} = |
|
| $analysis->{'parts_withrandomlist'}; |
|
| } |
} |
| } |
} |
| } |
} else { |
| if ($resource_error) { |
|
| $r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
| return ''; |
return ''; |
| } |
} |
| |
my $nav_error; |
| |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
| |
if ($randomorder || $randompick) { |
| |
$nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource,1,\%symb_for_examcode); |
| |
if ($nav_error) { |
| |
$r->print(&navmap_errormsg()); |
| |
return ''; |
| |
} |
| |
} |
| |
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
| |
\%grader_randomlists_by_symb,$bubbles_per_row); |
| |
|
| my ($uname,$udom); |
my ($uname,$udom); |
| my $result= <<SCANTRONFORM; |
my $result= <<SCANTRONFORM; |
|
Line 7829 sub scantron_process_students {
|
Line 10377 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,'Bubblesheet Status', |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count); |
| 'Bubblesheet Progress',$count, |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,'Processing first student'); |
| 'inline',undef,'scantronupload'); |
|
| &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
|
| 'Processing first student'); |
|
| $r->print('<br />'); |
$r->print('<br />'); |
| my $start=&Time::HiRes::time(); |
my $start=&Time::HiRes::time(); |
| my $i=-1; |
my $i=-1; |
| my $started; |
my $started; |
| |
|
| my $nav_error; |
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse. |
| &scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse. |
|
| if ($nav_error) { |
if ($nav_error) { |
| $r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
| return ''; |
return ''; |
|
Line 7857 SCANTRONFORM
|
Line 10402 SCANTRONFORM
|
| if ($ssi_error) { |
if ($ssi_error) { |
| $r->print("</form>"); |
$r->print("</form>"); |
| &ssi_print_error($r); |
&ssi_print_error($r); |
| $r->print(&show_grading_menu_form($symb)); |
|
| &Apache::lonnet::remove_lock($lock); |
&Apache::lonnet::remove_lock($lock); |
| return ''; # Dunno why the other returns return '' rather than just returning. |
return ''; # Dunno why the other returns return '' rather than just returning. |
| } |
} |
| |
|
| my %lettdig = &letter_to_digits(); |
my %lettdig = &Apache::lonnet::letter_to_digits(); |
| my $numletts = scalar(keys(%lettdig)); |
my $numletts = scalar(keys(%lettdig)); |
| |
my %orderedforcode; |
| |
|
| while ($i<$scanlines->{'count'}) { |
while ($i<$scanlines->{'count'}) { |
| ($uname,$udom)=('',''); |
($uname,$udom)=('',''); |
|
Line 7871 SCANTRONFORM
|
Line 10416 SCANTRONFORM
|
| 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; } |
| if ($started) { |
if ($started) { |
| &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student'); |
| 'last student'); |
|
| } |
} |
| $started=1; |
$started=1; |
| |
my %respnumlookup = (); |
| |
my %startline = (); |
| |
my $total; |
| my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
| $scan_data); |
$scan_data,undef,\%idmap,$randomorder, |
| |
$randompick,$sequence,\@master_seq, |
| |
\%symb_to_resource,\%grader_partids_by_symb, |
| |
\%orderedforcode,\%respnumlookup,\%startline, |
| |
\$total); |
| unless ($uname=&scantron_find_student($scan_record,$scan_data, |
unless ($uname=&scantron_find_student($scan_record,$scan_data, |
| \%idmap,$i)) { |
\%idmap,$i)) { |
| &scantron_add_delay(\@delayqueue,$line, |
&scantron_add_delay(\@delayqueue,$line, |
|
Line 7888 SCANTRONFORM
|
Line 10439 SCANTRONFORM
|
| 'Student '.$uname.' has multiple sheets',2); |
'Student '.$uname.' has multiple sheets',2); |
| next; |
next; |
| } |
} |
| |
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; |
| ($uname,$udom)=split(/:/,$uname); |
($uname,$udom)=split(/:/,$uname); |
| |
|
| |
my $scancode; |
| |
if ((exists($scan_record->{'scantron.CODE'})) && |
| |
(&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) { |
| |
$scancode = $scan_record->{'scantron.CODE'}; |
| |
} else { |
| |
$scancode = ''; |
| |
} |
| |
|
| |
my @mapresources = @resources; |
| |
if ($randomorder || $randompick) { |
| |
@mapresources = |
| |
&users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource, |
| |
\%orderedforcode); |
| |
} |
| my (%partids_by_symb,$res_error); |
my (%partids_by_symb,$res_error); |
| foreach my $resource (@resources) { |
foreach my $resource (@mapresources) { |
| my $ressymb; |
my $ressymb; |
| if (ref($resource)) { |
if (ref($resource)) { |
| $ressymb = $resource->symb(); |
$ressymb = $resource->symb(); |
|
Line 7901 SCANTRONFORM
|
Line 10475 SCANTRONFORM
|
| } |
} |
| if ((exists($grader_randomlists_by_symb{$ressymb})) || |
if ((exists($grader_randomlists_by_symb{$ressymb})) || |
| (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
| |
my $currcode; |
| |
if (exists($grader_randomlists_by_symb{$ressymb})) { |
| |
$currcode = $scancode; |
| |
} |
| my ($analysis,$parts) = |
my ($analysis,$parts) = |
| &scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom); |
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
| |
$uname,$udom,undef,$bubbles_per_row, |
| |
$currcode); |
| $partids_by_symb{$ressymb} = $parts; |
$partids_by_symb{$ressymb} = $parts; |
| } else { |
} else { |
| $partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb}; |
$partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb}; |
|
Line 7922 SCANTRONFORM
|
Line 10502 SCANTRONFORM
|
| &scantron_putfile($scanlines,$scan_data); |
&scantron_putfile($scanlines,$scan_data); |
| } |
} |
| |
|
| my $scancode; |
|
| if ((exists($scan_record->{'scantron.CODE'})) && |
|
| (&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) { |
|
| $scancode = $scan_record->{'scantron.CODE'}; |
|
| } else { |
|
| $scancode = ''; |
|
| } |
|
| |
|
| if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
| \@resources,\%partids_by_symb) eq 'ssi_error') { |
\@mapresources,\%partids_by_symb, |
| |
$bubbles_per_row,$randomorder,$randompick, |
| |
\%respnumlookup,\%startline) |
| |
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); |
| $r->print(&show_grading_menu_form($symb)); |
|
| &Apache::lonnet::remove_lock($lock); |
&Apache::lonnet::remove_lock($lock); |
| return ''; # Why return ''? Beats me. |
return ''; # Why return ''? Beats me. |
| } |
} |
| |
|
| |
if (($scancode) && ($randomorder || $randompick)) { |
| |
foreach my $key (keys(%symb_for_examcode)) { |
| |
my $symb_in_map = $symb_for_examcode{$key}; |
| |
if ($symb_in_map ne '') { |
| |
my $parmresult = |
| |
&Apache::lonparmset::storeparm_by_symb($symb_in_map, |
| |
'0_examcode',2,$scancode, |
| |
'string_examcode',$uname, |
| |
$udom); |
| |
} |
| |
} |
| |
} |
| $completedstudents{$uname}={'line'=>$line}; |
$completedstudents{$uname}={'line'=>$line}; |
| if ($env{'form.verifyrecord'}) { |
if ($env{'form.verifyrecord'}) { |
| my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'}; |
my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'}; |
| |
if ($randompick) { |
| |
if ($total) { |
| |
$lastpos = $total*$scantron_config{'Qlength'}; |
| |
} |
| |
} |
| |
|
| my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos); |
my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos); |
| chomp($studentdata); |
chomp($studentdata); |
| $studentdata =~ s/\r$//; |
$studentdata =~ s/\r$//; |
| my $studentrecord = ''; |
my $studentrecord = ''; |
| my $counter = -1; |
my $counter = -1; |
| foreach my $resource (@resources) { |
foreach my $resource (@mapresources) { |
| my $ressymb = $resource->symb(); |
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{$ressymb}, |
$counter,$studentdata,$partids_by_symb{$ressymb}, |
| \%scantron_config,\%lettdig,$numletts); |
\%scantron_config,\%lettdig,$numletts,$randomorder, |
| |
$randompick,\%respnumlookup,\%startline); |
| $studentrecord .= $recording; |
$studentrecord .= $recording; |
| } |
} |
| if ($studentrecord ne $studentdata) { |
if ($studentrecord ne $studentdata) { |
| &Apache::lonxml::clear_problem_counter(); |
&Apache::lonxml::clear_problem_counter(); |
| if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, |
| \@resources,\%partids_by_symb) eq 'ssi_error') { |
\@mapresources,\%partids_by_symb, |
| |
$bubbles_per_row,$randomorder,$randompick, |
| |
\%respnumlookup,\%startline) |
| |
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); |
| $r->print(&show_grading_menu_form($symb)); |
|
| &Apache::lonnet::remove_lock($lock); |
&Apache::lonnet::remove_lock($lock); |
| delete($completedstudents{$uname}); |
delete($completedstudents{$uname}); |
| return ''; |
return ''; |
| } |
} |
| $counter = -1; |
$counter = -1; |
| $studentrecord = ''; |
$studentrecord = ''; |
| foreach my $resource (@resources) { |
foreach my $resource (@mapresources) { |
| my $ressymb = $resource->symb(); |
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{$ressymb}, |
$counter,$studentdata,$partids_by_symb{$ressymb}, |
| \%scantron_config,\%lettdig,$numletts); |
\%scantron_config,\%lettdig,$numletts, |
| |
$randomorder,$randompick,\%respnumlookup, |
| |
\%startline); |
| $studentrecord .= $recording; |
$studentrecord .= $recording; |
| } |
} |
| if ($studentrecord ne $studentdata) { |
if ($studentrecord ne $studentdata) { |
|
Line 7993 SCANTRONFORM
|
Line 10590 SCANTRONFORM
|
| &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('Bubblesheet').'</td>'. |
'<td>'.&mt('Bubblesheet').'</td>'. |
| '<td><span class="LC_nobreak">'.$studentdata.'</span></td>'. |
'<td><span class="LC_nobreak" style="white-space: pre;"><tt>'.$studentdata.'</tt></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>'.&mt('Stored submissions').'</td>'. |
'<td>'.&mt('Stored submissions').'</td>'. |
| '<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n". |
'<td><span class="LC_nobreak" style="white-space: pre;"><tt>'.$studentrecord.'</tt></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>'); |
| } else { |
} else { |
|
Line 8019 SCANTRONFORM
|
Line 10616 SCANTRONFORM
|
| # $r->print("<p>took $lasttime</p>"); |
# $r->print("<p>took $lasttime</p>"); |
| |
|
| $r->print("</form>"); |
$r->print("</form>"); |
| $r->print(&show_grading_menu_form($symb)); |
|
| return ''; |
return ''; |
| } |
} |
| |
|
| sub graders_resources_pass { |
sub graders_resources_pass { |
| my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb) = @_; |
my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb, |
| |
$bubbles_per_row) = @_; |
| if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) && |
if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) && |
| (ref($grader_randomlists_by_symb) eq 'HASH')) { |
(ref($grader_randomlists_by_symb) eq 'HASH')) { |
| foreach my $resource (@{$resources}) { |
foreach my $resource (@{$resources}) { |
| my $ressymb = $resource->symb(); |
my $ressymb = $resource->symb(); |
| my ($analysis,$parts) = |
my ($analysis,$parts) = |
| &scantron_partids_tograde($resource,$env{'request.course.id'}, |
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
| $env{'user.name'},$env{'user.domain'},1); |
$env{'user.name'},$env{'user.domain'}, |
| |
1,$bubbles_per_row); |
| $grader_partids_by_symb->{$ressymb} = $parts; |
$grader_partids_by_symb->{$ressymb} = $parts; |
| if (ref($analysis) eq 'HASH') { |
if (ref($analysis) eq 'HASH') { |
| if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
|
Line 8044 sub graders_resources_pass {
|
Line 10642 sub graders_resources_pass {
|
| return; |
return; |
| } |
} |
| |
|
| |
=pod |
| |
|
| |
=item users_order |
| |
|
| |
Returns array of resources in current map, ordered based on either CODE, |
| |
if this is a CODEd exam, or based on student's identity if this is a |
| |
"NAMEd" exam. |
| |
|
| |
Should be used when randomorder and/or randompick applied when the |
| |
corresponding exam was printed, prior to students completing bubblesheets |
| |
for the version of the exam the student received. |
| |
|
| |
=cut |
| |
|
| |
sub users_order { |
| |
my ($user,$scancode,$mapurl,$master_seq,$symb_to_resource,$orderedforcode) = @_; |
| |
my @mapresources; |
| |
unless ((ref($master_seq) eq 'ARRAY') && (ref($symb_to_resource) eq 'HASH')) { |
| |
return @mapresources; |
| |
} |
| |
if ($scancode) { |
| |
if ((ref($orderedforcode) eq 'HASH') && (ref($orderedforcode->{$scancode}) eq 'ARRAY')) { |
| |
@mapresources = @{$orderedforcode->{$scancode}}; |
| |
} else { |
| |
$env{'form.CODE'} = $scancode; |
| |
my $actual_seq = |
| |
&Apache::lonprintout::master_seq_to_person_seq($mapurl, |
| |
$master_seq, |
| |
$user,$scancode,1); |
| |
if (ref($actual_seq) eq 'ARRAY') { |
| |
@mapresources = map { $symb_to_resource->{$_}; } @{$actual_seq}; |
| |
if (ref($orderedforcode) eq 'HASH') { |
| |
if (@mapresources > 0) { |
| |
$orderedforcode->{$scancode} = \@mapresources; |
| |
} |
| |
} |
| |
} |
| |
delete($env{'form.CODE'}); |
| |
} |
| |
} else { |
| |
my $actual_seq = |
| |
&Apache::lonprintout::master_seq_to_person_seq($mapurl, |
| |
$master_seq, |
| |
$user,undef,1); |
| |
if (ref($actual_seq) eq 'ARRAY') { |
| |
@mapresources = |
| |
map { $symb_to_resource->{$_}; } @{$actual_seq}; |
| |
} |
| |
} |
| |
return @mapresources; |
| |
} |
| |
|
| sub grade_student_bubbles { |
sub grade_student_bubbles { |
| my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts) = @_; |
my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts,$bubbles_per_row, |
| |
$randomorder,$randompick,$respnumlookup,$startline) = @_; |
| |
my $uselookup = 0; |
| |
if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH') && |
| |
(ref($startline) eq 'HASH')) { |
| |
$uselookup = 1; |
| |
} |
| |
|
| if (ref($resources) eq 'ARRAY') { |
if (ref($resources) eq 'ARRAY') { |
| my $count = 0; |
my $count = 0; |
| foreach my $resource (@{$resources}) { |
foreach my $resource (@{$resources}) { |
|
Line 8058 sub grade_student_bubbles {
|
Line 10715 sub grade_student_bubbles {
|
| 'grade_symb' => $ressymb, |
'grade_symb' => $ressymb, |
| 'CODE' => $scancode |
'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) eq 'HASH') { |
| if (ref($parts->{$ressymb}) eq 'ARRAY') { |
if (ref($parts->{$ressymb}) eq 'ARRAY') { |
| foreach my $part (@{$parts->{$ressymb}}) { |
foreach my $part (@{$parts->{$ressymb}}) { |
| $form{'scantron_questnum_start.'.$part} = |
if ($uselookup) { |
| 1+$env{'form.scantron.first_bubble_line.'.$count}; |
$form{'scantron_questnum_start.'.$part} = $startline->{$count} + 1; |
| |
} else { |
| |
$form{'scantron_questnum_start.'.$part} = |
| |
1+$env{'form.scantron.first_bubble_line.'.$count}; |
| |
} |
| $count++; |
$count++; |
| } |
} |
| } |
} |
|
Line 8076 sub grade_student_bubbles {
|
Line 10743 sub grade_student_bubbles {
|
| } |
} |
| |
|
| sub scantron_upload_scantron_data { |
sub scantron_upload_scantron_data { |
| my ($r)=@_; |
my ($r,$symb) = @_; |
| my $dom = $env{'request.role.domain'}; |
my $dom = $env{'request.role.domain'}; |
| |
my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($dom); |
| my $domdesc = &Apache::lonnet::domain($dom,'description'); |
my $domdesc = &Apache::lonnet::domain($dom,'description'); |
| $r->print(&Apache::loncommon::coursebrowser_javascript($dom)); |
$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', |
|
Line 8085 sub scantron_upload_scantron_data {
|
Line 10753 sub scantron_upload_scantron_data {
|
| 'coursename',$dom); |
'coursename',$dom); |
| my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'. |
my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'. |
| (' 'x2).&mt('(shows course personnel)'); |
(' 'x2).&mt('(shows course personnel)'); |
| my $default_form_data=&defaultFormData(&get_symb($r,1)); |
my $default_form_data=&defaultFormData($symb); |
| my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.'); |
my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.'); |
| |
&js_escape(\$nofile_alert); |
| 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."); |
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(' |
&js_escape(\$nocourseid_alert); |
| <script type="text/javascript" language="javascript"> |
$r->print(&Apache::lonhtmlcommon::scripttag(' |
| function checkUpload(formname) { |
function checkUpload(formname) { |
| if (formname.upfile.value == "") { |
if (formname.upfile.value == "") { |
| alert("'.$nofile_alert.'"); |
alert("'.$nofile_alert.'"); |
|
Line 8116 sub scantron_upload_scantron_data {
|
Line 10785 sub scantron_upload_scantron_data {
|
| return; |
return; |
| } |
} |
| |
|
| </script> |
'.$formatjs.' |
| |
')); |
| |
$r->print(' |
| <h3>'.&mt('Send bubblesheet data to a course').'</h3> |
<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"> |
|
Line 8131 sub scantron_upload_scantron_data {
|
Line 10801 sub scantron_upload_scantron_data {
|
| &Apache::lonhtmlcommon::row_closure(). |
&Apache::lonhtmlcommon::row_closure(). |
| &Apache::lonhtmlcommon::row_title(&mt('Domain')). |
&Apache::lonhtmlcommon::row_title(&mt('Domain')). |
| '<input name="domainid" type="hidden" />'.$domdesc. |
'<input name="domainid" type="hidden" />'.$domdesc. |
| &Apache::lonhtmlcommon::row_closure(). |
&Apache::lonhtmlcommon::row_closure()); |
| |
if ($formatoptions) { |
| |
$r->print(&Apache::lonhtmlcommon::row_title($formattitle).$formatoptions. |
| |
&Apache::lonhtmlcommon::row_closure()); |
| |
} |
| |
$r->print( |
| &Apache::lonhtmlcommon::row_title(&mt('File to upload')). |
&Apache::lonhtmlcommon::row_title(&mt('File to upload')). |
| '<input type="file" name="upfile" size="50" />'. |
'<input type="file" name="upfile" size="50" />'. |
| &Apache::lonhtmlcommon::row_closure(1). |
&Apache::lonhtmlcommon::row_closure(1). |
|
Line 8144 sub scantron_upload_scantron_data {
|
Line 10819 sub scantron_upload_scantron_data {
|
| return ''; |
return ''; |
| } |
} |
| |
|
| |
sub scantron_upload_dataformat { |
| |
my ($dom) = @_; |
| |
my ($formatoptions,$formattitle,$formatjs); |
| |
$formatjs = <<'END'; |
| |
function toggleScantab(form) { |
| |
return; |
| |
} |
| |
END |
| |
my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$dom); |
| |
if (ref($domconfig{'scantron'}) eq 'HASH') { |
| |
if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') { |
| |
if (keys(%{$domconfig{'scantron'}{'config'}}) > 1) { |
| |
if (($domconfig{'scantron'}{'config'}{'dat'}) && |
| |
(ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH')) { |
| |
if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { |
| |
if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) { |
| |
my ($onclick,$formatextra,$singleline); |
| |
my @lines = &Apache::lonnet::get_scantronformat_file(); |
| |
my $count = 0; |
| |
foreach my $line (@lines) { |
| |
next if (($line =~ /^\#/) || ($line eq '')); |
| |
$singleline = $line; |
| |
$count ++; |
| |
} |
| |
if ($count > 1) { |
| |
$formatextra = '<div style="display:none" id="bubbletype">'. |
| |
'<span class="LC_nobreak">'. |
| |
&mt('Bubblesheet type').': '. |
| |
&scantron_scantab().'</span></div>'; |
| |
$onclick = ' onclick="toggleScantab(this.form);"'; |
| |
$formatjs = <<"END"; |
| |
function toggleScantab(form) { |
| |
var divid = 'bubbletype'; |
| |
if (document.getElementById(divid)) { |
| |
var radioname = 'fileformat'; |
| |
var num = form.elements[radioname].length; |
| |
if (num) { |
| |
for (var i=0; i<num; i++) { |
| |
if (form.elements[radioname][i].checked) { |
| |
var chosen = form.elements[radioname][i].value; |
| |
if (chosen == 'dat') { |
| |
document.getElementById(divid).style.display = 'none'; |
| |
} else if (chosen == 'csv') { |
| |
document.getElementById(divid).style.display = 'block'; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
END |
| |
} elsif ($count == 1) { |
| |
my $formatname = (split(/:/,$singleline,2))[0]; |
| |
$formatextra = '<input type="hidden" name="scantron_format" value="'.$formatname.'" />'; |
| |
} |
| |
$formattitle = &mt('File format'); |
| |
$formatoptions = '<label><input name="fileformat" type="radio" value="dat" checked="checked"'.$onclick.' />'. |
| |
&mt('Plain Text (no delimiters)'). |
| |
'</label>'.(' 'x2). |
| |
'<label><input name="fileformat" type="radio" value="csv"'.$onclick.' />'. |
| |
&mt('Comma separated values').'</label>'.$formatextra; |
| |
} |
| |
} |
| |
} |
| |
} elsif (keys(%{$domconfig{'scantron'}{'config'}}) == 1) { |
| |
if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { |
| |
if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) { |
| |
$formattitle = &mt('Bubblesheet type'); |
| |
$formatoptions = &scantron_scantab(); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return ($formatoptions,$formattitle,$formatjs); |
| |
} |
| |
|
| sub scantron_upload_scantron_data_save { |
sub scantron_upload_scantron_data_save { |
| my($r)=@_; |
my ($r,$symb) = @_; |
| my ($symb)=&get_symb($r,1); |
|
| 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 8155 sub scantron_upload_scantron_data_save {
|
Line 10907 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 />"); |
| if ($symb) { |
unless ($symb) { |
| $r->print(&show_grading_menu_form($symb)); |
|
| } else { |
|
| $r->print($doanotherupload); |
$r->print($doanotherupload); |
| } |
} |
| return ''; |
return ''; |
| } |
} |
| my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'}); |
my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'}); |
| my $uploadedfile; |
my $uploadedfile; |
| $r->print('<h3>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</h3>'); |
$r->print('<p>'.&mt('Uploading file to [_1]','"'.$coursedata{'description'}.'"').'</p>'); |
| if (length($env{'form.upfile'}) < 2) { |
if (length($env{'form.upfile'}) < 2) { |
| $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>')); |
$r->print( |
| |
&Apache::lonhtmlcommon::confirm_success( |
| |
&mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.', |
| |
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'),1)); |
| } else { |
} else { |
| my $result = |
my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$env{'form.domainid'}); |
| &Apache::lonnet::userfileupload('upfile','','scantron','','','', |
my $parser; |
| |
if (ref($domconfig{'scantron'}) eq 'HASH') { |
| |
if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') { |
| |
my $is_csv; |
| |
my @possibles = keys(%{$domconfig{'scantron'}{'config'}}); |
| |
if (@possibles > 1) { |
| |
if ($env{'form.fileformat'} eq 'csv') { |
| |
if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') { |
| |
if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { |
| |
if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) { |
| |
$is_csv = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} elsif (@possibles == 1) { |
| |
if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') { |
| |
if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { |
| |
if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) { |
| |
$is_csv = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($is_csv) { |
| |
$parser = $domconfig{'scantron'}{'config'}{'csv'}; |
| |
} |
| |
} |
| |
} |
| |
my $result = |
| |
&Apache::lonnet::userfileupload('upfile','scantron','scantron',$parser,'','', |
| $env{'form.courseid'},$env{'form.domainid'}); |
$env{'form.courseid'},$env{'form.domainid'}); |
| if ($result =~ m{^/uploaded/}) { |
if ($result =~ m{^/uploaded/}) { |
| $r->print(&mt('[_1]Success:[_2] Successfully uploaded [_3] bytes of data into location: [_4]', |
$r->print( |
| '<span class="LC_success">','</span>',(length($env{'form.upfile'})-1), |
&Apache::lonhtmlcommon::confirm_success(&mt('Upload successful')).'<br />'. |
| '<span class="LC_filename">'.$result.'</span>')); |
&mt('Uploaded [_1] bytes of data into location: [_2]', |
| |
(length($env{'form.upfile'})-1), |
| |
'<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(&mt('[_1]Error:[_2] An error ([_3]) occurred when attempting to upload the file, [_4]', |
$r->print( |
| '<span class="LC_error">','</span>',$result, |
&Apache::lonhtmlcommon::confirm_success(&mt('Upload failed'),1).'<br />'. |
| |
&mt('An error ([_1]) occurred when attempting to upload the file: [_2]', |
| |
$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) { |
| $r->print(&scantron_selectphase($r,$uploadedfile)); |
$r->print(&scantron_selectphase($r,$uploadedfile,$symb)); |
| } else { |
} else { |
| $r->print($doanotherupload); |
$r->print($doanotherupload); |
| } |
} |
|
Line 8195 sub scantron_upload_scantron_data_save {
|
Line 10993 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 ($max_match_count,$max_match_pct) = (0,0); |
my ($found_match_count,$max_match_count,$max_match_pct) = (0,0,0); |
| my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cname); |
my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cname); |
| my %idmap = &username_to_idmap($classlist); |
my %idmap = &username_to_idmap($classlist); |
| foreach my $key (keys(%idmap)) { |
foreach my $key (keys(%idmap)) { |
|
Line 8212 sub validate_uploaded_scantron_file {
|
Line 11031 sub validate_uploaded_scantron_file {
|
| $idmap{$lckey} = $idmap{$key}; |
$idmap{$lckey} = $idmap{$key}; |
| } |
} |
| my %unique_formats; |
my %unique_formats; |
| my @formatlines = &get_scantronformat_file(); |
my @formatlines = &Apache::lonnet::get_scantronformat_file(); |
| foreach my $line (@formatlines) { |
foreach my $line (@formatlines) { |
| chomp($line); |
next if (($line =~ /^\#/) || ($line eq '')); |
| my @config = split(/:/,$line); |
my @config = split(/:/,$line); |
| my $idstart = $config[5]; |
my $idstart = $config[5]; |
| my $idlength = $config[6]; |
my $idlength = $config[6]; |
|
Line 8231 sub validate_uploaded_scantron_file {
|
Line 11050 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 8238 sub validate_uploaded_scantron_file {
|
Line 11059 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 8247 sub validate_uploaded_scantron_file {
|
Line 11085 sub validate_uploaded_scantron_file {
|
| if (($max_match_format eq '') || ($percent_match > $max_match_pct)) { |
if (($max_match_format eq '') || ($percent_match > $max_match_pct)) { |
| $max_match_pct = $percent_match; |
$max_match_pct = $percent_match; |
| $max_match_format = $key; |
$max_match_format = $key; |
| |
$found_match_count = $counts{$key}{'found'}; |
| $max_match_count = $counts{$key}{'total'}; |
$max_match_count = $counts{$key}{'total'}; |
| } |
} |
| } |
} |
| } |
} |
| 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 8265 sub validate_uploaded_scantron_file {
|
Line 11104 sub validate_uploaded_scantron_file {
|
| } |
} |
| } |
} |
| my $showpct = sprintf("%.0f",$max_match_pct).'%'; |
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). |
$output .= '<br />'; |
| '<br />'.&mt('A low percentage of matches results from one of the following:').'<ul>'. |
if ($found_match_count == $max_match_count) { |
| '<li>'.&mt('The file was uploaded to the wrong course').'</li>'. |
# 100% matching entries |
| '<li>'.&mt('The data are not in the format expected for the domain: [_1]', |
$output .= &Apache::lonhtmlcommon::confirm_success( |
| '<i>'.$cdom.'</i>').'</li>'. |
&mt('Comparison of student IDs: [_1] matching ([quant,_2,entry,entries])', |
| '<li>'.&mt('Students did not bubble their IDs, or mis-bubbled them').'</li>'. |
'<b>'.$showpct.'</b>',$found_match_count)).'<br />'. |
| '<li>'.&mt('The course roster is not up to date').'</li>'. |
&mt('Comparison of student IDs in the uploaded file with'. |
| '</ul>'; |
' 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); |
| |
} else { |
| |
# Not all entries matching? -> Show warning and additional info |
| |
$output .= |
| |
&Apache::lonhtmlcommon::confirm_success( |
| |
&mt('Comparison of student IDs: [_1] matching ([_2]/[quant,_3,entry,entries])', |
| |
'<b>'.$showpct.'</b>',$found_match_count,$max_match_count).'<br />'. |
| |
&mt('Not all entries could be matched!'),1).'<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). |
| |
'<p class="LC_info">'. |
| |
&mt('A low percentage of matches results from one of the following:'). |
| |
'</p><ul>'. |
| |
'<li>'.&mt('The file was uploaded to the wrong course.').'</li>'. |
| |
'<li>'.&mt('The data is 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>'; |
| |
} |
| |
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 '')) { |
| $output = '<span class="LC_warning">'.&mt('Uploaded file contained no data').'</span>'; |
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>'; |
| } |
} |
| 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 8289 sub valid_file {
|
Line 11317 sub valid_file {
|
| } |
} |
| |
|
| sub scantron_download_scantron_data { |
sub scantron_download_scantron_data { |
| my ($r)=@_; |
my ($r,$symb) = @_; |
| my $default_form_data=&defaultFormData(&get_symb($r,1)); |
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'}; |
| my $file=$env{'form.scantron_selectfile'}; |
my $file=$env{'form.scantron_selectfile'}; |
| if (! &valid_file($file)) { |
if (! &valid_file($file)) { |
| $r->print(' |
$r->print(' |
| <p> |
<p> |
| '.&mt('The requested file name was invalid.').' |
'.&mt('The requested filename was invalid.').' |
| </p> |
</p> |
| '); |
'); |
| $r->print(&show_grading_menu_form(&get_symb($r,1))); |
|
| 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 8311 sub scantron_download_scantron_data {
|
Line 11361 sub scantron_download_scantron_data {
|
| &Apache::lonnet::allowuploaded('/adm/grades',$skipped); |
&Apache::lonnet::allowuploaded('/adm/grades',$skipped); |
| $r->print(' |
$r->print(' |
| <p> |
<p> |
| '.&mt('[_1]Original[_2] file as uploaded by the scantron office.', |
'.&mt('[_1]Original[_2] file as uploaded by the bubblesheet scanning office.', |
| '<a href="'.$orig.'">','</a>').' |
'<a href="'.$orig.'">','</a>').' |
| </p> |
</p> |
| <p> |
<p> |
|
Line 8323 sub scantron_download_scantron_data {
|
Line 11373 sub scantron_download_scantron_data {
|
| '<a href="'.$skipped.'">','</a>').' |
'<a href="'.$skipped.'">','</a>').' |
| </p> |
</p> |
| '); |
'); |
| $r->print(&show_grading_menu_form(&get_symb($r,1))); |
|
| return ''; |
return ''; |
| } |
} |
| |
|
| sub checkscantron_results { |
sub checkscantron_results { |
| my ($r) = @_; |
my ($r,$symb) = @_; |
| my ($symb)=&get_symb($r); |
|
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| my $grading_menu_button=&show_grading_menu_form($symb); |
|
| my $cid = $env{'request.course.id'}; |
my $cid = $env{'request.course.id'}; |
| my %lettdig = &letter_to_digits(); |
my %lettdig = &Apache::lonnet::letter_to_digits(); |
| my $numletts = scalar(keys(%lettdig)); |
my $numletts = scalar(keys(%lettdig)); |
| my $cnum = $env{'course.'.$cid.'.num'}; |
my $cnum = $env{'course.'.$cid.'.num'}; |
| my $cdom = $env{'course.'.$cid.'.domain'}; |
my $cdom = $env{'course.'.$cid.'.domain'}; |
| my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'}); |
my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'}); |
| my %record; |
my %record; |
| my %scantron_config = |
my %scantron_config = |
| &Apache::grades::get_scantron_config($env{'form.scantron_format'}); |
&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); |
| my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile(); |
my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); |
| |
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 8350 sub checkscantron_results {
|
Line 11398 sub checkscantron_results {
|
| return ''; |
return ''; |
| } |
} |
| my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
| |
my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb, |
| |
%grader_randomlists_by_symb,%orderedforcode); |
| |
if (ref($map)) { |
| |
$randomorder=$map->randomorder(); |
| |
$randompick=$map->randompick(); |
| |
unless ($randomorder || $randompick) { |
| |
foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) { |
| |
if ($res->randomorder()) { |
| |
$randomorder = 1; |
| |
} |
| |
if ($res->randompick()) { |
| |
$randompick = 1; |
| |
} |
| |
last if ($randomorder || $randompick); |
| |
} |
| |
} |
| |
} |
| 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 $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource); |
| &graders_resources_pass(\@resources,\%grader_partids_by_symb, \%grader_randomlists_by_symb); |
if ($nav_error) { |
| |
$r->print(&navmap_errormsg()); |
| |
return ''; |
| |
} |
| |
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
| |
\%grader_randomlists_by_symb,$bubbles_per_row); |
| my ($uname,$udom); |
my ($uname,$udom); |
| my (%scandata,%lastname,%bylast); |
my (%scandata,%lastname,%bylast); |
| $r->print(' |
$r->print(' |
|
Line 8362 sub checkscantron_results {
|
Line 11431 sub checkscantron_results {
|
| my @delayqueue; |
my @delayqueue; |
| my %completedstudents; |
my %completedstudents; |
| |
|
| my $count=&Apache::grades::get_todo_count($scanlines,$scan_data); |
my $count=&get_todo_count($scanlines,$scan_data); |
| my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status', |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count); |
| 'Progress of Bubblesheet Data/Submission Records Comparison',$count, |
|
| 'inline',undef,'checkscantron'); |
|
| my ($username,$domain,$started); |
my ($username,$domain,$started); |
| my $nav_error; |
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse. |
| &scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse. |
|
| if ($nav_error) { |
if ($nav_error) { |
| $r->print(&navmap_errormsg()); |
$r->print(&navmap_errormsg()); |
| return ''; |
return ''; |
| } |
} |
| |
|
| &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,'Processing first student'); |
| 'Processing first student'); |
|
| my $start=&Time::HiRes::time(); |
my $start=&Time::HiRes::time(); |
| my $i=-1; |
my $i=-1; |
| |
|
|
Line 8385 sub checkscantron_results {
|
Line 11450 sub checkscantron_results {
|
| my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i); |
my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i); |
| if ($line=~/^[\s\cz]*$/) { next; } |
if ($line=~/^[\s\cz]*$/) { next; } |
| if ($started) { |
if ($started) { |
| &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student'); |
| 'last student'); |
|
| } |
} |
| $started=1; |
$started=1; |
| my $scan_record= |
my $scan_record= |
| &Apache::grades::scantron_parse_scanline($line,$i,\%scantron_config, |
&Apache::grades::scantron_parse_scanline($line,$i,\%scantron_config, |
| $scan_data); |
$scan_data); |
| unless ($uname=&Apache::grades::scantron_find_student($scan_record,$scan_data, |
unless ($uname=&scantron_find_student($scan_record,$scan_data, |
| \%idmap,$i)) { |
\%idmap,$i)) { |
| &Apache::grades::scantron_add_delay(\@delayqueue,$line, |
&Apache::grades::scantron_add_delay(\@delayqueue,$line, |
| 'Unable to find a student that matches',1); |
'Unable to find a student that matches',1); |
| next; |
next; |
|
Line 8406 sub checkscantron_results {
|
Line 11470 sub checkscantron_results {
|
| my $pid = $scan_record->{'scantron.ID'}; |
my $pid = $scan_record->{'scantron.ID'}; |
| $lastname{$pid} = $scan_record->{'scantron.LastName'}; |
$lastname{$pid} = $scan_record->{'scantron.LastName'}; |
| push(@{$bylast{$lastname{$pid}}},$pid); |
push(@{$bylast{$lastname{$pid}}},$pid); |
| |
my $usec = $classlist->{$uname}->[&Apache::loncoursedata::CL_SECTION]; |
| |
my $user = $uname.':'.$usec; |
| |
($username,$domain)=split(/:/,$uname); |
| |
|
| |
my $scancode; |
| |
if ((exists($scan_record->{'scantron.CODE'})) && |
| |
(&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) { |
| |
$scancode = $scan_record->{'scantron.CODE'}; |
| |
} else { |
| |
$scancode = ''; |
| |
} |
| |
|
| |
my @mapresources = @resources; |
| my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'}; |
my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'}; |
| |
my %respnumlookup=(); |
| |
my %startline=(); |
| |
if ($randomorder || $randompick) { |
| |
@mapresources = |
| |
&users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource, |
| |
\%orderedforcode); |
| |
my $total = &get_respnum_lookups($sequence,$scan_data,\%idmap,$line, |
| |
$scan_record,\@master_seq,\%symb_to_resource, |
| |
\%grader_partids_by_symb,\%orderedforcode, |
| |
\%respnumlookup,\%startline); |
| |
if ($randompick && $total) { |
| |
$lastpos = $total*$scantron_config{'Qlength'}; |
| |
} |
| |
} |
| $scandata{$pid} = substr($line,$scantron_config{'Qstart'}-1,$lastpos); |
$scandata{$pid} = substr($line,$scantron_config{'Qstart'}-1,$lastpos); |
| chomp($scandata{$pid}); |
chomp($scandata{$pid}); |
| $scandata{$pid} =~ s/\r$//; |
$scandata{$pid} =~ s/\r$//; |
| ($username,$domain)=split(/:/,$uname); |
|
| my $counter = -1; |
my $counter = -1; |
| foreach my $resource (@resources) { |
foreach my $resource (@mapresources) { |
| my $parts; |
my $parts; |
| my $ressymb = $resource->symb(); |
my $ressymb = $resource->symb(); |
| if ((exists($grader_randomlists_by_symb{$ressymb})) || |
if ((exists($grader_randomlists_by_symb{$ressymb})) || |
| (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
| |
my $currcode; |
| |
if (exists($grader_randomlists_by_symb{$ressymb})) { |
| |
$currcode = $scancode; |
| |
} |
| (my $analysis,$parts) = |
(my $analysis,$parts) = |
| &scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain); |
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
| |
$username,$domain,undef, |
| |
$bubbles_per_row,$currcode); |
| } else { |
} else { |
| $parts = $grader_partids_by_symb{$ressymb}; |
$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},$parts, |
$scandata{$pid},$parts, |
| \%scantron_config,\%lettdig,$numletts); |
\%scantron_config,\%lettdig,$numletts, |
| |
$randomorder,$randompick, |
| |
\%respnumlookup,\%startline); |
| $record{$pid} .= $recording; |
$record{$pid} .= $recording; |
| } |
} |
| } |
} |
|
Line 8448 sub checkscantron_results {
|
Line 11547 sub checkscantron_results {
|
| '<td>'.&mt('Bubblesheet').'</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>'.&mt('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('Bubblesheet').'</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>'.&mt('Submissions').'</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n". |
| '</tr>'."\n"; |
'</tr>'."\n"; |
| $failed ++; |
$failed ++; |
| } |
} |
|
Line 8463 sub checkscantron_results {
|
Line 11562 sub checkscantron_results {
|
| } |
} |
| } |
} |
| } |
} |
| $r->print('<p>'. |
$r->print( |
| &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).', |
'<p>' |
| '<b>', |
.&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).', |
| $numstudents, |
'<b>', |
| '</b>', |
$numstudents, |
| $env{'form.scantron_maxbubble'}). |
'</b>', |
| '</p>' |
$env{'form.scantron_maxbubble'}) |
| |
.'</p>' |
| |
); |
| |
$r->print('<p>' |
| |
.&mt('Exact matches for [_1][quant,_2,student][_3].','<b>',$passed,'</b>') |
| |
.'<br />' |
| |
.&mt('Discrepancies detected for [_1][quant,_2,student][_3].','<b>',$failed,'</b>') |
| |
.'</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 bubblesheet 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". |
|
Line 8491 sub checkscantron_results {
|
Line 11596 sub checkscantron_results {
|
| &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 bubblesheet grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original bubblesheets.'); |
&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 />'); |
| return; |
return; |
| } |
} |
| |
|
| sub verify_scantron_grading { |
sub verify_scantron_grading { |
| my ($resource,$domain,$username,$cid,$counter,$scandata,$partids, |
my ($resource,$domain,$username,$cid,$counter,$scandata,$partids, |
| $scantron_config,$lettdig,$numletts) = @_; |
$scantron_config,$lettdig,$numletts,$randomorder,$randompick, |
| |
$respnumlookup,$startline) = @_; |
| 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()); |
|
Line 8506 sub verify_scantron_grading {
|
Line 11612 sub verify_scantron_grading {
|
| foreach my $part_id (@{$partids}) { |
foreach my $part_id (@{$partids}) { |
| $counter ++; |
$counter ++; |
| $expected{$part_id} = 0; |
$expected{$part_id} = 0; |
| if ($env{"form.scantron.sub_bubblelines.$counter"}) { |
my $respnum = $counter; |
| my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$counter"}); |
if ($randomorder || $randompick) { |
| |
$respnum = $respnumlookup->{$counter}; |
| |
$startpos{$part_id} = $startline->{$counter} + 1; |
| |
} else { |
| |
$startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"}; |
| |
} |
| |
if ($env{"form.scantron.sub_bubblelines.$respnum"}) { |
| |
my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$respnum"}); |
| foreach my $item (@sub_lines) { |
foreach my $item (@sub_lines) { |
| $expected{$part_id} += $item; |
$expected{$part_id} += $item; |
| } |
} |
| } else { |
} else { |
| $expected{$part_id} = $env{"form.scantron.bubblelines.$counter"}; |
$expected{$part_id} = $env{"form.scantron.bubblelines.$respnum"}; |
| } |
} |
| $startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"}; |
|
| } |
} |
| if ($symb) { |
if ($symb) { |
| my %recorded; |
my %recorded; |
|
Line 8610 sub verify_scantron_grading {
|
Line 11722 sub verify_scantron_grading {
|
| return ($counter,$record); |
return ($counter,$record); |
| } |
} |
| |
|
| sub letter_to_digits { |
|
| my %lettdig = ( |
|
| A => 1, |
|
| B => 2, |
|
| C => 3, |
|
| D => 4, |
|
| E => 5, |
|
| F => 6, |
|
| G => 7, |
|
| H => 8, |
|
| I => 9, |
|
| J => 0, |
|
| ); |
|
| return %lettdig; |
|
| } |
|
| |
|
| |
|
| #-------- end of section for handling grading scantron forms ------- |
#-------- end of section for handling grading scantron forms ------- |
| # |
# |
| #------------------------------------------------------------------- |
#------------------------------------------------------------------- |
| |
|
| #-------------------------- Menu interface ------------------------- |
#-------------------------- Menu interface ------------------------- |
| # |
# |
| #--- Show a Grading Menu button - Calls the next routine --- |
#--- Href with symb and command --- |
| sub show_grading_menu_form { |
|
| my ($symb)=@_; |
|
| my $result.='<br /><form action="/adm/grades" method="post">'."\n". |
|
| '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
|
| '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n". |
|
| '<input type="hidden" name="command" value="gradingmenu" />'."\n". |
|
| '<input type="submit" name="submit" value="'.&mt('Grading Menu').'" />'."\n". |
|
| '</form>'."\n"; |
|
| return $result; |
|
| } |
|
| |
|
| # -- Retrieve choices for grading form |
sub href_symb_cmd { |
| sub savedState { |
my ($symb,$cmd)=@_; |
| my %savedState = (); |
return '/adm/grades?symb='.&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'<>&"').'&command='. |
| if ($env{'form.saveState'}) { |
&HTML::Entities::encode($cmd,'<>&"'); |
| foreach (split(/:/,$env{'form.saveState'})) { |
|
| my ($key,$value) = split(/=/,$_,2); |
|
| $savedState{$key} = $value; |
|
| } |
|
| } |
|
| return \%savedState; |
|
| } |
} |
| |
|
| sub grading_menu { |
sub grading_menu { |
| my ($request) = @_; |
my ($request,$symb) = @_; |
| my ($symb)=&get_symb($request); |
|
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| my $probTitle = &Apache::lonnet::gettitle($symb); |
|
| my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle); |
|
| |
|
| $request->print($table); |
|
| my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb), |
my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb), |
| 'handgrade'=>$hdgrade, |
'command'=>'individual'); |
| 'probTitle'=>$probTitle, |
|
| 'command'=>'submit_options', |
|
| 'saveState'=>"", |
|
| 'gradingMenu'=>1, |
|
| 'showgrading'=>"yes"); |
|
| |
|
| my $url1 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
|
| |
|
| |
my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| |
|
| |
$fields{'command'}='ungraded'; |
| |
my $url1b=&Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| |
|
| |
$fields{'command'}='table'; |
| |
my $url1c=&Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| |
|
| |
$fields{'command'}='all_for_one'; |
| |
my $url1d=&Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| |
|
| |
$fields{'command'}='downloadfilesselect'; |
| |
my $url1e=&Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| |
|
| $fields{'command'} = 'csvform'; |
$fields{'command'} = 'csvform'; |
| my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| |
|
|
Line 8683 sub grading_menu {
|
Line 11765 sub grading_menu {
|
| |
|
| $fields{'command'} = 'scantron_selectphase'; |
$fields{'command'} = 'scantron_selectphase'; |
| my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| |
|
| my @menu = ({ categorytitle=>'Course Grading', |
$fields{'command'} = 'initialverifyreceipt'; |
| |
my $url5 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| |
|
| |
my %permissions; |
| |
if ($perm{'mgr'}) { |
| |
$permissions{'either'} = 'F'; |
| |
$permissions{'mgr'} = 'F'; |
| |
} |
| |
if ($perm{'vgr'}) { |
| |
$permissions{'either'} = 'F'; |
| |
$permissions{'vgr'} = 'F'; |
| |
} |
| |
|
| |
my @menu = ({ categorytitle=>'Hand Grading', |
| items =>[ |
items =>[ |
| { linktext => 'Manual Grading/View Submissions', |
{ linktext => 'Select individual students to grade', |
| url => $url1, |
url => $url1a, |
| permission => 'F', |
permission => $permissions{'either'}, |
| icon => 'edit-find-replace.png', |
icon => 'grade_students.png', |
| linktitle => 'Start the process of hand grading submissions.' |
linktitle => 'Grade current resource for a selection of students.' |
| |
}, |
| |
{ linktext => 'Grade ungraded submissions', |
| |
url => $url1b, |
| |
permission => $permissions{'either'}, |
| |
icon => 'ungrade_sub.png', |
| |
linktitle => 'Grade all submissions that have not been graded yet.' |
| }, |
}, |
| |
|
| |
{ linktext => 'Grading table', |
| |
url => $url1c, |
| |
permission => $permissions{'either'}, |
| |
icon => 'grading_table.png', |
| |
linktitle => 'Grade current resource for all students.' |
| |
}, |
| |
{ linktext => 'Grade page/folder for one student', |
| |
url => $url1d, |
| |
permission => $permissions{'either'}, |
| |
icon => 'grade_PageFolder.png', |
| |
linktitle => 'Grade all resources in current page/sequence/folder for one student.' |
| |
}, |
| |
{ linktext => 'Download submissions', |
| |
url => $url1e, |
| |
permission => $permissions{'either'}, |
| |
icon => 'download_sub.png', |
| |
linktitle => 'Download all students submissions.' |
| |
}]}, |
| |
{ categorytitle=>'Automated Grading', |
| |
items =>[ |
| |
|
| { linktext => 'Upload Scores', |
{ linktext => 'Upload Scores', |
| url => $url2, |
url => $url2, |
| permission => 'F', |
permission => $permissions{'mgr'}, |
| icon => 'uploadscores.png', |
icon => 'uploadscores.png', |
| linktitle => 'Specify a file containing the class scores for current resource.' |
linktitle => 'Specify a file containing the class scores for current resource.' |
| }, |
}, |
| { linktext => 'Process Clicker', |
{ linktext => 'Process Clicker', |
| url => $url3, |
url => $url3, |
| permission => 'F', |
permission => $permissions{'mgr'}, |
| 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 Bubblesheets', |
{ linktext => 'Grade/Manage/Review Bubblesheets', |
| url => $url4, |
url => $url4, |
| permission => 'F', |
permission => $permissions{'mgr'}, |
| icon => 'stat.png', |
icon => 'bubblesheet.png', |
| linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.' |
linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.' |
| } |
}, |
| |
{ linktext => 'Verify Receipt Number', |
| |
url => $url5, |
| |
permission => $permissions{'either'}, |
| |
icon => 'receipt_number.png', |
| |
linktitle => 'Verify a system-generated receipt number for correct problem solution.' |
| |
} |
| |
|
| ] |
] |
| }); |
}); |
| |
my $cdom = $env{"course.$env{'request.course.id'}.domain"}; |
| #$fields{'command'} = 'verify'; |
my $cnum = $env{"course.$env{'request.course.id'}.num"}; |
| #$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
my %passback = &Apache::lonnet::dump('nohist_linkprot_passback',$cdom,$cnum); |
| # |
if (keys(%passback)) { |
| |
$fields{'command'} = 'initialpassback'; |
| |
my $url6 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); |
| |
push (@{$menu[1]{items}}, |
| |
{ linktext => 'Passback of Scores', |
| |
url => $url6, |
| |
permission => $permissions{'either'}, |
| |
icon => 'passback.png', |
| |
linktitle => 'Passback scores to launcher CMS for resources accessed via LTI-mediated deep-linking', |
| |
}); |
| |
} |
| # Create the menu |
# Create the menu |
| my $Str; |
my $Str; |
| # $Str .= '<h2>'.&mt('Please select a grading task').'</h2>'; |
|
| $Str .= '<form method="post" action="" name="gradingMenu">'; |
$Str .= '<form method="post" action="" name="gradingMenu">'; |
| $Str .= '<input type="hidden" name="command" value="" />'. |
$Str .= '<input type="hidden" name="command" value="" />'. |
| '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n"; |
| '<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n". |
|
| '<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n". |
|
| '<input type="hidden" name="saveState" value="" />'."\n". |
|
| '<input type="hidden" name="gradingMenu" value="1" />'."\n". |
|
| '<input type="hidden" name="showgrading" value="yes" />'."\n"; |
|
| |
|
| $Str .= Apache::lonhtmlcommon::generate_menu(@menu); |
|
| #$menudata->{'jscript'} |
|
| $Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '. |
|
| ' onclick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
|
| ' /> '. |
|
| &Apache::lonnet::recprefix($env{'request.course.id'}). |
|
| '-<input type="text" name="receipt" size="4" onchange="javascript:checkReceiptNo(this.form,\'OK\')" />'; |
|
| |
|
| $Str .="</form>\n"; |
$Str .= &Apache::lonhtmlcommon::generate_menu(@menu); |
| my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); |
|
| $request->print(<<GRADINGMENUJS); |
|
| <script type="text/javascript" language="javascript"> |
|
| function checkChoice(formname,val,cmdx) { |
|
| if (val <= 2) { |
|
| var cmd = radioSelection(formname.radioChoice); |
|
| var cmdsave = cmd; |
|
| } else { |
|
| cmd = cmdx; |
|
| cmdsave = 'submission'; |
|
| } |
|
| formname.command.value = cmd; |
|
| if (val < 5) formname.submit(); |
|
| if (val == 5) { |
|
| if (!checkReceiptNo(formname,'notOK')) { |
|
| return false; |
|
| } else { |
|
| formname.submit(); |
|
| } |
|
| } |
|
| } |
|
| |
|
| function checkReceiptNo(formname,nospace) { |
|
| var receiptNo = formname.receipt.value; |
|
| var checkOpt = false; |
|
| if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;} |
|
| if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;} |
|
| if (checkOpt) { |
|
| alert("$receiptalert"); |
|
| formname.receipt.value = ""; |
|
| formname.receipt.focus(); |
|
| return false; |
|
| } |
|
| return true; |
|
| } |
|
| </script> |
|
| GRADINGMENUJS |
|
| &commonJSfunctions($request); |
|
| return $Str; |
return $Str; |
| } |
} |
| |
|
| |
sub ungraded { |
| |
my ($request)=@_; |
| |
&submit_options($request); |
| |
} |
| |
|
| #--- Displays the submissions first page ------- |
sub submit_options_sequence { |
| sub submit_options { |
my ($request,$symb) = @_; |
| my ($request) = @_; |
|
| my ($symb)=&get_symb($request); |
|
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| my $probTitle = &Apache::lonnet::gettitle($symb); |
&commonJSfunctions($request); |
| |
my $result; |
| |
|
| my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); |
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n". |
| $request->print(<<GRADINGMENUJS); |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n"; |
| <script type="text/javascript" language="javascript"> |
$result.=&selectfield(0). |
| function checkChoice(formname,val,cmdx) { |
'<input type="hidden" name="command" value="pickStudentPage" /> |
| if (val <= 2) { |
<div> |
| var cmd = radioSelection(formname.radioChoice); |
<input type="submit" value="'.&mt('Next').' →" /> |
| var cmdsave = cmd; |
</div> |
| } else { |
</div> |
| cmd = cmdx; |
</form>'; |
| cmdsave = 'submission'; |
return $result; |
| } |
} |
| formname.command.value = cmd; |
|
| formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+ |
sub submit_options_table { |
| ":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status); |
my ($request,$symb) = @_; |
| if (val < 5) formname.submit(); |
if (!$symb) {return '';} |
| if (val == 5) { |
|
| if (!checkReceiptNo(formname,'notOK')) { return false;} |
|
| formname.submit(); |
|
| } |
|
| if (val < 7) formname.submit(); |
|
| } |
|
| |
|
| function checkReceiptNo(formname,nospace) { |
|
| var receiptNo = formname.receipt.value; |
|
| var checkOpt = false; |
|
| if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;} |
|
| if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;} |
|
| if (checkOpt) { |
|
| alert("$receiptalert"); |
|
| formname.receipt.value = ""; |
|
| formname.receipt.focus(); |
|
| return false; |
|
| } |
|
| return true; |
|
| } |
|
| </script> |
|
| GRADINGMENUJS |
|
| &commonJSfunctions($request); |
&commonJSfunctions($request); |
| my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle); |
my $is_tool = ($symb =~ /ext\.tool$/); |
| my $result; |
my $result; |
| my (undef,$sections) = &getclasslist('all','0'); |
|
| my $savedState = &savedState(); |
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n". |
| my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'}); |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n"; |
| my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'}); |
|
| my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'}); |
$result.=&selectfield(1,$is_tool). |
| my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'}); |
'<input type="hidden" name="command" value="viewgrades" /> |
| |
<div> |
| # Preselect sections |
<input type="submit" value="'.&mt('Next').' →" /> |
| my $selsec=""; |
</div> |
| if (ref($sections)) { |
</div> |
| foreach my $section (sort(@$sections)) { |
</form>'; |
| $selsec.='<option value="'.$section.'" '. |
return $result; |
| ($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n"; |
} |
| |
|
| |
sub submit_options_download { |
| |
my ($request,$symb) = @_; |
| |
if (!$symb) {return '';} |
| |
|
| |
my $res_error; |
| |
my ($partlist,$handgrade,$responseType,$numresp,$numessay,$numdropbox) = |
| |
&response_type($symb,\$res_error); |
| |
if ($res_error) { |
| |
$request->print(&mt('An error occurred retrieving response types')); |
| |
return; |
| |
} |
| |
unless ($numessay) { |
| |
$request->print(&mt('No essayresponse items found')); |
| |
return; |
| |
} |
| |
my $table; |
| |
if (ref($partlist) eq 'ARRAY') { |
| |
if (scalar(@$partlist) > 1 ) { |
| |
$table = &showResourceInfo($symb,$partlist,$responseType,'gradingMenu',1,1); |
| } |
} |
| } |
} |
| |
|
| $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n". |
my $is_tool = ($symb =~ /ext\.tool$/); |
| '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
&commonJSfunctions($request); |
| '<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n". |
|
| '<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n". |
|
| '<input type="hidden" name="command" value="" />'."\n". |
|
| '<input type="hidden" name="saveState" value="" />'."\n". |
|
| '<input type="hidden" name="gradingMenu" value="1" />'."\n". |
|
| '<input type="hidden" name="showgrading" value="yes" />'."\n"; |
|
| |
|
| |
my $result='<form action="/adm/grades" method="post" name="gradingMenu">'."\n". |
| |
$table."\n". |
| |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n"; |
| $result.=' |
$result.=' |
| <h2> |
<h2> |
| '.&mt('Grade Current Resource').' |
'.&mt('Select Students for whom to Download Submissions').' |
| </h2> |
</h2>'.&selectfield(1,$is_tool).' |
| <div> |
<input type="hidden" name="command" value="downloadfileslink" /> |
| '.$table.' |
<input type="submit" value="'.&mt('Next').' →" /> |
| </div> |
</div> |
| |
</div> |
| |
|
| |
|
| |
</form>'; |
| |
return $result; |
| |
} |
| |
|
| |
#--- Displays the submissions first page ------- |
| |
sub submit_options { |
| |
my ($request,$symb) = @_; |
| |
if (!$symb) {return '';} |
| |
|
| |
my $is_tool = ($symb =~ /ext\.tool$/); |
| |
&commonJSfunctions($request); |
| |
my $result; |
| |
|
| <div class="LC_columnSection"> |
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n". |
| |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n"; |
| |
$result.=&selectfield(1,$is_tool).' |
| |
<input type="hidden" name="command" value="submission" /> |
| |
<input type="submit" value="'.&mt('Next').' →" /> |
| |
</div> |
| |
</div> |
| |
</form>'; |
| |
return $result; |
| |
} |
| |
|
| |
sub selectfield { |
| |
my ($full,$is_tool)=@_; |
| |
my %options; |
| |
if ($is_tool) { |
| |
%options = |
| |
(&transtatus_options, |
| |
'select_form_order' => ['yes','incorrect','all']); |
| |
} else { |
| |
%options = |
| |
(&substatus_options, |
| |
'select_form_order' => ['yes','queued','graded','incorrect','all']); |
| |
} |
| |
|
| |
# |
| |
# PrepareClasslist() needs to be called to avoid getting a sections list |
| |
# for a different course from the @Sections global in lonstatistics.pm, |
| |
# populated by an earlier request. |
| |
# |
| |
&Apache::lonstatistics::PrepareClasslist(); |
| |
|
| |
my $result='<div class="LC_columnSection"> |
| |
|
| <fieldset> |
<fieldset> |
| <legend> |
<legend> |
| '.&mt('Sections').' |
'.&mt('Sections').' |
| </legend> |
</legend> |
| <select name="section" multiple="multiple" size="5">'."\n"; |
'.&Apache::lonstatistics::SectionSelect('section','multiple',5).' |
| $result.= $selsec; |
|
| $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> '; |
|
| $result.=' |
|
| </fieldset> |
</fieldset> |
| |
|
| <fieldset> |
<fieldset> |
|
Line 8882 GRADINGMENUJS
|
Line 12011 GRADINGMENUJS
|
| <legend> |
<legend> |
| '.&mt('Access Status').' |
'.&mt('Access Status').' |
| </legend> |
</legend> |
| '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').' |
'.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').' |
| </fieldset> |
</fieldset>'; |
| |
if ($full) { |
| |
my $heading = &mt('Submission Status'); |
| |
if ($is_tool) { |
| |
$heading = &mt('Transaction Status'); |
| |
} |
| |
$result.=' |
| <fieldset> |
<fieldset> |
| <legend> |
<legend> |
| '.&mt('Submission Status').' |
'.$heading.' |
| </legend> |
</legend>'. |
| <select name="submitonly" size="5"> |
&Apache::loncommon::select_form('all','submitonly',\%options). |
| <option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option> |
'</fieldset>'; |
| <option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option> |
} |
| <option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option> |
$result.='</div><br />'; |
| <option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option> |
|
| <option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option> |
|
| </select> |
|
| </fieldset> |
|
| |
|
| </div> |
|
| |
|
| <br /> |
|
| <div> |
|
| <div> |
|
| <label> |
|
| <input type="radio" name="radioChoice" value="submission" '. |
|
| ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '. |
|
| &mt('Select individual students to grade and view submissions.').' |
|
| </label> |
|
| </div> |
|
| <div> |
|
| <label> |
|
| <input type="radio" name="radioChoice" value="viewgrades" '. |
|
| ($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '. |
|
| &mt('Grade all selected students in a grading table.').' |
|
| </label> |
|
| </div> |
|
| <div> |
|
| <input type="button" onclick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" /> |
|
| </div> |
|
| </div> |
|
| |
|
| |
|
| <h2> |
|
| '.&mt('Grade Complete Folder for One Student').' |
|
| </h2> |
|
| <div> |
|
| <div> |
|
| <label> |
|
| <input type="radio" name="radioChoice" value="pickStudentPage" '. |
|
| ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '. |
|
| &mt('The <b>complete</b> page/sequence/folder: For one student').' |
|
| </label> |
|
| </div> |
|
| <div> |
|
| <input type="button" onclick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' →" /> |
|
| </div> |
|
| </div> |
|
| </form>'; |
|
| $result .= &show_grading_menu_form($symb); |
|
| return $result; |
return $result; |
| } |
} |
| |
|
| |
sub substatus_options { |
| |
return &Apache::lonlocal::texthash( |
| |
'yes' => 'with submissions', |
| |
'queued' => 'in grading queue', |
| |
'graded' => 'with ungraded submissions', |
| |
'incorrect' => 'with incorrect submissions', |
| |
'all' => 'with any status', |
| |
); |
| |
} |
| |
|
| |
sub transtatus_options { |
| |
return &Apache::lonlocal::texthash( |
| |
'yes' => 'with score transactions', |
| |
'incorrect' => 'with less than full credit', |
| |
'all' => 'with any status', |
| |
); |
| |
} |
| |
|
| sub reset_perm { |
sub reset_perm { |
| undef(%perm); |
undef(%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 8964 sub init_perm {
|
Line 12070 sub init_perm {
|
| } |
} |
| } |
} |
| |
|
| |
sub init_old_essays { |
| |
my ($symb,$apath,$adom,$aname) = @_; |
| |
if ($symb ne '') { |
| |
my %essays = &Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname); |
| |
if (keys(%essays) > 0) { |
| |
$old_essays{$symb} = \%essays; |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub reset_old_essays { |
| |
undef(%old_essays); |
| |
} |
| |
|
| sub gather_clicker_ids { |
sub gather_clicker_ids { |
| my %clicker_ids; |
my %clicker_ids; |
| |
|
|
Line 9026 sub clicker_grading_parameters {
|
Line 12147 sub clicker_grading_parameters {
|
| } |
} |
| |
|
| sub process_clicker { |
sub process_clicker { |
| my ($r)=@_; |
my ($r,$symb)=@_; |
| my ($symb)=&get_symb($r); |
|
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| my $result=&checkforfile_js(); |
my $result=&checkforfile_js(); |
| $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb); |
$result.=&Apache::loncommon::start_data_table(). |
| my ($table) = &showResourceInfo($symb,$env{'form.probTitle'}); |
&Apache::loncommon::start_data_table_header_row(). |
| $result.=$table; |
'<th>'.&mt('Specify a file containing clicker information and set grading options.').'</th>'. |
| $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n"; |
&Apache::loncommon::end_data_table_header_row(). |
| $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n"; |
&Apache::loncommon::start_data_table_row()."<td>\n"; |
| $result.=' <b>'.&mt('Specify a file containing the clicker information for this resource.'). |
|
| '</b></td></tr>'."\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 9054 sub process_clicker {
|
Line 12171 sub process_clicker {
|
| } |
} |
| } |
} |
| |
|
| my $upload=&mt("Upload File"); |
my $upload=&mt("Evaluate File"); |
| my $type=&mt("Type"); |
my $type=&mt("Type"); |
| my $attendance=&mt("Award points just for participation"); |
my $attendance=&mt("Award points just for participation"); |
| my $personnel=&mt("Correctness determined from response by course personnel"); |
my $personnel=&mt("Correctness determined from response by course personnel"); |
|
Line 9064 sub process_clicker {
|
Line 12181 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.= &Apache::lonhtmlcommon::scripttag(<<ENDUPFORM); |
| <script type="text/javascript"> |
|
| function sanitycheck() { |
function sanitycheck() { |
| // Accept only integer percentages |
// Accept only integer percentages |
| document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value); |
document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value); |
|
Line 9106 function sanitycheck() {
|
Line 12223 function sanitycheck() {
|
| // Remember the old state |
// Remember the old state |
| document.forms.gradesupload.waschecked.value=newgradingchoice; |
document.forms.gradesupload.waschecked.value=newgradingchoice; |
| } |
} |
| </script> |
ENDUPFORM |
| |
$result.= <<ENDUPFORM; |
| <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
| <input type="hidden" name="symb" value="$symb" /> |
<input type="hidden" name="symb" value="$symb" /> |
| <input type="hidden" name="command" value="processclickerfile" /> |
<input type="hidden" name="command" value="processclickerfile" /> |
| <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" /> |
|
| <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> |
ENDUPFORM |
| |
$result.='</td>'.&Apache::loncommon::end_data_table_row(). |
| |
&Apache::loncommon::start_data_table_row().'<td>'.(<<ENDGRADINGFORM); |
| |
<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" /> |
|
Line 9122 function sanitycheck() {
|
Line 12241 function sanitycheck() {
|
| <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> |
ENDGRADINGFORM |
| |
$result.='</td>'.&Apache::loncommon::end_data_table_row(). |
| |
&Apache::loncommon::start_data_table_row().'<td>'.(<<ENDPERCFORM); |
| |
<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 |
ENDPERCFORM |
| $result.='</td></tr></table>'."\n". |
$result.='</td>'. |
| '</td></tr></table><br /><br />'."\n"; |
&Apache::loncommon::end_data_table_row(). |
| $result.=&show_grading_menu_form($symb); |
&Apache::loncommon::end_data_table(); |
| return $result; |
return $result; |
| } |
} |
| |
|
| sub process_clicker_file { |
sub process_clicker_file { |
| my ($r)=@_; |
my ($r,$symb) = @_; |
| my ($symb)=&get_symb($r); |
|
| if (!$symb) {return '';} |
if (!$symb) {return '';} |
| |
|
| my %Saveable_Parameters=&clicker_grading_parameters(); |
my %Saveable_Parameters=&clicker_grading_parameters(); |
| &Apache::loncommon::store_course_settings('grades_clicker', |
&Apache::loncommon::store_course_settings('grades_clicker', |
| \%Saveable_Parameters); |
\%Saveable_Parameters); |
| |
my $result=''; |
| my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}); |
|
| if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) { |
if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) { |
| $result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>'; |
$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>'; |
| return $result.&show_grading_menu_form($symb); |
return $result; |
| } |
} |
| if (($env{'form.gradingmechanism'} eq 'given') && ($env{'form.givenanswer'}!~/\S/)) { |
if (($env{'form.gradingmechanism'} eq 'given') && ($env{'form.givenanswer'}!~/\S/)) { |
| $result.='<span class="LC_error">'.&mt('You need to specify the correct answer').'</span>'; |
$result.='<span class="LC_error">'.&mt('You need to specify the correct answer').'</span>'; |
| return $result.&show_grading_menu_form($symb); |
return $result; |
| } |
} |
| my $foundgiven=0; |
my $foundgiven=0; |
| if ($env{'form.gradingmechanism'} eq 'given') { |
if ($env{'form.gradingmechanism'} eq 'given') { |
|
Line 9194 sub process_clicker_file {
|
Line 12314 sub process_clicker_file {
|
| $number++; |
$number++; |
| } |
} |
| $result.="</p>\n"; |
$result.="</p>\n"; |
| if ($number==0) { |
if ($number==0) { |
| $result.='<span class="LC_error">'.&mt('No IDs found to determine correct answer').'</span>'; |
$result .= |
| return $result.&show_grading_menu_form($symb); |
&Apache::lonhtmlcommon::confirm_success( |
| } |
&mt('No IDs found to determine correct answer'),1); |
| |
return $result; |
| |
} |
| } |
} |
| if (length($env{'form.upfile'}) < 2) { |
if (length($env{'form.upfile'}) < 2) { |
| $result.=&mt('[_1] Error: [_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.', |
$result .= |
| '<span class="LC_error">', |
&Apache::lonhtmlcommon::confirm_success( |
| '</span>', |
&mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.', |
| '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'); |
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'),1); |
| return $result.&show_grading_menu_form($symb); |
return $result; |
| |
} |
| |
my $mimetype; |
| |
if ($env{'form.upfiletype'} eq 'iclicker') { |
| |
my $mm = new File::MMagic; |
| |
$mimetype = $mm->checktype_contents($env{'form.upfile'}); |
| |
unless (($mimetype eq 'text/plain') || ($mimetype eq 'text/html')) { |
| |
$result.= '<p>'. |
| |
&Apache::lonhtmlcommon::confirm_success( |
| |
&mt('File format is neither csv (iclicker 6) nor xml (iclicker 7)'),1).'</p>'; |
| |
return $result; |
| |
} |
| |
} elsif (($env{'form.upfiletype'} ne 'interwrite') && ($env{'form.upfiletype'} ne 'turning')) { |
| |
$result .= '<p>'. |
| |
&Apache::lonhtmlcommon::confirm_success( |
| |
&mt('Invalid clicker type: choose one of: i>clicker, Interwrite PRS, or Turning Technologies.'),1).'</p>'; |
| |
return $result; |
| } |
} |
| |
|
| # Were able to get all the info needed, now analyze the file |
# Were able to get all the info needed, now analyze the file |
| |
|
| $result.=&Apache::loncommon::studentbrowser_javascript(); |
$result.=&Apache::loncommon::studentbrowser_javascript(); |
| $symb = &Apache::lonenc::check_encrypt($symb); |
$symb = &Apache::lonenc::check_encrypt($symb); |
| my $heading=&mt('Scanning clicker file'); |
$result.=&Apache::loncommon::start_data_table(). |
| $result.=(<<ENDHEADER); |
&Apache::loncommon::start_data_table_header_row(). |
| <br /><table width="100%" border="0"><tr><td bgcolor="#777777"> |
'<th>'.&mt('Evaluate clicker file').'</th>'. |
| <table width="100%" border="0"><tr bgcolor="#e6ffff"><td> |
&Apache::loncommon::end_data_table_header_row(). |
| <b>$heading</b></td></tr><tr bgcolor="#ffffe6"><td> |
&Apache::loncommon::start_data_table_row().(<<ENDHEADER); |
| |
<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" /> |
| <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" /> |
|
| <input type="hidden" name="saveState" value="$env{'form.saveState'}" /> |
|
| <input type="hidden" name="gradingmechanism" value="$env{'form.gradingmechanism'}" /> |
<input type="hidden" name="gradingmechanism" value="$env{'form.gradingmechanism'}" /> |
| <input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" /> |
<input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" /> |
| <input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" /> |
<input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" /> |
|
Line 9233 ENDHEADER
|
Line 12370 ENDHEADER
|
| my $errormsg=''; |
my $errormsg=''; |
| my $number=0; |
my $number=0; |
| if ($env{'form.upfiletype'} eq 'iclicker') { |
if ($env{'form.upfiletype'} eq 'iclicker') { |
| ($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses); |
if ($mimetype eq 'text/plain') { |
| } |
($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses); |
| if ($env{'form.upfiletype'} eq 'interwrite') { |
} elsif ($mimetype eq 'text/html') { |
| |
($errormsg,$number)=&iclickerxml_eval(\@questiontitles,\%responses); |
| |
} |
| |
} elsif ($env{'form.upfiletype'} eq 'interwrite') { |
| ($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses); |
($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses); |
| |
} elsif ($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.'" />'. |
|
Line 9245 ENDHEADER
|
Line 12387 ENDHEADER
|
| '<br />'; |
'<br />'; |
| if (($env{'form.gradingmechanism'} eq 'given') && ($number!=$foundgiven)) { |
if (($env{'form.gradingmechanism'} eq 'given') && ($number!=$foundgiven)) { |
| $result.='<span class="LC_error">'.&mt('Number of given answers does not agree with number of questions in file.').'</span>'; |
$result.='<span class="LC_error">'.&mt('Number of given answers does not agree with number of questions in file.').'</span>'; |
| return $result.&show_grading_menu_form($symb); |
return $result; |
| } |
} |
| # Remember Question Titles |
# Remember Question Titles |
| # FIXME: Possibly need delimiter other than ":" |
# FIXME: Possibly need delimiter other than ":" |
|
Line 9265 ENDHEADER
|
Line 12407 ENDHEADER
|
| } elsif ($clicker_ids{$id}) { |
} elsif ($clicker_ids{$id}) { |
| if ($clicker_ids{$id}=~/\,/) { |
if ($clicker_ids{$id}=~/\,/) { |
| # More than one user with the same clicker! |
# More than one user with the same clicker! |
| $result.="\n<hr />".&mt('Clicker registered more than once').": <tt>".$id."</tt><br />"; |
$result.="</td>".&Apache::loncommon::end_data_table_row(). |
| |
&Apache::loncommon::start_data_table_row()."<td>". |
| |
&mt('Clicker registered more than once').": <tt>".$id."</tt><br />"; |
| $result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'. |
$result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'. |
| "<select name='multi".$id."'>"; |
"<select name='multi".$id."'>"; |
| foreach my $reguser (sort(split(/\,/,$clicker_ids{$id}))) { |
foreach my $reguser (sort(split(/\,/,$clicker_ids{$id}))) { |
|
Line 9279 ENDHEADER
|
Line 12423 ENDHEADER
|
| $student_count++; |
$student_count++; |
| } |
} |
| } else { |
} else { |
| $result.="\n<hr />".&mt('Unregistered Clicker')." <tt>".$id."</tt><br />"; |
$result.="</td>".&Apache::loncommon::end_data_table_row(). |
| |
&Apache::loncommon::start_data_table_row()."<td>". |
| |
&mt('Unregistered Clicker')." <tt>".$id."</tt><br />"; |
| $result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'. |
$result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'. |
| "\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,0,$id); |
&Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id,'',$id); |
| $unknown_count++; |
$unknown_count++; |
| } |
} |
| } |
} |
|
Line 9292 ENDHEADER
|
Line 12438 ENDHEADER
|
| &mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count); |
&mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count); |
| if (($env{'form.gradingmechanism'} ne 'attendance') && ($env{'form.gradingmechanism'} ne 'given')) { |
if (($env{'form.gradingmechanism'} ne 'attendance') && ($env{'form.gradingmechanism'} ne 'given')) { |
| if ($correct_count==0) { |
if ($correct_count==0) { |
| $errormsg.="Found no correct answers answers for grading!"; |
$errormsg.="Found no correct answers for grading!"; |
| } elsif ($correct_count>1) { |
} elsif ($correct_count>1) { |
| $result.='<br /><span class="LC_warning">'.&mt("Found [_1] entries for grading!",$correct_count).'</span>'; |
$result.='<br /><span class="LC_warning">'.&mt("Found [_1] entries for grading!",$correct_count).'</span>'; |
| } |
} |
|
Line 9305 ENDHEADER
|
Line 12451 ENDHEADER
|
| } else { |
} else { |
| $result.='<br /><input type="submit" name="finalize" value="'.&mt('Finalize Grading').'" />'; |
$result.='<br /><input type="submit" name="finalize" value="'.&mt('Finalize Grading').'" />'; |
| } |
} |
| $result.='</form></td></tr></table>'."\n". |
$result.='</form></td>'. |
| '</td></tr></table><br /><br />'."\n"; |
&Apache::loncommon::end_data_table_row(). |
| return $result.&show_grading_menu_form($symb); |
&Apache::loncommon::end_data_table(); |
| |
return $result; |
| } |
} |
| |
|
| sub iclicker_eval { |
sub iclicker_eval { |
|
Line 9338 sub iclicker_eval {
|
Line 12485 sub iclicker_eval {
|
| return ($errormsg,$number); |
return ($errormsg,$number); |
| } |
} |
| |
|
| |
sub iclickerxml_eval { |
| |
my ($questiontitles,$responses)=@_; |
| |
my $number=0; |
| |
my $errormsg=''; |
| |
my @state; |
| |
my %respbyid; |
| |
my $p = HTML::Parser->new |
| |
( |
| |
xml_mode => 1, |
| |
start_h => |
| |
[sub { |
| |
my ($tagname,$attr) = @_; |
| |
push(@state,$tagname); |
| |
if ("@state" eq "ssn p") { |
| |
my $title = $attr->{qn}; |
| |
$title =~ s/(^\s+|\s+$)//g; |
| |
$questiontitles->[$number]=$title; |
| |
} elsif ("@state" eq "ssn p v") { |
| |
my $id = $attr->{id}; |
| |
my $entry = $attr->{ans}; |
| |
$id=~s/^[\#0]+//; |
| |
$entry =~s/[^a-zA-Z0-9\.\*\-\+]+//g; |
| |
$respbyid{$id}[$number] = $entry; |
| |
} |
| |
}, "tagname, attr"], |
| |
end_h => |
| |
[sub { |
| |
my ($tagname) = @_; |
| |
if ("@state" eq "ssn p") { |
| |
$number++; |
| |
} |
| |
pop(@state); |
| |
}, "tagname"], |
| |
); |
| |
|
| |
$p->parse($env{'form.upfile'}); |
| |
$p->eof; |
| |
foreach my $id (keys(%respbyid)) { |
| |
$responses->{$id}=join(',',@{$respbyid{$id}}); |
| |
} |
| |
return ($errormsg,$number); |
| |
} |
| |
|
| sub interwrite_eval { |
sub interwrite_eval { |
| my ($questiontitles,$responses)=@_; |
my ($questiontitles,$responses)=@_; |
| my $number=0; |
my $number=0; |
|
Line 9369 sub interwrite_eval {
|
Line 12559 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,$symb) = @_; |
| 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 $res_error; |
my $res_error; |
|
Line 9379 sub assign_clicker_grades {
|
Line 12594 sub assign_clicker_grades {
|
| if ($res_error) { |
if ($res_error) { |
| return &navmap_errormsg(); |
return &navmap_errormsg(); |
| } |
} |
| |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| |
my %needpb = &passbacks_for_symb($cdom,$cnum,$symb); |
| |
my (%skip_passback,%pbsave); |
| # 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'}).'<br />'; |
my $result = &Apache::loncommon::start_data_table(). |
| |
&Apache::loncommon::start_data_table_header_row(). |
| $result .= &Apache::loncommon::start_data_table(). |
'<th>'.&mt('Assigning grades based on clicker file').'</th>'. |
| &Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::end_data_table_header_row(). |
| '<th>'.&mt('Assigning grades based on clicker file').'</th>'. |
&Apache::loncommon::start_data_table_row().'<td>'; |
| &Apache::loncommon::end_data_table_header_row(). |
|
| &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 9441 sub assign_clicker_grades {
|
Line 12657 sub assign_clicker_grades {
|
| if ($user) { |
if ($user) { |
| if ($users{$user}) { |
if ($users{$user}) { |
| $result.='<br /><span class="LC_warning">'. |
$result.='<br /><span class="LC_warning">'. |
| &mt("More than one entry found for <tt>[_1]</tt>!",$user). |
&mt('More than one entry found for [_1]!','<tt>'.$user.'</tt>'). |
| '</span><br />'; |
'</span><br />'; |
| } |
} |
| $users{$user}=1; |
$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 ($correct[$i] eq '-') { |
if ($correct[$i] eq '-') { |
| $realnumber--; |
$realnumber--; |
| } elsif ($answer[$i]) { |
} 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 9491 sub assign_clicker_grades {
|
Line 12707 sub assign_clicker_grades {
|
| $result.="<br /><span class=\"LC_error\">Failed to save student $username:$domain. Message when trying to save was ($returncode)</span>"; |
$result.="<br /><span class=\"LC_error\">Failed to save student $username:$domain. Message when trying to save was ($returncode)</span>"; |
| } else { |
} else { |
| $storecount++; |
$storecount++; |
| |
if (keys(%needpb)) { |
| |
my (%weights,%awardeds,%excuseds); |
| |
my $usec = &Apache::lonnet::getsection($domain,$username,$env{'request.course.id'}); |
| |
$weights{$symb}{$part} = &Apache::lonnet::EXT("resource.$part.weight",$symb,$domain,$username,$usec); |
| |
$awardeds{$symb}{$part} = $ave; |
| |
$excuseds{$symb}{$part} = ''; |
| |
&process_passbacks('clickergrade',[$symb],$cdom,$cnum,$domain,$username,$usec,\%weights, |
| |
\%awardeds,\%excuseds,\%needpb,\%skip_passback,\%pbsave); |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 9498 sub assign_clicker_grades {
|
Line 12723 sub assign_clicker_grades {
|
| $result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount). |
$result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount). |
| '</td>'. |
'</td>'. |
| &Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table_row(). |
| &Apache::loncommon::end_data_table()."<br /><br />\n"; |
&Apache::loncommon::end_data_table(); |
| return $result.&show_grading_menu_form($symb); |
return $result; |
| } |
} |
| |
|
| sub navmap_errormsg { |
sub navmap_errormsg { |
|
Line 9509 sub navmap_errormsg {
|
Line 12734 sub navmap_errormsg {
|
| '</div>'; |
'</div>'; |
| } |
} |
| |
|
| |
sub startpage { |
| |
my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$head_extra,$onload,$divforres) = @_; |
| |
my %args; |
| |
if ($onload) { |
| |
my %loaditems = ( |
| |
'onload' => $onload, |
| |
); |
| |
$args{'add_entries'} = \%loaditems; |
| |
} |
| |
if ($nomenu) { |
| |
$args{'only_body'} = 1; |
| |
$r->print(&Apache::loncommon::start_page("Student's Version",$head_extra,\%args)); |
| |
} else { |
| |
if ($env{'request.course.id'}) { |
| |
unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"}); |
| |
} |
| |
$args{'bread_crumbs'} = $crumbs; |
| |
$r->print(&Apache::loncommon::start_page('Grading',$head_extra,\%args)); |
| |
if ($env{'request.course.id'}) { |
| |
&Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading')); |
| |
} |
| |
} |
| |
unless ($nodisplayflag) { |
| |
$r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp,$divforres)); |
| |
} |
| |
} |
| |
|
| |
sub select_problem { |
| |
my ($r)=@_; |
| |
$r->print('<h3>'.&mt('Select the problem or one of the problems you want to grade').'</h3><form action="/adm/grades">'); |
| |
$r->print(&Apache::lonstathelpers::problem_selector('.',undef,1,undef,undef,1,1)); |
| |
$r->print('<input type="hidden" name="command" value="gradingmenu" />'); |
| |
$r->print('<input type="submit" value="'.&mt('Next').' →" /></form>'); |
| |
} |
| |
|
| |
#----- display problem, answer, and submissions for a single student (no grading) |
| |
|
| |
sub view_as_user { |
| |
my ($symb,$vuname,$vudom,$hasperm) = @_; |
| |
my $plainname = &Apache::loncommon::plainname($vuname,$vudom,'lastname'); |
| |
my $displayname = &nameUserString('',$plainname,$vuname,$vudom); |
| |
my $output = &Apache::loncommon::get_student_view($symb,$vuname,$vudom, |
| |
$env{'request.course.id'}, |
| |
undef,{'disable_submit' => 1}). |
| |
"\n\n". |
| |
'<div class="LC_grade_show_user">'. |
| |
'<h2>'.$displayname.'</h2>'. |
| |
"\n". |
| |
&Apache::loncommon::track_student_link('View recent activity', |
| |
$vuname,$vudom,'check').' '. |
| |
"\n"; |
| |
if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) || |
| |
(($env{'request.course.sec'} ne '') && |
| |
&Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.$env{'request.course.sec'}))) { |
| |
$output .= &Apache::loncommon::pprmlink(&mt('Set/Change parameters'), |
| |
$vuname,$vudom,$symb,'check'); |
| |
} |
| |
$output .= "\n"; |
| |
my $companswer = &Apache::loncommon::get_student_answers($symb,$vuname,$vudom, |
| |
$env{'request.course.id'}); |
| |
$companswer=~s|<form(.*?)>||g; |
| |
$companswer=~s|</form>||g; |
| |
$companswer=~s|name="submit"|name="would_have_been_submit"|g; |
| |
$output .= '<div class="LC_Box">'. |
| |
'<h3 class="LC_hcell">'.&mt('Correct answer for[_1]',$displayname).'</h3>'. |
| |
$companswer. |
| |
'</div>'."\n"; |
| |
my $is_tool = ($symb =~ /ext\.tool$/); |
| |
my ($essayurl,%coursedesc_by_cid); |
| |
(undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb); |
| |
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$vudom,$vuname); |
| |
my $res_error; |
| |
my ($partlist,$handgrade,$responseType,$numresp,$numessay) = |
| |
&response_type($symb,\$res_error); |
| |
my $fullname; |
| |
my $collabinfo; |
| |
if ($numessay) { |
| |
unless ($hasperm) { |
| |
&init_perm(); |
| |
} |
| |
($collabinfo,$fullname)= |
| |
&check_collaborators($symb,$vuname,$vudom,\%record,$handgrade,0); |
| |
unless ($hasperm) { |
| |
&reset_perm(); |
| |
} |
| |
} |
| |
my $checkIcon = '<img alt="'.&mt('Check Mark'). |
| |
'" src="'.$Apache::lonnet::perlvar{'lonIconsURL'}. |
| |
'/check.gif" height="16" border="0" />'; |
| |
my ($lastsubonly,$partinfo) = |
| |
&show_last_submission($vuname,$vudom,$symb,$essayurl,$responseType,'datesub', |
| |
'',$fullname,\%record,\%coursedesc_by_cid); |
| |
$output .= '<div class="LC_Box">'. |
| |
'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>'."\n".$collabinfo."\n"; |
| |
if (($numresp > $numessay) & !$is_tool) { |
| |
$output .='<p class="LC_info">'. |
| |
&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon). |
| |
"</p>\n"; |
| |
} |
| |
$output .= $partinfo; |
| |
$output .= $lastsubonly; |
| |
$output .= &displaySubByDates($symb,\%record,$partlist,$responseType,$checkIcon,$vuname,$vudom); |
| |
$output .= '</div></div>'."\n"; |
| |
return $output; |
| |
} |
| |
|
| sub handler { |
sub handler { |
| my $request=$_[0]; |
my $request=$_[0]; |
| &reset_caches(); |
&reset_caches(); |
|
Line 9519 sub handler {
|
Line 12850 sub handler {
|
| } |
} |
| &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); |
| |
|
| my $symb=&get_symb($request,1); |
# see what command we need to execute |
| |
|
| 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]; |
| |
|
| |
&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'); |
| |
return OK; |
| |
} |
| |
&Apache::loncommon::content_type($request,'text/html'); |
| |
$request->send_http_header; |
| |
|
| if ($#commands > 0) { |
if ($#commands > 0) { |
| &Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands)); |
&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands)); |
| } |
} |
| |
|
| |
# -------------------------------------- Flag and buffer for registered cleanup |
| |
$registered_cleanup=0; |
| |
undef(@Apache::grades::ltipassback); |
| |
|
| |
# see what the symb is |
| |
|
| |
my $symb=$env{'form.symb'}; |
| |
unless ($symb) { |
| |
(my $url=$env{'form.url'}) =~ s-^https*://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; |
| |
$symb=&Apache::lonnet::symbread($url); |
| |
} |
| |
&Apache::lonenc::check_decrypt(\$symb); |
| |
|
| $ssi_error = 0; |
$ssi_error = 0; |
| my $brcrum = [{href=>"/adm/grades",text=>"Grading"}]; |
if (($symb eq '' || $command eq '') && ($env{'request.course.id'})) { |
| my $start_page = &Apache::loncommon::start_page('Grading',undef, |
# |
| {'bread_crumbs' => $brcrum}); |
# Not called from a resource, but inside a course |
| if ($symb eq '' && $command eq '') { |
# |
| if ($env{'user.adv'}) { |
&startpage($request,undef,[],1,1); |
| &Apache::loncommon::content_type($request,'text/html'); |
&select_problem($request); |
| $request->send_http_header; |
|
| $request->print($start_page); |
|
| if (($env{'form.codeone'}) && ($env{'form.codetwo'}) && |
|
| ($env{'form.codethree'})) { |
|
| my $token=$env{'form.codeone'}.'*'.$env{'form.codetwo'}.'*'. |
|
| $env{'form.codethree'}; |
|
| my ($tsymb,$tuname,$tudom,$tcrsid)= |
|
| &Apache::lonnet::checkin($token); |
|
| if ($tsymb) { |
|
| my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb); |
|
| if (&Apache::lonnet::allowed('mgr',$tcrsid)) { |
|
| $request->print(&ssi_with_retries('/res/'.$url, $ssi_retries, |
|
| ('grade_username' => $tuname, |
|
| 'grade_domain' => $tudom, |
|
| 'grade_courseid' => $tcrsid, |
|
| 'grade_symb' => $tsymb))); |
|
| } else { |
|
| $request->print('<h3>Not authorized: '.$token.'</h3>'); |
|
| } |
|
| } else { |
|
| $request->print('<h3>Not a valid DocID: '.$token.'</h3>'); |
|
| } |
|
| } else { |
|
| $request->print(&Apache::lonxml::tokeninputfield()); |
|
| } |
|
| } 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(); |
|
| if (!$env{'request.course.id'}) { |
|
| # 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)); |
my ($stuvcurrent,$stuvdisp,$versionform,$js,$onload); |
| |
if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) { |
| |
($stuvcurrent,$stuvdisp,$versionform,$js) = |
| |
&choose_task_version_form($symb,$env{'form.student'}, |
| |
$env{'form.userdom'}); |
| |
} |
| |
my $divforres; |
| |
if ($env{'form.student'} eq '') { |
| |
$js .= &part_selector_js(); |
| |
$onload = "toggleParts('gradesub');"; |
| |
} else { |
| |
$divforres = 1; |
| |
} |
| |
my $head_extra = $js; |
| |
unless ($env{'form.vProb'} eq 'no') { |
| |
my $csslinks = &Apache::loncommon::css_links($symb); |
| |
if ($csslinks) { |
| |
$head_extra .= "\n$csslinks"; |
| |
} |
| |
} |
| |
&startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef, |
| |
$stuvcurrent,$stuvdisp,undef,$head_extra,$onload,$divforres); |
| |
if ($versionform) { |
| |
if ($divforres) { |
| |
$request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>'); |
| |
} |
| |
$request->print($versionform); |
| |
} |
| |
($env{'form.student'} eq '' ? &listStudents($request,$symb,'',$divforres) : &submission($request,0,0,$symb,$divforres,$command)); |
| |
} elsif ($command eq 'versionsub' && $perm{'vgr'}) { |
| |
my ($stuvcurrent,$stuvdisp,$versionform,$js) = |
| |
&choose_task_version_form($symb,$env{'form.student'}, |
| |
$env{'form.userdom'}, |
| |
$env{'form.inhibitmenu'}); |
| |
my $head_extra = $js; |
| |
unless ($env{'form.vProb'} eq 'no') { |
| |
my $csslinks = &Apache::loncommon::css_links($symb); |
| |
if ($csslinks) { |
| |
$head_extra .= "\n$csslinks"; |
| |
} |
| |
} |
| |
&startpage($request,$symb,[{href=>"", text=>"Previous Student Version"}],undef,undef, |
| |
$stuvcurrent,$stuvdisp,$env{'form.inhibitmenu'},$head_extra); |
| |
if ($versionform) { |
| |
$request->print($versionform); |
| |
} |
| |
$request->print('<br clear="all" />'); |
| |
$request->print(&show_previous_task_version($request,$symb)); |
| } elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) { |
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) { |
| &pickStudentPage($request); |
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'}, |
| |
{href=>'',text=>'Select student'}],1,1); |
| |
&pickStudentPage($request,$symb); |
| } elsif ($command eq 'displayPage' && $perm{'vgr'}) { |
} elsif ($command eq 'displayPage' && $perm{'vgr'}) { |
| &displayPage($request); |
my $csslinks; |
| |
unless ($env{'form.vProb'} eq 'no') { |
| |
$csslinks = &Apache::loncommon::css_links($symb,'map'); |
| |
} |
| |
&startpage($request,$symb, |
| |
[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'}, |
| |
{href=>'',text=>'Select student'}, |
| |
{href=>'',text=>'Grade student'}],1,1,undef,undef,undef,$csslinks); |
| |
&displayPage($request,$symb); |
| } elsif ($command eq 'gradeByPage' && $perm{'mgr'}) { |
} elsif ($command eq 'gradeByPage' && $perm{'mgr'}) { |
| &updateGradeByPage($request); |
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'}, |
| |
{href=>'',text=>'Select student'}, |
| |
{href=>'',text=>'Grade student'}, |
| |
{href=>'',text=>'Store grades'}],1,1); |
| |
&updateGradeByPage($request,$symb); |
| } elsif ($command eq 'processGroup' && $perm{'vgr'}) { |
} elsif ($command eq 'processGroup' && $perm{'vgr'}) { |
| &processGroup($request); |
my $csslinks; |
| |
unless ($env{'form.vProb'} eq 'no') { |
| |
$csslinks = &Apache::loncommon::css_links($symb); |
| |
} |
| |
&startpage($request,$symb,[{href=>'',text=>'...'}, |
| |
{href=>'',text=>'Modify grades'}],undef,undef,undef,undef,undef,$csslinks,undef,1); |
| |
&processGroup($request,$symb); |
| } elsif ($command eq 'gradingmenu' && $perm{'vgr'}) { |
} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) { |
| $request->print(&grading_menu($request)); |
&startpage($request,$symb); |
| } elsif ($command eq 'submit_options' && $perm{'vgr'}) { |
$request->print(&grading_menu($request,$symb)); |
| $request->print(&submit_options($request)); |
} elsif ($command eq 'individual' && $perm{'vgr'}) { |
| |
&startpage($request,$symb,[{href=>'',text=>'Select individual students to grade'}]); |
| |
$request->print(&submit_options($request,$symb)); |
| |
} elsif ($command eq 'ungraded' && $perm{'vgr'}) { |
| |
my $js = &part_selector_js(); |
| |
my $onload = "toggleParts('gradesub');"; |
| |
&startpage($request,$symb,[{href=>'',text=>'Grade ungraded submissions'}], |
| |
undef,undef,undef,undef,undef,$js,$onload); |
| |
$request->print(&listStudents($request,$symb,'graded')); |
| |
} elsif ($command eq 'table' && $perm{'vgr'}) { |
| |
&startpage($request,$symb,[{href=>"", text=>"Grading table"}]); |
| |
$request->print(&submit_options_table($request,$symb)); |
| |
} elsif ($command eq 'all_for_one' && $perm{'vgr'}) { |
| |
&startpage($request,$symb,[{href=>'',text=>'Grade page/folder for one student'}],1,1); |
| |
$request->print(&submit_options_sequence($request,$symb)); |
| } elsif ($command eq 'viewgrades' && $perm{'vgr'}) { |
} elsif ($command eq 'viewgrades' && $perm{'vgr'}) { |
| $request->print(&viewgrades($request)); |
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"},{href=>'', text=>"Modify grades"}]); |
| |
$request->print(&viewgrades($request,$symb)); |
| } elsif ($command eq 'handgrade' && $perm{'mgr'}) { |
} elsif ($command eq 'handgrade' && $perm{'mgr'}) { |
| $request->print(&processHandGrade($request)); |
&startpage($request,$symb,[{href=>'',text=>'...'}, |
| |
{href=>'',text=>'Store grades'}]); |
| |
$request->print(&processHandGrade($request,$symb)); |
| } elsif ($command eq 'editgrades' && $perm{'mgr'}) { |
} elsif ($command eq 'editgrades' && $perm{'mgr'}) { |
| $request->print(&editgrades($request)); |
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"}, |
| |
{href=>&href_symb_cmd($symb,'viewgrades').'&group=all§ion=all&Status=Active', |
| |
text=>"Modify grades"}, |
| |
{href=>'', text=>"Store grades"}]); |
| |
$request->print(&editgrades($request,$symb)); |
| |
} elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) { |
| |
&startpage($request,$symb,[{href=>'',text=>'Verify Receipt Number'}]); |
| |
$request->print(&initialverifyreceipt($request,$symb)); |
| } elsif ($command eq 'verify' && $perm{'vgr'}) { |
} elsif ($command eq 'verify' && $perm{'vgr'}) { |
| $request->print(&verifyreceipt($request)); |
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,"initialverifyreceipt"),text=>'Verify Receipt Number'}, |
| |
{href=>'',text=>'Verification Result'}]); |
| |
$request->print(&verifyreceipt($request,$symb)); |
| } elsif ($command eq 'processclicker' && $perm{'mgr'}) { |
} elsif ($command eq 'processclicker' && $perm{'mgr'}) { |
| $request->print(&process_clicker($request)); |
&startpage($request,$symb,[{href=>'', text=>'Process clicker'}]); |
| |
$request->print(&process_clicker($request,$symb)); |
| } elsif ($command eq 'processclickerfile' && $perm{'mgr'}) { |
} elsif ($command eq 'processclickerfile' && $perm{'mgr'}) { |
| $request->print(&process_clicker_file($request)); |
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,'processclicker'), text=>'Process clicker'}, |
| |
{href=>'', text=>'Process clicker file'}]); |
| |
$request->print(&process_clicker_file($request,$symb)); |
| } elsif ($command eq 'assignclickergrades' && $perm{'mgr'}) { |
} elsif ($command eq 'assignclickergrades' && $perm{'mgr'}) { |
| $request->print(&assign_clicker_grades($request)); |
&startpage($request,$symb,[{href=>&href_symb_cmd($symb,'processclicker'), text=>'Process clicker'}, |
| |
{href=>'', text=>'Process clicker file'}, |
| |
{href=>'', text=>'Store grades'}]); |
| |
$request->print(&assign_clicker_grades($request,$symb)); |
| } elsif ($command eq 'csvform' && $perm{'mgr'}) { |
} elsif ($command eq 'csvform' && $perm{'mgr'}) { |
| $request->print(&upcsvScores_form($request)); |
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); |
| |
$request->print(&upcsvScores_form($request,$symb)); |
| } elsif ($command eq 'csvupload' && $perm{'mgr'}) { |
} elsif ($command eq 'csvupload' && $perm{'mgr'}) { |
| $request->print(&csvupload($request)); |
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); |
| |
$request->print(&csvupload($request,$symb)); |
| } elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) { |
} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) { |
| $request->print(&csvuploadmap($request)); |
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); |
| |
$request->print(&csvuploadmap($request,$symb)); |
| } elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) { |
} elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) { |
| if ($env{'form.associate'} ne 'Reverse Association') { |
if ($env{'form.associate'} ne 'Reverse Association') { |
| $request->print(&csvuploadoptions($request)); |
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); |
| |
$request->print(&csvuploadoptions($request,$symb)); |
| } else { |
} else { |
| if ( $env{'form.upfile_associate'} ne 'reverse' ) { |
if ( $env{'form.upfile_associate'} ne 'reverse' ) { |
| $env{'form.upfile_associate'} = 'reverse'; |
$env{'form.upfile_associate'} = 'reverse'; |
| } else { |
} else { |
| $env{'form.upfile_associate'} = 'forward'; |
$env{'form.upfile_associate'} = 'forward'; |
| } |
} |
| $request->print(&csvuploadmap($request)); |
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); |
| |
$request->print(&csvuploadmap($request,$symb)); |
| } |
} |
| } elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) { |
} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) { |
| $request->print(&csvuploadassign($request)); |
&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); |
| |
$request->print(&csvuploadassign($request,$symb)); |
| } elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) { |
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) { |
| $request->print(&scantron_selectphase($request)); |
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1, |
| |
undef,undef,undef,undef,'toggleScantab(document.rules);'); |
| |
$request->print(&scantron_selectphase($request,undef,$symb)); |
| } elsif ($command eq 'scantron_warning' && $perm{'mgr'}) { |
} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) { |
| $request->print(&scantron_do_warning($request)); |
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
| |
$request->print(&scantron_do_warning($request,$symb)); |
| } elsif ($command eq 'scantron_validate' && $perm{'mgr'}) { |
} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) { |
| $request->print(&scantron_validate_file($request)); |
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
| |
$request->print(&scantron_validate_file($request,$symb)); |
| } elsif ($command eq 'scantron_process' && $perm{'mgr'}) { |
} elsif ($command eq 'scantron_process' && $perm{'mgr'}) { |
| $request->print(&scantron_process_students($request)); |
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
| |
$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, |
| $request->print(&scantron_upload_scantron_data($request)); |
undef,undef,undef,undef,'toggleScantab(document.rules);'); |
| |
$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); |
| $request->print(&scantron_upload_scantron_data_save($request)); |
$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); |
| $request->print(&scantron_download_scantron_data($request)); |
$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'}) { |
| $request->print(&checkscantron_results($request)); |
&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); |
| |
$request->print(&checkscantron_results($request,$symb)); |
| |
} elsif ($command eq 'downloadfilesselect' && $perm{'vgr'}) { |
| |
my $js = &part_selector_js(); |
| |
my $onload = "toggleParts('gradingMenu');"; |
| |
&startpage($request,$symb,[{href=>'', text=>'Select which submissions to download'}], |
| |
undef,undef,undef,undef,undef,$js,$onload); |
| |
$request->print(&submit_options_download($request,$symb)); |
| |
} elsif ($command eq 'downloadfileslink' && $perm{'vgr'}) { |
| |
&startpage($request,$symb, |
| |
[{href=>&href_symb_cmd($symb,'downloadfilesselect'), text=>'Select which submissions to download'}, |
| |
{href=>'', text=>'Download submitted files'}], |
| |
undef,undef,undef,undef,undef,undef,undef,1); |
| |
$request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>'); |
| |
&submit_download_link($request,$symb); |
| |
} elsif ($command eq 'initialpassback') { |
| |
&startpage($request,$symb,[{href=>'', text=>'Choose Launcher'}],undef,1); |
| |
$request->print(&initialpassback($request,$symb)); |
| |
} elsif ($command eq 'passback') { |
| |
&startpage($request,$symb, |
| |
[{href=>&href_symb_cmd($symb,'initialpassback'), text=>'Choose Launcher'}, |
| |
{href=>'', text=>'Types of User'}],undef,1); |
| |
$request->print(&passback_filters($request,$symb)); |
| |
} elsif ($command eq 'passbacknames') { |
| |
my $chosen; |
| |
if ($env{'form.passback'} ne '') { |
| |
if ($env{'form.passback'} eq &unescape($env{'form.passback'})) { |
| |
$env{'form.passback'} = &escape($env{'form.passback'} ); |
| |
} |
| |
$chosen = &HTML::Entities::encode($env{'form.passback'},'<>"&'); |
| |
} |
| |
&startpage($request,$symb, |
| |
[{href=>&href_symb_cmd($symb,'initialpassback'), text=>'Choose Launcher'}, |
| |
{href=>&href_symb_cmd($symb,'passback').'&passback='.$chosen, text=>'Types of User'}, |
| |
{href=>'', text=>'Select Users'}],undef,1); |
| |
$request->print(&names_for_passback($request,$symb)); |
| |
} elsif ($command eq 'passbackscores') { |
| |
my ($chosen,$stu_status); |
| |
if ($env{'form.passback'} ne '') { |
| |
if ($env{'form.passback'} eq &unescape($env{'form.passback'})) { |
| |
$env{'form.passback'} = &escape($env{'form.passback'} ); |
| |
} |
| |
$chosen = &HTML::Entities::encode($env{'form.passback'},'<>"&'); |
| |
} |
| |
if ($env{'form.Status'}) { |
| |
$stu_status = &HTML::Entities::encode($env{'form.Status'}); |
| |
} |
| |
&startpage($request,$symb, |
| |
[{href=>&href_symb_cmd($symb,'initialpassback'), text=>'Choose Launcher'}, |
| |
{href=>&href_symb_cmd($symb,'passback').'&passback='.$chosen, text=>'Types of User'}, |
| |
{href=>&href_symb_cmd($symb,'passbacknames').'&Status='.$stu_status.'&passback='.$chosen, text=>'Select Users'}, |
| |
{href=>'', text=>'Execute Passback'}],undef,1); |
| |
$request->print(&do_passback($request,$symb)); |
| } elsif ($command) { |
} elsif ($command) { |
| |
&startpage($request,$symb,[{href=>'', text=>'Access denied'}]); |
| $request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>'); |
$request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>'); |
| } |
} |
| } |
} |
| if ($ssi_error) { |
if ($ssi_error) { |
| &ssi_print_error($request); |
&ssi_print_error($request); |
| } |
} |
| $request->print(&Apache::loncommon::end_page()); |
if ($env{'form.inhibitmenu'}) { |
| |
$request->print(&Apache::loncommon::end_page()); |
| |
} elsif ($env{'request.course.id'}) { |
| |
&Apache::lonquickgrades::endGradeScreen($request); |
| |
} |
| &reset_caches(); |
&reset_caches(); |
| return OK; |
return OK; |
| } |
} |
|
Line 9680 described at http://www.lon-capa.org.
|
Line 13166 described at http://www.lon-capa.org.
|
| =head1 OVERVIEW |
=head1 OVERVIEW |
| |
|
| Do an ssi with retries: |
Do an ssi with retries: |
| While I'd love to factor out this with the vesrion in lonprintout, |
While I'd love to factor out this with the version in lonprintout, |
| that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure |
that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure |
| I'm not quite ready to invent (e.g. an ssi_with_retry object). |
I'm not quite ready to invent (e.g. an ssi_with_retry object). |
| |
|
|
Line 9691 At least the logic that drives this has
|
Line 13177 At least the logic that drives this has
|
| ssi_with_retries - Does the server side include of a resource. |
ssi_with_retries - Does the server side include of a resource. |
| if the ssi call returns an error we'll retry it up to |
if the ssi call returns an error we'll retry it up to |
| the number of times requested by the caller. |
the number of times requested by the caller. |
| If we still have a proble, no text is appended to the |
If we still have a problem, no text is appended to the |
| output and we set some global variables. |
output and we set some global variables. |
| to indicate to the caller an SSI error occurred. |
to indicate to the caller an SSI error occurred. |
| All of this is supposed to deal with the issues described |
All of this is supposed to deal with the issues described |
| in LonCAPA BZ 5631 see: |
in LON-CAPA BZ 5631 see: |
| http://bugs.lon-capa.org/show_bug.cgi?id=5631 |
http://bugs.lon-capa.org/show_bug.cgi?id=5631 |
| by informing the user that this happened. |
by informing the user that this happened. |
| |
|
|
Line 9727 ssi_with_retries()
|
Line 13213 ssi_with_retries()
|
| |
|
| =over |
=over |
| |
|
| |
=head1 Routines to display previous version of a Task for a specific student |
| |
|
| |
Tasks are graded pass/fail. Students who have yet to pass a particular Task |
| |
can receive another opportunity. Access to tasks is slot-based. If a slot |
| |
requires a proctor to check-in the student, a new version of the Task will |
| |
be created when the student is checked in to the new opportunity. |
| |
|
| |
If a particular student has tried two or more versions of a particular task, |
| |
the submission screen provides a user with vgr privileges (e.g., a Course |
| |
Coordinator) the ability to display a previous version worked on by the |
| |
student. By default, the current version is displayed. If a previous version |
| |
has been selected for display, submission data are only shown that pertain |
| |
to that particular version, and the interface to submit grades is not shown. |
| |
|
| |
=over 4 |
| |
|
| |
=item show_previous_task_version() |
| |
|
| |
Displays a specified version of a student's Task, as the student sees it. |
| |
|
| |
Inputs: 2 |
| |
request - request object |
| |
symb - unique symb for current instance of resource |
| |
|
| |
Output: None. |
| |
|
| |
Side Effects: calls &show_problem() to print version of Task, with |
| |
version contained in form item: $env{'form.previousversion'} |
| |
|
| |
=item choose_task_version_form() |
| |
|
| |
Displays a web form used to select which version of a student's view of a |
| |
Task should be displayed. Either launches a pop-up window, or replaces |
| |
content in existing pop-up, or replaces page in main window. |
| |
|
| |
Inputs: 4 |
| |
symb - unique symb for current instance of resource |
| |
uname - username of student |
| |
udom - domain of student |
| |
nomenu - 1 if display is in a pop-up window, and hence no menu |
| |
breadcrumbs etc., are displayed |
| |
|
| |
Output: 4 |
| |
current - student's current version |
| |
displayed - student's version being displayed |
| |
result - scalar containing HTML for web form used to switch to |
| |
a different version (or a link to close window, if pop-up). |
| |
js - javascript for processing selection in versions web form |
| |
|
| |
Side Effects: None. |
| |
|
| |
=item previous_display_javascript() |
| |
|
| |
Inputs: 2 |
| |
nomenu - 1 if display is in a pop-up window, and hence no menu |
| |
breadcrumbs etc., are displayed. |
| |
current - student's current version number. |
| |
|
| |
Output: 1 |
| |
js - javascript for processing selection in versions web form. |
| |
|
| |
Side Effects: None. |
| |
|
| |
=back |
| |
|
| |
=head1 Routines to process bubblesheet data. |
| |
|
| |
=over 4 |
| |
|
| =item scantron_get_correction() : |
=item scantron_get_correction() : |
| |
|
| Builds the interface screen to interact with the operator to fix a |
Builds the interface screen to interact with the operator to fix a |
|
Line 9736 ssi_with_retries()
|
Line 13291 ssi_with_retries()
|
| $r - Apache request object |
$r - Apache request object |
| $i - number of the current scanline |
$i - number of the current scanline |
| $scan_record - hash ref as returned from &scantron_parse_scanline() |
$scan_record - hash ref as returned from &scantron_parse_scanline() |
| $scan_config - hash ref as returned from &get_scantron_config() |
$scan_config - hash ref as returned from &Apache::lonnet::get_scantron_config() |
| $line - full contents of the current scanline |
$line - full contents of the current scanline |
| $error - error condition, valid values are |
$error - error condition, valid values are |
| 'incorrectCODE', 'duplicateCODE', |
'incorrectCODE', 'duplicateCODE', |
|
Line 9753 ssi_with_retries()
|
Line 13308 ssi_with_retries()
|
| - missingbubble - array ref of the bubble lines that have missing |
- missingbubble - array ref of the bubble lines that have missing |
| bubble errors |
bubble errors |
| |
|
| |
$randomorder - True if exam folder (or a sub-folder) has randomorder set |
| |
$randompick - True if exam folder (or a sub-folder) has randompick set |
| |
$respnumlookup - Reference to HASH mapping question numbers in bubble lines |
| |
for current line to question number used for same question |
| |
in "Master Seqence" (as seen by Course Coordinator). |
| |
$startline - Reference to hash where key is question number (0 is first) |
| |
and value is number of first bubble line for current student |
| |
or code-based randompick and/or randomorder. |
| |
|
| |
|
| |
|
| =item scantron_get_maxbubble() : |
=item scantron_get_maxbubble() : |
| |
|
| Arguments: |
Arguments: |
|
Line 9762 ssi_with_retries()
|
Line 13328 ssi_with_retries()
|
| calling routine should trap the error condition and display the warning |
calling routine should trap the error condition and display the warning |
| found in &navmap_errormsg(). |
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 9771 ssi_with_retries()
|
Line 13339 ssi_with_retries()
|
| $env{'form.scantron.bubble_lines.n'}, |
$env{'form.scantron.bubble_lines.n'}, |
| $env{'form.scantron.first_bubble_line.n'} and |
$env{'form.scantron.first_bubble_line.n'} and |
| $env{"form.scantron.sub_bubblelines.n"} |
$env{"form.scantron.sub_bubblelines.n"} |
| which are the total number of bubble, lines, the number of bubble |
which are the total number of bubble lines, the number of bubble |
| lines for response n and number of the first bubble line for response n, |
lines for response n and number of the first bubble line for response n, |
| and a comma separated list of numbers of bubble lines for sub-questions |
and a comma separated list of numbers of bubble lines for sub-questions |
| (for optionresponse, matchresponse, and rankresponse items), for response n. |
(for optionresponse, matchresponse, and rankresponse items), for response n. |
|
Line 9810 ssi_with_retries()
|
Line 13378 ssi_with_retries()
|
| =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() : |
| |
|
|
Line 9830 ssi_with_retries()
|
Line 13403 ssi_with_retries()
|
| =item navmap_errormsg() : |
=item navmap_errormsg() : |
| |
|
| Returns HTML mark-up inside a <div></div> with a link to re-initialize the course. |
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. |
Should be called whenever the request to instantiate a navmap object fails. |
| |
|
| |
=back |
| |
|
| =back |
=back |
| |
|
![[BACK]](/icons/back.gif){kind=icon}
Return to grades.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / homework