--- loncom/homework/response.pm 2014/09/24 18:14:27 1.237
+++ loncom/homework/response.pm 2024/10/29 03:22:10 1.250
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.237 2014/09/24 18:14:27 damieng Exp $
+# $Id: response.pm,v 1.250 2024/10/29 03:22:10 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";
}
@@ -469,8 +473,8 @@ sub end_customresponse {
$error = $award;
$award = 'ERROR';
}
- if (($award eq 'INCORRECT' || $award eq 'APPROX_ANS' ||
- $award eq 'EXACT_ANS')) {
+ 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') {
@@ -514,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);
@@ -576,49 +583,6 @@ sub start_mathresponse {
return $result;
}
-sub edit_mathresponse_button {
- my ($id,$field)=@_;
- 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(<<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/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
-
- } else {
- # LON-CAPA math equation editor
- return(<<EQ_EDITOR_SCRIPT);
-<script type="text/javascript">
- var field = document.getElementById('${field}');
- field.className += ' math'; // note the space
- var LCMATH_started;
- if (typeof LCMATH_started === 'undefined') {
- 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);
- }
-</script>
-EQ_EDITOR_SCRIPT
- }
-}
-
sub end_mathresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
@@ -673,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);
@@ -816,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);
@@ -847,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/) {
@@ -926,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;
@@ -1357,7 +1316,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;
}
@@ -1393,10 +1352,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
@@ -1413,7 +1374,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; }