--- loncom/homework/optionresponse.pm 2001/09/13 19:55:02 1.24
+++ loncom/homework/optionresponse.pm 2001/12/07 23:58:35 1.28
@@ -1,5 +1,30 @@
# The LearningOnline Network with CAPA
# option list style responses
+#
+# $Id: optionresponse.pm,v 1.28 2001/12/07 23:58:35 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;
@@ -114,7 +139,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 }
@@ -123,18 +148,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'};
@@ -144,18 +171,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;
@@ -184,6 +221,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'} };
@@ -192,19 +242,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/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
+ 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";
@@ -236,7 +294,7 @@ sub end_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::optionresponse::conceptgroup=0;
my $result='';
- if ($target eq 'web' || $target eq 'grade') {
+ 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'} };
@@ -264,8 +322,9 @@ sub insert_conceptgroup {
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'; }
@@ -274,8 +333,7 @@ sub start_foil {
$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">';
- }
- if ($target eq 'modified') {
+ } elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
@@ -287,7 +345,7 @@ 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);