--- loncom/homework/response.pm 2011/06/06 17:17:38 1.223
+++ loncom/homework/response.pm 2025/02/19 23:38:41 1.252
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.223 2011/06/06 17:17:38 www Exp $
+# $Id: response.pm,v 1.252 2025/02/19 23:38:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,7 +42,7 @@ described at http://www.lon-capa.org.
=over
-=item
+=item
=back
@@ -53,8 +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'));
@@ -71,7 +73,7 @@ sub start_response {
push (@Apache::inputtags::response,$id);
push (@Apache::inputtags::responselist,$id);
@Apache::inputtags::inputlist=();
- if ($Apache::inputtags::part eq '' &&
+ if ($Apache::inputtags::part eq '' &&
!$Apache::lonhomework::ignore_response_errors) {
&Apache::lonxml::error(&HTML::Entities::encode(&mt("Found a <*response> outside of a <part> in a <part>ed problem"),'<>&"'));
}
@@ -139,7 +141,7 @@ sub setrandomnumber {
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);
@@ -161,7 +163,7 @@ sub setrandomnumber {
} else {
$shift_amt=0;
}
- }
+ }
&Apache::lonxml::debug("id1: $id1, id2: $id2, shift_amt: $shift_amt");
if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
$rand_alg eq '64bit2') {
@@ -179,7 +181,6 @@ sub setrandomnumber {
} else {
($rndmod,$rndmod2)=&Apache::lonnet::digest("$id1,$id2");
}
-
if ($rndseed =~/([,:])/) {
my $char=$1;
use integer;
@@ -196,7 +197,6 @@ sub setrandomnumber {
}
}
&Apache::lonxml::debug("randseed $rndmod $rndseed");
- $Apache::lonhomework::results{'resource.'.$id1.'.rndseed'}=$rndseed;
&Apache::lonnet::setup_random_from_rndseed($rndseed);
return '';
}
@@ -265,10 +265,15 @@ sub mandatory_part_meta {
}
sub meta_part_order {
+ my ($type) = @_;
if (@Apache::inputtags::partlist) {
my @parts=@Apache::inputtags::partlist;
- shift(@parts);
+ unless ($type eq 'library') {
+ shift(@parts);
+ }
return '<partorder>'.join(',',@parts).'</partorder>'."\n";
+ } elsif ($type eq 'library') {
+ return '<partorder></partorder>'."\n";
} else {
return '<partorder>0</partorder>'."\n";
}
@@ -322,7 +327,7 @@ sub check_for_previous {
next if (($questiontype eq 'randomizetry') &&
($curr_rndseed ne $Apache::lonhomework::history{"$history:resource.$partid.rndseed"}));
push (@{$previous{'versionci'}},$history);
- $previous{'awardci'} = $Apache::lonhomework::history{"resource.$partid.$id.awarddetail"};
+ $previous{'awardci'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"};
$previous{'usedci'} = 1;
}
}
@@ -398,7 +403,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');
}
}
}
@@ -450,7 +455,7 @@ sub end_customresponse {
if ($Apache::lonhomework::type eq 'exam' ||
&Apache::response::submitted('scantron')) {
&Apache::response::scored_response($part,$id);
- } elsif ( $response =~ /[^\s]/ &&
+ } elsif ( $response =~ /[^\s]/ &&
$Apache::response::custom_answer_type[-1] eq 'loncapa/perl') {
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
@@ -462,12 +467,24 @@ sub end_customresponse {
my $error;
${$safeeval->varglob('LONCAPA::customresponse_submission')}=
$response;
-
+
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') || ($award eq 'ASSIGNED_SCORE')) {
+ 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;
@@ -490,17 +507,20 @@ 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' ||
+ 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();
}
}
+ if ($target eq 'web') {
+ &setup_prior_tries_hash(\&format_prior_response_math);
+ }
pop(@Apache::lonxml::namespace);
pop(@Apache::response::custom_answer);
pop(@Apache::response::custom_answer_type);
@@ -511,6 +531,9 @@ sub end_customresponse {
sub format_prior_response_custom {
my ($mode,$answer) =@_;
+ if (ref($answer) eq 'ARRAY') {
+ $answer = '('.join(', ', @{ $answer }).')';
+ }
return '<span class="LC_prior_custom">'.
&HTML::Entities::encode($answer,'"<>&').'</span>';
}
@@ -560,23 +583,6 @@ sub start_mathresponse {
return $result;
}
-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(<<ENDFORMULABUTTON);
-<script type="text/javascript" language="JavaScript">
-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");
-}
-</script>
-<a href="javascript:edit_${id}_${field}('${field}');void(0);"><img class="stift" src="$iconpath/stift.gif" alt="$button" title="$button" /></a>
-ENDFORMULABUTTON
-}
-
sub end_mathresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
@@ -610,6 +616,18 @@ sub end_mathresponse {
$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;
@@ -619,15 +637,6 @@ sub end_mathresponse {
}
}
}
- if ($target eq 'web') {
- &setup_prior_tries_hash(\&format_prior_response_math);
- my $partid = $Apache::inputtags::part;
- 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");
- }
- }
pop(@Apache::lonxml::namespace);
pop(@Apache::response::custom_answer);
@@ -762,7 +771,8 @@ sub start_responseparam {
}
} elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' ||
$target eq 'tex' || $target eq 'analyze' ) {
- if ($env{'request.state'} eq 'construct') {
+ if (($env{'request.state'} eq 'construct') ||
+ ($env{'request.noversionuri'} =~ m{^\Q/res/adm/includes/templates/\E[^/]+\.problem$})) {
my $name =&Apache::lonxml::get_param('name',$parstack,$safeeval);
my $default=&Apache::lonxml::get_param('default',$parstack,
$safeeval);
@@ -793,7 +803,10 @@ sub reset_params {
sub setup_params {
my ($tag,$safeeval) = @_;
- if ($env{'request.state'} eq 'construct') { return; }
+ if (($env{'request.state'} eq 'construct') ||
+ ($env{'request.noversionuri'} =~ m{^\Q/res/adm/includes/templates/\E[^/]+\.problem$})) {
+ return;
+ }
my %paramlist=();
foreach my $key (keys(%Apache::lonnet::packagetab)) {
if ($key =~ /^\Q$tag\E/) {
@@ -835,18 +848,18 @@ 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 {
- my $td = '<td '.(defined($rows)?'rowspan="'.$rows.'"':'').'>';
+ my $th = '<td '.(defined($rows)?'rowspan="'.$rows.'"':'').'>';
$result = '<table border="1"><tr>';
if ($Apache::lonhomework::type eq 'exam') {
- $result .= $td.($Apache::lonxml::counter+$increment). ')</td>';
+ $result .= $th.($Apache::lonxml::counter+$increment). ')</th>';
} else {
- $result .= $td.&mt('Answer for Part: [_1]',
- $Apache::inputtags::part).'</td>';
+ $result .= $th.&mt('Answer for Part: [_1]',
+ $Apache::inputtags::part).'</th>';
}
$result .= "\n";
$need_row_start = 0;
@@ -872,7 +885,7 @@ sub answer_part {
if ($env{'form.answer_output_mode'} eq 'tex') {
if (!$args->{'no_verbatim'}) {
my $to_use='|';
- foreach my $value (32..126) {
+ foreach my $value (33..41,43..126) {
my $char=pack('c',$value);
if ($answer !~ /\Q$char\E/) {
$to_use=$char;
@@ -924,7 +937,7 @@ sub answer_footer {
sub showallfoils {
if (defined($env{'form.showallfoils'})) {
my ($symb)=&Apache::lonnet::whichuser();
- if (($env{'request.state'} eq 'construct') ||
+ if (($env{'request.state'} eq 'construct') ||
($env{'user.adv'} && $symb eq '') ||
($Apache::lonhomework::viewgrades) ) {
return 1;
@@ -958,7 +971,7 @@ Optional Arguments:
'A is 1' -> a number between 1 and 26
'letter' -> a letter between 'A' and 'Z'
$lines - undef problem only needs a single line of bubbles.
- nonzero Problem wants the first nonempty response in
+ nonzero Problem wants the first nonempty response in
$lines lines of bubbles.
$bubbles_per_line - Must be provided if lines is defined.. number of
bubbles on a line.
@@ -996,23 +1009,24 @@ sub getresponse {
if ((defined($response)) && ($response ne "") && ($response ne " ")) {
last;
}
-
}
# save bubbled letter for later
$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);
}
}
@@ -1020,7 +1034,7 @@ sub getresponse {
} else {
$response = $env{$formparm};
}
- #
+ #
# If we have a nonempty answer, correct the numeric value
# of the answer for the line on which it was found.
#
@@ -1032,8 +1046,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
@@ -1041,9 +1064,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
@@ -1066,18 +1105,31 @@ Arguments
$part_id - id of the part to grade
$response_id - id of the response to grade
-
+
=cut
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; }
@@ -1091,8 +1143,11 @@ sub scored_response {
sub whichorder {
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'))) {
@@ -1141,11 +1196,17 @@ sub whichorder {
sub show_answer {
my $part = $Apache::inputtags::part;
- my $award = $Apache::lonhomework::history{"resource.$part.awarded"};
+ my $award = $Apache::lonhomework::history{"resource.$part.solved"};
my $status = $Apache::inputtags::status[-1];
- return ( ($award ==1
- && &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 {
@@ -1173,8 +1234,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;
@@ -1212,7 +1276,7 @@ sub pick_foil_for_concept {
Get a parameter associated with a problem.
Parameters:
- $id - the id of the paramater, either a part id,
+ $id - the id of the paramater, either a part id,
or a partid and responspe id joined by _
$name - Name of the parameter to fetch
$default - Default value for the paramter.
@@ -1236,7 +1300,7 @@ sub get_response_param {
sub submitted {
my ($who)=@_;
-
+
# when scatron grading any submission is a submission
if ($env{'form.submitted'} eq 'scantron') { return 1; }
# if the caller only cared if this was a scantron submission
@@ -1251,7 +1315,7 @@ sub submitted {
return 1;
}
# Submit All button on a .page was pressed
- if (defined($env{'form.all_submit'})) { return 1; }
+ if ($env{'form.all_submit'}) { return 1; }
# otherwise no submission occurred
return 0;
}
@@ -1279,7 +1343,7 @@ sub add_to_gradingqueue {
}
}
-=pod
+=pod
=item check_status()
@@ -1287,10 +1351,12 @@ basically undef and 0 (both false) mean
and all true values mean that they can't do any more work
a return of undef means it is unattempted
- a return of 0 means it is attmpted and wrong but still has tries
+ a return of 0 means it is both attempted and still has tries and
+ is wrong or is only partially correct, and retries
+ are allowed.
a return of 1 means it is marked correct
- a return of 2 means they have exceed maximum number of tries
- a return of 3 means it after the answer date
+ a return of 2 means they have exceeded maximum number of tries
+ a return of 3 means it is after the answer date
=cut
@@ -1299,7 +1365,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 &&
@@ -1307,7 +1373,13 @@ sub check_status {
return 3;
}
my $status=&Apache::lonnet::EXT("user.resource.resource.$id.solved");
- if ($status =~ /^correct/) { return 1; }
+ if ($status =~ /^correct/) {
+ my $awarded=&Apache::lonnet::EXT("user.resource.resource.$id.awarded");
+ my $retrypartial=&Apache::lonnet::EXT("resource.$id.retrypartial");
+ unless (($retrypartial =~ /^1|on|yes$/) && ($awarded <1)) {
+ return 1;
+ }
+ }
if (!$status) { return undef; }
my $maxtries=&Apache::lonnet::EXT("resource.$id.maxtries");
if ($maxtries eq '') { $maxtries=2; }
@@ -1355,7 +1427,7 @@ sub setup_prior_tries_hash {
}
}
}
- if ($questiontype eq 'randomizetry') {
+ if ($questiontype eq 'randomizetry') {
my $order_key = "$partprefix.$id.foilorder";
my @whichopts = &Apache::lonnet::str2array($Apache::lonhomework::history{$order_key});
if (@whichopts > 0) {
@@ -1375,7 +1447,7 @@ sub setup_prior_tries_hash {
1;
__END__
-
+
=pod
=cut