--- loncom/homework/response.pm 2009/03/13 00:34:20 1.212 +++ loncom/homework/response.pm 2015/02/20 22:14:49 1.239 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # various response type definitons response definition # -# $Id: response.pm,v 1.212 2009/03/13 00:34:20 raeburn Exp $ +# $Id: response.pm,v 1.239 2015/02/20 22:14:49 damieng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,7 +30,7 @@ =head1 NAME -Apache::resonse.pm +Apache::response.pm =head1 SYNOPSIS @@ -53,7 +53,10 @@ package Apache::response; use strict; use Apache::lonlocal; use Apache::lonnet; +use Apache::inputtags(); use Apache::lonmaxima(); +use Apache::lonr(); +use Apache::lontexconvert(); BEGIN { &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse','mathresponse')); @@ -135,9 +138,10 @@ sub poprandomnumber { } sub setrandomnumber { - my ($ignore_id2) = @_; - my $rndseed; - $rndseed=&Apache::structuretags::setup_rndseed(); + my ($ignore_id2,$target,$rndseed) = @_; + if (!defined($rndseed)) { + $rndseed=&Apache::structuretags::setup_rndseed(undef,$target); + } if (!defined($rndseed)) { $rndseed=&Apache::lonnet::rndseed(); } &Apache::lonxml::debug("randseed $rndseed"); # $rndseed=unpack("%32i",$rndseed); @@ -177,7 +181,7 @@ sub setrandomnumber { } else { ($rndmod,$rndmod2)=&Apache::lonnet::digest("$id1,$id2"); } - + $Apache::lonhomework::results{'resource.'.$id1.'.rawrndseed'}=$rndseed; if ($rndseed =~/([,:])/) { my $char=$1; use integer; @@ -194,6 +198,7 @@ sub setrandomnumber { } } &Apache::lonxml::debug("randseed $rndmod $rndseed"); + $Apache::lonhomework::results{'resource.'.$id1.'.rndseed'}=$rndseed; &Apache::lonnet::setup_random_from_rndseed($rndseed); return ''; } @@ -279,9 +284,11 @@ sub meta_response_order { } sub check_for_previous { - my ($curresponse,$partid,$id,$last) = @_; + my ($curresponse,$partid,$id,$last,$type) = @_; my %previous; $previous{'used'} = 0; + my $questiontype = $Apache::lonhomework::type; + my $curr_rndseed = $env{'form.'.$partid.'.rndseed'}; foreach my $key (sort(keys(%Apache::lonhomework::history))) { if ($key =~ /resource\.\Q$partid\E\.\Q$id\E\.submission$/) { if ( $last && $key =~ /^(\d+):/ ) { @@ -290,21 +297,38 @@ sub check_for_previous { &Apache::lonxml::debug("Trying $key"); my $pastresponse=$Apache::lonhomework::history{$key}; if ($pastresponse eq $curresponse) { - $previous{'used'} = 1; my $history; if ( $key =~ /^(\d+):/ ) { - $history=$1; + $history=$1; + next if ((($questiontype eq 'randomizetry') || + ($Apache::lonhomework::history{"$history:resource.$partid.type"} eq 'randomizetry')) && + ($curr_rndseed ne $Apache::lonhomework::history{"$history:resource.$partid.rndseed"})); $previous{'award'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"}; $previous{'last'}='0'; push(@{ $previous{'version'} },$history); } else { + next if ((($questiontype eq 'randomizetry') || + ($Apache::lonhomework::history{"resource.$partid.type"} eq 'randomizetry')) && + ($curr_rndseed ne $Apache::lonhomework::history{"resource.$partid.rndseed"})); $previous{'award'} = $Apache::lonhomework::history{"resource.$partid.$id.awarddetail"}; $previous{'last'}='1'; } + $previous{'used'} = 1; if (! $previous{'award'} ) { $previous{'award'} = 'UNKNOWN'; } if ($previous{'award'} eq 'INTERNAL_ERROR') { $previous{'used'}=0; } &Apache::lonxml::debug("got a match :$previous{'award'}:$previous{'used'}:"); - } + } elsif ($type eq 'ci') { + if (lc($pastresponse) eq lc($curresponse)) { + if ($key =~ /^(\d+):/) { + my $history = $1; + next if (($questiontype eq 'randomizetry') && + ($curr_rndseed ne $Apache::lonhomework::history{"$history:resource.$partid.rndseed"})); + push (@{$previous{'versionci'}},$history); + $previous{'awardci'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"}; + $previous{'usedci'} = 1; + } + } + } } } &Apache::lonhomework::showhash(%previous); @@ -317,7 +341,10 @@ sub handle_previous { if ($$previous{'last'}) { push(@Apache::inputtags::previous,'PREVIOUSLY_LAST'); push(@Apache::inputtags::previous_version,$$previous{'version'}); - } elsif ($Apache::lonhomework::type ne 'survey') { + } elsif (($Apache::lonhomework::type ne 'survey') && + ($Apache::lonhomework::type ne 'surveycred') && + ($Apache::lonhomework::type ne 'anonsurvey') && + ($Apache::lonhomework::type ne 'anonsurveycred')) { push(@Apache::inputtags::previous,'PREVIOUSLY_USED'); push(@Apache::inputtags::previous_version,$$previous{'version'}); } @@ -373,7 +400,7 @@ sub end_dataresponse { $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}='SUBMITTED'; } } else { - $result='Not Permitted to change values.' + $result=&mt('Not Permitted to change values'); } } } @@ -398,7 +425,7 @@ sub start_customresponse { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('String to display for answer:', - 'answerdisplay',$token); + 'answerdisplay',$token,'50'); $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag; @@ -438,14 +465,29 @@ sub end_customresponse { ${$safeeval->varglob('LONCAPA::customresponse_submission')}= $response; - my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval); + my ($award,$score) = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval); if (!&Apache::inputtags::valid_award($award)) { $error = $award; $award = 'ERROR'; } + if (($award eq 'INCORRECT' || $award eq 'APPROX_ANS' || + $award eq 'EXACT_ANS')) { + if ($Apache::lonhomework::type eq 'survey') { + $award='SUBMITTED'; + } elsif ($Apache::lonhomework::type eq 'surveycred') { + $award='SUBMITTED_CREDIT'; + } elsif ($Apache::lonhomework::type eq 'anonsurvey') { + $award='ANONYMOUS'; + } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { + $award='ANONYMOUS_CREDIT'; + } + } &Apache::response::handle_previous(\%previous,$award); $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= $award; + if ($award eq 'ASSIGNED_SCORE') { + $Apache::lonhomework::results{"resource.$part.$id.awarded"}=1.0*$score; + } if ($error) { $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}= $error; @@ -462,12 +504,12 @@ sub end_customresponse { $result .= &Apache::response::answer_footer('customresponse'); } if ($target eq 'web') { - &setup_prior_tries_hash(\&format_prior_response_math); + &setup_prior_tries_hash(\&format_prior_response_custom); } if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { - &Apache::lonxml::increment_counter(&Apache::response::repetition(), - "$part.$id"); + my $repetition = &repetition(); + &Apache::lonxml::increment_counter($repetition,"$part.$id"); if ($target eq 'analyze') { $Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse'; &Apache::lonhomework::set_bubble_lines(); @@ -483,6 +525,9 @@ sub end_customresponse { sub format_prior_response_custom { my ($mode,$answer) =@_; + if (ref($answer) eq 'ARRAY') { + $answer = '('.join(', ', @{ $answer }).')'; + } return ''. &HTML::Entities::encode($answer,'"<>&').''; } @@ -505,10 +550,10 @@ sub start_mathresponse { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('String to display for answer:', - 'answerdisplay',$token); + 'answerdisplay',$token,'50'); $result.=&Apache::edit::select_arg('Algebra System:', 'cas', - ['maxima'], + ['maxima','R'], $token); $result.=&Apache::edit::text_arg('Argument Array:', 'args',$token). @@ -533,20 +578,61 @@ sub start_mathresponse { } sub edit_mathresponse_button { - my ($id,$field)=@_; - my $button=&mt('Edit Answer'); -# my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor'); - my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; - return(< -function edit_${id}_${field} (textarea) { - thenumber = textarea; - thedata = document.forms['lonhomework'].elements[textarea].value; - newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable"); + my ($partid,$id)=@_; + my $field = 'HWVAL_'.$partid.'_'.$id; + my $btype = $env{'browser.type'}; + my $bversion = $env{'browser.version'}; + if (($btype eq 'explorer' && $bversion < 9) || ($btype eq 'safari' && $bversion < 3) || + ($btype eq 'mozilla' && $bversion < 3)) { + # 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 +$button ENDFORMULABUTTON + + } else { + # 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 + } } sub end_mathresponse { @@ -572,10 +658,28 @@ sub end_mathresponse { $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args, &Apache::lonxml::get_param('libraries',$parstack,$safeeval)); } + if ($cas eq 'R') { + my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)]; + $award=&Apache::lonr::r_run($Apache::response::custom_answer[-1],$response,$args, + &Apache::lonxml::get_param('libraries',$parstack,$safeeval)); + } + if (!&Apache::inputtags::valid_award($award)) { $error = $award; $award = 'ERROR'; } + if (($award eq 'INCORRECT' || $award eq 'APPROX_ANS' || + $award eq 'EXACT_ANS')) { + if ($Apache::lonhomework::type eq 'survey') { + $award='SUBMITTED'; + } elsif ($Apache::lonhomework::type eq 'surveycred') { + $award='SUBMITTED_CREDIT'; + } elsif ($Apache::lonhomework::type eq 'anonsurvey') { + $award='ANONYMOUS'; + } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { + $award='ANONYMOUS_CREDIT'; + } + } &Apache::response::handle_previous(\%previous,$award); $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= $award; @@ -591,7 +695,7 @@ sub end_mathresponse { my $id = $Apache::inputtags::response[-1]; if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') && (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) { - $result.=&edit_mathresponse_button($id,"HWVAL_$id"); + $result.=&edit_mathresponse_button($partid,$id); } } @@ -801,8 +905,8 @@ sub answer_header { if ($Apache::lonhomework::type eq 'exam') { $bit = ($Apache::lonxml::counter+$increment).') '; } else { - $bit .= ' Answer for Part: \verb|'. - $Apache::inputtags::part.'| '; + $bit .= ' '.&mt('Answer for Part: [_1]', + '\verb|'.$Apache::inputtags::part.'|').' '; } push(@answer_bits,$bit); } else { @@ -897,6 +1001,10 @@ sub showallfoils { } } if ($Apache::lonhomework::type eq 'survey') { return 1; } + if ($Apache::lonhomework::type eq 'surveycred') { return 1; } + if ($Apache::lonhomework::type eq 'anonsurvey') { return 1; } + if ($Apache::lonhomework::type eq 'anonsurveycred') { return 1; } + return 0; } @@ -965,16 +1073,18 @@ sub getresponse { $Apache::lonhomework::results{"resource.$part.$id.scantron"}.= $response; if ($resulttype ne 'letter') { - if ($resulttype eq 'A is 1') { - $response = $let_to_num{$response}+1; - } else { - $response = $let_to_num{$response}; + $response = $let_to_num{$response}; + if ($resulttype eq 'A is 1') { + if ($response ne "") { + $response = $response+1; + } } if ($response ne "") { $response += $line * $bubbles_per_line; } } else { if ($response ne "") { + my $raw = $response; $response = chr(ord($response) + $line * $bubbles_per_line); } } @@ -994,8 +1104,17 @@ sub getresponse { =item &repetition(); -Returns the number of lines that are required to encode the weight. -(Currently expects that there are 10 bubbles per line) +In scalar context: + +returns: the number of lines that are required to encode the weight. +(Default is for 10 bubbles per bubblesheet item; other (integer) +values can be specified by using a custom Bubblesheet format file +with an eighteenth entry (BubblesPerRow) set to the integer +appropriate for the bubblesheets which will be used to assign weights. + +In array context: + +returns: number of lines required to encode weight, and bubbles/line. =cut @@ -1003,9 +1122,25 @@ sub repetition { my $id = $Apache::inputtags::part; my $weight = &Apache::lonnet::EXT("resource.$id.weight"); if (!defined($weight) || ($weight eq '')) { $weight=1; } - my $repetition = int($weight/10); - if ($weight % 10 != 0) { $repetition++; } + my $bubbles_per_row; + if (($env{'form.bubbles_per_row'} =~ /^\d+$/) && + ($env{'form.bubbles_per_row'} > 0)) { + $bubbles_per_row = $env{'form.bubbles_per_row'}; + } else { + $bubbles_per_row = 10; + } + my $denominator = $bubbles_per_row; + if (($env{'form.scantron_lastbubblepoints'} == 0) && + ($bubbles_per_row > 1)) { + $denominator = $bubbles_per_row - 1; + } + my $repetition = int($weight/$denominator); + if ($weight % $denominator != 0) { $repetition++; } + if (wantarray) { + return ($repetition,$bubbles_per_row); + } return $repetition; + } =pod @@ -1035,11 +1170,24 @@ Arguments sub scored_response { my ($part,$id)=@_; my $repetition=&repetition(); + my $bubbles_per_row; + if (($env{'form.bubbles_per_row'} =~ /^\d+$/) && + ($env{'form.bubbles_per_row'} > 0)) { + $bubbles_per_row = $env{'form.bubbles_per_row'}; + } else { + $bubbles_per_row = 10; + } my $score=0; for (my $i=0;$i<$repetition;$i++) { - # A is 1, B is 2, etc. (get response return 0-9 and then we add 1) + # A is 1, B is 2, etc. my $increase=&Apache::response::getresponse($i+1); - if ($increase ne '') { $score+=$increase+1; } + unless (($increase == $bubbles_per_row-1) && + ($env{'form.scantron_lastbubblepoints'} == 0)) { + # (get response return 0-9 and then we add 1) + if ($increase ne '') { + $score+=$increase+1; + } + } } my $weight = &Apache::lonnet::EXT("resource.$part.weight"); if (!defined($weight) || $weight eq '' || $weight eq 0) { $weight = 1; } @@ -1051,10 +1199,13 @@ sub scored_response { } sub whichorder { - my ($max,$randomize,$showall,$hash)=@_; + my ($max,$randomize,$showall,$hash,$rndseed)=@_; #&Apache::lonxml::debug("man $max randomize $randomize"); - if (!defined(@{ $$hash{'names'} })) { return; } - my @names = @{ $$hash{'names'} }; + my @names; + if (ref($hash->{'names'}) eq 'ARRAY') { + @names = @{$hash->{'names'}}; + } + return if (!@names); my @whichopt =(); my (%top,@toplist,%bottom,@bottomlist); if (!($showall || ($randomize eq 'no'))) { @@ -1105,9 +1256,15 @@ sub show_answer { my $part = $Apache::inputtags::part; my $award = $Apache::lonhomework::history{"resource.$part.solved"}; my $status = $Apache::inputtags::status[-1]; - return ( ($award =~ /^correct/ - && &Apache::lonhomework::show_problem_status()) - || $status eq "SHOW_ANSWER"); + my $canshow = 0; + if ($award =~ /^correct/) { + if (($Apache::lonhomework::history{"resource.$part.awarded"} >= 1) || + (&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/)) { + $canshow = 1; + } + } + return (($canshow && &Apache::lonhomework::show_problem_status()) + || $status eq "SHOW_ANSWER"); } sub analyze_store_foilgroup { @@ -1135,8 +1292,11 @@ sub check_if_computed { sub pick_foil_for_concept { my ($target,$attrs,$hinthash,$parstack,$safeeval)=@_; - if (not defined(@{ $Apache::response::conceptgroup{'names'} })) { return; } - my @names = @{ $Apache::response::conceptgroup{'names'} }; + my @names; + if (ref($Apache::response::conceptgroup{'names'}) eq 'ARRAY') { + @names = @{ $Apache::response::conceptgroup{'names'} }; + } + return if (!@names); my $pick=int(&Math::Random::random_uniform() * ($#names+1)); my $name=$names[$pick]; push @{ $Apache::response::foilgroup{'names'} }, $name; @@ -1261,7 +1421,7 @@ sub check_status { if (!defined($id)) { $id=$Apache::inputtags::part; } my $curtime=&Apache::lonnet::EXT('system.time'); my $opendate=&Apache::lonnet::EXT("resource.$id.opendate"); - my $duedate=&Apache::lonnet::EXT("resource.$id.duedate"); + my $duedate=&Apache::lonhomework::due_date($id); my $answerdate=&Apache::lonnet::EXT("resource.$id.answerdate"); if ( $opendate && $curtime > $opendate && $duedate && $curtime > $duedate && @@ -1291,25 +1451,40 @@ sub check_status { - scalars that are other elements of the history hash to pass to $func - ref to data to be passed untouched to $func + $questiontype is the questiontype (currently only passed in if + randomizebytry. + =cut sub setup_prior_tries_hash { - my ($func,$data) = @_; + my ($func,$data,$questiontype) = @_; my $part = $Apache::inputtags::part; - my $id = $Apache::inputtags::response[-1]; + my $id = $Apache::inputtags::response[-1]; foreach my $i (1..$Apache::lonhomework::history{'version'}) { - my $sub_key = "$i:resource.$part.$id.submission"; + my $partprefix = "$i:resource.$part"; + my $sub_key = "$partprefix.$id.submission"; next if (!exists($Apache::lonhomework::history{$sub_key})); + my $type_key = "$partprefix.type"; + my $type = $Apache::lonhomework::history{$type_key}; my @other_data; - foreach my $datum (@{ $data }) { - if (ref($datum)) { - push(@other_data,$datum); - } else { - my $info_key = "$i:resource.$part.$id.$datum"; - push(@other_data,$Apache::lonhomework::history{$info_key}); + if (ref($data) eq 'ARRAY') { + foreach my $datum (@{ $data }) { + if (ref($datum)) { + push(@other_data,$datum); + } else { + my $info_key = "$i:resource.$part.$id.$datum"; + push(@other_data,$Apache::lonhomework::history{$info_key}); + } } - } - + } + if ($questiontype eq 'randomizetry') { + my $order_key = "$partprefix.$id.foilorder"; + my @whichopts = &Apache::lonnet::str2array($Apache::lonhomework::history{$order_key}); + if (@whichopts > 0) { + shift(@other_data); + unshift(@other_data,\@whichopts); + } + } my $output = &$func('grade', $Apache::lonhomework::history{$sub_key},