Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.102 and 1.123

version 1.102, 2005/06/22 12:03:23 version 1.123, 2007/06/29 17:32:31
Line 31  use strict; Line 31  use strict;
 use HTML::Entities();  use HTML::Entities();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::response;
   
   my $default_bubbles_per_line = 10;
   
   
 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;
   
   
   
     #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);
   
     %Apache::hint::radiobutton=();      %Apache::hint::radiobutton=();
     undef(%Apache::response::foilnames);      undef(%Apache::response::foilnames);
     if ($target eq 'meta') {      if ($target eq 'meta') {
Line 60  sub start_radiobuttonresponse { Line 80  sub start_radiobuttonresponse {
     $token,'4').      $token,'4').
     &Apache::edit::select_arg('Randomize Foil Order','randomize',      &Apache::edit::select_arg('Randomize Foil Order','randomize',
       ['yes','no'],$token).        ['yes','no'],$token).
       &Apache::edit::select_arg('Display Direction','direction',
         ['vertical','horizontal'],$token).
       &Apache::edit::end_row().        &Apache::edit::end_row().
       &Apache::edit::start_spanning_row()."\n";        &Apache::edit::start_spanning_row()."\n";
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'max',       $safeeval,'max',
      'randomize');       'randomize','direction');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $type=&Apache::lonxml::get_param('TeXtype',$parstack,$safeeval,   my $type=&Apache::lonxml::get_param('TeXtype',$parstack,$safeeval,
Line 134  sub storesurvey { Line 156  sub storesurvey {
     return '';      return '';
 }  }
   
   
 sub grade_response {  sub grade_response {
     my ($max,$randomize)=@_;      my ($answer, $whichfoils, $bubbles_per_line)=@_;
     #keep the random numbers the same must always call this  
     my ($answer,@whichfoils)=&whichfoils($max,$randomize);  
     if ( !&Apache::response::submitted() ) { return; }      if ( !&Apache::response::submitted() ) { return; }
     my $response;      my $response;
       
     if ($env{'form.submitted'} eq 'scantron') {      if ($env{'form.submitted'} eq 'scantron') {
  $response=&Apache::response::getresponse();   $response = &Apache::response::getresponse(1,undef,
      &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']};
     }      }
   
   
     if ( $response !~ /[0-9]+/) { return; }      if ( $response !~ /[0-9]+/) { return; }
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];      my $id = $Apache::inputtags::response['-1'];
     my %responsehash;      my %responsehash;
     $responsehash{$whichfoils[$response]}=$response;      $responsehash{$whichfoils->[$response]}=$response;
     my $responsestr=&Apache::lonnet::hash2str(%responsehash);      my $responsestr=&Apache::lonnet::hash2str(%responsehash);
     my %previous=&Apache::response::check_for_previous($responsestr,      my %previous=&Apache::response::check_for_previous($responsestr,
        $part,$id);         $part,$id);
Line 170  sub end_foilgroup { Line 199  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 177  sub end_foilgroup { Line 216  sub end_foilgroup {
    $safeeval,'-2');     $safeeval,'-2');
  if ( $style eq 'survey'  && $target ne 'analyze') {   if ( $style eq 'survey'  && $target ne 'analyze') {
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
  $result=&displayallfoils($direction);   $result=&displayallfoils($direction, $target);
     } elsif ( $target eq 'answer' ) {      } elsif ( $target eq 'answer' ) {
  $result=&displayallanswers();   $result=&displayallanswers();
     } 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 ($answer, @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,
         $answer, \@shown,
         $direction,
         $bubbles_per_line);
     } elsif ($target eq 'answer' ) {      } elsif ($target eq 'answer' ) {
  $result=&displayanswers($max,$randomize);   $result=&displayanswers($answer, \@shown);
     } elsif ( $target eq 'grade') {      } elsif ( $target eq 'grade') {
  &grade_response($max,$randomize);   &grade_response($answer, \@shown, $bubbles_per_line);
     }  elsif ( $target eq 'analyze') {      }  elsif ( $target eq 'analyze') {
  my @shown = &whichfoils($max,$randomize);  
  &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 204  sub end_foilgroup { Line 251  sub end_foilgroup {
       ('true','false'));        ('true','false'));
     }      }
  }   }
    $Apache::lonxml::post_evaluate=0;
     }      }
       if ($target eq 'web') {
    &Apache::response::setup_prior_tries_hash(\&format_prior_answer,
     [\%Apache::response::foilgroup]);
       }
       $bubble_lines = &bubble_line_count($answer_count, $bubbles_per_line);
     &Apache::response::poprandomnumber();      &Apache::response::poprandomnumber();
     &Apache::lonxml::increment_counter();      &Apache::lonxml::increment_counter($bubble_lines);
     return $result;      return $result;
 }  }
   
Line 228  sub getfoilcounts { Line 281  sub getfoilcounts {
     return ($truecnt,$falsecnt);      return ($truecnt,$falsecnt);
 }  }
   
   sub format_prior_answer {
       my ($mode,$answer,$other_data) = @_;
       my $foil_data = $other_data->[0];
       my %response = &Apache::lonnet::str2hash($answer);
       my ($name)   = keys(%response);
       return '<span class="LC_prior_radiobutton">'.
    $foil_data->{$name.'.text'}.'</span>';
   
   }
   
 sub displayallfoils {  sub displayallfoils {
     my ($direction)=@_;      my ($direction, $target)=@_;
     my $result;      my $result;
     &Apache::lonxml::debug("survey style display");      &Apache::lonxml::debug("survey style display");
     my @names = @{ $Apache::response::foilgroup{'names'} };      my @names;
       &Apache::lonnet::loghthis("Display all foils");
       if ( $Apache::response::foilgroup{'names'} ) {
    @names= @{ $Apache::response::foilgroup{'names'} };
       }
   
     my $temp=0;      my $temp=0;
       my $i   =0;
     my $id=$Apache::inputtags::response['-1'];      my $id=$Apache::inputtags::response['-1'];
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $lastresponse=      my $lastresponse=
Line 243  sub displayallfoils { Line 312  sub displayallfoils {
     if (&Apache::response::show_answer() ) {      if (&Apache::response::show_answer() ) {
  foreach my $name (@names) {   foreach my $name (@names) {
     if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {      if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
  if ($direction eq 'horizontal') {   if (($direction eq 'horizontal') && ($target ne 'tex')) {
     $result.="<td>";      $result.="<td>";
  } else {   } else {
     $result.="<br />";      if ($target eq 'tex') {
    $result .= '\item \vskip -2mm ';
       } else {
    $result.="<br />";
       }
  }   }
  if (defined($lastresponse{$name})) {   if (defined($lastresponse{$name})) {
     $result.='<b>';      if ($target eq 'tex') {
    $result .= '}';
       } else {
    $result.='<b>';
       }
  }   }
  $result .= $Apache::response::foilgroup{$name.'.text'};   $result .= $Apache::response::foilgroup{$name.'.text'};
  if (defined($lastresponse{$name})) {   if (defined($lastresponse{$name}) && ($target ne 'tex')) {
     $result.='</b>';      $result.='</b>';
  }   }
  if ($direction eq 'horizontal') { $result.="</td>"; }   if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.="</td>"; }
     }      }
  }   }
     } else {      } else {
Line 264  sub displayallfoils { Line 341  sub displayallfoils {
  if ($direction eq 'horizontal') {   if ($direction eq 'horizontal') {
     $result.="<td>";      $result.="<td>";
  } else {   } else {
     $result.="<br />";      if ($target eq 'tex') {
    $result .= '\item \vskip -2mm ';
       } else {
    $result.="<br />";
       }
    }
    if ($target eq 'tex') {
       $result .= '$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
       $i++;
    } else {
       $result .= '<label>';
       $result.="<input
                          onchange=\"javascript:setSubmittedPart('$part');\"
                          type=\"radio\"
                          name=\"HWVAL_$Apache::inputtags::response['-1']\"
                          value=\"$temp\" ";
       if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
       $result .= ' />'.$Apache::response::foilgroup{$name.'.text'}.
    '</label>';
  }   }
                 $result .= '<label>';  
  $result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";  
  if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }  
  $result .= '>'.$Apache::response::foilgroup{$name.'.text'}.  
                     '</label>';  
  $temp++;   $temp++;
  if ($direction eq 'horizontal') { $result.="</td>"; }   if ($target ne 'tex') {
       if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.="</td>"; }
    } else {
       $result.='\vskip 0 mm ';
    }
     }      }
  }   }
     }      }
     if ($direction eq 'horizontal') { $result.='</tr></table>'; }      
       if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.='</tr></table>'; }
     return $result;      return $result;
 }  }
   
   =pod
   
   =item &whichfoils($max,$randomize)
   
   Randomizes the list of foils.
   Respects
     - each foils desire to be randomized
     - the existance of Concept groups of foils (select 1 foil from each)
     - and selects a single correct statement from all possilble true statments
     - and limits it to a toal of $max foils
   
   WARNING: this routine uses the random number generator, it should only
   be called once per target, otherwise it can cause randomness changes in
   homework problems.
   
   Arguments
     $max - maximum number of foils to select (including the true one)
            (so a max of 5 is: 1 true, 4 false)
   
     $randomize - whether to randomize the listing of foils, by default
                  will randomize, only if randomize is 'no' will it not
   
   Returns
     $answer - location in the array of the correct answer
     @foils  - array of foil names in to display order
   
   =cut
   
 sub whichfoils {  sub whichfoils {
     my ($max,$randomize)=@_;      my ($max,$randomize)=@_;
   
Line 289  sub whichfoils { Line 412  sub whichfoils {
     my ($truecnt,$falsecnt) = &getfoilcounts();      my ($truecnt,$falsecnt) = &getfoilcounts();
     my $count=0;      my $count=0;
     # we will add in 1 of the true statements      # we will add in 1 of the true statements
     if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }      if ( $max>0 && ($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; $max=$count; }
     my $answer=int(&Math::Random::random_uniform() * ($count));      my $answer=int(&Math::Random::random_uniform() * ($count));
     &Apache::lonxml::debug("Count is $count, $answer is $answer");      &Apache::lonxml::debug("Count is $count, $answer is $answer");
     my @names;      my @names;
Line 417  sub whichfoils { Line 540  sub whichfoils {
 }  }
   
 sub displayfoils {  sub displayfoils {
     my ($target,$max,$randomize,$direction)=@_;      my ($target,$answer,$whichfoils,$direction, $bubbles_per_line)=@_;
     my $result;      my $result;
   
     my ($answer,@whichfoils)=&whichfoils($max,$randomize);  
     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 430  sub displayfoils { Line 552  sub displayfoils {
  $result.='<table><tr>';   $result.='<table><tr>';
     }      }
  }   }
  foreach my $name (@whichfoils) {   foreach my $name (@{ $whichfoils }) {
     if ($direction eq 'horizontal') {      if ($direction eq 'horizontal') {
  if ($target ne 'tex') { $result.='<td>'; }   if ($target ne 'tex') { $result.='<td>'; }
     }      }
Line 462  sub displayfoils { Line 584  sub displayfoils {
     } else {      } else {
  my @alphabet = ('A'..'Z');   my @alphabet = ('A'..'Z');
  my $i = 0;   my $i = 0;
    my $bubble_number = 0;
  my $temp=0;     my $temp=0;  
  my $id=$Apache::inputtags::response['-1'];   my $id=$Apache::inputtags::response['-1'];
  my $part=$Apache::inputtags::part;   my $part=$Apache::inputtags::part;
Line 470  sub displayfoils { Line 593  sub displayfoils {
  if ($target ne 'tex' && $direction eq 'horizontal') {   if ($target ne 'tex' && $direction eq 'horizontal') {
     $result.="<table><tr>";      $result.="<table><tr>";
  }   }
  foreach my $name (@whichfoils) {   foreach my $name (@{ $whichfoils }) {
     if ($target ne 'tex') {      if ($target ne 'tex') {
  if ($direction eq 'horizontal') {   if ($direction eq 'horizontal') {
     $result.="<td>";       $result.="<td>"; 
Line 480  sub displayfoils { Line 603  sub displayfoils {
     }      }
     if ($target ne 'tex') {       if ($target ne 'tex') { 
                 $result.= '<label>';                  $result.= '<label>';
  $result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";   $result.=
       "<input type=\"radio\"
                               onchange=\"javascript:setSubmittedPart('$part');\"
                               name=\"HWVAL_$Apache::inputtags::response['-1']\"
                               value=\"$temp\" ";
  if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }   if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
  $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</label>";   $result .= ' />'.$Apache::response::foilgroup{$name.'.text'}."</label>";
     } else {      } else {
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs      $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
     $i++;      $i++;
       $bubble_number++;
       if($bubble_number >= $bubbles_per_line) {
    $i = 0;
    $bubble_number = 0;
    $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
       }
  } else {   } else {
     $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};      $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
  }   }
Line 505  sub displayfoils { Line 638  sub displayfoils {
 }  }
   
 sub displayallanswers {  sub displayallanswers {
     my @names = @{ $Apache::response::foilgroup{'names'} };      my @names;
         if ( $Apache::response::foilgroup{'names'} ) {
    @names= @{ $Apache::response::foilgroup{'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',
Line 517  sub displayallanswers { Line 652  sub displayallanswers {
 }  }
   
 sub displayanswers {  sub displayanswers {
     my ($max,$randomize)=@_;      my ($answer, $whichopt)=@_;
     my ($answer,@whichopt) = &whichfoils($max,$randomize);  
     my $result=&Apache::response::answer_header('radiobuttonresponse');      my $result=&Apache::response::answer_header('radiobuttonresponse');
     foreach my $name (@whichopt) {      if ($Apache::lonhomework::type eq 'exam') {
    my $correct = ('A'..'Z')[$answer];
  $result.=&Apache::response::answer_part('radiobuttonresponse',   $result.=&Apache::response::answer_part('radiobuttonresponse',
  $Apache::response::foilgroup{$name.'.value'})   $correct);
  }      }
       foreach my $name (@{ $whichopt }) {
    $result.=&Apache::response::answer_part('radiobuttonresponse',
    $Apache::response::foilgroup{$name.'.value'});
       }
     $result.=&Apache::response::answer_footer('radiobuttonresponse');      $result.=&Apache::response::answer_footer('radiobuttonresponse');
     return $result;      return $result;
 }  }

Removed from v.1.102  
changed lines
  Added in v.1.123


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