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

Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.40 and 1.45

version 1.40, 2002/05/03 19:44:13 version 1.45, 2002/08/05 15:55:21
Line 29 Line 29
   
 package Apache::radiobuttonresponse;  package Apache::radiobuttonresponse;
 use strict;  use strict;
   use HTML::Entities();
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));    &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
Line 73  sub end_radiobuttonresponse { Line 74  sub end_radiobuttonresponse {
   return $result;    return $result;
 }  }
   
 %Apache::response::foilgroup={};  %Apache::response::foilgroup=();
 sub start_foilgroup {  sub start_foilgroup {
   %Apache::response::foilgroup={};    %Apache::response::foilgroup=();
   $Apache::radiobuttonresponse::conceptgroup=0;    $Apache::radiobuttonresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();    &Apache::response::setrandomnumber();
   return '';    return '';
Line 183  sub displayallfoils { Line 184  sub displayallfoils {
   my $part=$Apache::inputtags::part;    my $part=$Apache::inputtags::part;
   my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};    my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
   my %lastresponse=&Apache::lonnet::str2hash($lastresponse);    my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
   &Apache::lonhomework::showhash(%lastresponse);    if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  '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 /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";   $result.="<br />".$Apache::response::foilgroup{$name.'.value'};
       if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }   if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
       $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";    $result.='<b>';
       $temp++;   }
    $result .= $Apache::response::foilgroup{$name.'.text'};
    if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
     $result.='</b>';
    }
         }
       }
     } else {
       foreach my $name (@names) {
         if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
    $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
    if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
    $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
    $temp++;
         }
     }      }
   }    }
   return $result;    return $result;
Line 200  sub whichfoils { Line 215  sub whichfoils {
   
   my @truelist;    my @truelist;
   my @falselist;    my @falselist;
     my @whichfalse =();
   
   my @names;    my @names;
   if ( $Apache::response::foilgroup{'names'} ) {    if ( $Apache::response::foilgroup{'names'} ) {
     @names= @{ $Apache::response::foilgroup{'names'} };      @names= @{ $Apache::response::foilgroup{'names'} };
   }    }
   foreach my $name (@names) {    if (&Apache::response::showallfoils()) {
     #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";      @whichfalse=@names;
     if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {    } else {
       push (@truelist,$name);      foreach my $name (@names) {
     } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {        #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
       push (@falselist,$name);        if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
     } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {   push (@truelist,$name);
     } else {        } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
       &Apache::lonxml::error(&HTML::Entites::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));   push (@falselist,$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>"));
         }
     }      }
       my $whichtrue = int(rand($#truelist+1));
       &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
       while ((($#whichfalse+1) < $max-1) && ($#falselist > -1)) {
         &Apache::lonxml::debug("Have $#whichfalse max is $max");
         my $afalse=int(rand($#falselist+1));
         &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
         $afalse=splice(@falselist,$afalse,1);
         &Apache::lonxml::debug("Picked $afalse");
         push (@whichfalse,$afalse);
       }
       splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
       &Apache::lonxml::debug("the true statement is $answer");
   }    }
   my $whichtrue = int(rand($#truelist+1));  
   &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");  
   my @whichfalse =();  
   while ((($#whichfalse+1) < $max-1) && ($#falselist > -1)) {  
     &Apache::lonxml::debug("Have $#whichfalse max is $max");  
     my $afalse=int(rand($#falselist+1));  
     &Apache::lonxml::debug("From $#falselist elms, picking $afalse");  
     $afalse=splice(@falselist,$afalse,1);  
     &Apache::lonxml::debug("Picked $afalse");  
     push (@whichfalse,$afalse);  
   }  
   splice(@whichfalse,$answer,0,$truelist[$whichtrue]);  
   &Apache::lonxml::debug("the true statement is $answer");  
   return @whichfalse;    return @whichfalse;
 }  }
   
Line 237  sub displayfoils { Line 256  sub displayfoils {
   my $result;    my $result;
   
   my @whichfoils=&whichfoils($max,$answer);    my @whichfoils=&whichfoils($max,$answer);
   if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {    if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
     foreach my $name (@whichfoils) {      foreach my $name (@whichfoils) {
       if ($target ne 'tex') {        if ($target ne 'tex') {
   $result.="<br />";    $result.="<br />";
         } else {
     $result.='\vskip 0 mm ';
       }        }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {         if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
  $result.='Correct';   $result.='Correct:<b>';
       } else {        } else {
  $result.='Incorrect';   $result.='Incorrect:';
         }
         $result.=$Apache::response::foilgroup{$name.'.text'}."</input>\n";
         if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
    $result.='</b>';
       }        }
       $result.=":".$Apache::response::foilgroup{$name.'.text'}."</input>\n";  
     }      }
   } else {    } else {
     my $temp=0;      my $temp=0;
Line 261  sub displayfoils { Line 285  sub displayfoils {
   if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }    if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
   $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";    $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       } else {        } else {
   $result .= $Apache::response::foilgroup{$name.'.text'};    $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
       }        }
       $temp++;        $temp++;
     }      }
   }    }
   if ($target ne 'tex') { $result.="<br />"; }    if ($target ne 'tex') { $result.="<br />"; } else { $result.='\vskip 0 mm '; }
   return $result;    return $result;
 }  }
   
Line 285  sub displayanswers { Line 309  sub displayanswers {
 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);
Line 331  sub start_foil { Line 355  sub start_foil {
   my $result='';    my $result='';
   if ($target eq 'web' || $target eq 'tex') {    if ($target eq 'web' || $target eq 'tex') {
     &Apache::lonxml::startredirection;      &Apache::lonxml::startredirection;
     if ($target eq 'tex') {  
  $result .= '\item ';  
     }  
   } 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);
     $result.=&Apache::edit::select_arg('Correct Option:','value',      $result.=&Apache::edit::select_or_text_arg('Correct Option:','value',
        ['unused','true','false'],$token);         ['unused','true','false'],$token);
     $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();      $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
Line 357  sub end_foil { Line 378  sub end_foil {
     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) { $name=$Apache::lonxml::curdepth; }        if (!$name) { $name=$Apache::lonxml::curdepth; }
       if ( $Apache::radiobuttonresponse::conceptgroup ) {        if ( $Apache::radiobuttonresponse::conceptgroup
      && !&Apache::response::showallfoils() ) {
  push @{ $Apache::response::conceptgroup{'names'} }, $name;   push @{ $Apache::response::conceptgroup{'names'} }, $name;
  $Apache::response::conceptgroup{"$name.value"} = $value;   $Apache::response::conceptgroup{"$name.value"} = $value;
  $Apache::response::conceptgroup{"$name.text"} = $text;   $Apache::response::conceptgroup{"$name.text"} = $text;
Removed from v.1.40  
changed lines
  Added in v.1.45

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