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

Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.91 and 1.95

version 1.91, 2004/08/26 22:08:30 version 1.95, 2004/10/07 20:28:30
Line 167  sub end_foilgroup { Line 167  sub end_foilgroup {
     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;
    my $direction = &Apache::lonxml::get_param('direction',$parstack,
      $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();   $result=&displayallfoils($direction);
     } elsif ( $target eq 'answer' ) {      } elsif ( $target eq 'answer' ) {
  $result=&displayallanswers();   $result=&displayallanswers();
     } elsif ( $target eq 'grade' ) {      } elsif ( $target eq 'grade' ) {
Line 181  sub end_foilgroup { Line 183  sub end_foilgroup {
  '-2');   '-2');
     my $randomize = &Apache::lonxml::get_param('randomize',$parstack,      my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
        $safeeval,'-2');         $safeeval,'-2');
     my $direction = &Apache::lonxml::get_param('direction',$parstack,  
        $safeeval,'-2');  
     &Apache::lonxml::debug("direction is $direction");  
     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);
     } elsif ($target eq 'answer' ) {      } elsif ($target eq 'answer' ) {
Line 224  sub getfoilcounts { Line 223  sub getfoilcounts {
 }  }
   
 sub displayallfoils {  sub displayallfoils {
       my ($direction)=@_;
     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::response::foilgroup{'names'} };
Line 232  sub displayallfoils { Line 232  sub displayallfoils {
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $lastresponse=      my $lastresponse=
  $Apache::lonhomework::history{"resource.$part.$id.submission"};   $Apache::lonhomework::history{"resource.$part.$id.submission"};
       if ($direction eq 'horizontal') { $result.='<table><tr>'; }
     my %lastresponse=&Apache::lonnet::str2hash($lastresponse);      my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     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') {
  $result.="<br />";   if ($direction eq 'horizontal') {
       $result.="<td>";
    } else {
       $result.="<br />";
    }
  if (defined($lastresponse{$name})) {   if (defined($lastresponse{$name})) {
     $result.='<b>';      $result.='<b>';
  }   }
Line 244  sub displayallfoils { Line 249  sub displayallfoils {
  if (defined($lastresponse{$name})) {   if (defined($lastresponse{$name})) {
     $result.='</b>';      $result.='</b>';
  }   }
    if ($direction eq 'horizontal') { $result.="</td>"; }
     }      }
  }   }
     } else {      } else {
  foreach my $name (@names) {   foreach my $name (@names) {
     if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {      if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
  $result.="<br /><input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";   if ($direction eq 'horizontal') {
       $result.="<td>";
    } else {
       $result.="<br />";
    }
                   $result .= '<label>';
    $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'}."</input>";   $result .= '>'.$Apache::response::foilgroup{$name.'.text'}.
                       '</label>';
  $temp++;   $temp++;
    if ($direction eq 'horizontal') { $result.="</td>"; }
     }      }
  }   }
     }      }
       if ($direction eq 'horizontal') { $result.='</tr></table>'; }
     return $result;      return $result;
 }  }
   
Line 420  sub displayfoils { Line 435  sub displayfoils {
     } else {      } else {
  $result.='Incorrect:';   $result.='Incorrect:';
     }      }
       if ($target eq 'web') { $result.="<label>"; }
     $result.=$Apache::response::foilgroup{$name.'.text'};      $result.=$Apache::response::foilgroup{$name.'.text'};
     if ($target eq 'web') { $result.="</input>"; }      if ($target eq 'web') { $result.="</label>"; }
     if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {      if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
  if ($target ne 'tex') { $result.='</b>';} else {$result.='}';}   if ($target ne 'tex') { $result.='</b>';} else {$result.='}';}
     }      }
Line 454  sub displayfoils { Line 470  sub displayfoils {
  }    } 
     }      }
     if ($target ne 'tex') {       if ($target ne 'tex') { 
                   $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'}."</input>";   $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 474  sub displayfoils { Line 491  sub displayfoils {
     $result.="</tr></table>";      $result.="</tr></table>";
  }   }
     }      }
     if ($target ne 'tex') { $result.="<br />"; } else { $result.='\vskip 0 mm '; }      if ($target ne 'tex') { if ($direction ne 'horizontal') { $result.="<br />";} } else { $result.='\vskip 0 mm '; }
     return $result;      return $result;
 }  }
   
Line 545  sub start_foil { Line 562  sub start_foil {
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {      if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::startredirection;   &Apache::lonxml::startredirection;
    if ($target eq 'analyze') {
       &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
    }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::tag_start($target,$token);   $result=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::text_arg('Name:','name',$token);   $result.=&Apache::edit::text_arg('Name:','name',$token);
Removed from v.1.91  
changed lines
  Added in v.1.95

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