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

Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.122 and 1.132

version 1.122, 2007/06/29 17:24:03 version 1.132, 2008/02/28 11:59:50
Line 18 Line 18
 # GNU General Public License for more details.  # GNU General Public License for more details.
 #  #
 # You should have received a copy of the GNU General Public License  # You should have received a copy of the GNU General Public License
 # along with LON-CAPA; if not, write to the Free Software  # along with LON-CAPA; if not, write to the Free Software# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
 #  #
 # /home/httpd/html/adm/gpl.txt  # /home/httpd/html/adm/gpl.txt
 #  #
Line 56  sub start_radiobuttonresponse { Line 55  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');
Line 106  sub start_radiobuttonresponse { Line 103  sub start_radiobuttonresponse {
  $result .= '\begin{enumerate}';   $result .= '\begin{enumerate}';
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  my $part_id="$Apache::inputtags::part.$id";   my $part_id="$Apache::inputtags::part.$id";
           $Apache::lonhomework::analyze{"$part_id.type"} = 'radiobuttonresponse';
  push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);   push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
     }      }
     return $result;      return $result;
Line 158  sub storesurvey { Line 156  sub storesurvey {
   
   
 sub grade_response {  sub grade_response {
     my ($max,$randomize, $bubbles_per_line)=@_;      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(1,undef,   $response = &Apache::response::getresponse(1,undef,
    &bubble_line_count(scalar(@whichfoils),     &bubble_line_count(scalar(@{ $whichfoils}),
       $bubbles_per_line),        $bubbles_per_line),
    $bubbles_per_line);     $bubbles_per_line);
   
Line 179  sub grade_response { Line 176  sub grade_response {
     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 203  sub end_foilgroup { Line 200  sub end_foilgroup {
     my $bubble_lines;      my $bubble_lines;
     my $bubbles_per_line;      my $bubbles_per_line;
     my $answer_count;      my $answer_count;
     my $id = $Apache::inputtags::response['-1'];      my $id   = $Apache::inputtags::response['-1'];
       my $part = $Apache::inputtags::part;
     $bubbles_per_line =       $bubbles_per_line = 
  &Apache::response::get_response_param($Apache::inputtags::part."_$id",   &Apache::response::get_response_param($Apache::inputtags::part."_$id",
       'numbubbles',        'numbubbles',
Line 232  sub end_foilgroup { Line 230  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 ($answer,@shown) = &whichfoils($max,$randomize);      my ($answer, @shown) = &whichfoils($max, $randomize);
     $answer_count = scalar(@shown);      $answer_count = scalar(@shown);
   
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
  $result=&displayfoils($target,   $result=&displayfoils($target,
       $max,        $answer, \@shown,
       $randomize,  
       $direction,        $direction,
       $bubbles_per_line);        $bubbles_per_line);
     } elsif ($target eq 'answer' ) {      } elsif ($target eq 'answer' ) {
  $result=&displayanswers($max,$randomize);   $result=&displayanswers($answer, \@shown, $bubbles_per_line);
     } elsif ( $target eq 'grade') {      } elsif ( $target eq 'grade') {
  &grade_response($max,$randomize,   &grade_response($answer, \@shown, $bubbles_per_line);
                                 $bubbles_per_line);  
     }  elsif ( $target eq 'analyze') {      }  elsif ( $target eq 'analyze') {
    my $bubble_lines = &bubble_line_count($answer_count, 
         $bubbles_per_line);
  &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="$part.$id";
  push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },   push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },
       ('true','false'));        ('true','false'));
   
     }      }
  }   }
  $Apache::lonxml::post_evaluate=0;   $Apache::lonxml::post_evaluate=0;
Line 260  sub end_foilgroup { Line 259  sub end_foilgroup {
  &Apache::response::setup_prior_tries_hash(\&format_prior_answer,   &Apache::response::setup_prior_tries_hash(\&format_prior_answer,
   [\%Apache::response::foilgroup]);    [\%Apache::response::foilgroup]);
     }      }
     $bubble_lines = &bubble_line_count($answer_count, $bubbles_per_line);  
     &Apache::response::poprandomnumber();      &Apache::response::poprandomnumber();
     &Apache::lonxml::increment_counter($bubble_lines);      $bubble_lines = &bubble_line_count($answer_count, $bubbles_per_line);
       &Apache::lonxml::increment_counter($bubble_lines,
          "$part.$id");
       if ($target eq 'analyze') {
    &Apache::lonhomework::set_bubble_lines();
       }
     return $result;      return $result;
 }  }
   
Line 299  sub displayallfoils { Line 302  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'} };
     }      }
Line 389  Respects Line 391  Respects
   - and selects a single correct statement from all possilble true statments    - and selects a single correct statement from all possilble true statments
   - and limits it to a toal of $max foils    - 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  Arguments
   $max - maximum number of foils to select (including the true one)    $max - maximum number of foils to select (including the true one)
          (so a max of 5 is: 1 true, 4 false)           (so a max of 5 is: 1 true, 4 false)
Line 539  sub whichfoils { Line 545  sub whichfoils {
 }  }
   
 sub displayfoils {  sub displayfoils {
     my ($target,$max,$randomize,$direction, $bubbles_per_line)=@_;      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 552  sub displayfoils { Line 557  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 562  sub displayfoils { Line 567  sub displayfoils {
  $result.='\item \vskip -2 mm  ';   $result.='\item \vskip -2 mm  ';
     }      }
     if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
  if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: \textbf{';}  # if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: \textbf{';}
    if ($target ne 'tex') {
                       $result.=&mt('Correct:').'<b>';
                   } else {
                       $result.=&mt('Correct:').' \textbf{';
                   }
     } else {      } else {
  $result.='Incorrect:';   $result.=&mt('Incorrect:');
     }      }
     if ($target eq 'web') { $result.="<label>"; }      if ($target eq 'web') { $result.="<label>"; }
     $result.=$Apache::response::foilgroup{$name.'.text'};      $result.=$Apache::response::foilgroup{$name.'.text'};
Line 585  sub displayfoils { Line 595  sub displayfoils {
  my @alphabet = ('A'..'Z');   my @alphabet = ('A'..'Z');
  my $i = 0;   my $i = 0;
  my $bubble_number = 0;   my $bubble_number = 0;
    my $line = 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 593  sub displayfoils { Line 604  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 612  sub displayfoils { Line 623  sub displayfoils {
  $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  
     $i++;  
     $bubble_number++;  
     if($bubble_number >= $bubbles_per_line) {      if($bubble_number >= $bubbles_per_line) {
    $line++;
  $i = 0;   $i = 0;
  $bubble_number = 0;   $bubble_number = 0;
  $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';   $result.='\item[\textbf{'.($Apache::lonxml::counter+$line).'}.]';
     }      }
       $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
       $i++;
       $bubble_number++;
  } else {   } else {
     $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};      $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
  }   }
Line 652  sub displayallanswers { Line 664  sub displayallanswers {
 }  }
   
 sub displayanswers {  sub displayanswers {
     my ($max,$randomize)=@_;      my ($answer, $whichopt, $bubbles_per_line)=@_;
     my ($answer,@whichopt) = &whichfoils($max,$randomize);      my $result;
     my $result=&Apache::response::answer_header('radiobuttonresponse');  
     if ($Apache::lonhomework::type eq 'exam') {      if ($Apache::lonhomework::type eq 'exam') {
  my $correct = ('A'..'Z')[$answer];   my $line = int($answer/$bubbles_per_line);
  $result.=&Apache::response::answer_part('radiobuttonresponse',   my $correct = ('A'..'Z')[$answer%$bubbles_per_line];
  $correct);   $result .= &Apache::response::answer_header('radiobuttonresponse',
       $line);
    $result .= &Apache::response::answer_part('radiobuttonresponse',
     $correct);
       } else {
    $result .= &Apache::response::answer_header('radiobuttonresponse');
     }      }
     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'});
     }      }
Removed from v.1.122  
changed lines
  Added in v.1.132

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