version 1.225, 2007/05/21 23:09:57
|
version 1.273, 2010/11/03 17:06:28
|
Line 25
|
Line 25
|
# |
# |
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
|
|
|
=pod |
|
|
|
=head1 NAME |
|
|
|
Apache::inputtags |
|
|
|
=head1 SYNOPSIS |
|
|
|
|
|
|
|
This is part of the LearningOnline Network with CAPA project |
|
described at http://www.lon-capa.org. |
|
|
|
|
|
=head1 NOTABLE SUBROUTINES |
|
|
|
=over |
|
|
|
=item |
|
|
|
=back |
|
|
|
=cut |
|
|
package Apache::inputtags; |
package Apache::inputtags; |
use HTML::Entities(); |
use HTML::Entities(); |
use strict; |
use strict; |
use Apache::loncommon; |
use Apache::loncommon; |
|
use Apache::lonhtmlcommon; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
use LONCAPA; |
|
|
|
|
Line 39 BEGIN {
|
Line 63 BEGIN {
|
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); |
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); |
} |
} |
|
|
# Initializes a set of global variables used during the parse of the problem. |
=pod |
# |
|
# @Apache::inputtags::input - List of current input ids. |
=item initialize_inputtags() |
# @Apache::inputtags::inputlist - List of all input ids seen this problem. |
|
# @Apache::inputtags::response - List of all current resopnse ids. |
Initializes a set of global variables used during the parse of the problem. |
# @Apache::inputtags::responselist - List of all response ids seen this |
|
# problem. |
@Apache::inputtags::input - List of current input ids. |
# @Apache::inputtags::hint - List of all hint ids. |
@Apache::inputtags::inputlist - List of all input ids seen this problem. |
# @Apache::inputtags::hintlist - List of all hint ids seen this problem. |
@Apache::inputtags::response - List of all current resopnse ids. |
# @Apache::inputtags::previous - List describing if specific responseds |
@Apache::inputtags::responselist - List of all response ids seen this |
# have been used |
problem. |
# @Apache::inputtags::previous_version - Submission responses were used in. |
@Apache::inputtags::hint - List of all hint ids. |
# $Apache::inputtags::part - Current part id (valid only in |
@Apache::inputtags::hintlist - List of all hint ids seen this problem. |
# <problem>) |
@Apache::inputtags::previous - List describing if specific responseds |
# 0 if not in a part. |
have been used |
# @Apache::inputtags::partlist - List of part ids seen in the current |
@Apache::inputtags::previous_version - Submission responses were used in. |
# <problem> |
$Apache::inputtags::part - Current part id (valid only in |
# @Apache::inputtags::status - List of problem statuses. First |
<problem>) |
# element is the status of the <problem> |
0 if not in a part. |
# the remainder are for individual <part>s. |
@Apache::inputtags::partlist - List of part ids seen in the current |
# %Apache::inputtags::params - Hash of defined parameters for the |
<problem> |
# current response. |
@Apache::inputtags::status - List of problem statuses. First |
# @Apache::inputtags::import - List of all ids for <import> thes get |
element is the status of the <problem> |
# join()ed and prepended. |
the remainder are for individual <part>s. |
# @Apache::inputtags::importlist - List of all import ids seen. |
%Apache::inputtags::params - Hash of defined parameters for the |
# $Apache::inputtags::response_with_no_part |
current response. |
# - Flag set true if we have seen a response |
@Apache::inputtags::import - List of all ids for <import> thes get |
# that is not inside a <part> |
join()ed and prepended. |
# %Apache::inputtags::answertxt - <*response> tags store correct |
@Apache::inputtags::importlist - List of all import ids seen. |
# answer strings for display by <textline/> |
$Apache::inputtags::response_with_no_part |
# in this hash. |
- Flag set true if we have seen a response |
# %Apache::inputtags::submission_display |
that is not inside a <part> |
# - <*response> tags store improved display |
%Apache::inputtags::answertxt - <*response> tags store correct |
# of submission strings for display by part |
answer strings for display by <textline/> |
# end. |
in this hash. |
|
%Apache::inputtags::submission_display |
|
- <*response> tags store improved display |
|
of submission strings for display by part |
|
end. |
|
|
|
=cut |
|
|
sub initialize_inputtags { |
sub initialize_inputtags { |
@Apache::inputtags::input=(); |
@Apache::inputtags::input=(); |
Line 116 sub check_for_duplicate_ids {
|
Line 146 sub check_for_duplicate_ids {
|
|
|
sub start_input { |
sub start_input { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval); |
my $id = &Apache::lonxml::get_id($parstack,$safeeval); |
if ($id eq '') { $id = $Apache::lonxml::curdepth; } |
|
push (@Apache::inputtags::input,$id); |
push (@Apache::inputtags::input,$id); |
push (@Apache::inputtags::inputlist,$id); |
push (@Apache::inputtags::inputlist,$id); |
return $id; |
return $id; |
Line 157 sub start_textfield {
|
Line 186 sub start_textfield {
|
if ($addchars) { |
if ($addchars) { |
$result.=&addchars('HWVAL_'.$resid,$addchars); |
$result.=&addchars('HWVAL_'.$resid,$addchars); |
} |
} |
&Apache::lonhtmlcommon::add_htmlareafields('HWVAL_'.$resid); |
my $textareaclass = 'class="LC_richDetectHtml"'; |
$result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '. |
$result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '. |
"rows=\"$rows\" cols=\"$cols\">".$oldresponse; |
'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass.'>'. |
|
$oldresponse; |
if ($oldresponse ne '') { |
if ($oldresponse ne '') { |
|
|
#get rid of any startup text if the user has already responded |
#get rid of any startup text if the user has already responded |
Line 308 sub start_textline {
|
Line 338 sub start_textline {
|
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist]; |
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist]; |
} |
} |
$oldresponse = &HTML::Entities::encode($oldresponse,'<>&"'); |
$oldresponse = &HTML::Entities::encode($oldresponse,'<>&"'); |
|
$oldresponse =~ s/^\s+//; |
|
$oldresponse =~ s/\s+$//; |
|
$oldresponse =~ s/\s+/ /g; |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); |
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); |
$result=''; |
$result=''; |
Line 358 sub start_textline {
|
Line 390 sub start_textline {
|
&& $Apache::lonhomework::type ne 'exam') { |
&& $Apache::lonhomework::type ne 'exam') { |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';} |
if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';} |
$result='\framebox['.$size.'][s]{\tiny\strut}'; |
if ($env{'form.pdfFormFields'} eq 'yes' |
|
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
|
my $fieldname = $env{'request.symb'}. |
|
'&part_'. $Apache::inputtags::part. |
|
'&textresponse'. |
|
'&HWVAL_' . $Apache::inputtags::response['-1']; |
|
$result='\textField{'.$fieldname.'}{'.$size.'}{12 bp}'; |
|
} else { |
|
$result='\framebox['.$size.'][s]{\tiny\strut}'; |
|
} |
} elsif ($target eq 'tex' |
} elsif ($target eq 'tex' |
&& $Apache::lonhomework::type eq 'exam' |
&& $Apache::lonhomework::type eq 'exam' |
&& &needs_exam_box($tagstack)) { |
&& &needs_exam_box($tagstack)) { |
Line 417 sub end_hiddenline {
|
Line 457 sub end_hiddenline {
|
return ""; |
return ""; |
} |
} |
|
|
# $part -> partid |
=pod |
# $id -> responseid |
|
# $uploadefiletypes -> comma seperated list of extensions allowed or * for any |
=item file_selector() |
# $which -> 'uploadedonly' -> only newly uploaded files |
|
# 'portfolioonly' -> only allow files from portfolio |
$part -> partid |
# 'both' -> allow files from either location |
$id -> responseid |
# $extratext -> additional text to go between the link and the input box |
$uploadefiletypes -> comma seperated list of extensions allowed or * for any |
# returns a table row <tr> |
$which -> 'uploadonly' -> only newly uploaded files |
|
'portfolioonly' -> only allow files from portfolio |
|
'both' -> allow files from either location |
|
$extratext -> additional text to go between the link and the input box |
|
$maxfilesize -> maximum cumulative filesize for submitted files (in MB). |
|
returns a table row <tr> |
|
|
|
=cut |
|
|
sub file_selector { |
sub file_selector { |
my ($part,$id,$uploadedfiletypes,$which,$extratext)=@_; |
my ($part,$id,$uploadedfiletypes,$which,$extratext,$maxfilesize)=@_; |
if (!$uploadedfiletypes) { return ''; } |
if (!$uploadedfiletypes) { return ''; } |
|
|
my $jspart=$part; |
my $jspart=$part; |
$jspart=~s/\./_/g; |
$jspart=~s/\./_/g; |
|
|
my $result; |
my $result; |
|
my $current_files_display = ¤t_file_submissions($part,$id); |
$result.='<tr><td>'; |
my $addfiles; |
|
if ($current_files_display) { |
|
$result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')). |
|
$current_files_display. |
|
&Apache::lonhtmlcommon::row_closure(); |
|
$addfiles = &mt('Submit other file(s)'); |
|
} else { |
|
$addfiles = &mt('Choose file(s) to submit'); |
|
} |
|
$result .= &Apache::lonhtmlcommon::row_title($addfiles); |
|
my $constraints; |
if ($uploadedfiletypes ne '*') { |
if ($uploadedfiletypes ne '*') { |
$result.= |
$constraints = |
&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'; |
&mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />'; |
|
} |
|
if ($maxfilesize) { |
|
$constraints .= &mt('Combined size of all files not to exceed: [_1] MB[_2].', |
|
'<b>'.$maxfilesize.'</b>').'<br />'; |
|
} |
|
if ($constraints) { |
|
$result .= $constraints.'<br />'; |
} |
} |
if ($which eq 'uploadonly' || $which eq 'both') { |
if ($which eq 'uploadonly' || $which eq 'both') { |
$result.=&mt('Submit a file: (only one file can be uploaded)'). |
$result.=&mt('Submit a file: (only one file per submission)'). |
' <br /><input type="file" size="50" name="HWFILE'. |
' <br /><input type="file" size="50" name="HWFILE'. |
$jspart.'_'.$id.'" /><br />'; |
$jspart.'_'.$id.'" /><br />'; |
$result .= &show_past_file_submission($part,$id); |
|
} |
} |
if ( $which eq 'both') { |
if ( $which eq 'both') { |
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />'; |
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />'; |
} |
} |
if ($which eq 'portfolioonly' || $which eq 'both') { |
if ($which eq 'portfolioonly' || $which eq 'both') { |
$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname=HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'. |
$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'. |
&mt('Select Portfolio Files').'</a><br />'. |
&mt('Select Portfolio Files: (one or more files per submission)').'</a><br />'. |
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'. |
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'. |
'<br />'; |
'<br />'; |
$result .= &show_past_portfile_submission($part,$id); |
|
|
|
} |
} |
$result.='</td></tr>'; |
$result.=&Apache::lonhtmlcommon::row_closure(1); |
return $result; |
return $result; |
} |
} |
|
|
sub show_past_file_submission { |
sub current_file_submissions { |
my ($part,$id) = @_; |
my ($part,$id) = @_; |
my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"'); |
my $jspart=$part; |
|
$jspart=~s/\./_/g; |
return if (!$uploadedfile); |
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}; |
|
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"}; |
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; |
return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/)); |
&Apache::lonxml::extlink($url); |
my $header = &Apache::loncommon::start_data_table(). |
&Apache::lonnet::allowuploaded('/adm/essayresponse',$url); |
&Apache::loncommon::start_data_table_header_row(); |
my $icon=&Apache::loncommon::icon($url); |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $curfile='<a href="'.$url.'"><img src="'.$icon. |
$header .= '<th>'.&mt('Delete?').'</th>'; |
'" border="0" />'.$uploadedfile.'</a>'; |
} |
return &mt('Currently submitted: <tt>[_1]</tt>',$curfile); |
$header .= '<th>'.&mt('File').'</th>'. |
|
'<th>'.&mt('Size (MB)').'</th>'. |
} |
'<th>'.&mt('Last Modified').'</th>'. |
|
&Apache::loncommon::end_data_table_header_row(); |
sub show_past_portfile_submission { |
my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); |
my ($part,$id) = @_; |
my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/); |
if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}!~/[^\s]/){ |
my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list); |
return; |
if ($uploadedfile) { |
|
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; |
|
my $link = &HTML::Entities::encode($url,'<>&"'); |
|
my ($path,$name) = ($url =~ m{^(/uploaded/\Q$udom\E/\Q$uname\E/essayresponse.*/)([^/]+)$}); |
|
my ($status,$hashref,$error) = |
|
¤t_file_info($url,$link,$name,$path); |
|
if ($status eq 'ok') { |
|
push(@{$okfiles{$name}},$url); |
|
$rows{$url} = $hashref; |
|
$legacy{$url} = 1; |
|
&Apache::lonxml::extlink($url); |
|
&Apache::lonnet::allowuploaded('/adm/essayresponse',$url); |
|
} else { |
|
push(@bad_file_list,$error); |
|
} |
|
} |
|
if ($portfiles =~ /[^\s]/) { |
|
my $prefix = "/uploaded/$udom/$uname/portfolio"; |
|
foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) { |
|
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$}); |
|
my $url = $prefix.$path.$name; |
|
my $uploadedfile = &HTML::Entities::encode($url,'<>&"'); |
|
my ($status,$hashref,$error) = |
|
¤t_file_info($url,$uploadedfile,$name,$path); |
|
if ($status eq 'ok') { |
|
push(@{$okfiles{$name}},$url); |
|
$rows{$url} = $hashref; |
|
} else { |
|
push(@bad_file_list,$error); |
|
} |
|
} |
|
} |
|
foreach my $name (sort(keys(%okfiles))) { |
|
if (ref($okfiles{$name}) eq 'ARRAY') { |
|
my $num = 0; |
|
foreach my $url (@{$okfiles{$name}}) { |
|
if (ref($rows{$url}) eq 'HASH') { |
|
my $link = $rows{$url}{link}; |
|
my $portfile = $rows{$url}{path}.$rows{$url}{name}; |
|
$portfile = &HTML::Entities::encode($portfile,'<>&"'); |
|
if ($link) { |
|
my $icon=&Apache::loncommon::icon($url); |
|
unless ($header_shown) { |
|
$result .= $header; |
|
$header_shown = 1; |
|
} |
|
$result.= |
|
&Apache::loncommon::start_data_table_row()."\n"; |
|
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
|
$result .= |
|
'<td valign="bottom"><input type="checkbox" name="HWFILE'.$jspart.'_'.$id.'_delete"'. |
|
' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" /></td>'."\n"; |
|
$num ++; |
|
} |
|
my $showname = $rows{$url}{path}.$name; |
|
if ($legacy{$url}) { |
|
$showname = $name.' '.&mt('not in portfolio'); |
|
} |
|
$result .= |
|
'<td><a href="'.$link.'"><img src="'.$icon. |
|
'" border="0" />'.$showname.'</a></td>'."\n". |
|
'<td align="right" valign="bottom">'.$rows{$url}{size}.'</td>'."\n". |
|
'<td align="right" valign="bottom">'.$rows{$url}{lastmodified}.'</td>'."\n". |
|
&Apache::loncommon::end_data_table_row(); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if ($header_shown) { |
|
$result .= &Apache::loncommon::end_data_table(). |
|
'<br /><span class="LC_warning">'. |
|
&mt('Items checked for deletion will not be included amongst the files evaluated when your submission is graded.').'</span>'; |
} |
} |
my (@file_list,@bad_file_list); |
|
foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) { |
|
my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser(); |
|
my $url="/uploaded/$domain/$user/portfolio$file"; |
|
my $icon=&Apache::loncommon::icon($url); |
|
push(@file_list,'<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$file.'</a>'); |
|
if (! &Apache::lonnet::stat_file($url)) { |
|
&Apache::lonnet::logthis("bad file is $url"); |
|
push(@bad_file_list,'<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$file.'</a>'); |
|
} |
|
} |
|
my $files = '<span class="LC_filename">'. |
|
join('</span>, <span class="LC_filename">',@file_list). |
|
'</span>'; |
|
my $result = &mt("Portfolio files previously selected: [_1]",$files); |
|
if (@bad_file_list) { |
if (@bad_file_list) { |
my $bad_files = '<span class="LC_filename">'. |
my $bad_files = '<span class="LC_filename">'. |
join('</span>, <span class="LC_filename">',@bad_file_list). |
join('</span>, <span class="LC_filename">',@bad_file_list). |
'</span>'; |
'</span>'; |
$result.='<br />'.&mt('<span class="LC_error">These file(s) don\'t exist:</span> [_1]',$bad_files); |
$result.='<p class="LC_error">'. |
|
&mt("These file(s) don't exist: [_1]",$bad_files). |
|
'</p>'; |
} |
} |
return $result; |
return $result; |
|
} |
|
|
|
sub current_file_info { |
|
my ($url,$uploadedfile,$name,$path) = @_; |
|
my ($status,$error,%info); |
|
my @stat = &Apache::lonnet::stat_file($url); |
|
if ((@stat) && ($stat[0] ne 'no_such_dir')) { |
|
my ($lastmod,$size); |
|
if ($stat[9] =~ /^\d+$/) { |
|
$lastmod = &Apache::lonlocal::locallocaltime($stat[9]); |
|
} |
|
$size = $stat[7]/(1024*1024); |
|
$size = sprintf("%.3f",$size); |
|
%info = ( |
|
link => $uploadedfile, |
|
name => $name, |
|
path => $path, |
|
size => $size, |
|
lastmodified => $lastmod, |
|
); |
|
$status = 'ok'; |
|
} else { |
|
&Apache::lonnet::logthis("bad file is $url"); |
|
my $icon=&Apache::loncommon::icon($url); |
|
$error = '<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$uploadedfile.'</a>'; |
|
} |
|
return ($status,\%info,$error); |
} |
} |
|
|
sub valid_award { |
sub valid_award { |
Line 516 sub valid_award {
|
Line 663 sub valid_award {
|
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', |
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', |
'UNIT_FAIL', 'NO_UNIT', |
'UNIT_FAIL', 'NO_UNIT', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', |
'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', |
'BAD_FORMULA', 'NOT_FUNCTION', 'WRONG_FORMAT', |
|
'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', |
'EXCESS_FILESIZE', 'FILENAME_INUSE', |
'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') { |
'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT', |
|
'ANONYMOUS', 'ANONYMOUS_CREDIT', |
|
'ASSIGNED_SCORE', 'APPROX_ANS', |
|
'EXACT_ANS','COMMA_FAIL') { |
if ($award eq $possibleaward) { return 1; } |
if ($award eq $possibleaward) { return 1; } |
} |
} |
return 0; |
return 0; |
Line 530 sub valid_award {
|
Line 681 sub valid_award {
|
'TOO_LONG', |
'TOO_LONG', |
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', |
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION', |
|
'WRONG_FORMAT', 'INTERNAL_ERROR', |
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', |
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', |
'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', |
'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE', |
'APPROX_ANS', 'EXACT_ANS'); |
'DRAFT', 'SUBMITTED', |
|
'SUBMITTED_CREDIT', 'ANONYMOUS', 'ANONYMOUS_CREDIT', |
|
'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS'); |
my $i=0; |
my $i=0; |
my %fwd_awards = map { ($_,$i++) } @awards; |
my %fwd_awards = map { ($_,$i++) } @awards; |
my $max=scalar(@awards); |
my $max=scalar(@awards); |
Line 541 sub valid_award {
|
Line 695 sub valid_award {
|
$i=0; |
$i=0; |
my %rev_awards = map { ($_,$i++) } @awards; |
my %rev_awards = map { ($_,$i++) } @awards; |
|
|
|
sub awarddetail_to_awarded { |
|
my ($awarddetail) = @_; |
|
if ($awarddetail eq 'EXACT_ANS' |
|
|| $awarddetail eq 'APPROX_ANS') { |
|
return 1; |
|
} |
|
return 0; |
|
} |
|
|
|
sub hide_award { |
|
my ($award) = @_; |
|
if (&Apache::lonhomework::show_no_problem_status()) { |
|
return 1; |
|
} |
|
if ($award =~ |
|
/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|SUBMITTED_CREDIT|ANONYMOUS|ANONYMOUS_CREDIT|ASSIGNED_SCORE|INCORRECT)/) { |
|
return 1; |
|
} |
|
return 0; |
|
} |
|
|
sub finalizeawards { |
sub finalizeawards { |
my ($awardref,$msgref,$nameref,$reverse)=@_; |
my ($awardref,$msgref,$nameref,$reverse,$final_scantron)=@_; |
my $result; |
my $result; |
if ($#$awardref == -1) { $result = "NO_RESPONSE"; } |
if ($#$awardref == -1) { $result = "NO_RESPONSE"; } |
if ($result eq '' ) { |
if ($result eq '' ) { |
Line 553 sub finalizeawards {
|
Line 728 sub finalizeawards {
|
$blankcount++; |
$blankcount++; |
} |
} |
} |
} |
if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; } |
if ($blankcount == ($#$awardref + 1)) { |
|
return ('NO_RESPONSE'); |
|
} |
|
} |
|
|
|
if ($Apache::lonxml::internal_error) { $result='INTERNAL_ERROR'; } |
|
|
|
if (!$final_scantron && defined($result)) { return ($result); } |
|
|
|
# if in scantron mode, if the award for any response is |
|
# assigned score, then the part gets an assigned score |
|
if ($final_scantron |
|
&& grep {$_ eq 'ASSIGNED_SCORE'} (@$awardref)) { |
|
return ('ASSIGNED_SCORE'); |
} |
} |
if (defined($result)) { return ($result); } |
|
|
|
|
# if in scantron mode, if the award for any response is |
|
# correct and there are non-correct responses, |
|
# then the part gets an assigned score |
|
if ($final_scantron |
|
&& (grep { $_ eq 'EXACT_ANS' || |
|
$_ eq 'APPROX_ANS' } (@$awardref)) |
|
&& (grep { $_ ne 'EXACT_ANS' && |
|
$_ ne 'APPROX_ANS' } (@$awardref))) { |
|
return ('ASSIGNED_SCORE'); |
|
} |
# these awards are ordered from most important error through best correct |
# these awards are ordered from most important error through best correct |
my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ; |
my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ; |
|
|
Line 570 sub finalizeawards {
|
Line 767 sub finalizeawards {
|
} |
} |
$j++; |
$j++; |
} |
} |
|
|
if (defined($which)) { |
if (defined($which)) { |
if (ref($nameref)) { |
if (ref($nameref)) { |
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]); |
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]); |
Line 583 sub finalizeawards {
|
Line 781 sub finalizeawards {
|
|
|
sub decideoutput { |
sub decideoutput { |
my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_; |
my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_; |
|
|
my $message=''; |
my $message=''; |
my $button=0; |
my $button=0; |
my $previousmsg; |
my $previousmsg; |
Line 597 sub decideoutput {
|
Line 796 sub decideoutput {
|
); |
); |
|
|
my $part = $Apache::inputtags::part; |
my $part = $Apache::inputtags::part; |
my $handgrade = |
my $tohandgrade = &Apache::lonnet::EXT("resource.$part.handgrade"); |
('yes' eq lc(&Apache::lonnet::EXT("resource.$part.handgrade"))); |
my $handgrade = ('yes' eq lc($tohandgrade)); |
|
|
my $computer = ($handgrade)? '' |
my $computer = ($handgrade)? '' |
: " ".&mt("Computer's answer now shown above."); |
: " ".&mt("Computer's answer now shown above."); |
Line 628 sub decideoutput {
|
Line 827 sub decideoutput {
|
$message.= $computer; |
$message.= $computer; |
} |
} |
$added_computer_text=1; |
$added_computer_text=1; |
my ($symb) = &Apache::lonnet::whichuser(); |
if ($awarded > 0) { |
if (($symb ne '') |
my ($symb) = &Apache::lonnet::whichuser(); |
&& |
if (($symb ne '') |
($env{'course.'.$env{'request.course.id'}. |
&& |
'.disable_receipt_display'} ne 'yes')) { |
($env{'course.'.$env{'request.course.id'}. |
$message.=(($target eq 'web')?'<br />':' '). |
'.disable_receipt_display'} ne 'yes') && |
&mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part). |
($Apache::lonhomework::type ne 'practice')) { |
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); |
$message.=(($target eq 'web')?'<br />':' '). |
|
&mt('Your receipt no. is [_1]', |
|
(&Apache::lonnet::receipt($Apache::inputtags::part). |
|
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''))); |
|
} |
} |
} |
} |
} |
$button=0; |
$button=0; |
Line 662 sub decideoutput {
|
Line 865 sub decideoutput {
|
$message.= $computer; |
$message.= $computer; |
} |
} |
$added_computer_text=1; |
$added_computer_text=1; |
unless ($env{'course.'. |
if ($awarded > 0 |
|
&& $env{'course.'. |
$env{'request.course.id'}. |
$env{'request.course.id'}. |
'.disable_receipt_display'} eq 'yes') { |
'.disable_receipt_display'} ne 'yes') { |
$message.=(($target eq 'web')?'<br />':' '). |
$message.=(($target eq 'web')?'<br />':' '). |
'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part). |
&mt('Your receipt is [_1]', |
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); |
(&Apache::lonnet::receipt($Apache::inputtags::part). |
|
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''))); |
} |
} |
$css_class=$possible_class{'correct'}; |
$css_class=$possible_class{'correct'}; |
$button=0; |
$button=0; |
Line 683 sub decideoutput {
|
Line 888 sub decideoutput {
|
$button = 1; |
$button = 1; |
} elsif ($award eq 'MISSING_ANSWER') { |
} elsif ($award eq 'MISSING_ANSWER') { |
$message = &mt('Some items were not submitted.'); |
$message = &mt('Some items were not submitted.'); |
|
if ($target ne 'tex') { |
|
$message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted'); |
|
} |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button = 1; |
$button = 1; |
} elsif ($award eq 'ERROR') { |
} elsif ($award eq 'ERROR') { |
$message = &mt('An error occured while grading your answer.'); |
$message = &mt('An error occurred while grading your answer.'); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button = 1; |
$button = 1; |
} elsif ($award eq 'TOO_LONG') { |
} elsif ($award eq 'TOO_LONG') { |
Line 698 sub decideoutput {
|
Line 906 sub decideoutput {
|
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'MISORDERED_RANK') { |
} elsif ($award eq 'MISORDERED_RANK') { |
$message = &mt('You have provided an invalid ranking'); |
$message = &mt('You have provided an invalid ranking.'); |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems'); |
$message.=' '.&mt('Please refer to [_1]',&Apache::loncommon::help_open_topic('Ranking_Problems',&mt('help on ranking problems'))); |
} |
} |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'EXCESS_FILESIZE') { |
|
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.'); |
|
$css_class=$possible_class{'not_charged_try'}; |
|
$button=1; |
|
} elsif ($award eq 'FILENAME_INUSE') { |
|
$message = &mt('You have already uploaded a file with that filename.'); |
|
if ($target eq 'tex') { |
|
$message.= "\\\\\n"; |
|
} else { |
|
$message .= '<br />'; |
|
} |
|
$message .= &mt('Please use a different file name.'); |
|
$css_class=$possible_class{'not_charged_try'}; |
|
$button=1; |
} elsif ($award eq 'INVALID_FILETYPE') { |
} elsif ($award eq 'INVALID_FILETYPE') { |
$message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.'); |
$message = &mt("Submission won't be graded. The type of file submitted is not allowed."); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'SIG_FAIL') { |
} elsif ($award eq 'SIG_FAIL') { |
my ($used,$min,$max)=split(':',$awardmsg); |
my ($used,$min,$max)=split(':',$awardmsg); |
my $word = ($used < $min) ? 'more' : 'fewer'; |
my $word = ($used < $min) ? 'more' : 'fewer'; |
$message = &mt("Submission not graded. Use $word digits.",$used); |
$message = &mt("Submission not graded. Use $word digits.",$used); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') { |
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') { |
Line 743 sub decideoutput {
|
Line 965 sub decideoutput {
|
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'BAD_FORMULA') { |
} elsif ($award eq 'BAD_FORMULA') { |
$message = &mt("Unable to understand formula"); |
$message = &mt("Unable to understand formula").'.'; |
|
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')}; |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'NOT_FUNCTION') { |
|
$message = &mt("Not a function").'.'; |
|
$css_class=$possible_class{'not_charged_try'}; |
|
$button=1; |
|
} elsif ($award eq 'WRONG_FORMAT') { |
|
$message = &mt("Wrong format").'.'; |
|
$css_class=$possible_class{'not_charged_try'}; |
|
$button=1; |
|
} elsif ($award eq 'INTERNAL_ERROR') { |
|
$message = &mt("An internal error occurred while processing your answer. Please try again later."); |
|
$css_class=$possible_class{'not_charged_try'}; |
|
$button=1; |
} elsif ($award eq 'INCORRECT') { |
} elsif ($award eq 'INCORRECT') { |
$message = &mt("Incorrect").'.'; |
$message = &mt("Incorrect").'.'; |
$css_class=$possible_class{'charged_try'}; |
$css_class=$possible_class{'charged_try'}; |
Line 754 sub decideoutput {
|
Line 989 sub decideoutput {
|
$message = &mt("Your submission has been recorded."); |
$message = &mt("Your submission has been recorded."); |
$css_class=$possible_class{'no_grade'}; |
$css_class=$possible_class{'no_grade'}; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'SUBMITTED_CREDIT') { |
|
$message = &mt("Your submission has been recorded, and credit awarded."); |
|
$css_class=$possible_class{'correct'}; |
|
$button=1; |
|
} elsif ($award eq 'ANONYMOUS') { |
|
$message = &mt("Your anonymous submission has been recorded."); |
|
$css_class=$possible_class{'no_grade'}; |
|
$button=1; |
|
} elsif ($award eq 'ANONYMOUS_CREDIT') { |
|
$message = &mt("Your anonymous submission has been recorded, and credit awarded."); |
|
$css_class=$possible_class{'correct'}; |
} elsif ($award eq 'DRAFT') { |
} elsif ($award eq 'DRAFT') { |
$message = &mt("A draft copy has been saved."); |
$message = &mt("Copy saved but not submitted."); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'ASSIGNED_SCORE') { |
} elsif ($award eq 'ASSIGNED_SCORE') { |
Line 777 sub decideoutput {
|
Line 1023 sub decideoutput {
|
my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser(); |
my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser(); |
foreach my $resid(@Apache::inputtags::response){ |
foreach my $resid(@Apache::inputtags::response){ |
if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) { |
if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) { |
$message.='<br />'; |
if ($target eq 'tex') { |
|
$message.= "\\\\\n"; |
|
} else { |
|
$message.='<br />'; |
|
} |
my @files = split(/\s*,\s*/, |
my @files = split(/\s*,\s*/, |
$Apache::lonhomework::history{"resource.$part.$resid.handback"}); |
$Apache::lonhomework::history{"resource.$part.$resid.handback"}); |
my $file_msg; |
my $file_msg; |
foreach my $file (@files) { |
foreach my $file (@files) { |
$file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>'; |
if ($target eq 'tex') { |
|
$file_msg.= "\\\\\n".$file; |
|
} else { |
|
$file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>'; |
|
} |
} |
} |
$message .= &mt('Returned file(s): [_1]',$file_msg); |
$message .= &mt('Returned file(s): [_1]',$file_msg); |
|
if ($target eq 'tex') { |
|
$message.= "\\\\\n"; |
|
} else { |
|
$message.='<br />'; |
|
} |
} |
} |
} |
} |
|
|
if (lc($Apache::lonhomework::problemstatus) eq 'no' && |
if (&Apache::lonhomework::hide_problem_status() |
$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') { |
&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER' |
|
&& &hide_award($award)) { |
$message = &mt("Answer Submitted: Your final submission will be graded after the due date."); |
$message = &mt("Answer Submitted: Your final submission will be graded after the due date."); |
$css_class=$possible_class{'no_grade'}; |
$css_class=$possible_class{'no_grade'}; |
$button=1; |
$button=1; |
Line 799 sub decideoutput {
|
Line 1059 sub decideoutput {
|
$message.= $computer; |
$message.= $computer; |
$added_computer_text=1; |
$added_computer_text=1; |
} |
} |
|
if ($Apache::lonhomework::type eq 'practice') { |
|
if ($target eq 'web') { |
|
$message .= '<br />'; |
|
} else { |
|
$message .= ' '; |
|
} |
|
$message.=&mt('Submissions to practice problems are not permanently recorded.'); |
|
} |
|
|
return ($button,$css_class,$message,$previousmsg); |
return ($button,$css_class,$message,$previousmsg); |
} |
} |
|
|
Line 852 sub setgradedata {
|
Line 1121 sub setgradedata {
|
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; |
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; |
return ''; |
return ''; |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ |
/^correct/ || $Apache::lonhomework::scantronmode || |
/^correct/ |
lc($Apache::lonhomework::problemstatus) eq 'no') { |
|| $Apache::lonhomework::scantronmode |
|
|| &Apache::lonhomework::hide_problem_status() ) { |
# the student doesn't already have it correct, |
# the student doesn't already have it correct, |
# or we are in a mode (scantron orno problem status) where a correct |
# or we are in a mode (scantron orno problem status) where a correct |
# can become incorrect |
# can become incorrect |
Line 875 sub setgradedata {
|
Line 1145 sub setgradedata {
|
my $numawards=scalar(@Apache::inputtags::response); |
my $numawards=scalar(@Apache::inputtags::response); |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
foreach my $res (@Apache::inputtags::response) { |
foreach my $res (@Apache::inputtags::response) { |
$Apache::lonhomework::results{"resource.$id.awarded"}+= |
if (defined($Apache::lonhomework::results{"resource.$id.$res.awarded"})) { |
$Apache::lonhomework::results{"resource.$id.$res.awarded"}; |
$Apache::lonhomework::results{"resource.$id.awarded"}+= |
|
$Apache::lonhomework::results{"resource.$id.$res.awarded"}; |
|
} else { |
|
$Apache::lonhomework::results{"resource.$id.awarded"}+= |
|
&awarddetail_to_awarded($Apache::lonhomework::results{"resource.$id.$res.awarddetail"}); |
|
} |
} |
} |
if ($numawards > 0) { |
if ($numawards > 0) { |
$Apache::lonhomework::results{"resource.$id.awarded"}/= |
$Apache::lonhomework::results{"resource.$id.awarded"}/= |
Line 888 sub setgradedata {
|
Line 1163 sub setgradedata {
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$solvemsg; |
$solvemsg; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
|
} elsif ( $award eq 'SUBMITTED_CREDIT' ) { |
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
'credit_attempted'; |
|
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
|
} elsif ( $award eq 'ANONYMOUS_CREDIT' ) { |
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
'credit_attempted'; |
|
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
} elsif ( $award eq 'INCORRECT' ) { |
} elsif ( $award eq 'INCORRECT' ) { |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
if (lc($Apache::lonhomework::problemstatus) eq 'no' || |
if (&Apache::lonhomework::hide_problem_status() |
$Apache::lonhomework::scantronmode) { |
|| $Apache::lonhomework::scantronmode) { |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
} |
} |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
Line 902 sub setgradedata {
|
Line 1189 sub setgradedata {
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'ungraded_attempted'; |
'ungraded_attempted'; |
|
} elsif ( $award eq 'ANONYMOUS' ) { |
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
'ungraded_attempted'; |
} elsif ( $award eq 'DRAFT' ) { |
} elsif ( $award eq 'DRAFT' ) { |
$Apache::lonhomework::results{"resource.$id.solved"} = ''; |
$Apache::lonhomework::results{"resource.$id.solved"} = ''; |
} elsif ( $award eq 'NO_RESPONSE' ) { |
} elsif ( $award eq 'NO_RESPONSE' ) { |
Line 911 sub setgradedata {
|
Line 1203 sub setgradedata {
|
} else { |
} else { |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'incorrect_attempted'; |
'incorrect_attempted'; |
if (lc($Apache::lonhomework::problemstatus) eq 'no' || |
if (&Apache::lonhomework::show_no_problem_status() |
$Apache::lonhomework::scantronmode) { |
|| $Apache::lonhomework::scantronmode) { |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
} |
} |
|
|
|
if (&Apache::lonhomework::show_some_problem_status()) { |
|
# clear out the awarded if they had gotten it wrong/right |
|
# and are now in an error mode |
|
$Apache::lonhomework::results{"resource.$id.awarded"} = ''; |
|
} |
} |
} |
if (defined($msg)) { |
if (defined($msg)) { |
$Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg; |
$Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg; |
Line 930 sub setgradedata {
|
Line 1228 sub setgradedata {
|
# check if this was a previous submission if it was delete the |
# check if this was a previous submission if it was delete the |
# unneeded data and update the previously_used attribute |
# unneeded data and update the previously_used attribute |
if ( $previously_used eq 'PREVIOUSLY_USED') { |
if ( $previously_used eq 'PREVIOUSLY_USED') { |
if (lc($Apache::lonhomework::problemstatus) ne 'no') { |
if (&Apache::lonhomework::show_problem_status()) { |
delete($Apache::lonhomework::results{"resource.$id.tries"}); |
delete($Apache::lonhomework::results{"resource.$id.tries"}); |
$Apache::lonhomework::results{"resource.$id.previous"} = '1'; |
$Apache::lonhomework::results{"resource.$id.previous"} = '1'; |
} |
} |
Line 955 sub setgradedata {
|
Line 1253 sub setgradedata {
|
if ($award eq 'SUBMITTED') { |
if ($award eq 'SUBMITTED') { |
&Apache::response::add_to_gradingqueue(); |
&Apache::response::add_to_gradingqueue(); |
} |
} |
|
if (($Apache::lonhomework::type eq 'anonsurvey') || |
|
($Apache::lonhomework::type eq 'anonsurveycred')) { |
|
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type; |
|
} |
} |
} |
|
|
sub find_which_previous { |
sub find_which_previous { |
Line 1008 sub grade {
|
Line 1310 sub grade {
|
&Apache::lonxml::debug("got message $value from $response for $id"); |
&Apache::lonxml::debug("got message $value from $response for $id"); |
push (@msgs,$value); |
push (@msgs,$value); |
} |
} |
my ($finalaward,$msg) = &finalizeawards(\@awards,\@msgs); |
my ($finalaward,$msg) = |
|
&finalizeawards(\@awards,\@msgs,undef,undef, |
|
$Apache::lonhomework::scantronmode); |
my $previously_used; |
my $previously_used; |
if ( $#Apache::inputtags::previous eq $#awards ) { |
if ( $#Apache::inputtags::previous eq $#awards ) { |
my ($match) = |
my ($match) = |
&previous_match(\@Apache::inputtags::previous_version, |
&previous_match(\@Apache::inputtags::previous_version, |
scalar(@Apache::inputtags::response)); |
scalar(@Apache::inputtags::response)); |
|
|
if ($match) { |
if ($match) { |
$previously_used = 'PREVIOUSLY_LAST'; |
$previously_used = 'PREVIOUSLY_LAST'; |
foreach my $value (@Apache::inputtags::previous) { |
foreach my $value (@Apache::inputtags::previous) { |
Line 1065 sub get_grade_messages {
|
Line 1369 sub get_grade_messages {
|
if ( $tries eq '' ) { $tries = '0'; } |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
my $tries_text=&mt('Tries'); |
my $tries_text= &get_tries_text();; |
if ( $Apache::lonhomework::type eq 'survey' || |
|
$Apache::lonhomework::parsing_a_task) { |
|
$tries_text=&mt('Submissions'); |
|
} |
|
|
|
if ($showbutton) { |
if ($showbutton) { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
if ($env{'request.state'} ne "construct" |
if ($env{'request.state'} ne "construct" |
Line 1082 sub get_grade_messages {
|
Line 1381 sub get_grade_messages {
|
$trystr = '\vskip 0 mm '; |
$trystr = '\vskip 0 mm '; |
} |
} |
} else { |
} else { |
$trystr = "<td><nobr>".$tries_text." $tries"; |
$trystr = '<td><span class="LC_nobreak">'.&mt($tries_text)." $tries"; |
if ($Apache::lonhomework::parsing_a_task) { |
if ($Apache::lonhomework::parsing_a_task) { |
} elsif($env{'request.state'} ne 'construct') { |
} elsif($env{'request.state'} ne 'construct') { |
$trystr.="/$maxtries"; |
$trystr.="/$maxtries"; |
Line 1091 sub get_grade_messages {
|
Line 1390 sub get_grade_messages {
|
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
} |
} |
} |
} |
$trystr.="</nobr></td>"; |
$trystr.="</span></td>"; |
} |
} |
} |
} |
|
|
Line 1133 sub gradestatus {
|
Line 1432 sub gradestatus {
|
} |
} |
if ( $showbutton ) { |
if ( $showbutton ) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$button = '<input onsubmit="javascript:setSubmittedPart(\''.$id.'\')" type="submit" name="submit_'.$id.'" value="'.&mt('Submit Answer').'" />'; |
$button = |
|
'<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';" |
|
type="submit" name="submit_'.$id.'" |
|
value="'.&mt('Submit Answer').'" />'; |
} |
} |
} |
} |
|
|
Line 1166 sub previous_tries {
|
Line 1468 sub previous_tries {
|
|
|
foreach my $i (1..$Apache::lonhomework::history{'version'}) { |
foreach my $i (1..$Apache::lonhomework::history{'version'}) { |
my $prefix = $i.":resource.$id"; |
my $prefix = $i.":resource.$id"; |
|
my $is_anon; |
|
if (defined($env{'form.grade_symb'})) { |
|
if (($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurvey') || |
|
($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurveycred')) { |
|
$is_anon = 1; |
|
} |
|
} |
next if (!exists($Apache::lonhomework::history{"$prefix.award"})); |
next if (!exists($Apache::lonhomework::history{"$prefix.award"})); |
$count++; |
$count++; |
$count_lookup{$i} = $count; |
$count_lookup{$i} = $count; |
Line 1180 sub previous_tries {
|
Line 1488 sub previous_tries {
|
my ($match,$which) = &find_which_previous($i); |
my ($match,$which) = &find_which_previous($i); |
$message=$previousmsg; |
$message=$previousmsg; |
my $previous = $count_lookup{$which}; |
my $previous = $count_lookup{$which}; |
$message =~ s{(</td>)}{ as submission # $previous $1}; |
$message =~ s{(</td>)}{ as submission \# $previous $1}; |
} elsif ($Apache::lonhomework::history{"$prefix.tries"}) { |
} elsif ($Apache::lonhomework::history{"$prefix.tries"}) { |
if (!(lc($Apache::lonhomework::problemstatus) eq 'no' |
if (!(&Apache::lonhomework::hide_problem_status() |
&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') |
&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') |
&& $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/ |
&& $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/ |
) { |
) { |
|
|
|
my $txt_correct = &mt('Correct'); |
$message =~ s{(<td.*?>)(.*?)(</td>)} |
$message =~ s{(<td.*?>)(.*?)(</td>)} |
{$1 <strong>Correct</strong>. $3}s; |
{$1 <strong>$txt_correct</strong>. $3}s; |
} |
} |
my $trystr = "(Try ". |
my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")"; |
$Apache::lonhomework::history{"$prefix.tries"}.')'; |
|
$message =~ s{(</td>)}{ $trystr $1}; |
$message =~ s{(</td>)}{ $trystr $1}; |
} |
} |
my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #" |
my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #" |
Line 1211 sub previous_tries {
|
Line 1519 sub previous_tries {
|
$submission = |
$submission = |
$Apache::lonhomework::history{"$prefix.submission"}; |
$Apache::lonhomework::history{"$prefix.submission"}; |
} |
} |
$output.='<td>'.$submission.'</td>'; |
if ($is_anon) { |
|
$output.='<td>'.&mt('(only shown to submitter)').'</td>'; |
|
} else { |
|
$output.='<td>'.$submission.'</td>'; |
|
} |
} else { |
} else { |
$output.='<td></td>'; |
$output.='<td></td>'; |
} |
} |
Line 1225 sub previous_tries {
|
Line 1537 sub previous_tries {
|
&mt('Submitted Answer').'</th>'; |
&mt('Submitted Answer').'</th>'; |
$output ='<table class="LC_prior_tries">'.$headers.$output.'</table>'; |
$output ='<table class="LC_prior_tries">'.$headers.$output.'</table>'; |
#return $output; |
#return $output; |
$output=~s/\\/\\\\/g; |
$output = &Apache::loncommon::js_ready($output); |
$output=~s/\'/\\\'/g; |
$output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>'; |
$output=~s/\s+/ /g; |
|
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
|
my $tries_text = &get_tries_text('link'); |
my $start_page = |
my $start_page = |
&Apache::loncommon::start_page('Previous Tries', undef, |
&Apache::loncommon::start_page($tries_text, undef, |
{'only_body' => 1, |
{'only_body' => 1, |
'bgcolor' => '#FFFFFF', |
'bgcolor' => '#FFFFFF', |
'js_ready' => 1,}); |
'js_ready' => 1, |
|
'inherit_jsmath' => 1, }); |
my $end_page = |
my $end_page = |
&Apache::loncommon::end_page({'js_ready' => 1,}); |
&Apache::loncommon::end_page({'js_ready' => 1,}); |
|
my $prefix = $env{'form.request.prefix'}; |
|
$prefix =~ tr{.}{_}; |
|
my $function_name = "LONCAPA_previous_tries_".$prefix. |
|
$Apache::lonxml::curdepth.'_'.$env{'form.counter'}; |
my $result ="<script type=\"text/javascript\"> |
my $result ="<script type=\"text/javascript\"> |
// <![CDATA[ |
// <![CDATA[ |
function LONCAPA_previous_tries_$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()} |
function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()} |
// ]]> |
// ]]> |
</script><a href=\"javascript:LONCAPA_previous_tries_$Apache::lonxml::curdepth();void(0);\">".&mt("Previous Tries")."</a><br />"; |
</script><a href=\"javascript:$function_name();void(0);\">".&mt($tries_text)."</a><br />"; |
#use Data::Dumper; |
#use Data::Dumper; |
#&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display)); |
#&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display)); |
return $result; |
return $result; |
} |
} |
|
|
|
sub get_tries_text { |
|
my ($context) = @_; |
|
my $tries_text; |
|
if ($context eq 'link') { |
|
$tries_text = 'Previous Tries'; |
|
} else { |
|
$tries_text = 'Tries'; |
|
} |
|
if ( $Apache::lonhomework::type eq 'survey' || |
|
$Apache::lonhomework::type eq 'surveycred' || |
|
$Apache::lonhomework::type eq 'anonsurvey' || |
|
$Apache::lonhomework::type eq 'anonsurveycred' || |
|
$Apache::lonhomework::parsing_a_task) { |
|
if ($context eq 'link') { |
|
$tries_text = 'Previous Submissions'; |
|
} else { |
|
$tries_text = 'Submissions'; |
|
} |
|
} |
|
return $tries_text; |
|
} |
|
|
1; |
1; |
__END__ |
__END__ |
|
|
|
=pod |
|
|
|
=back |
|
|
|
=cut |
|
|