--- loncom/homework/response.pm 2004/08/29 07:49:35 1.101
+++ 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.101 2004/08/29 07:49:35 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,16 +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];
}
- } else {
- $rndmod=(&Apache::lonnet::numval2($Apache::inputtags::part) << 10);
- if (defined($Apache::inputtags::response[-1])) {
- $rndmod+=&Apache::lonnet::numval2($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($id1) << 10);
+ if (defined($id2)) { $rndmod+=&Apache::lonnet::numval2($id2); }
+ } else {
+ 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 =~/([,:])/) {
@@ -136,12 +155,17 @@ sub setrandomnumber {
my ($num1,$num2)=split(/\Q$char\E/,$rndseed);
$num1+=$rndmod;
$num2+=$rndmod;
+ if($Apache::lonnet::_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
$rndseed=$num1.$char.$num2;
} else {
$rndseed+=$rndmod;
+ if($Apache::lonnet::_64bit) {
+ use integer;
+ $rndseed=(($rndseed<<32)>>32);
+ }
}
+ &Apache::lonxml::debug("randseed $rndmod $rndseed");
&Apache::lonnet::setup_random_from_rndseed($rndseed);
- &Apache::lonxml::debug("randseed $rndseed");
return '';
}
@@ -268,10 +292,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'});
}
}
@@ -419,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 {
@@ -500,12 +523,16 @@ sub answer_footer {
}
sub showallfoils {
- my $return=0;
- if (defined($ENV{'form.showallfoils'}) &&
- $ENV{'request.state'} eq 'construct') {
- $return=1;
+ if (defined($ENV{'form.showallfoils'})) {
+ my ($symb)=&Apache::lonxml::whichuser();
+ if (($ENV{'request.state'} eq 'construct') ||
+ ($ENV{'user.adv'} && $symb eq '') ||
+ ($Apache::lonhomework::viewgrades) ) {
+ return 1;
+ }
}
- return $return;
+ if ($Apache::lonhomework::type eq 'survey') { return 1; }
+ return 0;
}
sub getresponse {
@@ -530,7 +557,11 @@ sub getresponse {
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
$response;
if ($resulttype ne 'letter') {
- $response = $let_to_num{$response};
+ if ($resulttype eq 'A is 1') {
+ $response = $let_to_num{$response}+1;
+ } else {
+ $response = $let_to_num{$response};
+ }
}
} else {
$response = $ENV{$formparm};
@@ -640,7 +671,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;
}
@@ -696,6 +727,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__