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

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

version 1.119, 2007/06/20 22:50:27 version 1.120, 2007/06/26 10:42:09
Line 33  use Apache::lonlocal; Line 33  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::response;  use Apache::response;
   
 my $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'));
Line 43  sub start_radiobuttonresponse { Line 45  sub start_radiobuttonresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
   
   
   
     #when in a radiobutton response use these      #when in a radiobutton response use these
     &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);
     if ($target eq 'meta') {      if ($target eq 'meta') {
Line 128  sub storesurvey { Line 137  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 140  sub storesurvey { Line 150  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)=@_;
     #keep the random numbers the same must always call this      #keep the random numbers the same must always call this
Line 151  sub grade_response { Line 171  sub grade_response {
     # bubble lines to consume:      # bubble lines to consume:
           
     my $numfoils = scalar(@whichfoils);      my $numfoils = scalar(@whichfoils);
     my $bubble_lines = int($numfoils / $bubbles_per_line);      &bubble_line_count($numfoils);
     if (($numfoils % $bubbles_per_line) != 0) {  
  $bubble_lines++; # Partial line of bubbles too.  
     }  
           
           
     if ($env{'form.submitted'} eq 'scantron') {      if ($env{'form.submitted'} eq 'scantron') {
Line 164  sub grade_response { Line 182  sub grade_response {
     } else {      } else {
  $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};   $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};
     }      }
     &Apache::lonxml::increment_counter($bubble_lines-1);  
   
     if ( $response !~ /[0-9]+/) { return; }      if ( $response !~ /[0-9]+/) { return; }
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
Line 218  sub end_foilgroup { Line 236  sub end_foilgroup {
  &grade_response($max,$randomize);   &grade_response($max,$randomize);
     }  elsif ( $target eq 'analyze') {      }  elsif ( $target eq 'analyze') {
  my @shown = &whichfoils($max,$randomize);   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 233  sub end_foilgroup { Line 252  sub end_foilgroup {
     }      }
           
     &Apache::response::poprandomnumber();      &Apache::response::poprandomnumber();
     &Apache::lonxml::increment_counter();      &Apache::lonxml::increment_counter($bubble_lines);
     return $result;      return $result;
 }  }
   
Line 270  sub displayallfoils { Line 289  sub displayallfoils {
     my $result;      my $result;
     &Apache::lonxml::debug("survey style display");      &Apache::lonxml::debug("survey style display");
     my @names;      my @names;
       &Apache::lonnet::loghthis("Display all foils");
     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;
     my $id=$Apache::inputtags::response['-1'];      my $id=$Apache::inputtags::response['-1'];
Line 342  sub displayallfoils { Line 364  sub displayallfoils {
     }      }
  }   }
     }      }
       
     if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.='</tr></table>'; }      if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.='</tr></table>'; }
     return $result;      return $result;
 }  }
Line 487  sub displayfoils { Line 510  sub displayfoils {
     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 562  sub displayfoils { Line 586  sub displayfoils {
     if($bubble_number >= $bubbles_per_line) {      if($bubble_number >= $bubbles_per_line) {
  $i = 0;   $i = 0;
  $bubble_number = 0;   $bubble_number = 0;
  &Apache::lonxml::increment_counter(1);  
  $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';   $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
     }      }
  } else {   } else {
Line 587  sub displayallanswers { Line 610  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.119  
changed lines
  Added in v.1.120

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