--- loncom/homework/response.pm	2011/11/29 13:24:38	1.228
+++ loncom/homework/response.pm	2021/01/12 15:57:18	1.244.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.228 2011/11/29 13:24:38 raeburn Exp $
+# $Id: response.pm,v 1.244.2.3 2021/01/12 15:57:18 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 '';
 }
@@ -399,7 +398,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 +468,18 @@ sub end_customresponse {
 		$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;
@@ -491,7 +502,7 @@ 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') {
@@ -502,6 +513,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);
@@ -512,6 +526,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>';
 }
@@ -561,23 +578,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;
@@ -611,6 +611,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;
@@ -620,15 +632,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);
@@ -836,8 +839,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 {
@@ -1132,8 +1135,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'))) {
@@ -1186,8 +1192,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;
         }   
     }
@@ -1220,8 +1226,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;
@@ -1298,7 +1307,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;
 }
@@ -1334,10 +1343,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
 
@@ -1346,7 +1357,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 &&
@@ -1354,7 +1365,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; }