--- loncom/homework/matchresponse.pm 2004/02/09 19:47:53 1.35
+++ loncom/homework/matchresponse.pm 2004/12/04 00:41:26 1.48
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Full matching style response
#
-# $Id: matchresponse.pm,v 1.35 2004/02/09 19:47:53 albertel Exp $
+# $Id: matchresponse.pm,v 1.48 2004/12/04 00:41:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,7 +30,8 @@ package Apache::matchresponse;
use strict;
use HTML::Entities();
use Math::Random();
-use Apache::optionresponse;
+use Apache::optionresponse();
+use Apache::lonlocal;
BEGIN {
&Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -46,6 +47,7 @@ sub start_matchresponse {
push (@Apache::lonxml::namespace,'matchresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
%Apache::hint::match=();
+ undef(%Apache::response::foilnames);
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('matchresponse');
} elsif ($target eq 'edit' ) {
@@ -80,6 +82,7 @@ sub end_matchresponse {
pop @Apache::lonxml::namespace;
&Apache::lonxml::deregister('Apache::matchresponse',
('foilgroup','foil','conceptgroup'));
+ undef(%Apache::response::foilnames);
return $result;
}
@@ -107,6 +110,7 @@ sub start_itemgroup {
} elsif ($target eq 'web' or $target eq 'tex') {
$Apache::matchresponse::itemtable{'location'}=
&Apache::lonxml::get_param('location',$parstack,$safeeval);
+ $Apache::matchresponse::TeXitemgroupwidth=&Apache::lonxml::get_param('TeXitemgroupwidth',$parstack,$safeeval,undef,0);
}
return $result;
}
@@ -150,7 +154,7 @@ sub end_itemgroup {
$table.='';
$Apache::matchresponse::itemtable{'display'}=$table;
} elsif ($target eq 'tex') {
- my $table=' \begin{description} ';
+ my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} ';
my $i=0;
foreach my $name (@names) {
$Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
@@ -158,7 +162,8 @@ sub end_itemgroup {
$Apache::response::itemgroup{$name.'.text'};
$i++;
}
- $table.=' \end{description} \strut ';
+ $table.=' \end{description} \strut ';
+ if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
$Apache::matchresponse::itemtable{'display'}=$table;
}
return $result;
@@ -228,7 +233,7 @@ sub start_foilgroup {
my $result;
%Apache::response::foilgroup=();
$Apache::matchresponse::conceptgroup=0;
- &Apache::response::setrandomnumber();
+ &Apache::response::pushrandomnumber();
if ($target eq 'edit') {
$result.=&Apache::edit::start_table($token)
."
Collection Of Foils | Delete:"
@@ -262,6 +267,7 @@ sub end_foilgroup {
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
+ &Apache::response::poprandomnumber();
return $result;
}
@@ -344,7 +350,16 @@ sub grade_response {
$itemstr;
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=
$gradestr;
- if (!$Apache::lonhomework::scantronmode) {
+ if ($Apache::lonhomework::type eq 'survey') {
+ if ($ignored == 0) {
+ my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+ &Apache::response::handle_previous(\%previous,$ad);
+ } elsif ($wrong==0 && $right==0) {
+ } else {
+ my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
+ &Apache::response::handle_previous(\%previous,$ad);
+ }
+ } elsif (!$Apache::lonhomework::scantronmode) {
my $ad;
if ($wrong==0 && $ignored==0) {
$ad='EXACT_ANS';
@@ -419,7 +434,7 @@ sub displayfoils {
}
} else {
my $i = 0;
- my $temp=0;
+ my $temp=1;
my $id=$Apache::inputtags::response[-1];
my $part=$Apache::inputtags::part;
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
@@ -454,19 +469,20 @@ sub displayfoils {
my $text=$Apache::response::foilgroup{$name.'.text'};
if ($target ne 'tex') {
if ($Apache::lonhomework::type ne 'exam') {
- $question.=' '.$optionlist.$text."\n";
+ $question.=" \n".$optionlist.$text;
} else {
- $question.=' '.$text."\n";
+ $question.=" \n".$text;
}
if ($Apache::lonhomework::type eq 'exam') {
- $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp,$last_letter);
+ my @blank;
+ $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
}
} else {
if ($Apache::lonhomework::type eq 'exam') {
$question.=' '.$optionlist.$text."\n";
my @emptyItems = ();
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
- $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
+ $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';
$internal_counter++;
} else {
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
@@ -481,17 +497,47 @@ sub displayfoils {
$result=$question.$result;
} elsif ($result=&itemdisplay('right')) {
if ($target ne 'tex') {
- $result=''.$question.' | '.$result.
- ' | ';
+ #remove the first
+ $question=~s| ||;
+ $result=''.$question.
+ ' | '.$result.' | ';
} else {
- $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}\end{tabular}';
+ my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
+ my ($lefttabsize,$righttabsize)=(0,0);
+ if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
+ $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
+ $lefttabsize=$tabsize*$1/100;
+ $righttabsize=0.95*($tabsize-$lefttabsize);
+ } else {
+ $tabsize=~/(\d+\.?\d*)/;
+ $lefttabsize=$1/2.1;
+ $righttabsize=0.95*($1-$lefttabsize);
+ }
+ $lefttabsize.=' mm ';
+ $righttabsize.=' mm ';
+ $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}';
}
} elsif ($result=&itemdisplay('left')) {
if ($target ne 'tex') {
- $result=''.$result.' | '.$question.
- ' | ';
+ #remove the first
+ $question=~s| ||;
+ $result=''.$result.
+ ' | '.$question.' | ';
} else {
- $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}\end{tabular}';
+ my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
+ my ($lefttabsize,$righttabsize)=(0,0);
+ if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
+ $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
+ $lefttabsize=$tabsize*$1/100;
+ $righttabsize=0.95*($tabsize-$lefttabsize);
+ } else {
+ $tabsize=~/(\d+\.?\d*)/;
+ $lefttabsize=$1/2.1;
+ $righttabsize=0.95*($1-$lefttabsize);
+ }
+ $lefttabsize.=' mm ';
+ $righttabsize.=' mm ';
+ $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}';
}
}
if ($target ne 'tex') {$result.=" ";} else {$result.=' \\\\ ';}
@@ -554,6 +600,9 @@ sub start_foil {
my $result='';
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
&Apache::lonxml::startredirection;
+ if ($target eq 'analyze') {
+ &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
+ }
} elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token,"Foil");
my $level='-2';
@@ -587,41 +636,34 @@ sub end_foil {
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' || $target eq 'analyze') {
+ if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+ $text='\vskip 5mm $\triangleright$ '.$text;
+ }
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
if ($value ne 'unused') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
- my $location =&Apache::lonxml::get_param('location',$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 (defined($Apache::response::foilnames{$name})) {
+ &Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",$name));
+ }
+ $Apache::response::foilnames{$name}++;
+ my $location =&Apache::lonxml::get_param('location',$parstack,
+ $safeeval);
if ( $Apache::matchresponse::conceptgroup
&& !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
- if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
- $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
- } else {
- $Apache::response::conceptgroup{"$name.text"} = $text;
- }
+ $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;
- if ($Apache::lonhomework::type eq 'exam') {
- if ($target eq 'tex') {
- $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
- } else {
- $Apache::response::foilgroup{"$name.text"} = $text;
- }
- } else {
- if ($target eq 'tex') {
- $Apache::response::foilgroup{"$name.text"} = $text;
- } else {
- $Apache::response::foilgroup{"$name.text"} = $text;
- }
- }
+ $Apache::response::foilgroup{"$name.text"} = $text;
$Apache::response::foilgroup{"$name.location"} = $location;
}
}
|