--- loncom/homework/optionresponse.pm 2002/10/17 14:40:05 1.52
+++ loncom/homework/optionresponse.pm 2002/11/13 16:53:11 1.63
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.52 2002/10/17 14:40:05 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.63 2002/11/13 16:53:11 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,6 +42,7 @@ sub start_optionresponse {
&Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'optionresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
+ %Apache::hint::option=();
if ($target eq 'edit') {
$result.=&Apache::edit::start_table($token).
"<tr><td>Multiple Option Response Question</td><td>Delete:".
@@ -179,6 +180,7 @@ sub end_foilgroup {
my @whichopt = &whichfoils($max,$randomize);
my $temp=1;my $name;
my %responsehash;
+ my %grade;
my $right=0;
my $wrong=0;
my $ignored=0;
@@ -188,7 +190,11 @@ sub end_foilgroup {
if ( $response =~ /[^\s]/) {
my $value=$Apache::response::foilgroup{$name.'.value'};
&Apache::lonxml::debug("submitted a $response for $value<br />\n");
- if ($value eq $response) {$right++;} else {$wrong++;}
+ if ($value eq $response) {
+ $grade{$name}='1'; $right++;
+ } else {
+ $grade{$name}='0'; $wrong++;
+ }
} else {
$ignored++;
}
@@ -197,6 +203,7 @@ sub end_foilgroup {
my $part=$Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+ my $gradestr =&Apache::lonnet::hash2str(%grade);
my %previous=&Apache::response::check_for_previous($responsestr,
$part,$id);
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
@@ -214,6 +221,7 @@ sub end_foilgroup {
}
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
$responsestr;
+ $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
$ad;
&Apache::response::handle_previous(\%previous,$ad);
@@ -310,25 +318,55 @@ sub displayfoils {
my @whichopt = &whichfoils($max,$randomize);
my $part=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
- if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
+ my $break;
+ if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
+ my $temp=1; ####
foreach $name (@whichopt) {
- if ($target eq 'web') {
- $result.="<br />";
+ my $text=$Apache::response::foilgroup{$name.'.text'};
+ if ($text!~/^\s*$/) {
+ if ($target eq 'tex') {
+ $break='\vskip 0 mm ';
+ } elsif ($target eq 'web') {
+ $break='<br />';
+ }
+ }
+ $result.=$break;
+ if ($target eq 'web') {
+ my $value=$Apache::response::foilgroup{$name.'.value'};
+ if (!($text=~s|<drawoptionlist\s*/>|$value|)) {
+ if ($text=~/^\s*$/) {
+ $text=$value.$text;
+ } else {
+ $text=$value.': '.$text;
+ }
+ }
+ $result.=$text."\n";
} elsif ($target eq 'tex') {
- $result.='\vskip 0 mm ';
- }
- if ($target ne 'tex') {
- $result .=$Apache::response::foilgroup{$name.'.value'}.
- ":".$Apache::response::foilgroup{$name.'.text'}."\n";
- } else {
- $result .='\item '.$Apache::response::foilgroup{$name.'.value'}.
+ $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
+ $result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.
":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
+ if ($Apache::lonhomework::type eq 'exam') {
+ if ($target ne 'tex') {
+ $result.=&webbubbles(\@opt,\@alphabet);
+ } else {
+ $result.=&bubbles(\@alphabet,\@opt);
+ }
+ }
+ $temp++;
}
} else {
my $temp=1;
my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
foreach $name (@whichopt) {
+ my $text=$Apache::response::foilgroup{$name.'.text'};
+ if ($text!~/^\s*$/) {
+ if ($target eq 'tex') {
+ $break='\vskip 0 mm ';
+ } elsif ($target eq 'web') {
+ $break='<br />';
+ }
+ }
my $lastopt=$lastresponse{$name};
my $optionlist="<option></option>\n";
my $option;
@@ -340,32 +378,35 @@ sub displayfoils {
}
}
if ($target ne 'tex') {
- $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
- .$optionlist
- ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
+ $optionlist='<select name="HWVAL_'.
+ $Apache::inputtags::response['-1'].':'.$temp.'">'.
+ $optionlist."</select>\n";
+ my $text=$Apache::response::foilgroup{$name.'.text'};
+ if (!($text=~s|<drawoptionlist\s*/>|$optionlist|)) {
+ $text=$optionlist.$text;
+ }
+ $result.=$break.$text."\n";
if ($Apache::lonhomework::type eq 'exam') {
- my $number_of_bubbles = $#opt + 1;
- $result.= '<table border="1"><tr>';
- for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
- $result.='<td>'.$alphabet[$ind].': '.$opt[$ind].'</td>';
- }
- $result.='</tr></table>';
+ $result.=&webbubbles(\@opt,\@alphabet);
}
$temp++;
} else {
+ my $texoptionlist = &optionlist_correction($optionlist);
if ($displayoptionintex == 0) {
- my $texoptionlist = &optionlist_correction($optionlist);
- if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';}
+ if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';} #if exam we do not need to show optionlist
if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
- if ($Apache::lonhomework::type eq 'exam') {
- $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
- }
- $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
+ if ($Apache::lonhomework::type eq 'exam') {
+ $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
+ }
+ if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
+ $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
+ }
+ $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
} else {
if ($Apache::lonhomework::type eq 'exam') {
- $result.= $texoptionlist.'\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+ $result.= $texoptionlist.'\vspace*{-2 mm}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
} else {
- $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
+ $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
}
}
if ($Apache::lonhomework::type eq 'exam') {
@@ -377,7 +418,10 @@ sub displayfoils {
if ($Apache::lonhomework::type eq 'exam') {
$Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
}
- $result.= $Apache::response::foilgroup{$name.'.text'};
+ if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
+ $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
+ }
+ $result.= $Apache::response::foilgroup{$name.'.text'};
} else {
if ($Apache::lonhomework::type eq 'exam') {
$result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
@@ -389,13 +433,12 @@ sub displayfoils {
$result.=&bubbles(\@alphabet,\@opt);
}
}
- }
+ }
}
- }
- if ($target ne 'tex') {
- return $result."<br />";
}
- else {
+ if ($target ne 'tex') {
+ return $result.$break;
+ } else {
return $result;
}
}
@@ -416,6 +459,22 @@ sub optionlist_correction {
}
+sub webbubbles {
+
+ my ($ropt,$ralphabet)=@_;
+ my @opt=@$ropt;
+ my @alphabet=@$ralphabet;
+ my $result='';
+ my $number_of_bubbles = $#opt + 1;
+ $result.= '<table border="1"><tr>';
+ for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
+ $result.='<td>'.$alphabet[$ind].': '.$opt[$ind].'</td>';
+ }
+ $result.='</tr></table>';
+ return $result;
+}
+
+
sub bubbles {
my ($ralphabit,$ropt) = @_;
@@ -438,10 +497,7 @@ sub bubbles {
}
}
- $Apache::lonxml::counter++;
- my %moreenv;
- $moreenv{'form.counter'}=$Apache::lonxml::counter;
- &Apache::lonnet::appenv(%moreenv);
+ &Apache::lonxml::increment_counter();
return $result;
}
@@ -500,6 +556,12 @@ sub end_conceptgroup {
$Apache::lonhomework::analyze{"$part_id.foil.location.$name"} =
$Apache::response::conceptgroup{"$name.location"};
}
+ } elsif ($target eq 'web') {
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ push(@{ $Apache::hint::option{"$part_id.concepts"} },
+ $concept);
+ $Apache::hint::option{"$part_id.concept.$concept"}=
+ $Apache::response::conceptgroup{'names'};
}
}
} elsif ($target eq 'edit') {
@@ -548,7 +610,7 @@ sub end_foil {
my $result = '';
if ($target eq 'web' || $target eq 'tex') {
$text=&Apache::lonxml::endredirection;
- if ($target eq 'tex') { $text = '\item '.$text; }
+ if ($target eq 'tex') { $text = '\vspace*{-2 mm}\item '.$text; }
}
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'
|| $target eq 'tex' || $target eq 'analyze') {