--- loncom/homework/response.pm	2004/11/06 21:30:35	1.105.2.1
+++ loncom/homework/response.pm	2005/04/04 10:04:09	1.118
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.105.2.1 2004/11/06 21:30:35 albertel Exp $
+# $Id: response.pm,v 1.118 2005/04/04 10:04:09 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,6 +110,7 @@ sub poprandomnumber {
 	&Apache::lonxml::error("Unable to restore random algorithm.");
     }
 }
+
 sub setrandomnumber {
     my $rndseed;
     $rndseed=&Apache::structuretags::setup_rndseed();
@@ -124,11 +125,17 @@ sub setrandomnumber {
 	if (defined($Apache::inputtags::response[-1])) {
 	    $rndmod+=&Apache::lonnet::numval($Apache::inputtags::response[-1]);
 	}
-    } else {
+    } elsif ($rand_alg eq '64bit3') {
 	$rndmod=(&Apache::lonnet::numval2($Apache::inputtags::part) << 10);
 	if (defined($Apache::inputtags::response[-1])) {
 	    $rndmod+=&Apache::lonnet::numval2($Apache::inputtags::response[-1]);
 	}
+    } else {
+	my $shift=(4*scalar(@Apache::inputtags::responselist))%30;
+	$rndmod=(&Apache::lonnet::numval3($Apache::inputtags::part) << (($shift+15)%30));
+	if (defined($Apache::inputtags::response[-1])) {
+	    $rndmod+=(&Apache::lonnet::numval3($Apache::inputtags::response[-1]) << $shift );
+	}
     }
     if ($rndseed =~/([,:])/) {
 	my $char=$1;
@@ -145,7 +152,7 @@ sub setrandomnumber {
 	    $rndseed=(($rndseed<<32)>>32);
 	}
     }
-    &Apache::lonxml::debug("randseed $rndseed");
+    &Apache::lonxml::debug("randseed $rndmod $rndseed");
     &Apache::lonnet::setup_random_from_rndseed($rndseed);
     return '';
 }
@@ -273,10 +280,11 @@ sub handle_previous {
     if ($$previous{'used'} && ($$previous{'award'} eq $ad) ) {
 	if ($$previous{'last'}) {
 	    push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
-	} else {
+	    push(@Apache::inputtags::previous_version,$$previous{'version'});
+	} elsif ($Apache::lonhomework::type ne 'survey') {
 	    push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
+	    push(@Apache::inputtags::previous_version,$$previous{'version'});
 	}
-	push(@Apache::inputtags::previous_version,$$previous{'version'});
     }
 }
 
@@ -424,13 +432,11 @@ sub end_responseparam {
 }
 
 sub start_parameter {
-    my $result = &start_responseparam(@_);
-    return $result;
+    return &start_responseparam(@_);
 }
 
 sub end_parameter {
-    my $result = &end_responseparam(@_);
-    return $result;
+    return &end_responseparam(@_);
 }
 
 sub reset_params {
@@ -507,11 +513,13 @@ sub answer_footer {
 sub showallfoils {
     if (defined($ENV{'form.showallfoils'})) {
 	my ($symb)=&Apache::lonxml::whichuser();
-	if ($ENV{'request.state'} eq 'construct' || 
-	    ($ENV{'user.adv'} && $symb eq '')) {
+	if (($ENV{'request.state'} eq 'construct') || 
+	    ($ENV{'user.adv'} && $symb eq '')      ||
+            ($Apache::lonhomework::viewgrades) ) {
 	    return 1;
 	}
     }
+    if ($Apache::lonhomework::type eq 'survey') { return 1; }
     return 0;
 }
 
@@ -651,7 +659,7 @@ sub analyze_store_foilgroup {
 sub check_if_computed {
     my ($token,$parstack,$safeeval,$name)=@_;
     my $value = &Apache::lonxml::get_param($name,$parstack,$safeeval);
-    if ($value ne $token->[2]{$name}) {
+    if (ref($token->[2]) eq 'HASH' && $value ne $token->[2]{$name}) {
 	my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
 	$Apache::lonhomework::analyze{"$part_id.answercomputed"} = 1;
     }
@@ -707,6 +715,50 @@ sub get_response_param {
     return $parameter;
 }
 
+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
+    if ($who eq 'scantron') { return 0; }
+    # if the Submit Answer button for this particular part was pressed
+    my $partid=$Apache::inputtags::part;
+    if (defined($ENV{'form.submit_'.$partid})) { return 1; }
+    # otherwise no submission occured
+    return 0;
+}
+
+# basically undef and 0 (both false) mean that they still have work to do
+# 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 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
+sub check_status {
+    my ($id)=@_;
+    if (!$id) {	$id=$Apache::linputtags::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 $answerdate=&Apache::lonnet::EXT("resource.$id.answerdate");
+    if ( $opendate && $curtime > $opendate &&
+         $duedate && $curtime > $duedate &&
+         $answerdate && $curtime > $answerdate) {
+        return 3;
+    }
+    my $status=&Apache::lonnet::EXT("user.resource.resource.$id.solved");
+    if ($status =~ /^correct/) { return 1; }
+    if (!$status) { return undef; }
+    my $maxtries=&Apache::lonnet::EXT("resource.$id.maxtries");
+    if ($maxtries eq '') { $maxtries=2; }
+    my $curtries=&Apache::lonnet::EXT("user.resource.resource.$id.tries");
+    if ($curtries < $maxtries) { return 0; }
+    return 2;
+}
+
 1;
 __END__