--- loncom/homework/response.pm 2004/06/29 22:32:14 1.100 +++ loncom/homework/response.pm 2005/06/29 19:20:10 1.122 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # various response type definitons response definition # -# $Id: response.pm,v 1.100 2004/06/29 22:32:14 albertel Exp $ +# $Id: response.pm,v 1.122 2005/06/29 19:20:10 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,6 +29,7 @@ package Apache::response; use strict; use Apache::lonlocal; +use Apache::lonnet; BEGIN { &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse')); @@ -46,7 +47,8 @@ sub start_response { push (@Apache::inputtags::response,$id); push (@Apache::inputtags::responselist,$id); @Apache::inputtags::inputlist=(); - if ($Apache::inputtags::part eq '') { + if ($Apache::inputtags::part eq '' && + !$Apache::lonhomework::ignore_response_errors) { &Apache::lonxml::error(&HTML::Entities::encode(&mt("Found a <*response> outside of a in a ed problem"),'<>&"')); } if ($Apache::inputtags::response_with_no_part && @@ -109,6 +111,7 @@ sub poprandomnumber { &Apache::lonxml::error("Unable to restore random algorithm."); } } + sub setrandomnumber { my $rndseed; $rndseed=&Apache::structuretags::setup_rndseed(); @@ -117,16 +120,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 =~/([,:])/) { @@ -135,12 +156,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 ''; } @@ -267,17 +293,18 @@ 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'}); } } sub view_or_modify { my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); my $myself=0; - if ( ($name eq $ENV{'user.name'}) && ($domain eq $ENV{'user.domain'}) ) { + if ( ($name eq $env{'user.name'}) && ($domain eq $env{'user.domain'}) ) { $myself=1; } my $vgr=&Apache::lonnet::allowed('vgr',$courseid); @@ -308,14 +335,14 @@ sub end_dataresponse { my $result; if ( $target eq 'web' ) { } elsif ($target eq 'grade' ) { - if ( defined $ENV{'form.submitted'}) { + if ( defined $env{'form.submitted'}) { my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser(); my $allowed=&Apache::lonnet::allowed('mgr',$courseid); if ($allowed) { &Apache::response::setup_params('dataresponse',$safeeval); my $partid = $Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; - my $response = $ENV{'form.HWVAL_'.$id}; + my $response = $env{'form.HWVAL_'.$id}; my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); if ( $response =~ /[^\s]/) { $Apache::lonhomework::results{"resource.$partid.$id.$name"}=$response; @@ -383,8 +410,8 @@ sub start_responseparam { $safeeval,'name','type', 'description','default'); my $element=&Apache::edit::html_element_name('parameter_package'); - if (defined($ENV{"form.$element"}) && $ENV{"form.$element"} ne '') { - my $name=$ENV{"form.$element"}; + if (defined($env{"form.$element"}) && $env{"form.$element"} ne '') { + my $name=$env{"form.$element"}; my $tag=&decide_package($tagstack); $token->[2]->{'name'}=$name; $token->[2]->{'type'}= @@ -401,7 +428,7 @@ 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') { my $name =&Apache::lonxml::get_param('name',$parstack,$safeeval); my $default=&Apache::lonxml::get_param('default',$parstack, $safeeval); @@ -418,13 +445,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 { @@ -434,7 +459,7 @@ sub reset_params { sub setup_params { my ($tag,$safeeval) = @_; - if ($ENV{'request.state'} eq 'construct') { return; } + if ($env{'request.state'} eq 'construct') { return; } my %paramlist=(); foreach my $key (keys(%Apache::lonnet::packagetab)) { if ($key =~ /^$tag/) { @@ -466,7 +491,7 @@ sub setup_params { sub answer_header { my ($type) = @_; my $result; - if ($ENV{'form.answer_output_mode'} eq 'tex') { + if ($env{'form.answer_output_mode'} eq 'tex') { $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: \verb|'. $Apache::inputtags::part.'| \\\\ \hline '; } else { @@ -479,7 +504,7 @@ sub answer_header { sub answer_part { my ($type,$answer) = @_; my $result; - if ($ENV{'form.answer_output_mode'} eq 'tex') { + if ($env{'form.answer_output_mode'} eq 'tex') { $result = ' \verb|'.$answer.'|\\\\ \hline '; } else { $result = ''.$answer.''; @@ -490,7 +515,7 @@ sub answer_part { sub answer_footer { my ($type) = @_; my $result; - if ($ENV{'form.answer_output_mode'} eq 'tex') { + if ($env{'form.answer_output_mode'} eq 'tex') { $result = ' \end{tabular} \vskip 0 mm '; } else { $result = ''; @@ -499,12 +524,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 { @@ -520,19 +549,23 @@ sub getresponse { 'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14, 'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21, 'W'=>22,'X'=>23,'Y'=>24,'Z'=>25); - if ($ENV{'form.submitted'} eq 'scantron') { + if ($env{'form.submitted'} eq 'scantron') { my $part = $Apache::inputtags::part; my $id = $Apache::inputtags::response[-1]; - $response = $ENV{'scantron.'.($Apache::lonxml::counter+$temp-1). + $response = $env{'scantron.'.($Apache::lonxml::counter+$temp-1). '.answer'}; # save bubbled letter for later $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}; + $response = $env{$formparm}; } return $response; } @@ -540,6 +573,7 @@ sub getresponse { sub repetition { my $id = $Apache::inputtags::part; my $weight = &Apache::lonnet::EXT("resource.$id.weight"); + if (!defined($weight) || ($weight eq '')) { $weight=1; } my $repetition = int $weight/9; if ($weight % 9 != 0) {$repetition++;} return $repetition; @@ -639,7 +673,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; } @@ -683,7 +717,7 @@ sub pick_foil_for_concept { sub get_response_param { my ($id,$name,$default)=@_; my $parameter; - if ($ENV{'request.state'} eq 'construct' && + if ($env{'request.state'} eq 'construct' && defined($Apache::inputtags::params{$name})) { $parameter=$Apache::inputtags::params{$name}; } else { @@ -695,6 +729,52 @@ 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; } + # Submit All button on a .page was pressed + if (defined($env{'form.all_submit'})) { 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__