--- loncom/homework/inputtags.pm 2014/11/28 18:23:04 1.328
+++ loncom/homework/inputtags.pm 2019/08/07 19:32:38 1.347
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.328 2014/11/28 18:23:04 raeburn Exp $
+# $Id: inputtags.pm,v 1.347 2019/08/07 19:32:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -460,18 +460,24 @@ sub start_textline {
}
my $name = 'HWVAL_'.$id;
my $itemid = 'HWVAL_'.$partid.'_'.$id;
+ # NOTE: the input id should match the one given by defaut_homework input_id().
+ my $input_tag_id = $itemid.'_'.$input_id;
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
$name = "none";
}
$result.= '';
+ . ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength.' />';
$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'
&& &needs_exam_box($tagstack)) {
@@ -641,7 +647,7 @@ sub file_selector {
my $current_files_display = ¤t_file_submissions($part,$id);
my $addfiles;
if ($current_files_display) {
- $result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')).
+ $result .= &Apache::lonhtmlcommon::row_title(&mt('Files currently selected for submission')).
$current_files_display.
&Apache::lonhtmlcommon::row_closure();
$addfiles = &mt('Submit other file(s)');
@@ -662,10 +668,12 @@ sub file_selector {
$result .= $constraints.'
';
}
if ($which eq 'uploadonly' || $which eq 'both') {
- $result.=&mt('Submit a file: (only one file per submission)').
- '
';
- }
+ my $free_space = $maxfilesize * 1048576;
+ $result .= &mt('Submit a file: (only one file per submission)').
+ '
'.
+ '
';
+ }
if ( $which eq 'both') {
$result.='
'.''.&mt('OR:').'
';
}
@@ -699,6 +707,15 @@ sub current_file_submissions {
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"};
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"};
return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/));
+ my @unversioned;
+ foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
+ my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
+ my ($origname,$version,$ext) = &Apache::lonnet::file_name_version_ext($name);
+ unless ($version) {
+ push(@unversioned,$file);
+ }
+ }
+ return if (!@unversioned);
my $header = &portpath_popup_js().
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row();
@@ -709,7 +726,7 @@ sub current_file_submissions {
'
'.&mt('Size (MB)').' | '.
''.&mt('Last Modified').' | '.
&Apache::loncommon::end_data_table_header_row();
- my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();
+ my ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();
my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/);
my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list);
if ($uploadedfile) {
@@ -728,9 +745,9 @@ sub current_file_submissions {
push(@bad_file_list,$error);
}
}
- if ($portfiles =~ /[^\s]/) {
+ if (@unversioned > 0) {
my $prefix = "/uploaded/$udom/$uname/portfolio";
- foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
+ foreach my $file (@unversioned) {
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
my $url = $prefix.$path.$name;
my $uploadedfile = &HTML::Entities::encode($url,'<>&"');
@@ -898,7 +915,7 @@ sub valid_award {
{
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
- 'WRONG_NUMCHECKEDBOXES','TOO_LONG',
+ 'WRONG_NUMBOXESCHECKED','TOO_LONG',
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION',
@@ -988,6 +1005,23 @@ sub finalizeawards {
$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 (ref($nameref)) {
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
@@ -1026,7 +1060,7 @@ sub decideoutput {
#
my $computer = ($handgrade || $nocorrect)? ''
- : " ".&mt("Computer's answer now shown above.");
+ : &mt("Computer's answer now shown above.");
&Apache::lonxml::debug("handgrade has :$handgrade:");
if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
@@ -1050,7 +1084,9 @@ sub decideoutput {
$message = '\textbf{'.$message.'}';
} else {
$message = "".$message."";
- $message.= $computer;
+ if ($computer) {
+ $message = "$computer $message";
+ }
}
$added_computer_text=1;
if ($awarded > 0) {
@@ -1094,7 +1130,9 @@ sub decideoutput {
$message = '\textbf{'.&mt('You are correct.').'}';
} else {
$message = "".&mt('You are correct.')."";
- $message.= $computer;
+ if ($computer) {
+ $message = "$computer $message";
+ }
}
$added_computer_text=1;
if ($awarded > 0
@@ -1296,17 +1334,27 @@ sub decideoutput {
my $first_access=&Apache::lonnet::get_first_access($interval[1]);
if (defined($first_access)) {
my $due_date= &Apache::lonnet::EXT("resource.$part.duedate");
- unless (($due_date) && ($due_date < $first_access + $interval[0])) {
+ my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+ unless (($due_date) && ($due_date < $first_access + $timelimit)) {
$message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");
}
}
}
$css_class=$possible_class{'no_grade'};
$button=1;
+ if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') {
+ if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
+ $message = 'Answer Submitted';
+ } else {
+ undef($message);
+ }
+ }
}
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&
!$added_computer_text && $target ne 'tex') {
- $message.= $computer;
+ if ($computer) {
+ $message = "$computer $message";
+ }
$added_computer_text=1;
}
if ($Apache::lonhomework::type eq 'practice') {
@@ -1503,7 +1551,8 @@ sub setgradedata {
$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();
+ $Apache::lonhomework::results{"resource.$id.version"} = &Apache::lonnet::usedversion();
+ $Apache::lonhomework::results{"resource.$id.maxtries"} = &Apache::lonnet::EXT("resource.$id.maxtries");
}
sub find_which_previous {
@@ -1602,7 +1651,11 @@ sub get_grade_messages {
if ($target eq 'tex') {
$message='\vskip 2 mm '.$message.' ';
} else {
- $message="$message | ";
+ if ($message) {
+ $message="$message | ";
+ } else {
+ $message=" | ";
+ }
if ($previousmsg) {
$previousmsg="$previousmsg | ";
}
@@ -1639,7 +1692,13 @@ sub get_grade_messages {
$trial.="/".$Apache::inputtags::params{'maxtries'};
}
}
- $trystr = ''.&mt($tries_text.' [_1]',$trial).' | ';
+
+ unless (($env{'request.state'} ne "construct") &&
+ ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') &&
+ (!$env{'request.role.adv'})) {
+ $trystr = ''.&mt($tries_text.' [_1]',$trial).'';
+ }
+ $trystr = ''.$trystr.' | ';
}
}
@@ -1672,7 +1731,8 @@ sub gradestatus {
&& $status ne 'NOT_IN_A_SLOT'
&& $status ne 'RESERVABLE'
&& $status ne 'RESERVABLE_LATER'
- && $status ne 'NOTRESERVABLE') {
+ && $status ne 'NOTRESERVABLE'
+ && $status ne 'NEED_DIFFERENT_IP') {
if ($status eq 'SHOW_ANSWER') {
$showbutton = 0;
@@ -1714,7 +1774,9 @@ sub gradestatus {
} else {
$output =
''.$button.' | '.$output;
- if (!$no_previous) {
+ if ((!$no_previous) &&
+ (($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') ||
+ ($env{'request.role.adv'}))) {
$output.=''.&previous_tries($id,$target).' | ';
}
$output.= '
';
@@ -1730,15 +1792,15 @@ sub previous_tries {
my $count;
my %count_lookup;
- my $lastrndseed;
+ my ($lastrndseed,$lasttype);
my $numstamps = 0;
foreach my $i (1..$Apache::lonhomework::history{'version'}) {
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 (($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurvey') ||
- ($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurveycred')) {
+ if (($curr_type eq 'anonsurvey') || ($curr_type eq 'anonsurveycred')) {
$is_anon = 1;
}
}
@@ -1777,8 +1839,9 @@ sub previous_tries {
{$1 $txt_correct. $3}s;
}
my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")";
- if (($curr_rndseed || $lastrndseed) && ($i > 1)) {
- if ($curr_rndseed ne $lastrndseed) {
+ if (($curr_rndseed ne '') && ($lastrndseed ne '')) {
+ if (($curr_rndseed ne $lastrndseed) &&
+ (($curr_type eq 'randomizetry') || ($lasttype eq 'randomizetry'))) {
$trystr .= '
'.&mt('New problem variation this try.').'';
}
}
@@ -1819,6 +1882,7 @@ sub previous_tries {
}
$output.=&Apache::loncommon::end_data_table_row()."\n";
$lastrndseed = $curr_rndseed;
+ $lasttype = $curr_type;
}
return if ($output eq '');
my $headers = ''.
@@ -1840,8 +1904,13 @@ sub previous_tries {
my $tries_text = &get_tries_text('link');
my $prefix = $env{'form.request.prefix'};
$prefix =~ tr{.}{_};
- my $function_name = "LONCAPA_previous_tries_".$prefix.
- $Apache::lonxml::curdepth.'_'.$env{'form.counter'};
+ my $function_name = 'LONCAPA_previous_tries_'.$prefix;
+ if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) {
+ $function_name .= $Apache::lonxml::curdepth;
+ } else {
+ $function_name .= &js_escape($id);
+ }
+ $function_name .= '_'.$Apache::lonxml::counter;
my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."
";
return $result;
}
@@ -1883,6 +1952,118 @@ sub spelling_languages {
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(<
+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");
+}
+
+
+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(<
+ 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);
+ }
+
+EQ_EDITOR_SCRIPT
+ }
+}
+
1;
__END__