--- loncom/homework/radiobuttonresponse.pm 2002/10/17 14:40:23 1.56
+++ loncom/homework/radiobuttonresponse.pm 2002/11/14 20:30:34 1.61
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.56 2002/10/17 14:40:23 sakharuk Exp $
+# $Id: radiobuttonresponse.pm,v 1.61 2002/11/14 20:30:34 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,6 +42,7 @@ sub start_radiobuttonresponse {
&Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'radiobuttonresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
+ %Apache::hint::radiobutton=();
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('radiobuttonresponse');
} elsif ($target eq 'edit' ) {
@@ -86,10 +87,7 @@ sub start_foilgroup {
&Apache::response::setrandomnumber();
if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
$result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
- $Apache::lonxml::counter++;
- my %moreenv;
- $moreenv{'form.counter'}=$Apache::lonxml::counter;
- &Apache::lonnet::appenv(%moreenv);
+ &Apache::lonxml::increment_counter();
}
return $result;
}
@@ -352,10 +350,10 @@ sub displayfoils {
if ($target ne 'tex') {
$result.="
";
} else {
- $result.='\vskip 0 mm \item ';
+ $result.='\item \vskip -2 mm ';
}
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
- if ($target ne 'tex') { $result.='Correct:'; } else { $result.='Correct: ';}
+ if ($target ne 'tex') { $result.='Correct:'; } else { $result.='Correct: \textbf{';}
} else {
$result.='Incorrect:';
}
@@ -365,7 +363,7 @@ sub displayfoils {
$result.=$Apache::response::foilgroup{$name.'.text'};
}
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
- if ($target ne 'tex') { $result.='';}
+ if ($target ne 'tex') { $result.='';} else {$result.='}';}
}
}
} else {
@@ -386,10 +384,10 @@ sub displayfoils {
}
} else {
if ($Apache::lonhomework::type eq 'exam') {
- $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';
+ $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs
$i++;
} else {
- $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
+ $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
}
}
$temp++;
@@ -444,6 +442,10 @@ sub end_conceptgroup {
my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
$Apache::response::foilgroup{"$name.concept"} = $concept;
&Apache::lonxml::debug("Selecting $name in $concept");
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ push(@{ $Apache::hint::radiobutton{"$part_id.concepts"} },$concept);
+ $Apache::hint::radiobutton{"$part_id.concept.$concept"}=
+ $Apache::response::conceptgroup{'names'};
}
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();