--- loncom/homework/optionresponse.pm 2002/04/01 21:26:57 1.36
+++ loncom/homework/optionresponse.pm 2002/08/26 18:15:22 1.46
@@ -1,7 +1,7 @@
-# The LearningOnline Network with CAPA
+# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.36 2002/04/01 21:26:57 albertel Exp $
+# $Id: optionresponse.pm,v 1.46 2002/08/26 18:15:22 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -63,7 +63,6 @@ sub start_optionresponse {
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
}
-# if ($target eq 'tex') {$result .= '\begin{itemize}';}
return $result;
}
@@ -74,16 +73,15 @@ sub end_optionresponse {
&Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
my $result;
if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
-# if ($target eq 'tex') {$result .= '\end{itemize}';}
return $result;
}
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
sub start_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- %Apache::response::foilgroup={};
+ %Apache::response::foilgroup=();
$Apache::optionresponse::conceptgroup=0;
&Apache::response::setrandomnumber();
if ($target eq 'edit') {
@@ -132,7 +130,7 @@ ENDTABLE
if ($optchanged) {
$result = "<foilgroup options=\"(";
foreach my $option (@options) {
- $option=~s/\'/\\\'/;
+ $option=~s/\'/\\\'/g;
&Apache::lonxml::debug("adding option :$option:");
$result .="'".$option."',";
}
@@ -140,7 +138,9 @@ ENDTABLE
$result.=')">';
} # else nothing changed so just use the default mechanism
}
- if ($target eq 'tex') {$result .= '\begin{itemize}';}
+ if ($target eq 'tex') {
+ $result .= ' \begin{enumerate} ';
+ }
return $result;
}
@@ -220,7 +220,7 @@ sub end_foilgroup {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table();
}
- if ($target eq 'tex') {$result .= '\end{itemize}';}
+ if ($target eq 'tex') {$result .= '\end{enumerate}';}
return $result;
}
@@ -229,6 +229,7 @@ sub getfoilcounts {
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
# +1 since instructors will count from 1
my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
+ if (&Apache::response::showallfoils()) { $max=$count; }
return ($count,$max);
}
@@ -238,7 +239,12 @@ sub whichfoils {
my @whichopt =();
while ((($#whichopt+1) < $max) && ($#names > -1)) {
&Apache::lonxml::debug("Have $#whichopt max is $max");
- my $aopt=int(rand($#names+1));
+ my $aopt;
+ if (&Apache::response::showallfoils()) {
+ $aopt=0;
+ } else {
+ $aopt=int(rand($#names+1));
+ }
&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
$aopt=splice(@names,$aopt,1);
&Apache::lonxml::debug("Picked $aopt");
@@ -267,7 +273,7 @@ sub displayfoils {
my @falselist;
my $result;
my $name;
- $Apache::optionresponse::displayoptionintex=0;
+ my $displayoptionintex=0;
my @whichopt = &whichfoils($max);
my $part=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
@@ -276,10 +282,15 @@ sub displayfoils {
if ($target eq 'web') {
$result.="<br />";
} elsif ($target eq 'tex') {
- $result.='\newline';
+ $result.='\vskip 0 mm ';
+ }
+ if ($target ne 'tex') {
+ $result .=$Apache::response::foilgroup{$name.'.value'}.
+ ":".$Apache::response::foilgroup{$name.'.text'}."\n";
+ } else {
+ $result .='\item '.$Apache::response::foilgroup{$name.'.value'}.
+ ":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
- $result .=$Apache::response::foilgroup{$name.'.value'}.
- ":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
} else {
my $temp=1;
@@ -301,16 +312,28 @@ sub displayfoils {
."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
$temp++;
} else {
- if ($Apache::optionresponse::displayoptionintex == 0) {
- my $durtyoptionlist = $optionlist;
- $durtyoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
- $durtyoptionlist =~ s/<option>/{\\bf /g;
- $durtyoptionlist =~ s/<\/option>/},/g;
- $durtyoptionlist =~ s/,$/\./g;
- $result.= $durtyoptionlist.$Apache::response::foilgroup{$name.'.text'};
- $Apache::optionresponse::displayoptionintex=1;
+ if ($displayoptionintex == 0) {
+ my $texoptionlist = $optionlist;
+ $texoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
+ $texoptionlist =~ s/<option>/{\\bf /g;
+ $texoptionlist =~ s/<option selected="on">/{\\bf /g;
+ $texoptionlist =~ s/<\/option>/},/g;
+ $texoptionlist =~ s/,$/\./g;
+ $texoptionlist =~ s/>/\$>\$/g;
+ $texoptionlist =~ s/</\$<\$/g;
+ $texoptionlist =~ s/=/\$=\$/g;
+ if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
+ $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
+ } else {
+ $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
+ }
+ $displayoptionintex=1;
} else {
- $result.= $Apache::response::foilgroup{$name.'.text'};
+ if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
+ $result.= $Apache::response::foilgroup{$name.'.text'};
+ } else {
+ $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
+ }
}
}
}
@@ -327,7 +350,7 @@ sub displayfoils {
sub start_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::optionresponse::conceptgroup=1;
- %Apache::response::conceptgroup={};
+ %Apache::response::conceptgroup=();
my $result;
if ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
@@ -405,7 +428,6 @@ sub start_foil {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
- if ($target eq 'tex') {$result .= '\item ';}
return $result;
}
@@ -424,14 +446,19 @@ sub end_foil {
&Apache::lonxml::debug("Got a name of :$name:");
if (!$name) { $name=$Apache::lonxml::curdepth; }
&Apache::lonxml::debug("Using a name of :$name:");
- if ( $Apache::optionresponse::conceptgroup ) {
+ if ( $Apache::optionresponse::conceptgroup
+ && !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
- $Apache::response::conceptgroup{"$name.text"} = $text;
+ $Apache::response::conceptgroup{"$name.text"} = $text;
} else {
push @{ $Apache::response::foilgroup{'names'} }, $name;
- $Apache::response::foilgroup{"$name.value"} = $value;
- $Apache::response::foilgroup{"$name.text"} = $text;
+ if ($target eq 'tex') {
+ $Apache::response::foilgroup{"$name.text"} = '\item '.$text;
+ } else {
+ $Apache::response::foilgroup{"$name.value"} = $value;
+ $Apache::response::foilgroup{"$name.text"} = $text;
+ }
}
}
}