--- loncom/homework/optionresponse.pm 2004/07/02 08:21:39 1.111
+++ loncom/homework/optionresponse.pm 2005/01/31 22:00:40 1.124
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.111 2004/07/02 08:21:39 albertel Exp $
+# $Id: optionresponse.pm,v 1.124 2005/01/31 22:00:40 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,7 +38,7 @@ sub start_optionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
#when in a option response use these
- &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
+ &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist'));
push (@Apache::lonxml::namespace,'optionresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
%Apache::hint::option=();
@@ -78,7 +78,7 @@ sub end_optionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
&Apache::response::end_response;
pop @Apache::lonxml::namespace;
- &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
+ &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist'));
my $result;
if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
undef(%Apache::response::foilnames);
@@ -182,7 +182,7 @@ sub end_foilgroup {
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
} elsif ( $target eq 'grade') {
- if ( defined $ENV{'form.submitted'}) {
+ if ( &Apache::response::submitted()) {
my @whichopt = &whichfoils($max,$randomize);
my $temp=1;my $name;
my %responsehash;
@@ -192,7 +192,7 @@ sub end_foilgroup {
my $ignored=0;
foreach $name (@whichopt) {
my $response=&Apache::response::getresponse($temp);
- if ($ENV{'form.submitted'} eq 'scantron') {
+ if ($ENV{'form.submitted'} eq 'scantron' && $response=~/\S/) {
$response = $opt[$response];
}
if ( $response =~ /[^\s]/) {
@@ -220,7 +220,16 @@ sub end_foilgroup {
$responsestr;
$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';
@@ -238,7 +247,11 @@ sub end_foilgroup {
} else {
my $ad;
if ($wrong==0 && $right==0) {
- #nothing submitted
+ #nothing submitted only assign a score if we
+ #need to override a previous grade
+ if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) {
+ $ad='ASSIGNED_SCORE';
+ }
} else {
$ad='ASSIGNED_SCORE';
}
@@ -350,7 +363,7 @@ sub displayfoils {
$text='•'.$text;
}
$result.=$text."\n";
- }
+ }
if ($Apache::lonhomework::type eq 'exam') {
$result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
}
@@ -453,10 +466,10 @@ sub optionlist_correction {
if ($TeXlayout eq 'vertical') {
$texoptionlist.=' \vskip 0 mm ',
} else {
- $texoptionlist.=',';
+ $texoptionlist.=', ';
}
}
- chop($texoptionlist);
+ $texoptionlist=~s/, $//;
if ($TeXlayout ne 'vertical') {$texoptionlist.='.';}
} else {
if ($TeXlayout ne 'vertical') {$texoptionlist='\\item [] \\vskip -5 mm';}
@@ -491,8 +504,8 @@ sub webbubbles {
sub bubbles {
- my ($ralphabit,$ropt) = @_;
- my @alphabet = @$ralphabit;
+ my ($ralphabet,$ropt,$response) = @_;
+ my @alphabet = @$ralphabet;
my @opt = @$ropt;
my ($result,$head,$line) =('','','');
my $number_of_bubbles = $#opt + 1;
@@ -508,6 +521,7 @@ sub bubbles {
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
my $leftmargin;
$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);
+ if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}
if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
@@ -603,16 +617,22 @@ sub end_foil {
my $result = '';
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
$text=&Apache::lonxml::endredirection;
- $text=~/(\w)/;
+ if ($target eq 'tex') {$text=~s/\\strut\s*\\\\\s*\\strut/\\vskip 0 mm/;}
if (($target eq 'tex') and ($Apache::lonhomework::type ne 'exam') and ($text=~/\S/)) {$text = '\vspace*{-2 mm}\item '.$text;}
}
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 ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+ $text='\vskip 5mm $\triangleright$ '.$text;
+ }
if ($value ne 'unused') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
&Apache::lonxml::debug("Got a name of :$name:");
- if (!$name) { $name=$Apache::lonxml::curdepth; }
+ if (!$name) {
+ &Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");
+ $name=$Apache::lonxml::curdepth;
+ }
&Apache::lonxml::debug("Using a name of :$name:");
if (defined($Apache::response::foilnames{$name})) {
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
@@ -623,20 +643,12 @@ sub end_foil {
&& !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
- if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
- $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\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 ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
- $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
- } else {
- $Apache::response::foilgroup{"$name.text"} = $text;
- }
+ $Apache::response::foilgroup{"$name.text"} = $text;
$Apache::response::foilgroup{"$name.location"} = $location;
}
}
@@ -647,6 +659,20 @@ sub end_foil {
return $result;
}
+sub start_drawoptionlist {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ if ($target ne 'meta') {
+ return $token->[4];
+ }
+}
+
+sub end_drawoptionlist {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ if ($target ne 'meta') {
+ return $token->[2];
+ }
+}
+
sub insert_foil {
return '
<foil name="" value="unused">