--- loncom/homework/optionresponse.pm 2002/03/29 18:32:46 1.34
+++ loncom/homework/optionresponse.pm 2002/07/18 15:45:41 1.43
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.34 2002/03/29 18:32:46 albertel Exp $
+# $Id: optionresponse.pm,v 1.43 2002/07/18 15:45:41 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,7 +73,6 @@ 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;
}
@@ -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;
}
@@ -148,7 +148,7 @@ 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') {
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
my $name;
my ($count,$max) = &getfoilcounts($parstack,$safeeval);
if ($count>$max) { $count=$max }
@@ -166,10 +166,12 @@ sub end_foilgroup {
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::conceptgroup{"$name.value"};
+ $Apache::response::foilgroup{"$name.value"};
$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
- $Apache::response::conceptgroup{"$name.text"};
+ $Apache::response::foilgroup{"$name.text"};
}
+ push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
+ push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($count));
} elsif ( $target eq 'grade') {
if ( defined $ENV{'form.submitted'}) {
my @whichopt = &whichfoils($count);
@@ -202,7 +204,11 @@ sub end_foilgroup {
} elsif ($wrong==0 && $right==0) {
#nothing submitted
} else {
- $ad='INCORRECT';
+ if ($ignored==0) {
+ $ad='INCORRECT';
+ } else {
+ $ad='MISSING_ANSWER';
+ }
}
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
$responsestr;
@@ -214,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;
}
@@ -223,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);
}
@@ -232,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");
@@ -269,8 +281,6 @@ sub displayfoils {
foreach $name (@whichopt) {
if ($target eq 'web') {
$result.="<br />";
- } elsif ($target eq 'tex') {
- $result.='\newline';
}
$result .=$Apache::response::foilgroup{$name.'.value'}.
":".$Apache::response::foilgroup{$name.'.text'}."\n";
@@ -301,10 +311,13 @@ sub displayfoils {
$durtyoptionlist =~ s/<option>/{\\bf /g;
$durtyoptionlist =~ s/<\/option>/},/g;
$durtyoptionlist =~ s/,$/\./g;
- $result.= $durtyoptionlist.$Apache::response::foilgroup{$name.'.text'};
+ $durtyoptionlist =~ s/>/\$>\$/g;
+ $durtyoptionlist =~ s/</\$<\$/g;
+ $durtyoptionlist =~ s/=/\$=\$/g;
+ $result.= $durtyoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
$Apache::optionresponse::displayoptionintex=1;
} else {
- $result.= $Apache::response::foilgroup{$name.'.text'};
+ $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
}
}
}
@@ -340,34 +353,38 @@ sub end_conceptgroup {
$Apache::optionresponse::conceptgroup=0;
my $result='';
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'
- || $target eq 'tex') {
+ || $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 rand $#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.value"} =
+ $Apache::response::conceptgroup{"$name.value"};
+ $Apache::response::foilgroup{"$name.text"} =
+ $Apache::response::conceptgroup{"$name.text"};
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"};
+ }
+ }
}
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
- } elsif ($target eq 'analyze') {
- my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
- my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
- 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"};
- }
}
return $result;
}
@@ -395,7 +412,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;
}
@@ -414,13 +430,18 @@ 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;
} else {
push @{ $Apache::response::foilgroup{'names'} }, $name;
- $Apache::response::foilgroup{"$name.value"} = $value;
+ if ($target eq 'tex') {
+ $Apache::response::foilgroup{"$name.value"} = '\item '.$value;
+ } else {
+ $Apache::response::foilgroup{"$name.value"} = $value;
+ }
$Apache::response::foilgroup{"$name.text"} = $text;
}
}