[BACK]Return to radiobuttonresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.120 and 1.121

version 1.120, 2007/06/26 10:42:09 version 1.121, 2007/06/29 12:49:10
Line 34  use Apache::lonnet; Line 34  use Apache::lonnet;
 use Apache::response;  use Apache::response;
   
 my $default_bubbles_per_line = 10;  my $default_bubbles_per_line = 10;
 my $bubbles_per_line;  
 my $bubble_lines = 1;  
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));      &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
 }  }
   
   sub bubble_line_count {
       my ($numfoils, $bubbles_per_line) = @_;
       my $bubble_lines;
       $bubble_lines = int($numfoils / $bubbles_per_line);
       if (($numfoils % $bubbles_per_line) != 0) {
    $bubble_lines++;
       }
       return $bubble_lines;
       
   }
   
   
 sub start_radiobuttonresponse {  sub start_radiobuttonresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
Line 51  sub start_radiobuttonresponse { Line 62  sub start_radiobuttonresponse {
     &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));      &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
     push (@Apache::lonxml::namespace,'radiobuttonresponse');      push (@Apache::lonxml::namespace,'radiobuttonresponse');
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
     $bubbles_per_line =   
  &Apache::response::get_response_param($Apache::inputtags::part."_$id",  
       'numbubbles',  
       $default_bubbles_per_line);  
   
     %Apache::hint::radiobutton=();      %Apache::hint::radiobutton=();
     undef(%Apache::response::foilnames);      undef(%Apache::response::foilnames);
Line 137  sub storesurvey { Line 144  sub storesurvey {
     my $part = $Apache::inputtags::part;      my $part = $Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];      my $id = $Apache::inputtags::response['-1'];
     my @whichfoils=@{ $Apache::response::foilgroup{'names'} };      my @whichfoils=@{ $Apache::response::foilgroup{'names'} };
     &bubble_line_count(scalar(@whichfoils));  
     my %responsehash;      my %responsehash;
     $responsehash{$whichfoils[$response]}=$response;      $responsehash{$whichfoils[$response]}=$response;
     my $responsestr=&Apache::lonnet::hash2str(%responsehash);      my $responsestr=&Apache::lonnet::hash2str(%responsehash);
Line 150  sub storesurvey { Line 156  sub storesurvey {
     return '';      return '';
 }  }
   
 sub bubble_line_count {  
     my ($numfoils) = @_;  
     $bubble_lines = int($numfoils / $bubbles_per_line);  
     if (($numfoils % $bubbles_per_line) != 0) {  
  $bubble_lines++;  
     }  
     return $bubble_lines;  
       
 }  
   
 sub grade_response {  sub grade_response {
     my ($max,$randomize)=@_;      my ($max,$randomize, $bubbles_per_line)=@_;
     #keep the random numbers the same must always call this      #keep the random numbers the same must always call this
     my ($answer,@whichfoils)=&whichfoils($max,$randomize);      my ($answer,@whichfoils)=&whichfoils($max,$randomize);
     if ( !&Apache::response::submitted() ) { return; }      if ( !&Apache::response::submitted() ) { return; }
     my $response;      my $response;
           
     # Need to know how many foils we have so that I know how many  
     # bubble lines to consume:  
       
     my $numfoils = scalar(@whichfoils);  
     &bubble_line_count($numfoils);  
   
       
       
     if ($env{'form.submitted'} eq 'scantron') {      if ($env{'form.submitted'} eq 'scantron') {
  $response = &Apache::response::getresponse(1,undef,$bubble_lines,   $response = &Apache::response::getresponse(1,undef,
  $bubbles_per_line);     &bubble_line_count(scalar(@whichfoils),
         $bubbles_per_line),
      $bubbles_per_line);
   
     } else {      } else {
  $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};   $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};
Line 209  sub end_foilgroup { Line 200  sub end_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
     my $result;      my $result;
       my $bubble_lines;
       my $bubbles_per_line;
       my $answer_count;
       my $id = $Apache::inputtags::response['-1'];
       $bubbles_per_line = 
    &Apache::response::get_response_param($Apache::inputtags::part."_$id",
         'numbubbles',
         $default_bubbles_per_line);
   
   
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  my $style = $Apache::lonhomework::type;   my $style = $Apache::lonhomework::type;
Line 222  sub end_foilgroup { Line 223  sub end_foilgroup {
     } elsif ( $target eq 'grade' ) {      } elsif ( $target eq 'grade' ) {
  $result=&storesurvey();   $result=&storesurvey();
     }      }
       $answer_count = scalar(@{$Apache::response::foilgroup{'names'}});
   
  } else {   } else {
   
     my $name;      my $name;
     my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,      my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,
  '-2');   '-2');
     my $randomize = &Apache::lonxml::get_param('randomize',$parstack,      my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
        $safeeval,'-2');         $safeeval,'-2');
       my @shown = &whichfoils($max,$randomize);
       $answer_count = scalar(@shown);
   
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
  $result=&displayfoils($target,$max,$randomize,$direction);   $result=&displayfoils($target,
         $max,
         $randomize,
         $direction,
         $bubbles_per_line);
     } elsif ($target eq 'answer' ) {      } elsif ($target eq 'answer' ) {
  $result=&displayanswers($max,$randomize);   $result=&displayanswers($max,$randomize);
     } elsif ( $target eq 'grade') {      } elsif ( $target eq 'grade') {
  &grade_response($max,$randomize);   &grade_response($max,$randomize,
                                   $bubbles_per_line);
     }  elsif ( $target eq 'analyze') {      }  elsif ( $target eq 'analyze') {
  my @shown = &whichfoils($max,$randomize);  
  &bubble_line_count(scalar(@shown));  
  &Apache::response::analyze_store_foilgroup(\@shown,   &Apache::response::analyze_store_foilgroup(\@shown,
    ['text','value','location']);     ['text','value','location']);
  my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";   my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
Line 250  sub end_foilgroup { Line 260  sub end_foilgroup {
  &Apache::response::setup_prior_tries_hash(\&format_prior_answer,   &Apache::response::setup_prior_tries_hash(\&format_prior_answer,
   [\%Apache::response::foilgroup]);    [\%Apache::response::foilgroup]);
     }      }
           $bubble_lines = &bubble_line_count($answer_count, $bubbles_per_line);
     &Apache::response::poprandomnumber();      &Apache::response::poprandomnumber();
     &Apache::lonxml::increment_counter($bubble_lines);      &Apache::lonxml::increment_counter($bubble_lines);
     return $result;      return $result;
Line 293  sub displayallfoils { Line 303  sub displayallfoils {
     if ( $Apache::response::foilgroup{'names'} ) {      if ( $Apache::response::foilgroup{'names'} ) {
  @names= @{ $Apache::response::foilgroup{'names'} };   @names= @{ $Apache::response::foilgroup{'names'} };
     }      }
     &bubble_line_count(scalar(@names));  
   
     my $temp=0;      my $temp=0;
     my $i   =0;      my $i   =0;
Line 506  sub whichfoils { Line 515  sub whichfoils {
 }  }
   
 sub displayfoils {  sub displayfoils {
     my ($target,$max,$randomize,$direction)=@_;      my ($target,$max,$randomize,$direction, $bubbles_per_line)=@_;
     my $result;      my $result;
   
     my ($answer,@whichfoils)=&whichfoils($max,$randomize);      my ($answer,@whichfoils)=&whichfoils($max,$randomize);
     &bubble_line_count(scalar(@whichfoils));  
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};      my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
     if ( ($target ne 'tex') &&      if ( ($target ne 'tex') &&
Line 610  sub displayallanswers { Line 618  sub displayallanswers {
     if ( $Apache::response::foilgroup{'names'} ) {      if ( $Apache::response::foilgroup{'names'} ) {
  @names= @{ $Apache::response::foilgroup{'names'} };   @names= @{ $Apache::response::foilgroup{'names'} };
     }      }
     &bubble_line_count(scalar(@names));  
     my $result=&Apache::response::answer_header('radiobuttonresponse');      my $result=&Apache::response::answer_header('radiobuttonresponse');
     foreach my $name (@names) {      foreach my $name (@names) {
  $result.=&Apache::response::answer_part('radiobuttonresponse',   $result.=&Apache::response::answer_part('radiobuttonresponse',
Removed from v.1.120  
changed lines
  Added in v.1.121

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>