version 1.249, 2008/11/25 13:16:17
|
version 1.295, 2011/10/08 19:19:58
|
Line 53 package Apache::inputtags;
|
Line 53 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 LONCAPA; |
use LONCAPA; |
|
|
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); |
&Apache::lonxml::register('Apache::inputtags',('hiddensubmission','hiddenline','textfield','textline')); |
} |
} |
|
|
=pod |
=pod |
Line 174 sub start_textfield {
|
Line 175 sub start_textfield {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$Apache::lonxml::evaluate--; |
$Apache::lonxml::evaluate--; |
my $partid=$Apache::inputtags::part; |
my $partid=$Apache::inputtags::part; |
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"'); |
my ($oldresponse,$newvariation); |
|
if ((($Apache::lonhomework::history{"resource.$partid.type"} eq 'randomizetry') || |
|
($Apache::lonhomework::type eq 'randomizetry')) && |
|
($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) { |
|
if ($env{'form.'.$partid.'.rndseed'} ne |
|
$Apache::lonhomework::history{"resource.$partid.rndseed"}) { |
|
$newvariation = 1; |
|
} |
|
} |
|
unless ($newvariation) { |
|
$oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"'); |
|
} |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
if ( $cols eq '') { $cols = 80; } |
if ( $cols eq '') { $cols = 80; } |
Line 185 sub start_textfield {
|
Line 197 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 329 sub start_textline {
|
Line 342 sub start_textline {
|
$maxlength = ' maxlength="'.$size.'"'; |
$maxlength = ' maxlength="'.$size.'"'; |
} |
} |
} |
} |
my $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
my ($oldresponse,$newvariation); |
&Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse)); |
if ((($Apache::lonhomework::history{"resource.$partid.type"} eq 'randomizetry') || |
|
($Apache::lonhomework::type eq 'randomizetry')) && |
if (ref($oldresponse) eq 'ARRAY') { |
($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) { |
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist]; |
if ($env{'form.'.$partid.'.rndseed'} ne |
} |
$Apache::lonhomework::history{"resource.$partid.rndseed"}) { |
$oldresponse = &HTML::Entities::encode($oldresponse,'<>&"'); |
$newvariation = 1; |
$oldresponse =~ s/^\s+//; |
} |
$oldresponse =~ s/\s+$//; |
} |
$oldresponse =~ s/\s+/ /g; |
unless ($newvariation) { |
|
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
|
&Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse)); |
|
if (ref($oldresponse) eq 'ARRAY') { |
|
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist]; |
|
} |
|
$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 388 sub start_textline {
|
Line 411 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';} |
if ($env{'form.pdfFormFields'} eq 'yes') { |
if ($env{'form.pdfFormFields'} eq 'yes' |
|
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $fieldname = $env{'request.symb'}. |
my $fieldname = $env{'request.symb'}. |
'&part_'. $Apache::inputtags::part. |
'&part_'. $Apache::inputtags::part. |
'&textresponse'. |
'&textresponse'. |
'&HWVAL_' . $Apache::inputtags::response['-1']; |
'&HWVAL_' . $Apache::inputtags::response['-1']; |
$result="\n\\\\\n".'\textField{'.$fieldname.'}{'.$size.'}{12 bp}'; |
$result='\textField{'.$fieldname.'}{'.$size.'}{12 bp}'; |
} else { |
} else { |
$result='\framebox['.$size.'][s]{\tiny\strut}'; |
$result='\framebox['.$size.'][s]{\tiny\strut}'; |
} |
} |
Line 454 sub end_hiddenline {
|
Line 478 sub end_hiddenline {
|
return ""; |
return ""; |
} |
} |
|
|
|
|
|
sub start_hiddensubmission { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result = ""; |
|
my $input_id = &start_input($parstack,$safeeval); |
|
if ($target eq 'web') { |
|
$Apache::lonxml::evaluate--; |
|
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
|
my $partid=$Apache::inputtags::part; |
|
my $id=$Apache::inputtags::response[-1]; |
|
if ($Apache::lonhomework::type ne 'exam') { |
|
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
|
$value = &HTML::Entities::encode($value,'<>&"'); |
|
$result= '<input type="hidden" name="HWVAL_'.$id.'" value="'.$value.'" />'; |
|
} |
|
} |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::tag_start($target,$token); |
|
$result.=&Apache::edit::text_arg('Value:','value',$token,'15'); |
|
$result.=&Apache::edit::end_row(); |
|
$result.=&Apache::edit::end_table(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'value'); |
|
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
|
} |
|
|
|
if ( ($target eq 'web' || $target eq 'tex') |
|
&& $Apache::lonhomework::type eq 'exam' |
|
&& &needs_exam_box($tagstack)) { |
|
$result.=&exam_box($target); |
|
} |
|
return $result; |
|
} |
|
|
|
sub end_hiddensubmission { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
if ($target eq 'web') { $Apache::lonxml::evaluate++; } |
|
elsif ($target eq 'edit') { return ('','no'); } |
|
&end_input(); |
|
return ""; |
|
} |
|
|
=pod |
=pod |
|
|
=item file_selector() |
=item file_selector() |
Line 461 sub end_hiddenline {
|
Line 528 sub end_hiddenline {
|
$part -> partid |
$part -> partid |
$id -> responseid |
$id -> responseid |
$uploadefiletypes -> comma seperated list of extensions allowed or * for any |
$uploadefiletypes -> comma seperated list of extensions allowed or * for any |
$which -> 'uploadedonly' -> only newly uploaded files |
$which -> 'uploadonly' -> only newly uploaded files |
'portfolioonly' -> only allow files from portfolio |
'portfolioonly' -> only allow files from portfolio |
'both' -> allow files from either location |
'both' -> allow files from either location |
$extratext -> additional text to go between the link and the input box |
$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> |
returns a table row <tr> |
|
|
=cut |
=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.'" id="HWFILE'.$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='.$env{'form.request.prefix'}.'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); |
|
} |
|
} |
|
} |
|
my $num = 0; |
|
foreach my $name (sort(keys(%okfiles))) { |
|
if (ref($okfiles{$name}) eq 'ARRAY') { |
|
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" alt="" />'.$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('Exclude existing file(s) from grading by checking the "Delete?" checkbox(es) and clicking "Submit Answer"').'</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 560 sub valid_award {
|
Line 727 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', |
'EXCESS_FILESIZE', 'DRAFT', |
'EXCESS_FILESIZE', 'FILENAME_INUSE', |
'SUBMITTED', 'ASSIGNED_SCORE', |
'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT', |
'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') { |
'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 575 sub valid_award {
|
Line 745 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', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED', |
'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE', |
|
'DRAFT', 'SUBMITTED', |
|
'SUBMITTED_CREDIT', 'ANONYMOUS', 'ANONYMOUS_CREDIT', |
'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS'); |
'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS'); |
my $i=0; |
my $i=0; |
my %fwd_awards = map { ($_,$i++) } @awards; |
my %fwd_awards = map { ($_,$i++) } @awards; |
Line 601 sub hide_award {
|
Line 774 sub hide_award {
|
return 1; |
return 1; |
} |
} |
if ($award =~ |
if ($award =~ |
/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|ASSIGNED_SCORE|INCORRECT)/) { |
/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|SUBMITTED_CREDIT|ANONYMOUS|ANONYMOUS_CREDIT|ASSIGNED_SCORE|INCORRECT)/) { |
return 1; |
return 1; |
} |
} |
return 0; |
return 0; |
Line 623 sub finalizeawards {
|
Line 796 sub finalizeawards {
|
return ('NO_RESPONSE'); |
return ('NO_RESPONSE'); |
} |
} |
} |
} |
|
|
|
if ($Apache::lonxml::internal_error) { $result='INTERNAL_ERROR'; } |
|
|
if (!$final_scantron && defined($result)) { return ($result); } |
if (!$final_scantron && defined($result)) { return ($result); } |
|
|
# if in scantron mode, if the award for any response is |
# if in scantron mode, if the award for any response is |
Line 668 sub finalizeawards {
|
Line 844 sub finalizeawards {
|
} |
} |
|
|
sub decideoutput { |
sub decideoutput { |
my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_; |
my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect)=@_; |
|
|
my $message=''; |
my $message=''; |
my $button=0; |
my $button=0; |
my $previousmsg; |
my $previousmsg; |
Line 685 sub decideoutput {
|
Line 862 sub decideoutput {
|
my $part = $Apache::inputtags::part; |
my $part = $Apache::inputtags::part; |
my $tohandgrade = &Apache::lonnet::EXT("resource.$part.handgrade"); |
my $tohandgrade = &Apache::lonnet::EXT("resource.$part.handgrade"); |
my $handgrade = ('yes' eq lc($tohandgrade)); |
my $handgrade = ('yes' eq lc($tohandgrade)); |
|
# |
|
# Should "Computer's Answer" be displayed? |
|
# Should not be displayed if still answerable, |
|
# if the problem is handgraded, |
|
# or if the problem does not give a correct answer |
|
# |
|
|
my $computer = ($handgrade)? '' |
my $computer = ($handgrade || $nocorrect)? '' |
: " ".&mt("Computer's answer now shown above."); |
: " ".&mt("Computer's answer now shown above."); |
&Apache::lonxml::debug("handgrade has :$handgrade:"); |
&Apache::lonxml::debug("handgrade has :$handgrade:"); |
|
|
Line 702 sub decideoutput {
|
Line 885 sub decideoutput {
|
$message=&mt('Incorrect.'); |
$message=&mt('Incorrect.'); |
$css_class=$possible_class{'charged_try'}; |
$css_class=$possible_class{'charged_try'}; |
} |
} |
if ($env{'request.filename'} =~ |
if ($handgrade || |
m|/res/lib/templates/examupload.problem$|) { |
($env{'request.filename'}=~/\/res\/lib\/templates\/(examupload|DropBox).problem$/)) { |
$message = &mt("A score has been assigned."); |
$message = &mt("A score has been assigned."); |
$added_computer_text=1; |
$added_computer_text=1; |
} else { |
} else { |
Line 722 sub decideoutput {
|
Line 905 sub decideoutput {
|
'.disable_receipt_display'} ne 'yes') && |
'.disable_receipt_display'} ne 'yes') && |
($Apache::lonhomework::type ne 'practice')) { |
($Apache::lonhomework::type ne 'practice')) { |
$message.=(($target eq 'web')?'<br />':' '). |
$message.=(($target eq 'web')?'<br />':' '). |
&mt('Your receipt is [_1]', |
&mt('Your receipt no. is [_1]', |
(&Apache::lonnet::receipt($Apache::inputtags::part). |
(&Apache::lonnet::receipt($Apache::inputtags::part). |
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''))); |
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''))); |
} |
} |
} |
} |
} |
} |
$button=0; |
if ($awarded==1) { $button=0; } else { $button=1; } |
$previousmsg=''; |
$previousmsg=''; |
} elsif ($solved =~ /^excused/) { |
} elsif ($solved =~ /^excused/) { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
Line 803 sub decideoutput {
|
Line 986 sub decideoutput {
|
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.'); |
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.'); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$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 847 sub decideoutput {
|
Line 1039 sub decideoutput {
|
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')}; |
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 855 sub decideoutput {
|
Line 1059 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 878 sub decideoutput {
|
Line 1093 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 />'; |
|
} |
} |
} |
} |
} |
|
|
Line 909 sub decideoutput {
|
Line 1137 sub decideoutput {
|
} |
} |
$message.=&mt('Submissions to practice problems are not permanently recorded.'); |
$message.=&mt('Submissions to practice problems are not permanently recorded.'); |
} |
} |
|
|
return ($button,$css_class,$message,$previousmsg); |
return ($button,$css_class,$message,$previousmsg); |
} |
} |
|
|
Line 962 sub setgradedata {
|
Line 1189 sub setgradedata {
|
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
$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.awarded"} < 1 |
/^correct/ |
|
|| $Apache::lonhomework::scantronmode |
|| $Apache::lonhomework::scantronmode |
|| &Apache::lonhomework::hide_problem_status() ) { |
|| &Apache::lonhomework::hide_problem_status() ) { |
# the student doesn't already have it correct, |
# the student doesn't already have it correct, |
Line 1005 sub setgradedata {
|
Line 1231 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; |
Line 1019 sub setgradedata {
|
Line 1257 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 1067 sub setgradedata {
|
Line 1310 sub setgradedata {
|
$Apache::lonhomework::results{"resource.$id.previous"} = '0'; |
$Apache::lonhomework::results{"resource.$id.previous"} = '0'; |
} |
} |
} |
} |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~ |
} elsif ( $Apache::lonhomework::history{"resource.$id.awarded"} == 1 ) { |
/^correct/ ) { |
|
#delete all data as they student already has it correct |
#delete all data as they student already has it correct |
&removealldata($id); |
&removealldata($id); |
#and since they didn't do anything we were never here |
#and since they didn't do anything we were never here |
Line 1078 sub setgradedata {
|
Line 1320 sub setgradedata {
|
if ($award eq 'SUBMITTED') { |
if ($award eq 'SUBMITTED') { |
&Apache::response::add_to_gradingqueue(); |
&Apache::response::add_to_gradingqueue(); |
} |
} |
|
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type; |
|
$Apache::lonhomework::results{"resource.$id.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate"); |
|
$Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries"); |
|
$Apache::lonhomework::results{"resourse.$id.version"} = &Apache::lonnet::usedversion(); |
} |
} |
|
|
sub find_which_previous { |
sub find_which_previous { |
Line 1157 sub grade {
|
Line 1403 sub grade {
|
} |
} |
|
|
sub get_grade_messages { |
sub get_grade_messages { |
my ($id,$prefix,$target,$status) = @_; |
my ($id,$prefix,$target,$status,$nocorrect) = @_; |
|
# nocorrect suppresses "Computer's answer now shown above" |
my ($message,$latemessage,$trystr,$previousmsg); |
my ($message,$latemessage,$trystr,$previousmsg); |
my $showbutton = 1; |
my $showbutton = 1; |
|
|
Line 1172 sub get_grade_messages {
|
Line 1418 sub get_grade_messages {
|
&Apache::lonxml::debug('Getting message'); |
&Apache::lonxml::debug('Getting message'); |
($showbutton,my $css_class,$message,$previousmsg) = |
($showbutton,my $css_class,$message,$previousmsg) = |
&decideoutput($award,$awarded,$awardmsg,$solved,$previous, |
&decideoutput($award,$awarded,$awardmsg,$solved,$previous, |
$target); |
$target,(($status eq 'CAN_ANSWER') || $nocorrect)); |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$message='\vskip 2 mm '.$message.' '; |
$message='\vskip 2 mm '.$message.' '; |
} else { |
} else { |
Line 1190 sub get_grade_messages {
|
Line 1436 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" |
&& $Apache::lonhomework::type ne 'exam' |
&& $Apache::lonhomework::type ne 'exam' |
&& $env{'form.suppress_tries'} ne 'yes') { |
&& $env{'form.suppress_tries'} ne 'yes') { |
$trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '. |
$trystr ='{\vskip 1 mm \small ' |
$tries.'/'.$maxtries.'} \vskip 2 mm '; |
.&mt('[_1]'.$tries_text.'[_2] [_3]' |
|
,'\textit{','}',$tries.'/'.$maxtries ) |
|
.'} \vskip 2 mm'; |
} else { |
} else { |
$trystr = '\vskip 0 mm '; |
$trystr = '\vskip 0 mm '; |
} |
} |
} else { |
} else { |
$trystr = "<td><nobr>".$tries_text." $tries"; |
my $trial =$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"; |
$trial.="/".&Apache::lonhtmlcommon::direct_parm_link($maxtries,$env{'request.symb'},'maxtries',$id,$target); |
} else { |
} else { |
if (defined($Apache::inputtags::params{'maxtries'})) { |
if (defined($Apache::inputtags::params{'maxtries'})) { |
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
$trial.="/".$Apache::inputtags::params{'maxtries'}; |
} |
} |
} |
} |
$trystr.="</nobr></td>"; |
$trystr = '<td><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>'; |
} |
} |
} |
} |
|
|
Line 1259 sub gradestatus {
|
Line 1502 sub gradestatus {
|
if ( $showbutton ) { |
if ( $showbutton ) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$button = |
$button = |
'<input |
'<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';" |
onmouseup="javascript:setSubmittedPart(\''.$id.'\')" |
type="submit" name="submit_'.$id.'" |
onsubmit="javascript:setSubmittedPart(\''.$id.'\')" |
value="'.&mt('Submit Answer').'" />'; |
type="submit" name="submit_'.$id.'" |
|
value="'.&mt('Submit Answer').'" />'; |
|
} |
} |
} |
} |
|
|
Line 1293 sub previous_tries {
|
Line 1534 sub previous_tries {
|
|
|
my $count; |
my $count; |
my %count_lookup; |
my %count_lookup; |
|
my $lastrndseed; |
|
|
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; |
|
my $curr_rndseed = $Apache::lonhomework::history{"$prefix.rndseed"}; |
my ($previousmsg,$latemessage,$message,$trystr); |
my ($previousmsg,$latemessage,$message,$trystr); |
|
|
($previousmsg,$latemessage,$message,$trystr) = |
($previousmsg,$latemessage,$message,$trystr) = |
Line 1318 sub previous_tries {
|
Line 1566 sub previous_tries {
|
) { |
) { |
|
|
my $txt_correct = &mt('Correct'); |
my $txt_correct = &mt('Correct'); |
|
my $awarded = $Apache::lonhomework::history{"$prefix.awarded"}; |
|
if ($awarded < 1 && $awarded > 0) { |
|
$txt_correct=&mt('Partially Correct'); |
|
} elsif ($awarded < 1) { |
|
if ($awarded eq '') { |
|
$txt_correct=''; |
|
} else { |
|
$txt_correct=&mt('Incorrect'); |
|
} |
|
} |
$message =~ s{(<td.*?>)(.*?)(</td>)} |
$message =~ s{(<td.*?>)(.*?)(</td>)} |
{$1 <strong>$txt_correct</strong>. $3}s; |
{$1 <strong>$txt_correct</strong>. $3}s; |
} |
} |
my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")"; |
my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")"; |
|
if (($curr_rndseed || $lastrndseed) && ($i > 1)) { |
|
if ($curr_rndseed ne $lastrndseed) { |
|
$trystr .= '<br /><span style="color: green; white-space: nowrap; font-style: italic; font-weight: bold; font-size: 80%;">'.&mt('New problem variation this try.').'</span>'; |
|
} |
|
} |
$message =~ s{(</td>)}{ $trystr $1}; |
$message =~ s{(</td>)}{ $trystr $1}; |
} |
} |
my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #" |
my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #" |
Line 1341 sub previous_tries {
|
Line 1604 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>'; |
} |
} |
} |
} |
$output.=&Apache::loncommon::end_data_table_row()."\n"; |
$output.=&Apache::loncommon::end_data_table_row()."\n"; |
|
$lastrndseed = $curr_rndseed; |
} |
} |
return if ($output eq ''); |
return if ($output eq ''); |
my $headers = |
my $headers = |
Line 1359 sub previous_tries {
|
Line 1627 sub previous_tries {
|
$output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>'; |
$output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>'; |
|
|
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, |
Line 1375 sub previous_tries {
|
Line 1644 sub previous_tries {
|
// <![CDATA[ |
// <![CDATA[ |
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()} |
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:$function_name();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__ |
|
|