version 1.331, 2015/03/10 23:11:22
|
version 1.339, 2015/10/30 11:21:19
|
Line 460 sub start_textline {
|
Line 460 sub start_textline {
|
} |
} |
my $name = 'HWVAL_'.$id; |
my $name = 'HWVAL_'.$id; |
my $itemid = 'HWVAL_'.$partid.'_'.$id; |
my $itemid = 'HWVAL_'.$partid.'_'.$id; |
|
my $input_tag_id = $itemid.'_'.$input_id; |
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
$name = "none"; |
$name = "none"; |
} |
} |
$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"' |
$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"' |
. ' onfocus="javascript:disableAutoComplete(\''.$itemid.'\');"' |
. ' onfocus="javascript:disableAutoComplete(\''.$input_tag_id.'\');"' |
. ' type="text" '.$readonly.' name="'. $name . '"' |
. ' type="text" '.$readonly.' name="'. $name . '"' |
. ' id="' . $itemid . '"' |
. ' id="' . $input_tag_id . '"' |
. ' value="'. $oldresponse.'"' |
. ' value="'. $oldresponse.'"' |
. ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength.' />'; |
. ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength.' />'; |
|
|
$result .= &spellcheck_onblur($itemid, $spellcheck); |
$result .= &spellcheck_onblur($itemid, $spellcheck); |
|
if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') && |
|
(($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) && |
|
(&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) { |
|
$result.=&edit_mathresponse_button($input_tag_id); |
|
} |
} |
} |
if ($Apache::lonhomework::type eq 'exam' |
if ($Apache::lonhomework::type eq 'exam' |
&& &needs_exam_box($tagstack)) { |
&& &needs_exam_box($tagstack)) { |
Line 661 sub file_selector {
|
Line 667 sub file_selector {
|
$result .= $constraints.'<br />'; |
$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 per submission)'). |
my $free_space = $maxfilesize * 1048576; |
' <br /><input type="file" size="50" name="HWFILE'. |
$result .= &mt('Submit a file: (only one file per submission)'). |
$jspart.'_'.$id.'" id="HWFILE'.$jspart.'_'.$id.'" /><br />'; |
' <br /><input type="file" size="50" name="HWFILE'.$jspart.'_'.$id. |
} |
'" id="HWFILE'.$jspart.'_'.$id.'" class="flUpload" /><br />'. |
|
'<input type="hidden" id="free_space" value="'.$free_space.'" /><br />' |
|
} |
if ( $which eq 'both') { |
if ( $which eq 'both') { |
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />'; |
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />'; |
} |
} |
Line 906 sub valid_award {
|
Line 914 sub valid_award {
|
|
|
{ |
{ |
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', |
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', |
'WRONG_NUMCHECKEDBOXES','TOO_LONG', |
'WRONG_NUMBOXESCHECKED','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', 'NOT_FUNCTION', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION', |
Line 996 sub finalizeawards {
|
Line 1004 sub finalizeawards {
|
$j++; |
$j++; |
} |
} |
|
|
|
# if at least one response item is set to include lenient grading |
|
# and that item is partially correct then overall award reflects |
|
# that, unless an award for one of the other response items does |
|
# not fall within the basic awards for correct or incorrect. |
|
if ($Apache::inputtags::leniency) { |
|
if (($$awardref[$which] eq 'INCORRECT') |
|
&& (grep { $_ eq 'EXACT_ANS' || |
|
$_ eq 'APPROX_ANS' || |
|
$_ eq 'ASSIGNED_SCORE' } (@$awardref)) |
|
&& !((grep { $_ ne 'INCORRECT' && |
|
$_ ne 'EXACT_ANS' && |
|
$_ ne 'APPROX_ANS' && |
|
$_ ne 'ASSIGNED_SCORE' } (@$awardref)))) { |
|
return ('ASSIGNED_SCORE'); |
|
} |
|
} |
|
|
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 1681 sub gradestatus {
|
Line 1706 sub gradestatus {
|
&& $status ne 'NOT_IN_A_SLOT' |
&& $status ne 'NOT_IN_A_SLOT' |
&& $status ne 'RESERVABLE' |
&& $status ne 'RESERVABLE' |
&& $status ne 'RESERVABLE_LATER' |
&& $status ne 'RESERVABLE_LATER' |
&& $status ne 'NOTRESERVABLE') { |
&& $status ne 'NOTRESERVABLE' |
|
&& $status ne 'NEED_DIFFERENT_IP') { |
|
|
if ($status eq 'SHOW_ANSWER') { |
if ($status eq 'SHOW_ANSWER') { |
$showbutton = 0; |
$showbutton = 0; |
Line 1739 sub previous_tries {
|
Line 1765 sub previous_tries {
|
|
|
my $count; |
my $count; |
my %count_lookup; |
my %count_lookup; |
my $lastrndseed; |
my ($lastrndseed,$lasttype); |
my $numstamps = 0; |
my $numstamps = 0; |
|
|
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; |
my $is_anon; |
|
my $curr_type = $Apache::lonhomework::history{"$prefix.type"}; |
if (defined($env{'form.grade_symb'})) { |
if (defined($env{'form.grade_symb'})) { |
if (($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurvey') || |
if (($curr_type eq 'anonsurvey') || ($curr_type eq 'anonsurveycred')) { |
($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurveycred')) { |
|
$is_anon = 1; |
$is_anon = 1; |
} |
} |
} |
} |
Line 1786 sub previous_tries {
|
Line 1812 sub previous_tries {
|
{$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 ne '')) { |
if ($curr_rndseed ne $lastrndseed) { |
if (($curr_rndseed ne $lastrndseed) && |
|
(($curr_type eq 'randomizetry') || ($lasttype eq 'randomizetry'))) { |
$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>'; |
$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>'; |
} |
} |
} |
} |
Line 1828 sub previous_tries {
|
Line 1855 sub previous_tries {
|
} |
} |
$output.=&Apache::loncommon::end_data_table_row()."\n"; |
$output.=&Apache::loncommon::end_data_table_row()."\n"; |
$lastrndseed = $curr_rndseed; |
$lastrndseed = $curr_rndseed; |
|
$lasttype = $curr_type; |
} |
} |
return if ($output eq ''); |
return if ($output eq ''); |
my $headers = '<tr>'. |
my $headers = '<tr>'. |
Line 1892 sub spelling_languages {
|
Line 1920 sub spelling_languages {
|
return \@spelllangs; |
return \@spelllangs; |
} |
} |
|
|
|
sub edit_mathresponse_button { |
|
my ($field) = @_; |
|
my $eqneditor = 'lcmath'; |
|
if ($env{'browser.type'} eq 'safari') { |
|
if ($env{'browser.os'} eq 'mac') { |
|
my ($prefix,$version) = ($env{'browser.version'} =~ /^(\d*)(\d{3})\./); |
|
if ($env{'browser.mobile'}) { |
|
if (($version < 531) || (($prefix eq '') && ($version < 533))) { |
|
$eqneditor = ''; |
|
} |
|
} elsif ($version < 533) { |
|
$eqneditor = 'dragmath'; |
|
} |
|
} elsif ($env{'browser.os'} eq 'win') { |
|
if ($env{'browser.version'} < 533) { |
|
$eqneditor = 'dragmath'; |
|
} |
|
} |
|
} elsif ($env{'browser.type'} eq 'explorer') { |
|
if ($env{'browser.version'} < 9) { |
|
$eqneditor = 'dragmath'; |
|
} |
|
} elsif ($env{'browser.type'} eq 'mozilla') { |
|
if ($env{'browser.version'} < 5) { |
|
$eqneditor = 'dragmath'; |
|
} else { |
|
if ($env{'browser.info'} =~ /^firefox\-([\d\.]+)/) { |
|
my $firefox = $1; |
|
if ($firefox < 4) { |
|
$eqneditor = 'dragmath'; |
|
} |
|
} |
|
} |
|
} elsif ($env{'browser.type'} eq 'chrome') { |
|
if ($env{'browser.version'} < 5) { |
|
$eqneditor = 'dragmath'; |
|
} |
|
} elsif ($env{'browser.type'} eq 'opera') { |
|
if ($env{'browser.version'} < 12) { |
|
$eqneditor = 'dragmath'; |
|
} |
|
} |
|
if ($eqneditor eq 'lcmath') { |
|
if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) { |
|
if (exists($env{'course.'.$env{'request.course.id'}.'.uselcmath'})) { |
|
if ($env{'course.'.$env{'request.course.id'}.'.uselcmath'} eq '0') { |
|
$eqneditor = 'dragmath'; |
|
} |
|
} else { |
|
my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'}); |
|
if ($domdefs{'uselcmath'} eq '0') { |
|
$eqneditor = 'dragmath'; |
|
} |
|
} |
|
} else { |
|
my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'}); |
|
if ($domdefs{'uselcmath'} eq '0') { |
|
$eqneditor = 'dragmath'; |
|
} |
|
} |
|
} |
|
if ($eqneditor eq 'dragmath') { |
|
# DragMath applet |
|
my $button=&mt('Edit Answer'); |
|
# my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor'); |
|
my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; |
|
return(<<ENDFORMULABUTTON); |
|
<script type="text/javascript" language="JavaScript"> |
|
function LC_mathedit_${field} (LCtextline) { |
|
thenumber = LCtextline; |
|
var thedata = ''; |
|
if (document.getElementById(LCtextline)) { |
|
thedata = document.getElementById(LCtextline).value; |
|
} |
|
newwin = window.open("/adm/dragmath/MaximaPopup.html","","width=565,height=400,resizable"); |
|
} |
|
</script> |
|
<a href="javascript:LC_mathedit_${field}('${field}');void(0);"><img class="stift" src="$iconpath/stift.gif" alt="$button" title="$button" /></a> |
|
ENDFORMULABUTTON |
|
} elsif ($eqneditor eq 'lcmath') { |
|
# LON-CAPA math equation editor |
|
my $mathjaxjs; |
|
unless (lc(&Apache::lontexconvert::tex_engine()) eq 'mathjax') { |
|
$mathjaxjs = <<"MATHJAX_SCRIPT"; |
|
var mathjaxscript = document.createElement("script"); |
|
mathjaxscript.type = "text/javascript"; |
|
mathjaxscript.src = "/adm/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"; |
|
document.body.appendChild(mathjaxscript); |
|
MATHJAX_SCRIPT |
|
} |
|
return(<<EQ_EDITOR_SCRIPT); |
|
<script type="text/javascript"> |
|
var LCmathField = document.getElementById('${field}'); |
|
LCmathField.className += ' math'; // note the space |
|
LCmathField.setAttribute('data-implicit_operators', 'true'); |
|
var LCMATH_started; |
|
if (typeof LCMATH_started === 'undefined') { |
|
$mathjaxjs |
|
LCMATH_started = true; |
|
var script = document.createElement("script"); |
|
script.type = "text/javascript"; |
|
script.src = "/adm/LC_math_editor/LC_math_editor.min.js"; |
|
document.body.appendChild(script); |
|
window.addEventListener('load', function(e) { |
|
LCMATH.initEditors(); |
|
}, false); |
|
} |
|
</script> |
|
EQ_EDITOR_SCRIPT |
|
} |
|
} |
|
|
1; |
1; |
__END__ |
__END__ |
|
|