--- loncom/homework/optionresponse.pm 2001/07/18 20:27:21 1.20
+++ loncom/homework/optionresponse.pm 2001/12/04 14:57:31 1.26
@@ -17,17 +17,22 @@ sub start_optionresponse {
push (@Apache::lonxml::namespace,'optionresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
if ($target eq 'edit') {
- $result.=&Apache::edit::start_table($token)."
\n";
}
if ($target eq 'modified') {
- my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'max');
+ 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;
}
@@ -109,7 +114,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 }
@@ -118,18 +123,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 \n");
my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -140,7 +147,7 @@ sub end_foilgroup {
$temp++;
}
my $id = $Apache::inputtags::response['-1'];
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$allresponse;
+ $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
if ($wrong==0 && $ignored==0) {
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
@@ -149,8 +156,7 @@ sub end_foilgroup {
}
}
}
- }
- if ($target eq 'edit') {
+ } elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table();
}
return $result;
@@ -179,6 +185,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,7 +211,7 @@ sub displayfoils {
foreach $option (@opt) {
$optionlist.="\n";
}
- if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+ if (($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
foreach $name (@whichopt) {
$result.=" ".$Apache::response::foilgroup{$name.'.value'}.
":".$Apache::response::foilgroup{$name.'.text'}."\n";
@@ -231,7 +250,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'} };
@@ -259,8 +278,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'; }
@@ -269,8 +289,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 .= ' |
';
- }
- 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); }
}
@@ -282,7 +301,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);
|