--- loncom/homework/optionresponse.pm 2002/09/26 21:41:30 1.48
+++ loncom/homework/optionresponse.pm 2002/11/07 16:45:55 1.58
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.48 2002/09/26 21:41:30 albertel Exp $
+# $Id: optionresponse.pm,v 1.58 2002/11/07 16:45:55 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);
@@ -305,10 +313,13 @@ sub displayfoils {
my $result;
my $name;
my $displayoptionintex=0;
+ my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
+ 'Q','R','S','T','U','V','W','X','Y','Z');
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')) {
+ 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 />";
@@ -319,9 +330,18 @@ sub displayfoils {
$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;
@@ -341,29 +361,45 @@ sub displayfoils {
$result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
.$optionlist
."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result.=&webbubbles(\@opt,\@alphabet);
+ }
$temp++;
} else {
if ($displayoptionintex == 0) {
- my $texoptionlist = $optionlist;
- $texoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
- $texoptionlist =~ s/<option>/{\\bf /g;
- $texoptionlist =~ s/<option selected="on">/{\\bf /g;
- $texoptionlist =~ s/<\/option>/},/g;
- $texoptionlist =~ s/,$/\./g;
- $texoptionlist =~ s/>/\$>\$/g;
- $texoptionlist =~ s/</\$<\$/g;
- $texoptionlist =~ s/=/\$=\$/g;
+ my $texoptionlist = &optionlist_correction($optionlist);
+ if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';}
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'};
} else {
- $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result.= $texoptionlist.'\vspace*{-2 mm}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+ } else {
+ $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
+ }
+ }
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result.=&bubbles(\@alphabet,\@opt);
}
$displayoptionintex=1;
} else {
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.= $Apache::response::foilgroup{$name.'.text'};
} else {
- $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+ } else {
+ $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
+ }
+ }
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result.=&bubbles(\@alphabet,\@opt);
}
}
}
@@ -378,6 +414,64 @@ sub displayfoils {
}
+sub optionlist_correction {
+
+ my $texoptionlist = shift;
+ $texoptionlist =~ s/<option><\/option>/\\item \[\] Possible answers are:/;
+ $texoptionlist =~ s/<option>/\{\\bf /g;
+ $texoptionlist =~ s/<option selected="on">/\{\\bf /g;
+ $texoptionlist =~ s/<\/option>/\},/g;
+ $texoptionlist =~ s/,$/\./g;
+ $texoptionlist =~ s/>/\$>\$/g;
+ $texoptionlist =~ s/</\$<\$/g;
+ $texoptionlist =~ s/=/\$=\$/g;
+ return $texoptionlist;
+}
+
+
+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) = @_;
+ my @alphabet = @$ralphabit;
+ my @opt = @$ropt;
+ my ($result,$head,$line) =('','','');
+ my $number_of_bubbles = $#opt + 1;
+ my $current_length = 0;
+ for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
+ $current_length += (length($opt[$ind])+length($alphabet[$ind])+2)*2;
+ if ($current_length<0.9*$ENV{'form.textwidth'} and $ind!=$number_of_bubbles) {
+ $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
+ $head.='lr';
+ } else {
+ $line=~s/\&\s*$//;
+ $result.='\vskip -5 mm\begin{tabular}{'.$head.'}\\\\'.$line.'\\\\\end{tabular}';
+ $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
+ $head ='lr';
+ $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;
+ }
+
+ }
+ &Apache::lonxml::increment_counter();
+ return $result;
+}
+
+
sub start_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::optionresponse::conceptgroup=1;
@@ -432,6 +526,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') {
@@ -480,7 +580,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') {