--- loncom/homework/optionresponse.pm 2002/10/01 20:17:04 1.50
+++ loncom/homework/optionresponse.pm 2002/10/28 23:31:48 1.57
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.50 2002/10/01 20:17:04 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.57 2002/10/28 23:31:48 albertel 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).
"
Multiple Option Response Question | 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 \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);
@@ -321,7 +329,8 @@ 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";
}
}
@@ -355,10 +364,18 @@ sub displayfoils {
} else {
if ($displayoptionintex == 0) {
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);
@@ -366,9 +383,16 @@ sub displayfoils {
$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);
@@ -389,7 +413,7 @@ sub displayfoils {
sub optionlist_correction {
my $texoptionlist = shift;
- $texoptionlist =~ s/ |