--- loncom/homework/imageresponse.pm 2007/09/25 23:45:33 1.86
+++ loncom/homework/imageresponse.pm 2007/10/15 09:47:29 1.90
@@ -1,8 +1,8 @@
-
+#
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.86 2007/09/25 23:45:33 albertel Exp $
+# $Id: imageresponse.pm,v 1.90 2007/10/15 09:47:29 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -62,6 +62,16 @@ sub start_imageresponse {
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
1);
+ } elsif ( $target eq 'edit' ) {
+ $result .= &Apache::edit::tag_start($target,$token).
+ &Apache::edit::text_arg('Max Number Of Shown Foils:',
+ 'max',$token,'4').
+ &Apache::edit::end_row().
+ &Apache::edit::start_spanning_row();
+ } elsif ( $target eq 'modified' ) {
+ my $constructtag=
+ &Apache::edit::get_new_args($token,$parstack,$safeeval,'max');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
}
@@ -69,6 +79,9 @@ sub start_imageresponse {
sub end_imageresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $part_id = $Apache::inputtags::part;
+ my $response_id = $Apache::inputtags::response[-1];
+
pop(@Apache::lonxml::namespace);
&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
@@ -84,7 +97,12 @@ sub end_imageresponse {
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
- &Apache::lonxml::increment_counter(&Apache::response::repetition());
+ &Apache::lonxml::increment_counter(&Apache::response::repetition(),
+ "$part_id.$response_id");
+ if ($target eq 'analyze') {
+ &Apache::lonhomework::set_bubble_lines();
+ }
+
}
&Apache::response::end_response();
@@ -105,27 +123,27 @@ 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; }
+ if (&Apache::response::showallfoils()) { $max=$count; }
return ($count,$max);
}
sub whichfoils {
my ($max)=@_;
- if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
+ return if (!defined(@{ $Apache::response::foilgroup{'names'} }));
my @names = @{ $Apache::response::foilgroup{'names'} };
- my @whichopt =();
+ my @whichopt;
while ((($#whichopt+1) < $max) && ($#names > -1)) {
&Apache::lonxml::debug("Have $#whichopt max is $max");
my $aopt;
-# if (&Apache::response::showallfoils()) {
-# $aopt=0;
-# } else {
+ if (&Apache::response::showallfoils()) {
+ $aopt=0;
+ } else {
$aopt=int(&Math::Random::random_uniform() * ($#names+1));
-# }
+ }
&Apache::lonxml::debug("From $#names elms, picking $aopt");
$aopt=splice(@names,$aopt,1);
&Apache::lonxml::debug("Picked $aopt");
- push (@whichopt,$aopt);
+ push(@whichopt,$aopt);
}
return @whichopt;
}
@@ -237,14 +255,15 @@ sub displayfoils {
} else {
my $respid=$Apache::inputtags::response['-1'];
my $token=&prep_image($image,'submission',$name);
- my $id = "HWVAL_$respid:$temp";
+ my $input_id = "HWVAL_$respid:$temp";
+ my $id = $env{'form.request.prefix'}.$input_id;
$result.='<img onclick="image_response_click(\''.$id.'\',event);"
src="/adm/randomlabel.png?token='.$token.'"
- id="imageresponse_'.$id.'"
+ id="'.$id.'_imageresponse"
/>'.
'<br />'.
- '<input type="hidden" name="token_'.$id.'" value="'.$token.'" />'.
- '<input type="hidden" name="'.$id.'" value="'.
+ '<input type="hidden" name="'.$input_id.'_token" value="'.$token.'" />'.
+ '<input type="hidden" name="'.$input_id.'" value="'.
join(':',&get_submission($name)).'" />';
}
}
@@ -279,7 +298,7 @@ sub format_prior_response {
sub display_answers {
my ($target,$whichopt)=@_;
- my $result;
+ my $result=&Apache::response::answer_header('imageresponse');
foreach my $name (@$whichopt) {
my $image=$Apache::response::foilgroup{"$name.image"};
&Apache::lonxml::debug("image is $image");
@@ -288,10 +307,9 @@ sub display_answers {
}
my $token=&prep_image($image,'answeronly',$name);
- $result.=&Apache::response::answer_header('imageresponse');
$result.=&Apache::response::answer_part('imageresponse',"<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n");
- $result.=&Apache::response::answer_footer('imageresponse');
}
+ $result.=&Apache::response::answer_footer('imageresponse');
return $result;
}
@@ -481,7 +499,7 @@ sub start_foil {
}
$Apache::response::foilnames{$name}++;
if ( $Apache::imageresponse::conceptgroup
- #&& !&Apache::response::showallfoils()
+ && !&Apache::response::showallfoils()
) {
push(@{ $Apache::response::conceptgroup{'names'} }, $name);
} else {
@@ -534,7 +552,7 @@ sub end_text {
|| $target eq 'answer') {
my $name = $Apache::imageresponse::curname;
if ( $Apache::imageresponse::conceptgroup
- #&& !&Apache::response::showallfoils()
+ && !&Apache::response::showallfoils()
) {
$Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
} else {
@@ -577,7 +595,7 @@ sub end_image {
my $image = &Apache::lonxml::endredirection();
&Apache::lonxml::debug("original image is $image");
if ( $Apache::imageresponse::conceptgroup
- #&& !&Apache::response::showallfoils()
+ && !&Apache::response::showallfoils()
) {
$Apache::response::conceptgroup{"$name.image"} = $image;
} else {
@@ -586,7 +604,7 @@ sub end_image {
} elsif ($target eq 'analyze') {
my $image = &Apache::lonxml::endredirection();
if ( $Apache::imageresponse::conceptgroup
- #&& !&Apache::response::showallfoils()
+ && !&Apache::response::showallfoils()
) {
$Apache::response::conceptgroup{"$name.image"} = $image;
} else {
@@ -666,7 +684,7 @@ sub end_rectangle {
$area=~s/\s//g;
&Apache::lonxml::debug("out is $area for $name");
if ( $Apache::imageresponse::conceptgroup
- #&& !&Apache::response::showallfoils()
+ && !&Apache::response::showallfoils()
) {
push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";
} else {
@@ -747,7 +765,7 @@ sub end_polygon {
$area=~s/\s*//g;
&Apache::lonxml::debug("out is $area for $name");
if ( $Apache::imageresponse::conceptgroup
- #&& !&Apache::response::showallfoils()
+ && !&Apache::response::showallfoils()
) {
push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area";
} else {