--- loncom/homework/optionresponse.pm 2002/01/25 16:12:18 1.33
+++ loncom/homework/optionresponse.pm 2002/05/23 18:02:03 1.40
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.33 2002/01/25 16:12:18 albertel Exp $
+# $Id: optionresponse.pm,v 1.40 2002/05/23 18:02:03 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -53,16 +53,17 @@ sub start_optionresponse {
$result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
&Apache::edit::end_row().
&Apache::edit::start_spanning_row();
- }
- if ($target eq 'modified') {
+ } elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'max');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
- }
- if ($target eq 'meta') {
+ } elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write('optionresponse');
+ } elsif ($target eq 'analyze') {
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
}
-# if ($target eq 'tex') {$result .= '\begin{itemize}';}
+# if ($target eq 'tex') {$result .= '\begin{enumerate}';}
return $result;
}
@@ -73,7 +74,7 @@ sub end_optionresponse {
&Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
my $result;
if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
-# if ($target eq 'tex') {$result .= '\end{itemize}';}
+# if ($target eq 'tex') {$result .= '\end{enumerate}';}
return $result;
}
@@ -139,7 +140,7 @@ ENDTABLE
$result.=')">';
} # else nothing changed so just use the default mechanism
}
- if ($target eq 'tex') {$result .= '\begin{itemize}';}
+ if ($target eq 'tex') {$result .= '\begin{enumerate}';}
return $result;
}
@@ -147,7 +148,7 @@ sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
my $name;
my ($count,$max) = &getfoilcounts($parstack,$safeeval);
if ($count>$max) { $count=$max }
@@ -159,6 +160,18 @@ sub end_foilgroup {
$result.=&displayfoils($target,$count,@opt);
} elsif ( $target eq 'answer') {
$result.=&displayanswers($count,@opt);
+ } elsif ( $target eq 'analyze') {
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
+ if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; }
+ push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name);
+ $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
+ $Apache::response::foilgroup{"$name.value"};
+ $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
+ $Apache::response::foilgroup{"$name.text"};
+ }
+ push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
+ push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($count));
} elsif ( $target eq 'grade') {
if ( defined $ENV{'form.submitted'}) {
my @whichopt = &whichfoils($count);
@@ -171,8 +184,8 @@ sub end_foilgroup {
my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
$responsehash{$name}=$response;
if ( $response =~ /[^\s]/) {
- &Apache::lonxml::debug("submitted a $response
\n");
my $value=$Apache::response::foilgroup{$name.'.value'};
+ &Apache::lonxml::debug("submitted a $response for $value
\n");
if ($value eq $response) {$right++;} else {$wrong++;}
} else {
$ignored++;
@@ -191,7 +204,11 @@ sub end_foilgroup {
} elsif ($wrong==0 && $right==0) {
#nothing submitted
} else {
- $ad='INCORRECT';
+ if ($ignored==0) {
+ $ad='INCORRECT';
+ } else {
+ $ad='MISSING_ANSWER';
+ }
}
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
$responsestr;
@@ -203,7 +220,7 @@ sub end_foilgroup {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table();
}
- if ($target eq 'tex') {$result .= '\end{itemize}';}
+ if ($target eq 'tex') {$result .= '\end{enumerate}';}
return $result;
}
@@ -212,6 +229,7 @@ sub getfoilcounts {
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
# +1 since instructors will count from 1
my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
+ if (&Apache::response::showallfoils()) { $max=$count; }
return ($count,$max);
}
@@ -221,7 +239,12 @@ sub whichfoils {
my @whichopt =();
while ((($#whichopt+1) < $max) && ($#names > -1)) {
&Apache::lonxml::debug("Have $#whichopt max is $max");
- my $aopt=int(rand($#names+1));
+ my $aopt;
+ if (&Apache::response::showallfoils()) {
+ $aopt=0;
+ } else {
+ $aopt=int(rand($#names+1));
+ }
&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
$aopt=splice(@names,$aopt,1);
&Apache::lonxml::debug("Picked $aopt");
@@ -290,6 +313,9 @@ sub displayfoils {
$durtyoptionlist =~ s/