--- loncom/homework/rankresponse.pm 2003/03/17 20:08:21 1.3
+++ loncom/homework/rankresponse.pm 2003/10/24 18:04:55 1.24
@@ -1,8 +1,7 @@
# The LearningOnline Network with CAPA
# rank style response
#
-# $Id: rankresponse.pm,v 1.3 2003/03/17 20:08:21 sakharuk Exp $
-#
+# $Id: rankresponse.pm,v 1.24 2003/10/24 18:04:55 sakharuk Exp $
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -30,6 +29,7 @@
package Apache::rankresponse;
use strict;
use HTML::Entities();
+use Apache::optionresponse;
BEGIN {
&Apache::lonxml::register('Apache::rankresponse',('rankresponse'));
@@ -104,6 +104,9 @@ sub end_foilgroup {
} elsif ( $target eq 'grade') {
&grade_response($max,$randomize,$tol);
}
+ &Apache::lonxml::increment_counter(&getfoilcounts($max));
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
}
return $result;
}
@@ -118,7 +121,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;
@@ -184,7 +187,7 @@ sub grade_response {
my ($temp,$right,$wrong,$ignored)=(0,0,0,0);
my @correctorder=&get_correct_order($tol,@whichfoils);
foreach my $name (@whichfoils) {
- my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
+ my $response = &Apache::response::getresponse($temp);
$responsehash{$name}=$response;
my $value=shift(@correctorder);
if ( $response =~ /[^\s]/) {
@@ -231,17 +234,18 @@ sub grade_response {
sub displayfoils {
my ($target,$max,$randomize,$tol)=@_;
my $result;
+ my @alphabet=('A'..'Z');
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.='
'.$value.':'.$text;
+ if ($target eq 'web') {$result.='
';} else {$result.=' \strut\\\\\strut ';}
+ $result.=$value.':'.$text;
}
} else {
my $i = 0;
@@ -249,8 +253,9 @@ sub displayfoils {
my $id=$Apache::inputtags::response[-1];
my $part=$Apache::inputtags::part;
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
- my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
- my $localcount = 1;
+ 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='';
@@ -263,7 +268,7 @@ sub displayfoils {
if ($target ne 'tex') {$optionlist.="\n";}
}
}
- if ($target ne 'tex') {
+ if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
$optionlist='\n";
@@ -272,12 +277,28 @@ sub displayfoils {
}
my $text=$Apache::response::foilgroup{$name.'.text'};
if ($target ne 'tex') {
- $result.='
'.$optionlist.$text."\n";
- } else {$result.=' \\\\ '.$localcount.'. '.$text."\n"; $localcount++;}
+ if ($Apache::lonhomework::type ne 'exam') {
+ $result.='
'.$optionlist.$text."\n";
+ } else {
+ $result.='
'.$text."\n";
+ }
+ if ($Apache::lonhomework::type eq 'exam') {
+ 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{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut ';
+ $internal_counter++;
+ } else {
+ $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
+ }
+ }
$temp++;
}
}
- if ($target ne 'tex') {$result.="
";} else {$result.=' \\\\ ';}
+ if ($target ne 'tex') {$result.="
";} else {$result.=' \vskip 0 mm ';}
return $result;
}
@@ -293,52 +314,9 @@ sub getfoilcounts {
sub whichfoils {
my ($max,$randomize)=@_;
- $max = &getfoilcounts($max);
- # &Apache::lonxml::debug("man $max randomize $randomize");
- if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
- my @names = @{ $Apache::response::foilgroup{'names'} };
- my @whichopt =();
- my (%top,@toplist,%bottom,@bottomlist);
- if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) {
- my $current=0;
- foreach my $name (@names) {
- $current++;
- if ($Apache::response::foilgroup{"$name.location"} eq 'top') {
- $top{$name}=$current;
- } elsif ($Apache::response::foilgroup{"$name.location"} eq
- 'bottom') {
- $bottom{$name}=$current;
- }
- }
- }
- while ((($#whichopt+1) < $max) && ($#names > -1)) {
-# &Apache::lonxml::debug("Have $#whichopt max is $max");
- my $aopt;
- if (&Apache::response::showallfoils() || ($randomize eq 'no')) {
- $aopt=0;
- } else {
- $aopt=int(&Math::Random::random_uniform() * ($#names+1));
- }
-# &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
- $aopt=splice(@names,$aopt,1);
-# &Apache::lonxml::debug("Picked $aopt");
- if ($top{$aopt}) {
- $toplist[$top{$aopt}]=$aopt;
- } elsif ($bottom{$aopt}) {
- $bottomlist[$bottom{$aopt}]=$aopt;
- } else {
- push (@whichopt,$aopt);
- }
- }
-# &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist);
- for (my $i=0;$i<=$#toplist;$i++) {
- if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }
- }
- for (my $i=0;$i<=$#bottomlist;$i++) {
- if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }
- }
- &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist);
- return @whichopt;
+ return &Apache::response::whichorder($max,$randomize,
+ &Apache::response::showallfoils(),
+ \%Apache::response::foilgroup);
}
sub start_conceptgroup {
@@ -364,7 +342,7 @@ 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' ) {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
#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'} };
@@ -381,7 +359,7 @@ sub end_conceptgroup {
$safeeval);
$Apache::response::foilgroup{"$name.concept"} = $concept;
&Apache::lonxml::debug("Selecting $name in $concept");
- if ($target eq 'web') {
+ 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);
@@ -446,12 +424,24 @@ sub end_foil {
&& !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
- $Apache::response::conceptgroup{"$name.text"} = $text;
+ if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+ $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
+ } else {
+ $Apache::response::conceptgroup{"$name.text"} = $text;
+ }
$Apache::response::conceptgroup{"$name.location"} = $location;
} else {
push @{ $Apache::response::foilgroup{'names'} }, $name;
$Apache::response::foilgroup{"$name.value"} = $value;
- $Apache::response::foilgroup{"$name.text"} = $text;
+ if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+ $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
+ } else {
+ if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+ $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
+ } else {
+ $Apache::response::foilgroup{"$name.text"} = $text;
+ }
+ }
$Apache::response::foilgroup{"$name.location"} = $location;
}
}