--- loncom/homework/optionresponse.pm 2003/10/03 15:23:53 1.88 +++ loncom/homework/optionresponse.pm 2004/02/19 19:20:25 1.96.2.2 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.88 2003/10/03 15:23:53 albertel Exp $ +# $Id: optionresponse.pm,v 1.96.2.2 2004/02/19 19:20:25 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,8 +25,6 @@ # # http://www.lon-capa.org/ # -# 2/21 Guy -# 01/18 Alex package Apache::optionresponse; use strict; use Apache::response; @@ -63,7 +61,7 @@ sub start_optionresponse { } elsif ($target eq 'meta') { $result=&Apache::response::meta_package_write('optionresponse'); } elsif ($target eq 'analyze') { - my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; + my $part_id="$Apache::inputtags::part.$id"; push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); } return $result; @@ -151,7 +149,8 @@ sub end_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { my $tex_option_switch=&Apache::lonxml::get_param('texoptions',$parstack,$safeeval); my $name; my @opt; @@ -166,17 +165,11 @@ sub end_foilgroup { } elsif ( $target eq 'answer') { $result.=&displayanswers($max,$randomize,@opt); } elsif ( $target eq 'analyze') { - my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; - foreach my $name (@{ $Apache::response::foilgroup{'names'} }) { - if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; } - push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name); - $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} = - $Apache::response::foilgroup{"$name.value"}; - $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} = - $Apache::response::foilgroup{"$name.text"}; - } - push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt); - push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($max,$randomize)); + my @shown = &whichfoils($max,$randomize); + &Apache::response::analyze_store_foilgroup(\@shown, + ['text','value','location']); + my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; + push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt); } elsif ( $target eq 'grade') { if ( defined $ENV{'form.submitted'}) { my @whichopt = &whichfoils($max,$randomize); @@ -191,8 +184,8 @@ sub end_foilgroup { if ($ENV{'form.submitted'} eq 'scantron') { $response = $opt[$response]; } - $responsehash{$name}=$response; if ( $response =~ /[^\s]/) { + $responsehash{$name}=$response; my $value=$Apache::response::foilgroup{$name.'.value'}; &Apache::lonxml::debug("submitted a $response for $value
\n"); if ($value eq $response) { @@ -302,11 +295,13 @@ sub displayfoils { my $id=$Apache::inputtags::response[-1]; my $break; my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; - my $status=$Apache::inputtags::status[-1]; if ( ($target ne 'tex') && &Apache::response::show_answer() ) { + my $temp=1; foreach $name (@whichopt) { my $text=$Apache::response::foilgroup{$name.'.text'}; + my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"}); + my $lastopt=$lastresponse{$name}; if ($text!~/^\s*$/) { if ($target eq 'tex') { $break='\vskip 0 mm '; @@ -323,6 +318,8 @@ sub displayfoils { } else { $text=$value.': '.$text; } + } else { + $text='•'.$text; } $result.=$text."\n"; } elsif ($target eq 'tex') { @@ -333,11 +330,12 @@ sub displayfoils { } if ($Apache::lonhomework::type eq 'exam') { if ($target ne 'tex') { - $result.=&webbubbles(\@opt,\@alphabet); + $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt); } else { $result.=&bubbles(\@alphabet,\@opt); } } + $temp++; } } else { my $temp=1; @@ -371,10 +369,12 @@ sub displayfoils { my $text=$Apache::response::foilgroup{$name.'.text'}; if (!($text=~s||$optionlist|) && $Apache::lonhomework::type ne 'exam') { $text=$optionlist.$text; + } else { + $text='•'.$text; } $result.=$break.$text."\n"; if ($Apache::lonhomework::type eq 'exam') { - $result.=&webbubbles(\@opt,\@alphabet,$temp); + $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt); } $temp++; } else { @@ -397,7 +397,7 @@ sub displayfoils { } } if ($Apache::lonhomework::type eq 'exam') { - $result.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut '; + $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).'\end{enumerate} \vskip -9 mm \strut '; $internal_counter++; } $displayoptionintex=1; @@ -418,7 +418,7 @@ sub displayfoils { } } if ($Apache::lonhomework::type eq 'exam') { - $result.='\vskip -2 mm \parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut '; + $result.='\vskip -1 mm \noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).'\end{enumerate} \vskip -9 mm \strut '; $internal_counter++; } } @@ -455,18 +455,24 @@ sub optionlist_correction { sub webbubbles { - my ($ropt,$ralphabet,$temp)=@_; + my ($ropt,$ralphabet,$temp,$lastopt)=@_; my @opt=@$ropt; my @alphabet=@$ralphabet; my $result=''; - my $number_of_bubbles = $#opt + 1; - $result.= ''; - for (my $ind=0;$ind<$number_of_bubbles;$ind++) { - $result.=''; + my $number_of_bubbles = $#opt + 1; + $result.= '
'.$alphabet[$ind].': '.$opt[$ind].'
'; + for (my $ind=0;$ind<$number_of_bubbles;$ind++) { + my $checked=''; + if ($lastopt eq $opt[$ind]) { + $checked=' checked="on" '; } - $result.='
'; - return $result; + $result.=''.$alphabet[$ind].': '. + $opt[$ind].''; + } + $result.=''; + return $result; } @@ -478,14 +484,25 @@ sub bubbles { my ($result,$head,$line) =('','',''); my $number_of_bubbles = $#opt + 1; my $current_length = 0; + my $textwidth; + if ($ENV{'form.textwidth'} ne '') { + $ENV{'form.textwidth'}=~/(\d+)/; + $textwidth=$1; + } else { + $ENV{'textwidth'}=~/(\d+)/; + $textwidth=$1; + } for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { - $current_length += (length($opt[$ind])+length($alphabet[$ind])+2)*2; - if ($current_length<0.9*$ENV{'form.textwidth'} and $ind!=$number_of_bubbles) { + my $leftmargin; + $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]); + if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;} + $current_length += (length($opt[$ind])+length($alphabet[$ind])+3)*2; + if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & '; $head.='lr'; } else { $line=~s/\&\s*$//; - $result.='\vskip -5 mm\begin{tabular}{'.$head.'}\\\\'.$line.'\\\\\end{tabular}'; + $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}'; $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';; $head ='lr'; $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2; @@ -517,47 +534,13 @@ sub end_conceptgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; $Apache::optionresponse::conceptgroup=0; my $result=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' - || $target eq 'tex' || $target eq 'analyze') { + 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 'analyze') { - my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; - push (@{ $Apache::lonhomework::analyze{"$part_id.concepts"} }, - $concept); - $Apache::lonhomework::analyze{"$part_id.concept.$concept"}= - $Apache::response::conceptgroup{'names'}; - foreach my $name (@{ $Apache::response::conceptgroup{'names'} }) { - push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} }, - $name); - $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} = - $Apache::response::conceptgroup{"$name.value"}; - $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} = - $Apache::response::conceptgroup{"$name.text"}; - $Apache::lonhomework::analyze{"$part_id.foil.location.$name"} = - $Apache::response::conceptgroup{"$name.location"}; - } - } elsif ($target eq 'web') { - my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; - push(@{ $Apache::hint::option{"$part_id.concepts"} }, - $concept); - $Apache::hint::option{"$part_id.concept.$concept"}= - $Apache::response::conceptgroup{'names'}; - } - } + &Apache::response::pick_foil_for_concept($target, + ['value','text','location'], + \%Apache::hint::option, + $parstack,$safeeval); } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); }