--- loncom/homework/optionresponse.pm 2001/06/16 20:33:33 1.16
+++ loncom/homework/optionresponse.pm 2001/12/14 23:00:52 1.29
@@ -1,5 +1,30 @@
# The LearningOnline Network with CAPA
# option list style responses
+#
+# $Id: optionresponse.pm,v 1.29 2001/12/14 23:00:52 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
package Apache::optionresponse;
use strict;
@@ -12,17 +37,27 @@ sub BEGIN {
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::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');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ }
+ if ($target eq 'meta') {
+ $result=&Apache::response::meta_package_write('optionresponse');
}
-
return $result;
}
@@ -30,19 +65,12 @@ 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={};
sub start_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -56,7 +84,7 @@ sub start_foilgroup {
my $option;
my @opt;
eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);
- my $count=0;
+ my $count=1;
foreach $option (@opt) {
$optionlist.="<option value=\"$count\">$option</option>\n";
$count++;
@@ -82,7 +110,7 @@ ENDTABLE
if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {
my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};
&Apache::lonxml::debug("Deleting :$delopt:");
- splice(@options,$delopt,1);
+ splice(@options,$delopt-1,1);
$optchanged=1;
}
if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
@@ -112,7 +140,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') {
my $name;
my ($count,$max) = &getfoilcounts($parstack,$safeeval);
if ($count>$max) { $count=$max }
@@ -121,18 +149,20 @@ sub end_foilgroup {
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
&Apache::lonxml::debug("Options are $#opt");
if ($target eq 'web') {
- $result=&displayfoils($count,@opt);
+ $result.=&displayfoils($count,@opt);
+ } elsif ( $target eq 'answer') {
+ $result.=&displayanswers($count,@opt);
} 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'};
@@ -142,18 +172,28 @@ sub end_foilgroup {
}
$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';
+ $ad='INCORRECT';
}
+ $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();
}
return $result;
@@ -182,6 +222,19 @@ sub whichfoils {
return @whichopt;
}
+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 ($max,@opt)=@_;
my @names = @{ $Apache::response::foilgroup{'names'} };
@@ -190,19 +243,27 @@ sub displayfoils {
my $result;
my $name;
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";
}
} else {
my $temp=1;
+ my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
foreach $name (@whichopt) {
+ 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";
+ }
+ }
$result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
.$optionlist
."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
@@ -219,10 +280,9 @@ sub start_conceptgroup {
%Apache::response::conceptgroup={};
my $result;
if ($target eq 'edit') {
- my $insertlist=&Apache::edit::insertlist($target,$token);
$result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
- my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
- $result.="Concept: <input name=\"$Apache::lonxml::curdepth.concept\" type=\"text\" value=\"$concept\" /></td></tr><tr><td colspan=\"3\">";
+ $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50')."</td></tr>";
+ $result.="<tr><td colspan=\"3\">\n";
}
if ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept');
@@ -235,16 +295,19 @@ 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 'web' || $target eq 'grade' || $target eq 'answer') {
+ #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 'edit') {
$result=&Apache::edit::end_table();
@@ -253,37 +316,25 @@ sub end_conceptgroup {
}
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') {
+ &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);
- my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval);
- my $optionlist="<option>unused</option>\n";
- foreach my $option (@opt) {
- if ( $value eq $option ) {
- $optionlist.="<option selected=\"on\">$option</option>\n";
- } else {
- $optionlist.="<option>$option</option>\n";
- }
- }
- my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
- $result.="Name: <input name=\"$Apache::lonxml::curdepth.name\" type=\"text\" value=\"$name\" />".
- "Correct Option:
- <select name=\"$Apache::lonxml::curdepth.value\">
- $optionlist
- </select></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 .= '</td></tr><tr><td colspan="3">';
+ } elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
@@ -295,11 +346,13 @@ sub end_foil {
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 'grade' || $target eq 'answer') {
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; }
+ &Apache::lonxml::debug("Using a name of :$name:");
if ( $Apache::optionresponse::conceptgroup ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;