--- loncom/homework/rankresponse.pm 2003/05/16 20:16:18 1.13
+++ loncom/homework/rankresponse.pm 2004/02/09 19:38:00 1.28
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# rank style response
#
-# $Id: rankresponse.pm,v 1.13 2003/05/16 20:16:18 albertel Exp $
+# $Id: rankresponse.pm,v 1.28 2004/02/09 19:38:00 albertel Exp $
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -24,7 +24,6 @@
#
# http://www.lon-capa.org/
#
-# 2/21 Guy
package Apache::rankresponse;
use strict;
@@ -63,6 +62,9 @@ sub start_rankresponse {
$safeeval,'max',
'randomize');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ } elsif ($target eq 'analyze') {
+ my $part_id="$Apache::inputtags::part.$id";
+ push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
}
return $result;
}
@@ -91,7 +93,8 @@ sub start_foilgroup {
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 $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
$safeeval,'-2');
@@ -103,7 +106,14 @@ sub end_foilgroup {
$result=&displayanswers($max,$randomize,$tol);
} elsif ( $target eq 'grade') {
&grade_response($max,$randomize,$tol);
+ } elsif ( $target eq 'analyze') {
+ my @shown = &whichfoils($max,$randomize);
+ &Apache::response::analyze_store_foilgroup(\@shown,
+ ['text','value','location']);
}
+ &Apache::lonxml::increment_counter(&getfoilcounts($max));
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
}
return $result;
}
@@ -118,7 +128,7 @@ sub get_correct_order {
}
@value_names =
sort {
- if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] cmp $b->[0]);}
+ if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] <=> $b->[0]);}
return 0;
} @value_names;
my @value_names_tmp=@value_names;
@@ -181,13 +191,13 @@ sub grade_response {
if (!defined($ENV{'form.submitted'})) { return; }
my %responsehash;
my %grade;
- my ($temp,$right,$wrong,$ignored)=(0,0,0,0);
+ my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
my @correctorder=&get_correct_order($tol,@whichfoils);
foreach my $name (@whichfoils) {
- my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
- $responsehash{$name}=$response;
+ my $response = &Apache::response::getresponse($temp);
my $value=shift(@correctorder);
if ( $response =~ /[^\s]/) {
+ $responsehash{$name}=$response;
&Apache::lonxml::debug("submitted a $response for $value<br />\n");
if ($value eq $response) {
$grade{$name}='1'; $right++;
@@ -235,14 +245,14 @@ sub displayfoils {
my (@whichfoils)=&whichfoils($max,$randomize);
my $part=$Apache::inputtags::part;
my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
- my $status=$Apache::inputtags::status[-1];
my @whichopt=(1..($#whichfoils+1));
my @correctorder=&get_correct_order($tol,@whichfoils);
- if (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) {
+ if ( &Apache::response::show_answer() && ($target ne 'tex')) {
foreach my $name (@whichfoils) {
my $text=$Apache::response::foilgroup{$name.'.text'};
my $value=shift(@correctorder);
- $result.='<br />'.$value.':'.$text;
+ if ($target eq 'web') {$result.='<br />';} else {$result.=' \strut\\\\\strut ';}
+ $result.=$value.':'.$text;
}
} else {
my $i = 0;
@@ -252,6 +262,7 @@ sub displayfoils {
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
my @alp = splice @alphabet, 0, $#whichopt + 1;
+ my $internal_counter=$Apache::lonxml::counter;
foreach my $name (@whichfoils) {
my $lastopt=$lastresponse{$name};
my $optionlist='';
@@ -279,14 +290,16 @@ sub displayfoils {
$result.='<br />'.$text."\n";
}
if ($Apache::lonhomework::type eq 'exam') {
- $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt,$temp);
+ my @values=(1..scalar(@whichopt));
+ $result.=&Apache::optionresponse::webbubbles(\@values,\@whichopt,$temp,$lastopt);
}
} else {
if ($Apache::lonhomework::type eq 'exam') {
$result.='\vskip 0 mm '.$text.' \vskip -3 mm '."\n";
- $result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut ';
+ $result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut ';
+ $internal_counter++;
} else {
- $result.=' \\\\ \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
+ $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
}
}
$temp++;
@@ -336,31 +349,13 @@ sub end_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::rankresponse::conceptgroup=0;
my $result='';
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
+ 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(&Math::Random::random_uniform() * ($#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.location"} =
- $Apache::response::conceptgroup{"$name.location"};
- 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 'tex') {
- my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
- push(@{ $Apache::hint::rank{"$part_id.concepts"} },
- $concept);
- $Apache::hint::rank{"$part_id.concept.$concept"}=
- $Apache::response::conceptgroup{'names'};
- }
- }
+ &Apache::response::pick_foil_for_concept($target,
+ ['value','text','location'],
+ \%Apache::hint::rank,
+ $parstack,$safeeval);
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
@@ -375,7 +370,7 @@ sub insert_conceptgroup {
sub start_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web' || $target eq 'tex') {
+ 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");
@@ -403,10 +398,11 @@ sub end_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $text ='';
my $result = '';
- if ($target eq 'web' || $target eq 'tex') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
$text=&Apache::lonxml::endredirection;
}
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
+ 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);