--- loncom/homework/inputtags.pm 2020/01/13 15:19:21 1.333.2.9.2.1 +++ loncom/homework/inputtags.pm 2015/10/05 02:35:40 1.337 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.333.2.9.2.1 2020/01/13 15:19:21 raeburn Exp $ +# $Id: inputtags.pm,v 1.337 2015/10/05 02:35:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -460,23 +460,17 @@ sub start_textline { } 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.= ''; $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)) { @@ -646,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)'); @@ -666,14 +660,13 @@ sub file_selector { if ($constraints) { $result .= $constraints.'
'; } - if ($which eq 'uploadonly' || $which eq 'both') { + if ($which eq 'uploadonly' || $which eq 'both') { my $free_space = $maxfilesize * 1048576; $result .= &mt('Submit a file: (only one file per submission)'). '
'. - '
'; - } + '" id="HWFILE'.$jspart.'_'.$id.'" class="flUpload" />
'. + '
' + } if ( $which eq 'both') { $result.='
'.''.&mt('OR:').'
'; } @@ -694,6 +687,7 @@ sub file_selector { &mt('Select Portfolio Files: (one or more files per submission)').'
'. ''. '
'; + } $result.=&Apache::lonhtmlcommon::row_closure(1); return $result; @@ -706,6 +700,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(); @@ -716,7 +719,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) { @@ -735,9 +738,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,'<>&"'); @@ -1037,7 +1040,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; @@ -1051,7 +1053,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'); } @@ -1075,9 +1077,7 @@ sub decideoutput { $message = '\textbf{'.$message.'}'; } else { $message = "".$message.""; - if ($computer) { - $message = "$computer $message"; - } + $message.= $computer; } $added_computer_text=1; if ($awarded > 0) { @@ -1121,9 +1121,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 @@ -1201,12 +1199,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.",$used); - 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); @@ -1329,8 +1323,7 @@ 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"); - my ($timelimit) = ($interval[0] =~ /^(\d+)/); - unless (($due_date) && ($due_date < $first_access + $timelimit)) { + unless (($due_date) && ($due_date < $first_access + $interval[0])) { $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached."); } } @@ -1340,9 +1333,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') { @@ -1709,7 +1700,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; @@ -1879,13 +1871,8 @@ 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\s\-]/)) { - $function_name .= $Apache::lonxml::curdepth; - } else { - $function_name .= &js_escape($id); - } - $function_name .= '_'.$Apache::lonxml::counter; + 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; } @@ -1927,118 +1914,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__