--- loncom/homework/response.pm 2011/11/29 17:43:30 1.229
+++ loncom/homework/response.pm 2018/03/30 23:50:13 1.245
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.229 2011/11/29 17:43:30 raeburn Exp $
+# $Id: response.pm,v 1.245 2018/03/30 23:50:13 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -56,6 +56,7 @@ 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'));
@@ -180,7 +181,6 @@ sub setrandomnumber {
} else {
($rndmod,$rndmod2)=&Apache::lonnet::digest("$id1,$id2");
}
- $Apache::lonhomework::results{'resource.'.$id1.'.rawrndseed'}=$rndseed;
if ($rndseed =~/([,:])/) {
my $char=$1;
use integer;
@@ -197,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 '';
}
@@ -266,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";
}
@@ -399,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');
}
}
}
@@ -469,6 +473,18 @@ sub end_customresponse {
$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;
@@ -502,6 +518,9 @@ sub end_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);
@@ -564,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;
@@ -614,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;
@@ -623,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);
@@ -839,8 +844,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 {
@@ -1135,8 +1140,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'))) {
@@ -1189,8 +1197,8 @@ sub show_answer {
my $status = $Apache::inputtags::status[-1];
my $canshow = 0;
if ($award =~ /^correct/) {
- if ((&Apache::inputtags::grading_is_nonlenient($part)) ||
- ($Apache::lonhomework::history{"resource.$part.awarded"} == 1)) {
+ if (($Apache::lonhomework::history{"resource.$part.awarded"} >= 1) ||
+ (&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/)) {
$canshow = 1;
}
}
@@ -1223,8 +1231,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;
@@ -1349,7 +1360,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 &&