--- loncom/homework/inputtags.pm 2023/09/11 13:44:18 1.333.2.14 +++ loncom/homework/inputtags.pm 2015/04/21 12:28:05 1.334 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.333.2.14 2023/09/11 13:44:18 raeburn Exp $ +# $Id: inputtags.pm,v 1.334 2015/04/21 12:28:05 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -450,7 +450,6 @@ sub start_textline { if ($addchars) { $result.=&addchars('HWVAL_'.$id,$addchars); } - my $numrespclass; my $readonly=&Apache::lonxml::get_param('readonly',$parstack, $safeeval); if (lc($readonly) eq 'yes' @@ -458,32 +457,20 @@ sub start_textline { $readonly=' readonly="readonly" '; } else { $readonly=''; - if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') && - ($tagstack->[-2] eq 'numericalresponse')) { - $numrespclass = ' LC_numresponse_text'; - } } my $name = 'HWVAL_'.$id; my $itemid = 'HWVAL_'.$partid.'_'.$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')) || - (($tagstack->[-2] eq 'customresponse') && - (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') eq 'no')))) { - $result.=&edit_mathresponse_button($input_tag_id); - } } if ($Apache::lonhomework::type eq 'exam' && &needs_exam_box($tagstack)) { @@ -653,7 +640,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)'); @@ -673,13 +660,10 @@ sub file_selector { if ($constraints) { $result .= $constraints.'
'; } - if ($which eq 'uploadonly' || $which eq 'both') { - my $free_space = $maxfilesize * 1048576; - $result .= &mt('Submit a file: (only one file per submission)'). - '
'. - '
'; + if ($which eq 'uploadonly' || $which eq 'both') { + $result.=&mt('Submit a file: (only one file per submission)'). + '

'; } if ( $which eq 'both') { $result.='
'.''.&mt('OR:').'
'; @@ -701,6 +685,7 @@ sub file_selector { &mt('Select Portfolio Files: (one or more files per submission)').'
'. ''. '
'; + } $result.=&Apache::lonhtmlcommon::row_closure(1); return $result; @@ -713,6 +698,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(); @@ -723,7 +717,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) { @@ -742,9 +736,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,'<>&"'); @@ -912,7 +906,7 @@ sub valid_award { { my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', - 'WRONG_NUMBOXESCHECKED','TOO_LONG', + 'WRONG_NUMCHECKEDBOXES','TOO_LONG', 'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', 'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION', @@ -1044,7 +1038,6 @@ sub decideoutput { 'not_charged_try' => 'LC_answer_not_charged_try', 'no_grade' => 'LC_answer_no_grade', 'no_message' => 'LC_no_message', - 'no_charge_warn' => 'LC_answer_warning', ); my $part = $Apache::inputtags::part; @@ -1058,7 +1051,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'); } @@ -1082,9 +1075,7 @@ sub decideoutput { $message = '\textbf{'.$message.'}'; } else { $message = "".$message.""; - if ($computer) { - $message = "$computer $message"; - } + $message.= $computer; } $added_computer_text=1; if ($awarded > 0) { @@ -1128,9 +1119,7 @@ sub decideoutput { $message = '\textbf{'.&mt('You are correct.').'}'; } else { $message = "".&mt('You are correct.').""; - if ($computer) { - $message = "$computer $message"; - } + $message.= $computer; } $added_computer_text=1; if ($awarded > 0 @@ -1159,11 +1148,7 @@ sub decideoutput { if ($target ne 'tex') { $message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted'); } - if (&Apache::lonhomework::show_some_problem_status()) { - $css_class=$possible_class{'no_charge_warn'}; - } else { - $css_class=$possible_class{'not_charged_try'}; - } + $css_class=$possible_class{'not_charged_try'}; $button = 1; } elsif ($award eq 'WRONG_NUMBOXESCHECKED') { $message = &mt('Number of boxes checked outside permissible range (either too few or too many).'); @@ -1212,12 +1197,8 @@ sub decideoutput { } elsif ($award eq 'SIG_FAIL') { my ($used,$min,$max)=split(':',$awardmsg); my $word = ($used < $min) ? 'more' : 'fewer'; - $message = &mt("Submission not graded. Use $word significant figures."); - if (&Apache::lonhomework::show_some_problem_status()) { - $css_class=$possible_class{'no_charge_warn'}; - } else { - $css_class=$possible_class{'not_charged_try'}; - } + $message = &mt("Submission not graded. Use $word digits.",$used); + $css_class=$possible_class{'not_charged_try'}; $button=1; } elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') { $message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg); @@ -1227,37 +1208,21 @@ sub decideoutput { } elsif ($award eq 'UNIT_INVALID_STUDENT') { $message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target)); if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} - if (&Apache::lonhomework::show_some_problem_status()) { - $css_class=$possible_class{'no_charge_warn'}; - } else { - $css_class=$possible_class{'not_charged_try'}; - } + $css_class=$possible_class{'not_charged_try'}; $button=1; } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') { $message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target)); if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} - if (&Apache::lonhomework::show_some_problem_status()) { - $css_class=$possible_class{'no_charge_warn'}; - } else { - $css_class=$possible_class{'not_charged_try'}; - } + $css_class=$possible_class{'not_charged_try'}; $button=1; } elsif ($award eq 'UNIT_NOTNEEDED') { $message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target)); - if (&Apache::lonhomework::show_some_problem_status()) { - $css_class=$possible_class{'no_charge_warn'}; - } else { - $css_class=$possible_class{'not_charged_try'}; - } + $css_class=$possible_class{'not_charged_try'}; $button=1; } elsif ($award eq 'NO_UNIT') { $message = &mt("Units required").'.'; if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')}; - if (&Apache::lonhomework::show_some_problem_status()) { - $css_class=$possible_class{'no_charge_warn'}; - } else { - $css_class=$possible_class{'not_charged_try'}; - } + $css_class=$possible_class{'not_charged_try'}; $button=1; } elsif ($award eq 'COMMA_FAIL') { $message = &mt("Proper comma separation is required").'.'; @@ -1366,9 +1331,7 @@ sub decideoutput { } if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && !$added_computer_text && $target ne 'tex') { - if ($computer) { - $message = "$computer $message"; - } + $message.= $computer; $added_computer_text=1; } if ($Apache::lonhomework::type eq 'practice') { @@ -1905,16 +1868,9 @@ 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; - if (($env{'request.state'} eq 'construct') || ($id =~ /\W/)) { - $function_name .= $Apache::lonxml::curdepth; - } else { - $function_name .= $id; - } - $function_name .= '_'.$Apache::lonxml::counter; - my $possmathjax = 1; - my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output, - &mt($tries_text),$possmathjax)."
"; + my $function_name = "LONCAPA_previous_tries_".$prefix. + $Apache::lonxml::curdepth.'_'.$env{'form.counter'}; + my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."
"; return $result; } @@ -1955,118 +1911,6 @@ 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"); -} - -$button -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__