--- loncom/homework/imageresponse.pm 2008/11/12 20:01:21 1.95 +++ loncom/homework/imageresponse.pm 2013/04/30 03:03:34 1.105 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # image click response style # -# $Id: imageresponse.pm,v 1.95 2008/11/12 20:01:21 jms Exp $ +# $Id: imageresponse.pm,v 1.105 2013/04/30 03:03:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,134 +41,69 @@ Coordinates the response to clicking an This is part of the LearningOnline Network with CAPA project described at http://www.lon-capa.org. -=head1 HANDLER SUBROUTINE - - - -=head1 OTHER SUBROUTINES +=head1 SUBROUTINES =over -=item * - -start_imageresponse() - -=item * - -end_imageresponse() - -=item * - -start_foilgroup() - -=item * - -getfoilcounts() - -=item * - -whichfoils() - -=item * - -prep_image() - -=item * - -draw_image() - -=item * - -displayfoils() - -=item * - -format_prior_response() - -=item * - -display_answers() - -=item * - -clean_up_image() +=item start_imageresponse() -=item * +=item end_imageresponse() -gradefoils() +=item start_foilgroup() -=item * +=item getfoilcounts() -stringify_submission() +=item whichfoils() -=item * +=item prep_image() -get_submission() +=item draw_image() -=item * +=item displayfoils() -end_foilgroup() +=item format_prior_response() -=item * +=item display_answers() -start_conceptgroup() +=item clean_up_image() -=item * +=item gradefoils() -end_conceptgroup() +=item stringify_submission() -=item * +=item get_submission() -insert_foil() +=item end_foilgroup() -=item * +=item start_conceptgroup() -start_foil() +=item end_conceptgroup() -=item * +=item insert_foil() -end_foil() +=item start_foil() -=item * +=item end_foil() -start_text() +=item start_text() -=item * +=item end_text() -end_text() +=item start_image() -=item * +=item end_image() -start_image() +=item start_rectangle() +=item grade_rectangle() -=item * +=item end_rectangle() -end_image() +=item start_polygon() -=item * +=item grade_polygon() -start_rectangle() - -=item * - -grade_rectangle() - -=item * - -end_rectangle() - -=item * - -start_polygon() - -=item * - -grade_polygon() - -=item * - -end_polygon() +=item end_polygon() =back @@ -244,7 +179,8 @@ 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(), + my $repetition = &Apache::response::repetition(); + &Apache::lonxml::increment_counter($repetition, "$part_id.$response_id"); if ($target eq 'analyze') { &Apache::lonhomework::set_bubble_lines(); @@ -252,15 +188,15 @@ sub end_imageresponse { } &Apache::response::end_response(); - return $result; } %Apache::response::foilgroup=(); sub start_foilgroup { + my ($target) = @_; %Apache::response::foilgroup=(); $Apache::imageresponse::conceptgroup=0; - &Apache::response::pushrandomnumber(); + &Apache::response::pushrandomnumber(undef,$target); return ''; } @@ -276,8 +212,11 @@ sub getfoilcounts { sub whichfoils { my ($max)=@_; - return if (!defined(@{ $Apache::response::foilgroup{'names'} })); - my @names = @{ $Apache::response::foilgroup{'names'} }; + my @names; + if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') { + @names = @{ $Apache::response::foilgroup{'names'} }; + } + return if (!@names); my @whichopt; while ((($#whichopt+1) < $max) && ($#names > -1)) { &Apache::lonxml::debug("Have $#whichopt max is $max"); @@ -385,7 +324,7 @@ sub displayfoils { my $image=$Apache::response::foilgroup{"$name.image"}; &Apache::lonxml::debug("image is $image"); if ( ($target eq 'web' || $target eq 'answer') - && $image !~ /^http:/ ) { + && $image !~ /^https?\:/ ) { $image=&clean_up_image($image); } push(@images,$image); @@ -418,12 +357,59 @@ sub displayfoils { $temp++; } if ($target eq 'web') { - &Apache::response::setup_prior_tries_hash(\&format_prior_response, - [\@images,\@whichopt]); + &get_prior_options(\@images,\@whichopt); } return $result; } +sub get_prior_options { + my ($currimages,$curropt) = @_; + return unless((ref($curropt) eq 'ARRAY') && + (ref($currimages) eq 'ARRAY')); + my $part = $Apache::inputtags::part; + my $respid = $Apache::inputtags::response[-1]; + foreach my $i (1..$Apache::lonhomework::history{'version'}) { + my $partprefix = "$i:resource.$part"; + my $sub_key = "$partprefix.$respid.submission"; + next if (!exists($Apache::lonhomework::history{$sub_key})); + my $type_key = "$partprefix.type"; + my @whichopt = (); + my @images = (); + if ($Apache::lonhomework::history{$type_key} eq 'randomizetry') { + my $order_key = "$partprefix.$respid.foilorder"; + @whichopt = &Apache::lonnet::str2array($Apache::lonhomework::history{$order_key}); + if (@whichopt > 0) { + foreach my $name (@whichopt) { + my $image=$Apache::response::foilgroup{"$name.image"}; + if ($image !~ /^https?\:/ ) { + $image=&clean_up_image($image); + } + push(@images,$image); + } + } + } else { + @whichopt = @{$curropt}; + @images = @{$currimages}; + } + my $submission; + if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) || + (($env{'form.grade_username'} eq $env{'user.name'}) && + ($env{'form.grade_domain'} eq $env{'user.domain'}))) { + $submission = $Apache::lonhomework::history{$sub_key}; + } else { + unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || + ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) { + $submission = $Apache::lonhomework::history{$sub_key}; + } + } + my $output = &format_prior_response('grade',$submission, + [\@images,\@whichopt]); + if (defined($output)) { + $Apache::inputtags::submission_display{$sub_key} = $output; + } + } +} + sub format_prior_response { my ($mode,$answer,$other_data) = @_; @@ -451,7 +437,7 @@ sub display_answers { my $image=$Apache::response::foilgroup{"$name.image"}; &Apache::lonxml::debug("image is $image"); if ( ($target eq 'web' || $target eq 'answer') - && $image !~ /^http:/ ) { + && $image !~ /^https?\:/ ) { $image = &clean_up_image($image); } my $token=&prep_image($image,'answeronly',$name); @@ -466,7 +452,7 @@ sub clean_up_image { my ($image)=@_; if ($image =~ /\s*