--- loncom/homework/rankresponse.pm 2004/03/15 22:09:52 1.31 +++ loncom/homework/rankresponse.pm 2007/04/17 23:25:09 1.52 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # rank style response # -# $Id: rankresponse.pm,v 1.31 2004/03/15 22:09:52 albertel Exp $ +# $Id: rankresponse.pm,v 1.52 2007/04/17 23:25:09 albertel Exp $ # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -89,7 +89,7 @@ sub start_foilgroup { my $result; %Apache::response::foilgroup=(); $Apache::rankresponse::conceptgroup=0; - &Apache::response::setrandomnumber(); + &Apache::response::pushrandomnumber(); return $result; } @@ -105,6 +105,7 @@ sub end_foilgroup { if (!defined($tol)) { $tol=0; } 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') { @@ -113,11 +114,15 @@ sub end_foilgroup { 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; } &Apache::lonxml::increment_counter(&getfoilcounts($max)); } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } + &Apache::response::poprandomnumber(); return $result; } @@ -162,18 +167,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; @@ -191,13 +209,13 @@ 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)=(1,0,0,0); my @correctorder=&get_correct_order($tol,@whichfoils); foreach my $name (@whichfoils) { - my $response = &Apache::response::getresponse($temp); + my $response = &Apache::response::getresponse($temp,'A is 1'); my $value=shift(@correctorder); if ( $response =~ /[^\s]/) { $responsehash{$name}=$response; @@ -234,13 +252,34 @@ 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; @@ -254,8 +293,11 @@ sub displayfoils { foreach my $name (@whichfoils) { my $text=$Apache::response::foilgroup{$name.'.text'}; my $value=shift(@correctorder); - if ($target eq 'web') {$result.='
';} else {$result.=' \strut\\\\\strut ';} - $result.=$value.':'.$text; + if ($target eq 'web') { + $result.='
'.$value.': '.$text; + } else { + $result.=' \strut\\\\\strut '.$value.':'.$text; + } } } else { my $i = 0; @@ -279,7 +321,8 @@ sub displayfoils { } } if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { - $optionlist='\n"; } else { @@ -298,8 +341,8 @@ sub displayfoils { } } else { if ($Apache::lonhomework::type eq 'exam') { - $result.='\vskip 0 mm '.$text.' \vskip -3 mm '."\n"; - $result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut '; + $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"; @@ -308,6 +351,11 @@ sub displayfoils { $temp++; } } + 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; } @@ -375,6 +423,9 @@ sub start_foil { my $result=''; 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'; @@ -407,10 +458,16 @@ sub end_foil { 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); &Apache::lonxml::debug("Got a name of :$name:"); - if (!$name) { $name=$Apache::lonxml::curdepth; } + if ($name eq "") { + &Apache::lonxml::warning("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)); @@ -422,24 +479,12 @@ sub end_foil { && !&Apache::response::showallfoils() ) { push @{ $Apache::response::conceptgroup{'names'} }, $name; $Apache::response::conceptgroup{"$name.value"} = $value; - if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { - $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text; - } else { - $Apache::response::conceptgroup{"$name.text"} = $text; - } + $Apache::response::conceptgroup{"$name.text"} = $text; $Apache::response::conceptgroup{"$name.location"} = $location; } else { push @{ $Apache::response::foilgroup{'names'} }, $name; $Apache::response::foilgroup{"$name.value"} = $value; - if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { - $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; - } else { - if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { - $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text; - } else { - $Apache::response::foilgroup{"$name.text"} = $text; - } - } + $Apache::response::foilgroup{"$name.text"} = $text; $Apache::response::foilgroup{"$name.location"} = $location; } }