Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.153.6.10 and 1.162

version 1.153.6.10, 2012/02/05 16:11:57 version 1.162, 2018/12/19 04:07:35
Line 25 Line 25
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
   
   
 package Apache::radiobuttonresponse;  package Apache::radiobuttonresponse;
 use strict;  use strict;
 use HTML::Entities();  use HTML::Entities();
Line 38  my @alphabet      = ( 'A' .. 'Z' ); # Fo Line 40  my @alphabet      = ( 'A' .. 'Z' ); # Fo
   
   
   
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register( 'Apache::radiobuttonresponse',      &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
         ('radiobuttonresponse') );  
 }  }
   
 #---------------------------------------------------------------------------  #---------------------------------------------------------------------------
Line 48  BEGIN { Line 50  BEGIN {
 #  Generic utility subs.  #  Generic utility subs.
   
 sub bubble_line_count {  sub bubble_line_count {
     my ( $numfoils, $bubbles_per_line ) = @_;      my ($numfoils, $bubbles_per_line) = @_;
     my $bubble_lines;      my $bubble_lines;
     $bubble_lines = int( $numfoils / $bubbles_per_line );      $bubble_lines = int($numfoils / $bubbles_per_line);
     if ( ( $numfoils % $bubbles_per_line ) != 0 ) {      if (($numfoils % $bubbles_per_line) != 0) {
         $bubble_lines++;   $bubble_lines++;
     }      }
     return $bubble_lines;      return $bubble_lines;
       
 }  }
   
   
   
 #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
 #  #
 #  XML handlers.  #  XML handlers.
 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',      &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
         ( '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') {
         $result = &Apache::response::meta_package_write('radiobuttonresponse');   $result=&Apache::response::meta_package_write('radiobuttonresponse');
     }      } elsif ($target eq 'edit' ) {
     elsif ( $target eq 'edit' ) {   $result.=&Apache::edit::start_table($token)
         $result .=             .'<tr><td>'.&Apache::loncommon::insert_folding_button()
             &Apache::edit::start_table($token)             .&Apache::lonxml::description($token)
           . '<tr><td>'             .&Apache::loncommon::help_open_topic('Radio_Response_Problems')
           . &Apache::lonxml::description($token)             .'</td>'
           . &Apache::loncommon::help_open_topic('Radio_Response_Problems')             .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
           . '</td>'             .&Apache::edit::deletelist($target,$token)
           . '<td><span class="LC_nobreak">'             .'</span></td>'
           . &mt('Delete?') . ' '             .'<td>&nbsp;'.&Apache::edit::end_row()
           . &Apache::edit::deletelist( $target, $token )             .&Apache::edit::start_spanning_row();
           . '</span></td>'   $result.=
           . '<td>&nbsp;'      &Apache::edit::text_arg('Max Number Of Shown Foils:','max',
           . &Apache::edit::end_row()      $token,'4').
           . &Apache::edit::start_spanning_row();      &Apache::edit::select_arg('Randomize Foil Order:','randomize',
         $result .= &Apache::edit::text_arg( 'Max Number Of Shown Foils:',        ['yes','no'],$token).
             'max', $token, '4' )      &Apache::edit::select_arg('Display Direction:','direction',
           . '&nbsp;' x 3        ['vertical','horizontal'],$token).
           . &Apache::edit::select_arg( 'Randomize Foil Order:',        &Apache::edit::end_row().
             'randomize', [ 'yes', 'no' ], $token )        &Apache::edit::start_spanning_row()."\n";
           . '&nbsp;' x 3      } elsif ($target eq 'modified') {
           . &Apache::edit::select_arg(   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
             'Display Direction:', 'direction',       $safeeval,'max',
             [ 'vertical', 'horizontal' ], $token       'randomize','direction');
           )   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
           . &Apache::edit::end_row()  
           . &Apache::edit::start_spanning_row() . "\n";     } elsif ( $target eq 'tex' ) {
     }  
     elsif ( $target eq 'modified' ) {  
         my $constructtag =  
           &Apache::edit::get_new_args( $token, $parstack, $safeeval, 'max',  
             'randomize', 'direction' );  
         if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }  
     }  
     elsif ( $target eq 'tex' ) {  
         my $type =          my $type =
           &Apache::lonxml::get_param( 'TeXtype', $parstack, $safeeval, undef,            &Apache::lonxml::get_param( 'TeXtype', $parstack, $safeeval, undef,
             0 );              0 );
Line 135  sub start_radiobuttonresponse { Line 128  sub start_radiobuttonresponse {
     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';          $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;
 }  }
   
 sub end_radiobuttonresponse {  sub end_radiobuttonresponse {
     my ( $target, $token, $tagstack, $parstack, $parser, $safeeval, $style ) =      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       @_;  
     my $result;      my $result;
     if ( $target eq 'edit' ) { $result = &Apache::edit::end_table(); }      if ( $target eq 'edit' ) { 
    $result = &Apache::edit::end_table(); 
       }
     &Apache::response::end_response;      &Apache::response::end_response;
     pop @Apache::lonxml::namespace;      pop @Apache::lonxml::namespace;
     &Apache::lonxml::deregister( 'Apache::radiobuttonresponse',      &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
         ( 'foilgroup', 'foil', 'conceptgroup' ) );  
     undef(%Apache::response::foilnames);      undef(%Apache::response::foilnames);
     return $result;      return $result;
 }  }
   
 %Apache::response::foilgroup = ();  %Apache::response::foilgroup=();
   
 sub start_foilgroup {  sub start_foilgroup {
     my ( $target, $token, $tagstack, $parstack, $parser, $safeeval, $style ) =      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       @_;      %Apache::response::foilgroup=();
     %Apache::response::foilgroup               = ();      $Apache::radiobuttonresponse::conceptgroup=0;
     $Apache::radiobuttonresponse::conceptgroup = 0;      &Apache::response::pushrandomnumber(undef,$target);
     &Apache::response::pushrandomnumber( undef, $target );  
     return;      return;
 }  }
   
 sub storesurvey {  sub storesurvey {
     my ($style) = @_;      my ($style) = @_;
     if ( !&Apache::response::submitted() ) { return ''; }      if ( !&Apache::response::submitted() ) { return ''; }
     my $response = $env{ 'form.HWVAL_' . $Apache::inputtags::response['-1'] };      my $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};
     &Apache::lonxml::debug("Here I am!:$response:");      &Apache::lonxml::debug("Here I am!:$response:");
     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 @whichfoils = @{ $Apache::response::foilgroup{'names'} };      my @whichfoils=@{ $Apache::response::foilgroup{'names'} };
     my %responsehash;      my %responsehash;
     $responsehash{ $whichfoils[$response] } = $response;      $responsehash{$whichfoils[$response]}=$response;
     my $responsestr = &Apache::lonnet::hash2str(%responsehash);      my $responsestr=&Apache::lonnet::hash2str(%responsehash);
     $Apache::lonhomework::results{"resource.$part.$id.submission"} =      $Apache::lonhomework::results{"resource.$part.$id.submission"}=
       $responsestr;   $responsestr;
     my %previous =      my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
       &Apache::response::check_for_previous( $responsestr, $part, $id );  
     my $ad;      my $ad;
       if ($style eq 'anonsurvey') {
     if ( $style eq 'anonsurvey' ) {          $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS';
         $ad = $Apache::lonhomework::results{"resource.$part.$id.awarddetail"} =      } elsif ($style eq 'anonsurveycred') {
           'ANONYMOUS';          $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT';
     }      } elsif ($style eq 'surveycred') {
     elsif ( $style eq 'anonsurveycred' ) {          $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT';
         $ad = $Apache::lonhomework::results{"resource.$part.$id.awarddetail"} =      } else {
           'ANONYMOUS_CREDIT';          $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
     }  
     elsif ( $style eq 'surveycred' ) {  
         $ad = $Apache::lonhomework::results{"resource.$part.$id.awarddetail"} =  
           'SUBMITTED_CREDIT';  
     }  
     else {  
         $ad = $Apache::lonhomework::results{"resource.$part.$id.awarddetail"} =  
           'SUBMITTED';  
     }      }
     &Apache::response::handle_previous( \%previous, $ad );      &Apache::response::handle_previous(\%previous,$ad);
     &Apache::lonxml::debug("submitted a $response<br />\n");      &Apache::lonxml::debug("submitted a $response<br />\n");
     return '';      return '';
 }  }
   
   
 sub grade_response {  sub grade_response {
     my ( $answer, $whichfoils, $bubbles_per_line ) = @_;      my ($answer, $whichfoils, $bubbles_per_line)=@_;
   
     if ( !&Apache::response::submitted() ) { return; }      if ( !&Apache::response::submitted() ) { return; }
     my $response;      my $response;
       
       if ($env{'form.submitted'} eq 'scantron') {
    $response = &Apache::response::getresponse(1,undef,
      &bubble_line_count(scalar(@{ $whichfoils}),
         $bubbles_per_line),
      $bubbles_per_line);
   
     if ( $env{'form.submitted'} eq 'scantron' ) {      } else {
         $response =   $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};
           &Apache::response::getresponse( 1, undef,  
             &bubble_line_count( scalar( @{$whichfoils} ), $bubbles_per_line ),  
             $bubbles_per_line );  
   
     }  
     else {  
         $response = $env{ 'form.HWVAL_' . $Apache::inputtags::response['-1'] };  
     }      }
   
     if ( $response !~ /[0-9]+/ ) { return; }  
     my $part = $Apache::inputtags::part;      if ( $response !~ /[0-9]+/) { return; }
     my $id   = $Apache::inputtags::response['-1'];      my $part=$Apache::inputtags::part;
       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 =      my %previous=&Apache::response::check_for_previous($responsestr,
       &Apache::response::check_for_previous( $responsestr, $part, $id );         $part,$id);
     $Apache::lonhomework::results{"resource.$part.$id.submission"} =      $Apache::lonhomework::results{"resource.$part.$id.submission"}=
       $responsestr;   $responsestr;
     &Apache::lonxml::debug("submitted a $response<br />\n");      &Apache::lonxml::debug("submitted a $response<br />\n");
     my $ad;      my $ad;
       if ($response == $answer) {
     if ( $response == $answer ) {   $ad='EXACT_ANS';
         $ad = 'EXACT_ANS';      } else {
     }   $ad='INCORRECT';
     else {  
         $ad = 'INCORRECT';  
     }      }
     $Apache::lonhomework::results{"resource.$part.$id.awarddetail"} = $ad;      $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
     &Apache::response::handle_previous( \%previous, $ad );      &Apache::response::handle_previous(\%previous,$ad);
 }  }
   
 sub end_foilgroup {  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 $bubble_lines;
     my $answer_count;      my $answer_count;
     my $id               = $Apache::inputtags::response['-1'];      my $id   = $Apache::inputtags::response['-1'];
     my $part             = $Apache::inputtags::part;      my $part = $Apache::inputtags::part;
     my $bubbles_per_line = &getbubblesnum( $part, $id );      my $bubbles_per_line = &getbubblesnum($part,$id);
   
   
     if (   $target eq 'grade'      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
         || $target eq 'web'   $target eq 'tex' || $target eq 'analyze') {
         || $target eq 'answer'   my $style = $Apache::lonhomework::type;
         || $target eq 'tex'   my $direction = &Apache::lonxml::get_param('direction',$parstack,
         || $target eq 'analyze' )     $safeeval,'-2');
     {   if ( (($style eq 'survey') || ($style eq 'surveycred') || 
         my $style = $Apache::lonhomework::type;                ($style eq 'anonsurvey') || ($style eq 'anonsurveycred')) 
         my $direction =               && ($target ne 'analyze')) {
           &Apache::lonxml::get_param( 'direction', $parstack, $safeeval, '-2' );      if ($target eq 'web' || $target eq 'tex') {
         if (   $result=&displayallfoils($direction, $target);
             (      } elsif ( $target eq 'answer' ) {
                    ( $style eq 'survey' )   $result=&displayallanswers();
                 || ( $style eq 'surveycred' )      } elsif ( $target eq 'grade' ) {
                 || ( $style eq 'anonsurvey' )   $result=&storesurvey($style);
                 || ( $style eq 'anonsurveycred' )      }
             )      $answer_count = scalar(@{$Apache::response::foilgroup{'names'}});
             && ( $target ne 'analyze' )  
           )  
         {  
             if ( $target eq 'web' || $target eq 'tex' ) {  
                 $result = &displayallfoils( $direction, $target );  
             }  
             elsif ( $target eq 'answer' ) {  
                 $result = &displayallanswers();  
             }  
             elsif ( $target eq 'grade' ) {  
                 $result = &storesurvey($style);  
             }  
             $answer_count =  
               scalar( @{ $Apache::response::foilgroup{'names'} } );  
   
         }   } else {
         else {  
   
             my $name;      my $name;
             my $max =      my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,
               &Apache::lonxml::get_param( 'max', $parstack, $safeeval, '-2' );   '-2');
             my $randomize =      my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
               &Apache::lonxml::get_param( 'randomize', $parstack, $safeeval,         $safeeval,'-2');
                 '-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 =        $answer, \@shown,
                   &displayfoils( $target, $answer, \@shown, $direction,        $direction,
                     $bubbles_per_line );        $bubbles_per_line);
             }      } elsif ($target eq 'answer' ) {
             elsif ( $target eq 'answer' ) {   $result=&displayanswers($answer, \@shown, $bubbles_per_line);
                 $result =      } elsif ( $target eq 'grade') {
                   &displayanswers( $answer, \@shown, $bubbles_per_line );   &grade_response($answer, \@shown, $bubbles_per_line);
             }      }  elsif ( $target eq 'analyze') {
             elsif ( $target eq 'grade' ) {   my $bubble_lines = &bubble_line_count($answer_count, 
                 &grade_response( $answer, \@shown, $bubbles_per_line );        $bubbles_per_line);
             }   &Apache::response::analyze_store_foilgroup(\@shown,
             elsif ( $target eq 'analyze' ) {     ['text','value','location']);
                 my $bubble_lines =   my $part_id="$part.$id";
                   &bubble_line_count( $answer_count, $bubbles_per_line );   push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },
                 &Apache::response::analyze_store_foilgroup( \@shown,        ('true','false'));
                     [ 'text', 'value', 'location' ] );  
                 my $part_id = "$part.$id";  
                 push(  
                     @{ $Apache::lonhomework::analyze{"$part_id.options"} },  
                     ( 'true', 'false' )  
                 );  
   
             }      }
         }   }
         $Apache::lonxml::post_evaluate = 0;   $Apache::lonxml::post_evaluate=0;
     }      }
     if ( $target eq 'web' ) {      if ($target eq 'web') {
         &Apache::response::setup_prior_tries_hash( \&format_prior_answer,   &Apache::response::setup_prior_tries_hash(\&format_prior_answer,
             [ \%Apache::response::foilgroup ] );    [\%Apache::response::foilgroup]);
     }      }
     &Apache::response::poprandomnumber();      &Apache::response::poprandomnumber();
     $bubble_lines = &bubble_line_count( $answer_count, $bubbles_per_line );      $bubble_lines = &bubble_line_count($answer_count, $bubbles_per_line);
     &Apache::lonxml::increment_counter( $bubble_lines, "$part.$id" );      &Apache::lonxml::increment_counter($bubble_lines,
     if ( $target eq 'analyze' ) {         "$part.$id");
         &Apache::lonhomework::set_bubble_lines();      if ($target eq 'analyze') {
    &Apache::lonhomework::set_bubble_lines();
     }      }
     return $result;      return $result;
 }  }
   
 sub getbubblesnum {  sub getbubblesnum {
     my ( $part, $id ) = @_;      my ($part,$id) = @_;
     my $bubbles_per_line;      my $bubbles_per_line;
     my $default_numbubbles = $default_bubbles_per_line;      my $default_numbubbles = $default_bubbles_per_line;
     if (   ( $env{'form.bubbles_per_row'} =~ /^\d+$/ )      if (($env{'form.bubbles_per_row'} =~ /^\d+$/) &&
         && ( $env{'form.bubbles_per_row'} > 0 ) )          ($env{'form.bubbles_per_row'} > 0)) {
     {  
         $default_numbubbles = $env{'form.bubbles_per_row'};          $default_numbubbles = $env{'form.bubbles_per_row'};
     }      }
     $bubbles_per_line = &Apache::response::get_response_param( $part . "_$id",      $bubbles_per_line =
         'numbubbles', $default_numbubbles );          &Apache::response::get_response_param($part."_$id",'numbubbles',
                                                 $default_numbubbles);
     return $bubbles_per_line;      return $bubbles_per_line;
 }  }
   
 sub getfoilcounts {  sub getfoilcounts {
     my @names;      my @names;
     my $truecnt  = 0;      my $truecnt=0;
     my $falsecnt = 0;      my $falsecnt=0;
     my $name;      my $name;
     if ( $Apache::response::foilgroup{'names'} ) {      if ( $Apache::response::foilgroup{'names'} ) {
         @names = @{ $Apache::response::foilgroup{'names'} };   @names= @{ $Apache::response::foilgroup{'names'} };
     }      }
     foreach $name (@names) {      foreach $name (@names) {
         if ( $Apache::response::foilgroup{ $name . '.value' } eq 'true' ) {   if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
             $truecnt++;      $truecnt++;
         }   } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
         elsif ( $Apache::response::foilgroup{ $name . '.value' } eq 'false' ) {      $falsecnt++;
             $falsecnt++;   }
         }  
     }      }
     return ( $truecnt, $falsecnt );      return ($truecnt,$falsecnt);
 }  }
   
 sub format_prior_answer {  sub format_prior_answer {
     my ( $mode, $answer, $other_data ) = @_;      my ($mode,$answer,$other_data) = @_;
     my $foil_data = $other_data->[0];      my $foil_data = $other_data->[0];
     my %response  = &Apache::lonnet::str2hash($answer);      my %response = &Apache::lonnet::str2hash($answer);
     my ($name)    = keys(%response);      my ($name)   = keys(%response);
     return      return '<span class="LC_prior_radiobutton">'.
         '<span class="LC_prior_radiobutton">'   $foil_data->{$name.'.text'}.'</span>';
       . $foil_data->{ $name . '.text' }  
       . '</span>';  
   
 }  }
   
   
 ##   ## 
 # Return the last survey response.  The logic is slightly different than that of   # Return the last survey response.  The logic is slightly different than that of 
 # get_last_responses.  TODO: See if there are chunks of code betweenthis and  # get_last_responses.  TODO: See if there are chunks of code betweenthis and
Line 420  sub get_last_survey_response { Line 376  sub get_last_survey_response {
             $newvariation = 1;              $newvariation = 1;
         }          }
     }      }
     unless (      $showanswer = &Apache::response::show_answer();
         (      unless ($newvariation && !$showanswer) {
             (          if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
                 $Apache::lonhomework::history{"resource.$part.type"} eq              (($env{'form.grade_username'} eq $env{'user.name'}) &&
                 'anonsurvey'               ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
             )              $lastresponse = $Apache::lonhomework::history{"resource.$part.$id.submission"};
             || ( $Apache::lonhomework::history{"resource.$part.type"} eq          } else {
                 'anonsurveycred' )              unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
         )                      ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
         && ( defined( $env{'form.grade_symb'} ) )                  $lastresponse = $Apache::lonhomework::history{"resource.$part.$id.submission"};
         || ( $newvariation && !$showanswer )              }
       )          }
     {  
         $lastresponse =  
           $Apache::lonhomework::history{"resource.$part.$id.submission"};  
     }      }
     my %lastresponse = &Apache::lonnet::str2hash($lastresponse);      my %lastresponse = &Apache::lonnet::str2hash($lastresponse);
      
   
     return \%lastresponse;      return \%lastresponse;
   
Line 556  sub latex_survey { Line 508  sub latex_survey {
     my ($names, $showanswer, $lastresponse, $direction, $venv) = @_;      my ($names, $showanswer, $lastresponse, $direction, $venv) = @_;
   
     my $result;      my $result;
   
   
    
   
     if ($showanswer) {      if ($showanswer) {
   
  $result .= "\\begin{$venv}";   $result .= "\\begin{$venv}";
  foreach my $name (@{$names}) {   foreach my $name (@{$names}) {
           
Line 607  sub latex_survey { Line 554  sub latex_survey {
  $result .= '\vskip 0 mm ';   $result .= '\vskip 0 mm ';
     }      }
     $result .= "\\end{$venv}";      $result .= "\\end{$venv}";
  }   }
   
   
     }      }
       
     return $result;      return $result;
   
       
 }  }
 ##  ##
 #  Figure out the LaTeX environment in which to wrap the LaTeX vertical output.  #  Figure out the LaTeX environment in which to wrap the LaTeX vertical output.
Line 650  sub html_direction_fragments { Line 592  sub html_direction_fragments {
     if ($direction eq 'horizontal') {      if ($direction eq 'horizontal') {
  return ('<table><tr>', '</tr></table>', '<td>', '</td>');   return ('<table><tr>', '</tr></table>', '<td>', '</td>');
     } else {      } else {
  return ('', '<br />', '<br />', '');   return ('', '', '<div class="LC_radiofoil">', '</div>');
     }      }
 }  }
   
Line 697  sub displayallfoils{ Line 639  sub displayallfoils{
  );   );
   
     }      }
   
   
   
     return $result;      return $result;
 }  }
   
   
   
 sub whichfoils {  sub whichfoils {
     my ( $max, $randomize ) = @_;      my ($max,$randomize)=@_;
   
     my @truelist;      my @truelist;
     my @falselist;      my @falselist;
     my @whichfalse = ();      my @whichfalse =();
     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 ( $max > 0 && ( $falsecnt + 1 ) > $max ) { $count = $max }      if ( $max>0 && ($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; $max=$count; }
     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;
     if ( $Apache::response::foilgroup{'names'} ) {      if ( $Apache::response::foilgroup{'names'} ) {
         @names = @{ $Apache::response::foilgroup{'names'} };   @names= @{ $Apache::response::foilgroup{'names'} };
     }  
     if ( &Apache::response::showallfoils() ) {  
         @whichfalse = @names;  
     }  
     elsif ( $randomize eq 'no' ) {  
         &Apache::lonxml::debug("No randomization");  
         my $havetrue = 0;  
         foreach my $name (@names) {  
             if ( $Apache::response::foilgroup{ $name . '.value' } eq 'true' ) {  
                 if ( !$havetrue ) {  
                     push( @whichfalse, $name );  
                     $havetrue++;  
                     $answer = $#whichfalse;  
                 }  
             }  
             elsif (  
                 $Apache::response::foilgroup{ $name . '.value' } eq 'false' )  
             {  
                 push( @whichfalse, $name );  
             }  
             elsif (  
                 $Apache::response::foilgroup{ $name . '.value' } eq 'unused' )  
             {  
             }  
             else {  
                 &Apache::lonxml::error(  
                     &HTML::Entities::encode(  
 "No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",  
                         '<>&"'  
                     )  
                 );  
             }  
         }  
         if (   ( !$havetrue )  
             && ( $Apache::lonhomework::type ne 'survey' )  
             && ( $Apache::lonhomework::type ne 'surveycred' )  
             && ( $Apache::lonhomework::type ne 'anonsurvey' )  
             && ( $Apache::lonhomework::type ne 'anonsurveycred' ) )  
         {  
             &Apache::lonxml::error(  
                 &mt('There are no true statements available.') . '<br />' );  
         }  
     }      }
     else {      if (&Apache::response::showallfoils()) {
         my $current = 0;   @whichfalse=@names;
         &Apache::lonhomework::showhash(%Apache::response::foilgroup);      } elsif ($randomize eq 'no') {
         my ( %top, %bottom );   &Apache::lonxml::debug("No randomization");
    my $havetrue=0;
         #first find out where everyone wants to be   foreach my $name (@names) {
         foreach my $name (@names) {      if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
             $current++;   if (!$havetrue ) {
             if ( $Apache::response::foilgroup{ $name . '.value' } eq 'true' ) {      push(@whichfalse,$name); $havetrue++; $answer=$#whichfalse;
                 push( @truelist, $name );   }
                 if ( $Apache::response::foilgroup{ $name . '.location' } eq      } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
                     'top' )   push (@whichfalse,$name);
                 {      } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
                     $top{$name} = $current;      } else {
                 }   &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));
                 elsif ( $Apache::response::foilgroup{ $name . '.location' } eq      }
                     'bottom' )   }
                 {   if ((!$havetrue) && 
                     $bottom{$name} = $current;              ($Apache::lonhomework::type ne 'survey') && 
                 }              ($Apache::lonhomework::type ne 'surveycred') &&
             }              ($Apache::lonhomework::type ne 'anonsurvey') &&
             elsif (              ($Apache::lonhomework::type ne 'anonsurveycred')) {
                 $Apache::response::foilgroup{ $name . '.value' } eq 'false' )      &Apache::lonxml::error(&mt('There are no true statements available.').'<br />');
             {   }
                 push( @falselist, $name );      } else {
                 if ( $Apache::response::foilgroup{ $name . '.location' } eq   my $current=0;
                     'top' )   &Apache::lonhomework::showhash(%Apache::response::foilgroup);
                 {   my (%top,%bottom);
                     $top{$name} = $current;   #first find out where everyone wants to be
                 }   foreach my $name (@names) {
                 elsif ( $Apache::response::foilgroup{ $name . '.location' } eq      $current++;
                     'bottom' )      if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
                 {   push (@truelist,$name);
                     $bottom{$name} = $current;   if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
                 }      $top{$name}=$current;
             }   } elsif ($Apache::response::foilgroup{$name.'.location'} eq 'bottom') {
             elsif (      $bottom{$name}=$current;
                 $Apache::response::foilgroup{ $name . '.value' } eq 'unused' )   }
             {      } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
             }   push (@falselist,$name);
             else {   if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
                 &Apache::lonxml::error(      $top{$name}=$current;
                     &HTML::Entities::encode(   } elsif ($Apache::response::foilgroup{$name.'.location'} eq 'bottom') {
 "No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",      $bottom{$name}=$current;
                         '<>&"'   }
                     )      } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
                 );      } else {
             }   &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));
         }      }
    }
         #pick a true statement   #pick a true statement
         my $notrue = 0;   my $notrue=0;
         if ( scalar(@truelist) == 0 ) { $notrue = 1; }   if (scalar(@truelist) == 0) { $notrue=1; }
         my $whichtrue =   my $whichtrue = int(&Math::Random::random_uniform() * ($#truelist+1));
           int( &Math::Random::random_uniform() * ( $#truelist + 1 ) );   &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
         &Apache::lonxml::debug(   my (@toplist, @bottomlist);
             "Max is $max, From $#truelist elms, picking $whichtrue");   my $topcount=0;
         my ( @toplist, @bottomlist );   my $bottomcount=0;
         my $topcount    = 0;   # assign everyone to either toplist/bottomlist or whichfalse
         my $bottomcount = 0;   # which false is randomized, toplist bottomlist are in order
    while ((($#whichfalse+$topcount+$bottomcount) < $max-2) && ($#falselist > -1)) {
         # assign everyone to either toplist/bottomlist or whichfalse      &Apache::lonxml::debug("Have $#whichfalse max is $max");
         # which false is randomized, toplist bottomlist are in order      my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1));
         while (( ( $#whichfalse + $topcount + $bottomcount ) < $max - 2 )      &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
             && ( $#falselist > -1 ) )      $afalse=splice(@falselist,$afalse,1);
         {      &Apache::lonxml::debug("Picked $afalse");
             &Apache::lonxml::debug("Have $#whichfalse max is $max");      &Apache::lonhomework::showhash(('names'=>\@names));
             my $afalse =      &Apache::lonhomework::showhash(%top);
               int( &Math::Random::random_uniform() * ( $#falselist + 1 ) );      if ($top{$afalse}) {
             &Apache::lonxml::debug("From $#falselist elms, picking $afalse");   $toplist[$top{$afalse}]=$afalse;
             $afalse = splice( @falselist, $afalse, 1 );   $topcount++;
             &Apache::lonxml::debug("Picked $afalse");      } elsif ($bottom{$afalse}) {
             &Apache::lonhomework::showhash( ( 'names' => \@names ) );   $bottomlist[$bottom{$afalse}]=$afalse;
             &Apache::lonhomework::showhash(%top);   $bottomcount++;
             if ( $top{$afalse} ) {      } else {
                 $toplist[ $top{$afalse} ] = $afalse;   push (@whichfalse,$afalse);
                 $topcount++;      }
             }   }
             elsif ( $bottom{$afalse} ) {   &Apache::lonxml::debug("Answer wants $answer");
                 $bottomlist[ $bottom{$afalse} ] = $afalse;   my $truename=$truelist[$whichtrue];
                 $bottomcount++;   my $dosplice=1;
             }   if (($notrue) && 
             else {              ($Apache::lonhomework::type ne 'survey') &&
                 push( @whichfalse, $afalse );              ($Apache::lonhomework::type ne 'surveycred') &&
             }              ($Apache::lonhomework::type ne 'anonsurvey') &&
         }              ($Apache::lonhomework::type ne 'anonsurveycred')) {
         &Apache::lonxml::debug("Answer wants $answer");      $dosplice=0;
         my $truename = $truelist[$whichtrue];      &Apache::lonxml::error(&mt('There are no true statements available.').'<br />');
         my $dosplice = 1;   }
         if (   ($notrue)   #insert the true statement, keeping track of where it wants to be
             && ( $Apache::lonhomework::type ne 'survey' )   if ($Apache::response::foilgroup{$truename.'.location'} eq 'top' && $dosplice) {
             && ( $Apache::lonhomework::type ne 'surveycred' )      $toplist[$top{$truename}]=$truename;
             && ( $Apache::lonhomework::type ne 'anonsurvey' )      $answer=-1;
             && ( $Apache::lonhomework::type ne 'anonsurveycred' ) )      foreach my $top (reverse(@toplist)) {
         {   if ($top) { $answer++;}
             $dosplice = 0;   if ($top eq $truename) { last; }
             &Apache::lonxml::error(      }
                 &mt('There are no true statements available.') . '<br />' );      $dosplice=0;
         }   } elsif ($Apache::response::foilgroup{$truename.'.location'} eq 'bottom' && $dosplice) {
       $bottomlist[$bottom{$truename}]=$truename;
         #insert the true statement, keeping track of where it wants to be      $answer=-1;
         if (   $Apache::response::foilgroup{ $truename . '.location' } eq 'top'      foreach my $bot (@bottomlist) {
             && $dosplice )   if ($bot) { $answer++;}
         {   if ($bot eq $truename) { last; }
             $toplist[ $top{$truename} ] = $truename;      }
             $answer = -1;      $answer+=$topcount+$#whichfalse+1;
             foreach my $top ( reverse(@toplist) ) {      $dosplice=0;
                 if ($top) { $answer++; }   } else {
                 if ( $top eq $truename ) { last; }      if ($topcount>0 || $bottomcount>0) {
             }  
             $dosplice = 0;  
         }  
         elsif (  
             $Apache::response::foilgroup{ $truename . '.location' } eq 'bottom'  
             && $dosplice )  
         {  
             $bottomlist[ $bottom{$truename} ] = $truename;  
             $answer = -1;  
             foreach my $bot (@bottomlist) {  
                 if ($bot) { $answer++; }  
                 if ( $bot eq $truename ) { last; }  
             }  
             $answer += $topcount + $#whichfalse + 1;  
             $dosplice = 0;  
         }  
         else {  
             if ( $topcount > 0 || $bottomcount > 0 ) {  
                 my $inc = 1;                  my $inc = 1;
                 if (   ( $bottomcount > 0 )                  if (($bottomcount > 0) && ($Apache::lonhomework::type ne 'exam')) {
                     && ( $Apache::lonhomework::type ne 'exam' ) )  
                 {  
                     $inc = 2;                      $inc = 2;
                 }                  }
                 $answer = int(                  $answer=int(&Math::Random::random_uniform() * ($#whichfalse+$inc))
                     &Math::Random::random_uniform() * ( $#whichfalse + $inc ) )                          + $topcount;
                   + $topcount;      }
             }   }
         }   &Apache::lonxml::debug("Answer now wants $answer");
         &Apache::lonxml::debug("Answer now wants $answer");   #add the top items to the top, bottom items to the bottom
    for (my $i=0;$i<=$#toplist;$i++) {
         #add the top items to the top, bottom items to the bottom      if ($toplist[$i]) { unshift(@whichfalse,$toplist[$i]) }
         for ( my $i = 0 ; $i <= $#toplist ; $i++ ) {   }
             if ( $toplist[$i] ) { unshift( @whichfalse, $toplist[$i] ) }   for (my $i=0;$i<=$#bottomlist;$i++) {
         }      if ($bottomlist[$i]) { push(@whichfalse,$bottomlist[$i]) }
         for ( my $i = 0 ; $i <= $#bottomlist ; $i++ ) {   }
             if ( $bottomlist[$i] ) { push( @whichfalse, $bottomlist[$i] ) }   #if the true statement is randomized insert it into the list
         }   if ($dosplice) { splice(@whichfalse,$answer,0,$truelist[$whichtrue]); }
   
         #if the true statement is randomized insert it into the list  
         if ($dosplice) {  
             splice( @whichfalse, $answer, 0, $truelist[$whichtrue] );  
         }  
     }      }
     &Apache::lonxml::debug("Answer is $answer");      &Apache::lonxml::debug("Answer is $answer");
     return ( $answer, @whichfalse );      return ($answer,@whichfalse);
 }  }
   
 ##   ## 
Line 957  sub html_radiobutton { Line 825  sub html_radiobutton {
   
     my $result='<label>';      my $result='<label>';
           
     $result .= '<input type="radio"      $result .= '<input type="radio" '
                 onchange="javascript:setSubmittedPart(' . "'$part');\""   . 'onchange="javascript:setSubmittedPart(' . "'$part');\" "
  . 'name="HWVAL_' . $fieldname . '"'   . 'name="HWVAL_' . $fieldname . '" '
  . "value='$value'";   . 'value="'.$value.'"';
   
     if (defined($last_responses->{$name})) {      if (defined($last_responses->{$name})) {
  $result .= '  checked="checked" ';   $result .= '  checked="checked" ';
Line 1002  sub get_last_response { Line 870  sub get_last_response {
  }   }
     }      }
     unless ($newvariation) {      unless ($newvariation) {
  $lastresponse =          if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
     $Apache::lonhomework::history{"resource.$part.$id.submission"};              (($env{'form.grade_username'} eq $env{'user.name'}) &&
                ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
               $lastresponse =
                   $Apache::lonhomework::history{"resource.$part.$id.submission"};
           } else {
               unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
                       ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
                   $lastresponse =
                       $Apache::lonhomework::history{"resource.$part.$id.submission"};
   
               }
           }
     }      }
   
     my %lastresponse = &Apache::lonnet::str2hash($lastresponse);      my %lastresponse = &Apache::lonnet::str2hash($lastresponse);
   
     return \%lastresponse;      return \%lastresponse;
Line 1121  sub display_latex_exam { Line 1001  sub display_latex_exam {
     $whichfoils, \@foil_texts, '$\bigcirc$');      $whichfoils, \@foil_texts, '$\bigcirc$');
   
     } else {      } else {
  $result .= "\\begin{$venv}";  
   
    $result .= '\vskip 2mm \noindent';
   
  # This section puts out the prefix that tells the user   # This section puts out the prefix that tells the user
  # (if necessary) to only choose one bubble in the next n lines   # (if necessary) to only choose one bubble in the next n lines
  # for problems with more than one line worth of bubbles in the grid sheet:   # for problems with more than one line worth of bubbles in the grid sheet:
Line 1142  sub display_latex_exam { Line 1023  sub display_latex_exam {
     }      }
     $linetext =~ s/,\s$//;      $linetext =~ s/,\s$//;
     $result .=      $result .=
  '\item[\small {\textbf{'   '\small {\textbf{'
  . $linetext . '}}]'   . $linetext . '}} '
  . ' {\footnotesize '   . ' {\footnotesize '
  . &mt( '(Bubble once in [_1] lines)', $numlines )   . &mt( '(Bubble once in [_1] lines)', $numlines )
  . '} \hspace*{\fill} \\\\';   . '} \hspace*{\fill} \\\\';
  }   }
  else {   else {
     $result .= '\item[\textbf{' . $Apache::lonxml::counter . '}.]';      $result .= '\textbf{' . $Apache::lonxml::counter . '}.'.
                          '\hspace*{2 mm}';
  }   }
   
  # Now output the bubbles themselves:   # Now output the bubbles themselves:
Line 1164  sub display_latex_exam { Line 1046  sub display_latex_exam {
     if ( $numlines > 1 ) {      if ( $numlines > 1 ) {
  $identifier = $Apache::lonxml::counter + $line;   $identifier = $Apache::lonxml::counter + $line;
     }      }
     $result .=      my $preindent;
  '{\small \textbf{'      if ($bubble_number > 0) {
  . $identifier                  my $offset = 5;
                   if ($Apache::lonxml::counter) {
                       if ($identifier) {
                           $offset += 2 * (length($identifier)-1);
                       } else {
                           $offset += 2 * (length($Apache::lonxml::counter)-1);
                       }
                   }
                   $preindent = '\hspace*{'.$offset.' mm}';
       }
       my $foiltext = $Apache::response::foilgroup{$name . '.text'};
       $foiltext =~ s/\\noindent//; # forgive me for I have sinned..
       $result .= '{\small \textbf{'
    . $identifier  .$preindent
  . $alphabet[$i]   . $alphabet[$i]
  . '}}$\bigcirc$'   . '}}$\bigcirc$'
  . $Apache::response::foilgroup{ $name . '.text' }   . $foiltext
     . '\\\\';    #' stupid emacs -- it thinks it needs that apostrophe to close the quote      . '\\\\';    #' stupid emacs -- it thinks it needs that apostrophe to close the quote
           
     $i++;      $i++;
     $bubble_number++;      $bubble_number++;
  }   }
  $result .= "\\end{$venv}";  
   
     }      }
   
Line 1282  sub display_pdf_form { Line 1176  sub display_pdf_form {
 # @retval The rendered problem.  # @retval The rendered problem.
   
 sub displayfoils {  sub displayfoils {
     my ( $target, $answer, $whichfoils, $direction, $bubbles_per_line ) = @_;      my ($target,$answer,$whichfoils,$direction, $bubbles_per_line)=@_;
     my $result;      my $result;
   
   
     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"};
   
Line 1339  sub displayfoils { Line 1234  sub displayfoils {
     $result .= '\vskip 0 mm ';       $result .= '\vskip 0 mm '; 
                 
  }   }
   
   
     }      }
     return $result;      return $result;
 }  }
Line 1348  sub displayfoils { Line 1241  sub displayfoils {
 sub displayallanswers {  sub displayallanswers {
     my @names;      my @names;
     if ( $Apache::response::foilgroup{'names'} ) {      if ( $Apache::response::foilgroup{'names'} ) {
         @names = @{ $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 .=   $result.=&Apache::response::answer_part('radiobuttonresponse',
           &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;
 }  }
   
 sub displayanswers {  sub displayanswers {
     my ( $answer, $whichopt, $bubbles_per_line ) = @_;      my ($answer, $whichopt, $bubbles_per_line)=@_;
     my $result;      my $result;
   
     if ( $Apache::lonhomework::type eq 'exam' ) {      if ($Apache::lonhomework::type eq 'exam') {
         my $line    = int( $answer / $bubbles_per_line );   my $line = int($answer/$bubbles_per_line);
         my $correct = ( 'A' .. 'Z' )[ $answer % $bubbles_per_line ];   my $correct = ('A'..'Z')[$answer%$bubbles_per_line];
         $result .=   $result .= &Apache::response::answer_header('radiobuttonresponse',
           &Apache::response::answer_header( 'radiobuttonresponse', $line );      $line);
         $result .=   $result .= &Apache::response::answer_part('radiobuttonresponse',
           &Apache::response::answer_part( 'radiobuttonresponse', $correct );    $correct);
     }      } else {
     else {   $result .= &Apache::response::answer_header('radiobuttonresponse');
         $result .= &Apache::response::answer_header('radiobuttonresponse');      }
     }      foreach my $name (@{ $whichopt }) {
     foreach my $name ( @{$whichopt} ) {   $result.=&Apache::response::answer_part('radiobuttonresponse',
         $result .=   $Apache::response::foilgroup{$name.'.value'});
           &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;
 }  }
   
 sub start_conceptgroup {  sub start_conceptgroup {
     my ( $target, $token, $tagstack, $parstack, $parser, $safeeval, $style ) =      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       @_;      $Apache::radiobuttonresponse::conceptgroup=1;
     $Apache::radiobuttonresponse::conceptgroup = 1;      %Apache::response::conceptgroup=();
     %Apache::response::conceptgroup            = ();  
     my $result;      my $result;
     if ( $target eq 'edit' ) {      if ($target eq 'edit') {
         $result .= &Apache::edit::tag_start( $target, $token );   $result.=&Apache::edit::tag_start($target,$token);
         $result .=   $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50').
             &Apache::edit::text_arg( 'Concept:', 'concept', $token, '50' )      &Apache::edit::end_row().&Apache::edit::start_spanning_row();
           . &Apache::edit::end_row()      } elsif ($target eq 'modified') {
           . &Apache::edit::start_spanning_row();   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
     }       $safeeval,'concept');
     elsif ( $target eq 'modified' ) {   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
         my $constructtag =  
           &Apache::edit::get_new_args( $token, $parstack, $safeeval,  
             'concept' );  
         if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }  
     }      }
     return $result;      return $result;
 }  }
   
 sub end_conceptgroup {  sub end_conceptgroup {
     my ( $target, $token, $tagstack, $parstack, $parser, $safeeval, $style ) =      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       @_;      $Apache::radiobuttonresponse::conceptgroup=0;
     $Apache::radiobuttonresponse::conceptgroup = 0;  
     my $result;      my $result;
     if (   $target eq 'web'      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  ||
         || $target eq 'grade'   $target eq 'tex' || $target eq 'analyze') {
         || $target eq 'answer'   &Apache::response::pick_foil_for_concept($target,
         || $target eq 'tex'   ['value','text','location'],
         || $target eq 'analyze' )   \%Apache::hint::radiobutton,
     {   $parstack,$safeeval);
         &Apache::response::pick_foil_for_concept( $target,      } elsif ($target eq 'edit') {
             [ 'value', 'text', 'location' ],   $result=&Apache::edit::end_table();
             \%Apache::hint::radiobutton, $parstack, $safeeval );  
     }  
     elsif ( $target eq 'edit' ) {  
         $result = &Apache::edit::end_table();  
     }      }
     return $result;      return $result;
 }  }
   
 sub insert_conceptgroup {  sub insert_conceptgroup {
     my $result =      my $result="\n\t\t<conceptgroup concept=\"\">".&insert_foil()."\n\t\t</conceptgroup>\n";
         "\n\t\t<conceptgroup concept=\"\">"  
       . &insert_foil()  
       . "\n\t\t</conceptgroup>\n";  
     return $result;      return $result;
 }  }
   
 sub start_foil {  sub start_foil {
     my ( $target, $token, $tagstack, $parstack, $parser, $safeeval, $style ) =      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       @_;      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') {
         if ( $target eq 'analyze' ) {      &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
             &Apache::response::check_if_computed( $token, $parstack, $safeeval,   }
                 'value' );      } elsif ($target eq 'edit') {
         }   $result=&Apache::edit::tag_start($target,$token);
     }   $result.=&Apache::edit::text_arg('Name:','name',$token);
     elsif ( $target eq 'edit' ) {   $result.=&Apache::edit::select_or_text_arg('Correct Option:','value',
         $result = &Apache::edit::tag_start( $target, $token );     ['unused','true','false'],
         $result .= &Apache::edit::text_arg( 'Name:', 'name', $token );     $token);
         $result .= &Apache::edit::select_or_text_arg(   my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
             'Correct Option:', 'value',   $safeeval,'-3');
             [ 'unused', 'true', 'false' ], $token   if ($randomize ne 'no') {
         );      $result.=&Apache::edit::select_arg('Location:','location',
         my $randomize =         ['random','top','bottom'],$token);
           &Apache::lonxml::get_param( 'randomize', $parstack, $safeeval, '-3' );   }
         if ( $randomize ne 'no' ) {   $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
             $result .=      } elsif ($target eq 'modified') {
               &Apache::edit::select_arg( 'Location:', 'location',   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
                 [ 'random', 'top', 'bottom' ], $token );       $safeeval,'value','name',
         }       'location');
         $result .=   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
           &Apache::edit::end_row() . &Apache::edit::start_spanning_row();      } 
     }  
     elsif ( $target eq 'modified' ) {  
         my $constructtag =  
           &Apache::edit::get_new_args( $token, $parstack, $safeeval, 'value',  
             'name', 'location' );  
         if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }  
     }  
     return $result;      return $result;
 }  }
   
 sub end_foil {  sub end_foil {
     my ( $target, $token, $tagstack, $parstack, $parser, $safeeval, $style ) =      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       @_;      my $text='';
     my $text = '';      if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
     if ( $target eq 'web' || $target eq 'tex' || $target eq 'analyze' ) {   $text=&Apache::lonxml::endredirection;
         $text = &Apache::lonxml::endredirection;      }
     }      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'
     if (   $target eq 'web'   || $target eq 'tex' || $target eq 'analyze') {
         || $target eq 'grade'   my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
         || $target eq 'answer'   if ($value ne 'unused') {
         || $target eq 'tex'      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
         || $target eq 'analyze' )      if ($name eq "") {
     {   &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));
         my $value = &Apache::lonxml::get_param( 'value', $parstack, $safeeval );   $name=$Apache::lonxml::curdepth;
         if ( $value ne 'unused' ) {      }
             my $name =      if (defined($Apache::response::foilnames{$name})) {
               &Apache::lonxml::get_param( 'name', $parstack, $safeeval );   &Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.','<b><tt>'.$name.'</tt></b>'));
             if ( $name eq "" ) {      }
                 &Apache::lonxml::warning(      $Apache::response::foilnames{$name}++;
                     &mt(      my $location =&Apache::lonxml::get_param('location',$parstack,
 'Foils without names exist. This can cause problems to malfunction.'       $safeeval);
                     )      if ( $Apache::radiobuttonresponse::conceptgroup
                 );   && !&Apache::response::showallfoils() ) {
                 $name = $Apache::lonxml::curdepth;   push @{ $Apache::response::conceptgroup{'names'} }, $name;
             }   $Apache::response::conceptgroup{"$name.value"} = $value;
             if ( defined( $Apache::response::foilnames{$name} ) ) {   $Apache::response::conceptgroup{"$name.text"} = $text;
                 &Apache::lonxml::error(   $Apache::response::conceptgroup{"$name.location"} = $location;
                     &mt(      } else {
 'Foil name [_1] appears more than once. Foil names need to be unique.',   push @{ $Apache::response::foilgroup{'names'} }, $name;
                         '<b><tt>' . $name . '</tt></b>'   $Apache::response::foilgroup{"$name.value"} = $value;
                     )   $Apache::response::foilgroup{"$name.text"} = $text;
                 );   $Apache::response::foilgroup{"$name.location"} = $location;
             }      }
             $Apache::response::foilnames{$name}++;   }
             my $location =  
               &Apache::lonxml::get_param( 'location', $parstack, $safeeval );  
             if ( $Apache::radiobuttonresponse::conceptgroup  
                 && !&Apache::response::showallfoils() )  
             {  
                 push @{ $Apache::response::conceptgroup{'names'} }, $name;  
                 $Apache::response::conceptgroup{"$name.value"}    = $value;  
                 $Apache::response::conceptgroup{"$name.text"}     = $text;  
                 $Apache::response::conceptgroup{"$name.location"} = $location;  
             }  
             else {  
                 push @{ $Apache::response::foilgroup{'names'} }, $name;  
                 $Apache::response::foilgroup{"$name.value"}    = $value;  
                 $Apache::response::foilgroup{"$name.text"}     = $text;  
                 $Apache::response::foilgroup{"$name.location"} = $location;  
             }  
         }  
     }      }
     return '';      return '';
 }  }

Removed from v.1.153.6.10  
changed lines
  Added in v.1.162


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