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

Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.27 and 1.28

version 1.27, 2001/11/07 22:28:44 version 1.28, 2001/11/09 20:20:45
Line 69  sub end_foilgroup { Line 69  sub end_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       
   my $result;    my $result;
   if ($target eq 'grade' || $target eq 'web') {    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
     my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval,'-2');      my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval,'-2');
     if ( $style eq 'survey' ) {      if ( $style eq 'survey' ) {
       if ($target eq 'web') {        if ($target eq 'web') {
Line 87  sub end_foilgroup { Line 87  sub end_foilgroup {
       &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");        &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");
       if ($target eq 'web') {        if ($target eq 'web') {
  $result=&displayfoils($max,$answer);   $result=&displayfoils($max,$answer);
         } elsif ($target eq 'answer' ) {
    $result=&displayanswers($max,$answer);
       } elsif ( $target eq 'grade') {        } elsif ( $target eq 'grade') {
  if ( defined $ENV{'form.submitted'}) {   if ( defined $ENV{'form.submitted'}) {
   my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};    my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
Line 144  sub displayallfoils { Line 146  sub displayallfoils {
   return $result;    return $result;
 }  }
   
 sub displayfoils {  sub whichfoils {
   my ($max,$answer)=@_;    my ($max,$answer)=@_;
   my @names = @{ $Apache::response::foilgroup{'names'} };  
   my @truelist;    my @truelist;
   my @falselist;    my @falselist;
   my $result;  
   my $name;  
   
   foreach $name (@names) {    my @names = @{ $Apache::response::foilgroup{'names'} };
     foreach my $name (@names) {
     #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";      #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
     if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {      if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
       push (@truelist,$name);        push (@truelist,$name);
Line 176  sub displayfoils { Line 177  sub displayfoils {
   }    }
   splice(@whichfalse,$answer,0,$truelist[$whichtrue]);    splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
   &Apache::lonxml::debug("the true statement is $answer");    &Apache::lonxml::debug("the true statement is $answer");
     return @whichfalse;
   }
   
   sub displayfoils {
     my ($max,$answer)=@_;
     my $result;
   
     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/ ) {
     foreach $name (@whichfalse) {      foreach my $name (@whichfoils) {
       $result.="<br />";        $result.="<br />";
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {         if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
  $result.='Correct';   $result.='Correct';
Line 191  sub displayfoils { Line 200  sub displayfoils {
     my $id=$Apache::inputtags::response['-1'];      my $id=$Apache::inputtags::response['-1'];
     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"};
     foreach $name (@whichfalse) {      foreach my $name (@whichfoils) {
        $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";         $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
       if ($lastresponse eq $temp) { $result .= 'checked="on"'; }        if ($lastresponse eq $temp) { $result .= 'checked="on"'; }
       $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";        $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
Line 201  sub displayfoils { Line 210  sub displayfoils {
   return $result."<br />";    return $result."<br />";
 }  }
   
   sub displayanswers {
     my ($max,$answer)=@_;
     my @names = @{ $Apache::response::foilgroup{'names'} };
     my @whichopt = &whichfoils($max,$answer);
     my $result=&Apache::response::answer_header('radiobuttonresponse');
     foreach my $name (@whichopt) {
       $result.=&Apache::response::answer_part('radiobuttonresponse',
        $Apache::response::foilgroup{$name.'.value'})
     }
     $result.=&Apache::response::answer_footer('radiobuttonresponse');
     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;
Line 222  sub end_conceptgroup { Line 244  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' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {      if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };        my @names = @{ $Apache::response::conceptgroup{'names'} };
       my $pick=int rand $#names+1;        my $pick=int(rand($#names+1));
       my $name=$names[$pick];        my $name=$names[$pick];
       push @{ $Apache::response::foilgroup{'names'} }, $name;        push @{ $Apache::response::foilgroup{'names'} }, $name;
       $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};        $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
Line 254  sub start_foil { Line 276  sub start_foil {
     $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_arg('Correct Option:','value',
        ['true','false'],$token,'15');         ['unused','true','false'],$token);
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,       my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
   'value','name');    'value','name');
Line 267  sub end_foil { Line 289  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') { $text=&Apache::lonxml::endredirection; }    if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);      my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     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);
Removed from v.1.27  
changed lines
  Added in v.1.28

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