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

Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.101 and 1.111

version 1.101, 2005/06/21 21:00:55 version 1.111, 2007/02/22 01:25:31
Line 60  sub start_radiobuttonresponse { Line 60  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 177  sub end_foilgroup { Line 179  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' ) {
Line 204  sub end_foilgroup { Line 206  sub end_foilgroup {
       ('true','false'));        ('true','false'));
     }      }
  }   }
    $Apache::lonxml::post_evaluate=0;
     }      }
     &Apache::response::poprandomnumber();      &Apache::response::poprandomnumber();
     &Apache::lonxml::increment_counter();      &Apache::lonxml::increment_counter();
Line 229  sub getfoilcounts { Line 232  sub getfoilcounts {
 }  }
   
 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;
       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 250  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 279  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 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;
 }  }
   
Line 289  sub whichfoils { Line 317  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 482  sub displayfoils { Line 510  sub displayfoils {
                 $result.= '<label>';                  $result.= '<label>';
  $result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";   $result.="<input type=\"radio\" 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
Line 505  sub displayfoils { Line 533  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) {
Line 520  sub displayanswers { Line 551  sub displayanswers {
     my ($max,$randomize)=@_;      my ($max,$randomize)=@_;
     my ($answer,@whichopt) = &whichfoils($max,$randomize);      my ($answer,@whichopt) = &whichfoils($max,$randomize);
     my $result=&Apache::response::answer_header('radiobuttonresponse');      my $result=&Apache::response::answer_header('radiobuttonresponse');
       if ($Apache::lonhomework::type eq 'exam') {
    my $correct = ('A'..'Z')[$answer];
    $result.=&Apache::response::answer_part('radiobuttonresponse',
    $correct);
       }
     foreach my $name (@whichopt) {      foreach my $name (@whichopt) {
  $result.=&Apache::response::answer_part('radiobuttonresponse',   $result.=&Apache::response::answer_part('radiobuttonresponse',
  $Apache::response::foilgroup{$name.'.value'})   $Apache::response::foilgroup{$name.'.value'});
  }      }
     $result.=&Apache::response::answer_footer('radiobuttonresponse');      $result.=&Apache::response::answer_footer('radiobuttonresponse');
     return $result;      return $result;
 }  }
Line 607  sub end_foil { Line 643  sub end_foil {
  my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);   my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
  if ($value ne 'unused') {   if ($value ne 'unused') {
     my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
     if (!$name) {      if ($name eq "") {
  &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");   &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
  $name=$Apache::lonxml::curdepth;   $name=$Apache::lonxml::curdepth;
     }      }
Removed from v.1.101  
changed lines
  Added in v.1.111

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