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

Diff for /loncom/homework/optionresponse.pm between versions 1.140 and 1.143

version 1.140, 2007/04/05 10:29:58 version 1.143, 2007/04/17 23:25:09
Line 355  sub check_for_invalid { Line 355  sub check_for_invalid {
     }      }
 }  }
   
 sub setup_prior_tries_hash {  
     my ($whichopt) = @_;  
     my $part=$Apache::inputtags::part;  
     my $id=$Apache::inputtags::response[-1];  
     foreach my $i (1..$Apache::lonhomework::history{'version'}) {  
  my $key = "$i:resource.$part.$id.submission";  
  next if (!exists($Apache::lonhomework::history{"$key"}));  
  my %lastresponse=  
     &Apache::lonnet::str2hash($Apache::lonhomework::history{$key});  
  my $output;  
  foreach my $name (@$whichopt) {  
     next if (!defined($lastresponse{$name}));  
     $output .= '<td>'.$lastresponse{$name}.'</td>';  
  }  
  next if (!defined($output));  
  $output =  
     '<table class="LC_optres_prior"><tr>'.$output.'</tr></table>';  
  $Apache::inputtags::submission_display{$key} = $output;  
     }  
 }  
   
 sub displayfoils {  sub displayfoils {
   my ($target,$max,$randomize,$TeXlayout,@opt)=@_;    my ($target,$max,$randomize,$TeXlayout,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}    if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
Line 499  sub displayfoils { Line 478  sub displayfoils {
   }    }
   
   if ($target eq 'web') {    if ($target eq 'web') {
       &setup_prior_tries_hash(\@whichopt);        &Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer,
    [\@whichopt,
    'submissiongrading']);
   }    }
   
   if ($target ne 'tex') {    if ($target ne 'tex') {
Line 567  sub bubbles { Line 548  sub bubbles {
     my $number_of_bubbles = $#opt + 1;      my $number_of_bubbles = $#opt + 1;
     my $current_length = 0;      my $current_length = 0;
     my $textwidth;      my $textwidth;
     if ($max_width) {      if (defined($max_width)) {
  $textwidth=$max_width;   $textwidth=$max_width;
  &Apache::lonnet::logthis("Max width passed in: $max_width");   &Apache::lonxml::debug("Max width passed in: $max_width");
     }      } elsif ($env{'form.textwidth'} ne '') {
     elsif ($env{'form.textwidth'} ne '') {  
  $env{'form.textwidth'}=~/(\d+)/;   $env{'form.textwidth'}=~/(\d+)/;
  $textwidth=$1;   $textwidth=$1;
  &Apache::lonnet::logthis("Max width from form: $textwidth");   &Apache::lonxml::debug("Max width from form: $textwidth");
     } else {      } else {
  $env{'form.textwidth'}=~/(\d*)\.?(\d*)/;   $env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
  $textwidth=$1.'.'.$2;   $textwidth=$1.'.'.$2;
  &Apache::lonnet::logthis("Max width defaults? $textwidth");   &Apache::lonxml::debug("Max width defaults? $textwidth");
     }      }
     &Apache::lonnet::logthis("Final maxwidth: $textwidth");      &Apache::lonxml::debug("Final maxwidth: $textwidth");
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {      for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
  my $leftmargin;   my $leftmargin;
  $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);   $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);
Removed from v.1.140  
changed lines
  Added in v.1.143

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