--- loncom/homework/optionresponse.pm 2001/06/16 21:23:11 1.17
+++ loncom/homework/optionresponse.pm 2002/08/05 15:55:39 1.45
@@ -1,32 +1,67 @@
# The LearningOnline Network with CAPA
# option list style responses
+#
+# $Id: optionresponse.pm,v 1.45 2002/08/05 15:55:39 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# 2/21 Guy
+# 01/18 Alex
package Apache::optionresponse;
use strict;
use Apache::response;
-sub BEGIN {
+BEGIN {
&Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
}
sub start_optionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- #when in a radiobutton response use these
+ #when in a option response use these
&Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'optionresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
if ($target eq 'edit') {
- $result.=&Apache::edit::start_table($token)."<tr><td>Multiple Option Response Question</td>
-<td>Delete:".
- &Apache::edit::deletelist($target,$token)
- ."</td><td> </td></tr><tr><td colspan=\"3\">\n";
- $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4')."</td></tr>";
- $result.="<tr><td colspan=\"3\">\n";
- }
- if ($target eq 'modified') {
- my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'max');
+ $result.=&Apache::edit::start_table($token).
+ "<tr><td>Multiple Option Response Question</td><td>Delete:".
+ &Apache::edit::deletelist($target,$token)
+ ."</td><td> ".
+ &Apache::edit::end_row().
+ &Apache::edit::start_spanning_row().
+ "\n";
+ $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
+ &Apache::edit::end_row().
+ &Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'max');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ } 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]";
+ push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
}
return $result;
}
@@ -35,25 +70,18 @@ sub end_optionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
&Apache::response::end_response;
pop @Apache::lonxml::namespace;
+ &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
my $result;
if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
return $result;
}
-sub insert_optionresponse {
- return '
-<optionresponse max="10">
- <foilgroup options=\"\">
- </foilgroup>
-</optionresponse>';
-}
-
-%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') {
@@ -75,10 +103,10 @@ sub start_foilgroup {
</td>
<td>Delete an Option:
<select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
- </td>
- </tr>
- <tr><td colspan="3">$insertlist<br />
ENDTABLE
+ $result.= &Apache::edit::end_row();
+ $result.= &Apache::edit::start_spanning_row();
+ $result.= $insertlist.'<br />';
}
if ($target eq 'modified') {
my @options;
@@ -102,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."',";
}
@@ -110,6 +138,9 @@ ENDTABLE
$result.=')">';
} # else nothing changed so just use the default mechanism
}
+ if ($target eq 'tex') {
+ $result .= ' \begin{enumerate} ';
+ }
return $result;
}
@@ -117,7 +148,7 @@ sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'grade' || $target eq 'web') {
+ 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 }
@@ -125,42 +156,71 @@ sub end_foilgroup {
my @opt;
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
&Apache::lonxml::debug("Options are $#opt");
- if ($target eq 'web') {
- $result=&displayfoils($count,@opt);
+ if ($target eq 'web' || $target eq 'tex') {
+ $result.=&displayfoils($target,$count,@opt);
+ } elsif ( $target eq 'answer') {
+ $result.=&displayanswers($count,@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($count));
} elsif ( $target eq 'grade') {
if ( defined $ENV{'form.submitted'}) {
my @whichopt = &whichfoils($count);
my $temp=1;my $name;
- my $allresponse;
+ my %responsehash;
my $right=0;
my $wrong=0;
my $ignored=0;
foreach $name (@whichopt) {
my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
- $allresponse.="$response:";
+ $responsehash{$name}=$response;
if ( $response =~ /[^\s]/) {
- &Apache::lonxml::debug("submitted a $response<br />\n");
my $value=$Apache::response::foilgroup{$name.'.value'};
+ &Apache::lonxml::debug("submitted a $response for $value<br />\n");
if ($value eq $response) {$right++;} else {$wrong++;}
} else {
$ignored++;
}
$temp++;
}
+ my $part=$Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$allresponse;
+ my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+ my %previous=&Apache::response::check_for_previous($responsestr,
+ $part,$id);
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
+ my $ad;
if ($wrong==0 && $ignored==0) {
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
+ $ad='EXACT_ANS';
+ } elsif ($wrong==0 && $right==0) {
+ #nothing submitted
} else {
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';
+ if ($ignored==0) {
+ $ad='INCORRECT';
+ } else {
+ $ad='MISSING_ANSWER';
+ }
}
+ $Apache::lonhomework::results{"resource.$part.$id.submission"}=
+ $responsestr;
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
+ $ad;
+ &Apache::response::handle_previous(\%previous,$ad);
}
}
- }
- if ($target eq 'edit') {
+ } elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table();
- }
+ }
+ if ($target eq 'tex') {$result .= '\end{enumerate}';}
return $result;
}
@@ -169,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);
}
@@ -178,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");
@@ -187,46 +253,93 @@ sub whichfoils {
return @whichopt;
}
-sub displayfoils {
+sub displayanswers {
my ($max,@opt)=@_;
my @names = @{ $Apache::response::foilgroup{'names'} };
+ my @whichopt = &whichfoils($max);
+ my $result=&Apache::response::answer_header('optionresponse');
+ foreach my $name (@whichopt) {
+ $result.=&Apache::response::answer_part('optionresponse',
+ $Apache::response::foilgroup{$name.'.value'})
+ }
+ $result.=&Apache::response::answer_footer('optionresponse');
+ return $result;
+}
+
+sub displayfoils {
+ my ($target,$max,@opt)=@_;
+ my @names = @{ $Apache::response::foilgroup{'names'} };
my @truelist;
my @falselist;
my $result;
my $name;
+ my $displayoptionintex=0;
my @whichopt = &whichfoils($max);
- my $optionlist="<option></option>\n";
- my $option;
- foreach $option (@opt) {
- $optionlist.="<option>$option</option>\n";
- }
- if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+ my $part=$Apache::inputtags::part;
+ my $id=$Apache::inputtags::response[-1];
+ if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
foreach $name (@whichopt) {
- $result.="<br />".$Apache::response::foilgroup{$name.'.value'}.
- ":".$Apache::response::foilgroup{$name.'.text'}."\n";
+ if ($target eq 'web') {
+ $result.="<br />";
+ }
+ $result .=$Apache::response::foilgroup{$name.'.value'}.
+ ":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
} else {
my $temp=1;
+ my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
foreach $name (@whichopt) {
- $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
- .$optionlist
- ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
- $temp++;
+ my $lastopt=$lastresponse{$name};
+ my $optionlist="<option></option>\n";
+ my $option;
+ foreach $option (@opt) {
+ if ($option eq $lastopt) {
+ $optionlist.="<option selected=\"on\">$option</option>\n";
+ } else {
+ $optionlist.="<option>$option</option>\n";
+ }
+ }
+ if ($target ne 'tex') {
+ $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
+ .$optionlist
+ ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
+ $temp++;
+ } else {
+ if ($displayoptionintex == 0) {
+ my $texoptionlist = $optionlist;
+ $texoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
+ $texoptionlist =~ s/<option>/{\\bf /g;
+ $texoptionlist =~ s/<\/option>/},/g;
+ $texoptionlist =~ s/,$/\./g;
+ $texoptionlist =~ s/>/\$>\$/g;
+ $texoptionlist =~ s/</\$<\$/g;
+ $texoptionlist =~ s/=/\$=\$/g;
+ $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
+ $displayoptionintex=1;
+ } else {
+ $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
+ }
+ }
}
+ }
+ if ($target ne 'tex') {
+ return $result."<br />";
+ }
+ else {
+ return $result;
}
- return $result."<br />";
}
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");
- $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50')."</td></tr>";
- $result.="<tr><td colspan=\"3\">\n";
+ $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50').
+ &Apache::edit::end_row().&Apache::edit::start_spanning_row();
}
if ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept');
@@ -239,46 +352,66 @@ sub end_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::optionresponse::conceptgroup=0;
my $result='';
- if ($target eq 'web' || $target eq 'grade') {
- 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"};
- 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 'edit') {
+ 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 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"};
+ 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();
}
return $result;
}
sub insert_conceptgroup {
- my $result="\t\t<conceptgroup concept=\"\">\n".&insert_foil()."\t\t</conceptgroup>\n";
+ my $result="\n\t\t<conceptgroup concept=\"\">".&insert_foil()."\n\t\t</conceptgroup>\n";
return $result;
}
sub start_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') { &Apache::lonxml::startredirection; }
- if ($target eq 'edit') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' ) {
+ &Apache::lonxml::startredirection;
+ } elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token,"Foil");
my $level='-2';
if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; }
my @opt;
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
- $result.=&Apache::edit::text_arg('Name:','name',$token).
- &Apache::edit::select_arg('Correct Option:','value',['unused',(@opt)],$token).
- '</td></tr><tr><td colspan="3">';
- }
- if ($target eq 'modified') {
+ $result.=&Apache::edit::text_arg('Name:','name',$token);
+ $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');
+ $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
- }
+ }
return $result;
}
@@ -286,19 +419,29 @@ sub end_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $text ='';
my $result = '';
- if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
- if ($target eq 'web' || $target eq 'grade') {
+ if ($target eq 'web' || $target eq 'tex') {
+ $text=&Apache::lonxml::endredirection;
+ }
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'
+ || $target eq 'tex' || $target eq 'analyze') {
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
if ($value ne 'unused') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ &Apache::lonxml::debug("Got a name of :$name:");
if (!$name) { $name=$Apache::lonxml::curdepth; }
- if ( $Apache::optionresponse::conceptgroup ) {
+ &Apache::lonxml::debug("Using a name of :$name:");
+ 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;
}
}