--- loncom/homework/rankresponse.pm 2003/01/28 00:14:55 1.2 +++ loncom/homework/rankresponse.pm 2008/08/08 16:37:13 1.57 @@ -1,8 +1,7 @@ # The LearningOnline Network with CAPA # rank style response # -# $Id: rankresponse.pm,v 1.2 2003/01/28 00:14:55 albertel Exp $ -# +# $Id: rankresponse.pm,v 1.57 2008/08/08 16:37:13 bisitz Exp $ # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -25,11 +24,12 @@ # # http://www.lon-capa.org/ # -# 2/21 Guy package Apache::rankresponse; use strict; use HTML::Entities(); +use Apache::optionresponse(); +use Apache::lonlocal; BEGIN { &Apache::lonxml::register('Apache::rankresponse',('rankresponse')); @@ -44,6 +44,7 @@ sub start_rankresponse { push (@Apache::lonxml::namespace,'rankresponse'); my $id = &Apache::response::start_response($parstack,$safeeval); %Apache::hint::rank=(); + undef(%Apache::response::foilnames); if ($target eq 'meta') { $result=&Apache::response::meta_package_write('rankresponse'); } elsif ($target eq 'edit' ) { @@ -63,6 +64,12 @@ sub start_rankresponse { $safeeval,'max', 'randomize'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } elsif ($target eq 'analyze') { + my $part_id="$Apache::inputtags::part.$id"; + $Apache::lonhomework::analyze{"$part_id.type"} = 'rankresponse'; + push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); + push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1); + } return $result; } @@ -75,6 +82,7 @@ sub end_rankresponse { pop @Apache::lonxml::namespace; &Apache::lonxml::deregister('Apache::rankresponse', ('foilgroup','foil','conceptgroup')); + undef(%Apache::response::foilnames); return $result; } @@ -84,27 +92,46 @@ sub start_foilgroup { my $result; %Apache::response::foilgroup=(); $Apache::rankresponse::conceptgroup=0; - &Apache::response::setrandomnumber(); + &Apache::response::pushrandomnumber(); return $result; } sub end_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') { + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); my $randomize = &Apache::lonxml::get_param('randomize',$parstack, $safeeval,'-2'); my $tol = &Apache::lonxml::get_param('tol',$parstack,$safeeval,'-2'); if (!defined($tol)) { $tol=0; } - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { $result=&displayfoils($target,$max,$randomize,$tol); + $Apache::lonxml::post_evaluate=0; } elsif ($target eq 'answer' ) { $result=&displayanswers($max,$randomize,$tol); } elsif ( $target eq 'grade') { &grade_response($max,$randomize,$tol); + } elsif ( $target eq 'analyze') { + my @shown = &whichfoils($max,$randomize); + &Apache::response::analyze_store_foilgroup(\@shown, + ['text','value','location']); + my $part_id= + "$Apache::inputtags::part.$Apache::inputtags::response[-1]"; + $Apache::lonhomework::analyze{"$part_id.tol"}=$tol; + } + my $part = $Apache::inputtags::part; + my $id = $Apache::inputtags::response[-1]; + &Apache::lonxml::increment_counter(&getfoilcounts($max), + "$part.$id"); + if ($target eq 'analyze') { + &Apache::lonhomework::set_bubble_lines(); } + } elsif ($target eq 'edit') { + $result=&Apache::edit::end_table(); } + &Apache::response::poprandomnumber(); return $result; } @@ -118,7 +145,7 @@ sub get_correct_order { } @value_names = sort { - if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] cmp $b->[0]);} + if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] <=> $b->[0]);} return 0; } @value_names; my @value_names_tmp=@value_names; @@ -149,18 +176,31 @@ sub displayanswers { if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } my @names = @{ $Apache::response::foilgroup{'names'} }; my @whichfoils = &whichfoils($max,$randomize); - my $result=&Apache::response::answer_header('rankresponse'); my @correctorder=&get_correct_order($tol,@whichfoils); - foreach my $order (@correctorder) { - $result.=&Apache::response::answer_part('rankresponse',$order); + my $result; + if ($Apache::lonhomework::type eq 'exam') { + my @alphabet = ('A'..'Z'); + my $i=0; + foreach my $order (@correctorder) { + $result.=&Apache::response::answer_header('rankresponse',$i++); + $result.=&Apache::response::answer_part('rankresponse', + $alphabet[$order-1]); + $result.=&Apache::response::answer_part('rankresponse',$order); + $result.=&Apache::response::answer_footer('rankresponse'); + } + } else { + $result=&Apache::response::answer_header('rankresponse'); + foreach my $order (@correctorder) { + $result.=&Apache::response::answer_part('rankresponse',$order); + } + $result.=&Apache::response::answer_footer('rankresponse'); } - $result.=&Apache::response::answer_footer('rankresponse'); return $result; } sub check_response_order { my (%responsehash)=@_; - my @order=sort(values(%responsehash)); + my @order=sort( {$a <=> $b} values(%responsehash)); my $lastvalue=0; my $expected=1; my $malformed=0; @@ -178,16 +218,16 @@ sub check_response_order { sub grade_response { my ($max,$randomize,$tol)=@_; my (@whichfoils)=&whichfoils($max,$randomize); - if (!defined($ENV{'form.submitted'})) { return; } + if (!&Apache::response::submitted()) { return; } my %responsehash; my %grade; - my ($temp,$right,$wrong,$ignored)=(0,0,0,0); + my ($temp,$right,$wrong,$ignored)=(1,0,0,0); my @correctorder=&get_correct_order($tol,@whichfoils); foreach my $name (@whichfoils) { - my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"}; - $responsehash{$name}=$response; + my $response = &Apache::response::getresponse($temp,'A is 1'); my $value=shift(@correctorder); if ( $response =~ /[^\s]/) { + $responsehash{$name}=$response; &Apache::lonxml::debug("submitted a $response for $value
\n"); if ($value eq $response) { $grade{$name}='1'; $right++; @@ -221,55 +261,111 @@ sub grade_response { $ad='MISSING_ANSWER'; } } + if ($Apache::lonhomework::type eq 'survey' && + ($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS') ) { + $ad='SUBMITTED'; + } else { + $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; + } $Apache::lonhomework::results{"resource.$part.$id.submission"}= $responsestr; - $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; &Apache::response::handle_previous(\%previous,$ad); } +sub format_prior_answer { + my ($mode,$answer,$other_data) = @_; + my %lastresponse=&Apache::lonnet::str2hash($answer); + my $foil_order =$other_data->[0]; + my %grading =&Apache::lonnet::str2hash($other_data->[1]); + my $output; + foreach my $name (@{ $foil_order }) { + next if (!defined($lastresponse{$name})); + $output .= ''.$lastresponse{$name}.''; + } + return if (!defined($output)); + $output = + ''.$output.'
'; + return $output; +} + sub displayfoils { my ($target,$max,$randomize,$tol)=@_; my $result; + my @alphabet=('A'..'Z'); my (@whichfoils)=&whichfoils($max,$randomize); my $part=$Apache::inputtags::part; my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; - my $status=$Apache::inputtags::status[-1]; my @whichopt=(1..($#whichfoils+1)); my @correctorder=&get_correct_order($tol,@whichfoils); - if (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) { + if ( &Apache::response::show_answer() && ($target ne 'tex')) { foreach my $name (@whichfoils) { my $text=$Apache::response::foilgroup{$name.'.text'}; my $value=shift(@correctorder); - $result.='
'.$value.':'.$text; + if ($target eq 'web') { + $result.='
'.$value.': '.$text; + } else { + $result.=' \strut\\\\\strut '.$value.':'.$text; + } } } else { my $i = 0; - my $temp=0; + my $temp=1; my $id=$Apache::inputtags::response[-1]; my $part=$Apache::inputtags::part; my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; - my %lastresponse=&Apache::lonnet::str2hash($lastresponse); + my %lastresponse=&Apache::lonnet::str2hash($lastresponse); + my @alp = splice @alphabet, 0, $#whichopt + 1; + my $internal_counter=$Apache::lonxml::counter; foreach my $name (@whichfoils) { my $lastopt=$lastresponse{$name}; - my $optionlist="\n"; + my $optionlist=''; + if ($target ne 'tex') {$optionlist="\n";} my $option; foreach $option (@whichopt) { if ($option eq $lastopt) { - $optionlist.="\n"; + if ($target ne 'tex') {$optionlist.="\n";} } else { - $optionlist.="\n"; + if ($target ne 'tex') {$optionlist.="\n";} } } - $optionlist='\n"; + if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { + $optionlist='\n"; + } else { + $optionlist=' '.$temp.' '.$optionlist.' '; + } my $text=$Apache::response::foilgroup{$name.'.text'}; - $result.='
'.$optionlist.$text."\n"; + if ($target ne 'tex') { + if ($Apache::lonhomework::type ne 'exam') { + $result.='
'.$optionlist.$text."\n"; + } else { + $result.='
'.$text."\n"; + } + if ($Apache::lonhomework::type eq 'exam') { + my @values=(1..scalar(@whichopt)); + $result.=&Apache::optionresponse::webbubbles(\@values,\@whichopt,$temp,$lastopt); + } + } else { + if ($Apache::lonhomework::type eq 'exam') { + $result.='\vskip 0 mm '.$text.' \vskip 0 mm '."\n"; + $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse').'\end{enumerate} \vskip -8 mm \strut '; + $internal_counter++; + } else { + $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n"; + } + } $temp++; } } - $result.="
"; + if ($target eq 'web') { + &Apache::response::setup_prior_tries_hash(\&format_prior_answer, + [\@whichfoils, + 'submissiongrading']); + } + if ($target ne 'tex') {$result.="
";} else {$result.=' \vskip 0 mm ';} return $result; } @@ -285,52 +381,9 @@ sub getfoilcounts { sub whichfoils { my ($max,$randomize)=@_; - $max = &getfoilcounts($max); - # &Apache::lonxml::debug("man $max randomize $randomize"); - if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } - my @names = @{ $Apache::response::foilgroup{'names'} }; - my @whichopt =(); - my (%top,@toplist,%bottom,@bottomlist); - if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) { - my $current=0; - foreach my $name (@names) { - $current++; - if ($Apache::response::foilgroup{"$name.location"} eq 'top') { - $top{$name}=$current; - } elsif ($Apache::response::foilgroup{"$name.location"} eq - 'bottom') { - $bottom{$name}=$current; - } - } - } - while ((($#whichopt+1) < $max) && ($#names > -1)) { -# &Apache::lonxml::debug("Have $#whichopt max is $max"); - my $aopt; - if (&Apache::response::showallfoils() || ($randomize eq 'no')) { - $aopt=0; - } else { - $aopt=int(&Math::Random::random_uniform() * ($#names+1)); - } -# &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); - $aopt=splice(@names,$aopt,1); -# &Apache::lonxml::debug("Picked $aopt"); - if ($top{$aopt}) { - $toplist[$top{$aopt}]=$aopt; - } elsif ($bottom{$aopt}) { - $bottomlist[$bottom{$aopt}]=$aopt; - } else { - push (@whichopt,$aopt); - } - } -# &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist); - for (my $i=0;$i<=$#toplist;$i++) { - if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) } - } - for (my $i=0;$i<=$#bottomlist;$i++) { - if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) } - } - &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist); - return @whichopt; + return &Apache::response::whichorder($max,$randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); } sub start_conceptgroup { @@ -356,31 +409,13 @@ sub end_conceptgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; $Apache::rankresponse::conceptgroup=0; my $result=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { #if not there aren't any foils to display and thus no question - if (defined(@{ $Apache::response::conceptgroup{'names'} })) { - my @names = @{ $Apache::response::conceptgroup{'names'} }; - my $pick=int(&Math::Random::random_uniform() * ($#names+1)); - my $name=$names[$pick]; - push @{ $Apache::response::foilgroup{'names'} }, $name; - $Apache::response::foilgroup{"$name.value"} = - $Apache::response::conceptgroup{"$name.value"}; - $Apache::response::foilgroup{"$name.text"} = - $Apache::response::conceptgroup{"$name.text"}; - $Apache::response::foilgroup{"$name.location"} = - $Apache::response::conceptgroup{"$name.location"}; - my $concept = &Apache::lonxml::get_param('concept',$parstack, - $safeeval); - $Apache::response::foilgroup{"$name.concept"} = $concept; - &Apache::lonxml::debug("Selecting $name in $concept"); - if ($target eq 'web') { - my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; - push(@{ $Apache::hint::rank{"$part_id.concepts"} }, - $concept); - $Apache::hint::rank{"$part_id.concept.$concept"}= - $Apache::response::conceptgroup{'names'}; - } - } + &Apache::response::pick_foil_for_concept($target, + ['value','text','location'], + \%Apache::hint::rank, + $parstack,$safeeval); } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } @@ -395,8 +430,11 @@ sub insert_conceptgroup { sub start_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' ) { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { &Apache::lonxml::startredirection; + if ($target eq 'analyze') { + &Apache::response::check_if_computed($token,$parstack,$safeeval,'value'); + } } elsif ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token,"Foil"); my $level='-2'; @@ -423,17 +461,29 @@ sub end_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $text =''; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { $text=&Apache::lonxml::endredirection; } - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); + if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { + $text='\vskip 5mm $\triangleright$ '.$text; + } if ($value ne 'unused') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); - my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval); &Apache::lonxml::debug("Got a name of :$name:"); - if (!$name) { $name=$Apache::lonxml::curdepth; } + if ($name eq "") { + &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.')); + $name=$Apache::lonxml::curdepth; + } &Apache::lonxml::debug("Using a name of :$name:"); + if (defined($Apache::response::foilnames{$name})) { + &Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.',''.$name.'')); + } + $Apache::response::foilnames{$name}++; + my $location =&Apache::lonxml::get_param('location',$parstack, + $safeeval); if ( $Apache::rankresponse::conceptgroup && !&Apache::response::showallfoils() ) { push @{ $Apache::response::conceptgroup{'names'} }, $name;