--- loncom/homework/response.pm	2005/01/31 22:00:40	1.113
+++ loncom/homework/response.pm	2005/04/04 18:14:58	1.119
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.113 2005/01/31 22:00:40 albertel Exp $
+# $Id: response.pm,v 1.119 2005/04/04 18:14:58 albertel 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();
@@ -118,22 +119,34 @@ sub setrandomnumber {
     #  $rndseed=unpack("%32i",$rndseed);
     my $rand_alg=&Apache::lonnet::get_rand_alg();
     my $rndmod;
-    if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
-	$rand_alg eq '64bit2') {
-	$rndmod=(&Apache::lonnet::numval($Apache::inputtags::part) << 10);
+
+    my ($id1,$id2,$shift_amt);
+    if ($Apache::lonhomework::parsing_a_problem) {
+	$id1=$Apache::inputtags::part;
 	if (defined($Apache::inputtags::response[-1])) {
-	    $rndmod+=&Apache::lonnet::numval($Apache::inputtags::response[-1]);
+	    $id2=$Apache::inputtags::response[-1];
 	}
+	$shift_amt=scalar(@Apache::inputtags::responselist);
+    } elsif ($Apache::lonhomework::parsing_a_task) {
+	$id1=$Apache::bridgetask::dimension;
+	if (defined($Apache::bridgetask::instance[-1])) {
+	    $id2=$Apache::bridgetask::instance[-1];
+	}
+	$shift_amt=scalar(@Apache::bridgetask::instance);
+    } 
+    &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') {
+	$rndmod=(&Apache::lonnet::numval($id1) << 10);
+	if (defined($id2)) { $rndmod+=&Apache::lonnet::numval($id2); }
     } 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]);
-	}
+	$rndmod=(&Apache::lonnet::numval2($id1) << 10);
+	if (defined($id2)) { $rndmod+=&Apache::lonnet::numval2($id2); }
     } 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 );
+	my $shift=(4*$shift_amt)%30;
+	$rndmod=(&Apache::lonnet::numval3($id1) << (($shift+15)%30));
+	if (defined($id2)) {
+	    $rndmod+=(&Apache::lonnet::numval3($id2) << $shift );
 	}
     }
     if ($rndseed =~/([,:])/) {
@@ -431,13 +444,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 {
@@ -514,8 +525,9 @@ 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;
 	}
     }
@@ -728,6 +740,37 @@ sub submitted {
     # 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__