--- loncom/homework/rankresponse.pm 2003/01/19 08:13:04 1.1 +++ loncom/homework/rankresponse.pm 2003/03/26 18:43:29 1.9 @@ -1,8 +1,7 @@ # The LearningOnline Network with CAPA # rank style response # -# $Id: rankresponse.pm,v 1.1 2003/01/19 08:13:04 albertel Exp $ -# +# $Id: rankresponse.pm,v 1.9 2003/03/26 18:43:29 sakharuk Exp $ # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -30,6 +29,9 @@ package Apache::rankresponse; use strict; use HTML::Entities(); +use Apache::optionresponse; + +my $flag_for_exam_printing = 1; BEGIN { &Apache::lonxml::register('Apache::rankresponse',('rankresponse')); @@ -91,15 +93,13 @@ sub start_foilgroup { sub end_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') { - my $style = $Apache::lonhomework::type; - my $name; + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { 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); } elsif ($target eq 'answer' ) { $result=&displayanswers($max,$randomize,$tol); @@ -233,6 +233,7 @@ sub grade_response { 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"}; @@ -251,27 +252,45 @@ sub displayfoils { 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; 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') { + $optionlist='\n"; + } else { + $optionlist=' '.$temp.' '.$optionlist.' '; + } my $text=$Apache::response::foilgroup{$name.'.text'}; - $result.='
'.$optionlist.$text."\n"; + if ($target ne 'tex') { + $result.='
'.$optionlist.$text."\n"; + if ($Apache::lonhomework::type eq 'exam') { + $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt); + } + } else { + if ($Apache::lonhomework::type eq 'exam') { + $result.='\vskip 0 mm '.$text.' \vskip -3 mm '."\n"; + $result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut '; + } else { + $result.=' \\\\ \framebox[5 mm][s]{\tiny\strut} '.$text."\n"; + } + } $temp++; } } - $result.="
"; + if ($target ne 'tex') {$result.="
";} else {$result.=' \vskip 0 mm ';} return $result; } @@ -358,7 +377,7 @@ 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') { #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'} }; @@ -375,7 +394,7 @@ sub end_conceptgroup { $safeeval); $Apache::response::foilgroup{"$name.concept"} = $concept; &Apache::lonxml::debug("Selecting $name in $concept"); - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; push(@{ $Apache::hint::rank{"$part_id.concepts"} }, $concept); @@ -397,7 +416,7 @@ 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') { &Apache::lonxml::startredirection; } elsif ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token,"Foil"); @@ -425,10 +444,10 @@ 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') { $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') { my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); if ($value ne 'unused') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); @@ -440,12 +459,25 @@ sub end_foil { && !&Apache::response::showallfoils() ) { push @{ $Apache::response::conceptgroup{'names'} }, $name; $Apache::response::conceptgroup{"$name.value"} = $value; - $Apache::response::conceptgroup{"$name.text"} = $text; + if ($target eq 'tex') { + $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text; + } else { + $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; - $Apache::response::foilgroup{"$name.text"} = $text; + if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam' and $flag_for_exam_printing) { + $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; + $flag_for_exam_printing = 0; + } else { + if ($target eq 'tex') { + $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text; + } else { + $Apache::response::foilgroup{"$name.text"} = $text; + } + } $Apache::response::foilgroup{"$name.location"} = $location; } }