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

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

version 1.45, 2002/08/05 15:55:21 version 1.48, 2002/09/23 19:09:52
Line 51  sub start_radiobuttonresponse { Line 51  sub start_radiobuttonresponse {
  ."</td><td>&nbsp".&Apache::edit::end_row()   ."</td><td>&nbsp".&Apache::edit::end_row()
         .&Apache::edit::start_spanning_row();          .&Apache::edit::start_spanning_row();
   
     $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').      $result.=
  &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n";   &Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
    &Apache::edit::select_arg('Randomize Foil Order','randomize',
     ['yes','no'],$token).
           &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n";
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,      my $constructtag=&Apache::edit::get_new_args($token,$parstack,
  $safeeval,'max');   $safeeval,'max','randomize');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
       $result .= '\begin{enumerate}';        $result .= '\begin{enumerate}';
Line 98  sub storesurvey { Line 101  sub storesurvey {
 }  }
   
 sub grade_response {  sub grade_response {
   my ($max,$answer)=@_;    my ($max,$answer,$randomize)=@_;
   if (!defined($ENV{'form.submitted'})) { return; }    if (!defined($ENV{'form.submitted'})) { return; }
   my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};    my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
   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=&whichfoils($max,$answer);    my @whichfoils=&whichfoils($max,$answer,$randomize);
   my %responsehash;    my %responsehash;
   $responsehash{$whichfoils[$response]}=$response;    $responsehash{$whichfoils[$response]}=$response;
   my $responsestr=&Apache::lonnet::hash2str(%responsehash);    my $responsestr=&Apache::lonnet::hash2str(%responsehash);
Line 143  sub end_foilgroup { Line 146  sub end_foilgroup {
       if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }        if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }
       my $answer = int(rand ($count));        my $answer = int(rand ($count));
       &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");        &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");
         my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
    $safeeval,'-2');
       if ($target eq 'web' || $target eq 'tex') {        if ($target eq 'web' || $target eq 'tex') {
  $result=&displayfoils($target,$max,$answer);   $result=&displayfoils($target,$max,$answer,$randomize);
       } elsif ($target eq 'answer' ) {        } elsif ($target eq 'answer' ) {
  $result=&displayanswers($max,$answer);   $result=&displayanswers($max,$answer,$randomize);
       } elsif ( $target eq 'grade') {        } elsif ( $target eq 'grade') {
  &grade_response($max,$answer);   &grade_response($max,$answer,$randomize);
       }        }
     }      }
   }    }
Line 211  sub displayallfoils { Line 216  sub displayallfoils {
 }  }
   
 sub whichfoils {  sub whichfoils {
   my ($max,$answer)=@_;    my ($max,$answer,$randomize)=@_;
   
   my @truelist;    my @truelist;
   my @falselist;    my @falselist;
Line 223  sub whichfoils { Line 228  sub whichfoils {
   }    }
   if (&Apache::response::showallfoils()) {    if (&Apache::response::showallfoils()) {
     @whichfalse=@names;      @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++; }
     } 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>"));
     }
         }
   } else {    } else {
     foreach my $name (@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>";
Line 252  sub whichfoils { Line 270  sub whichfoils {
 }  }
   
 sub displayfoils {  sub displayfoils {
   my ($target,$max,$answer)=@_;    my ($target,$max,$answer,$randomize)=@_;
   my $result;    my $result;
   
   my @whichfoils=&whichfoils($max,$answer);    my @whichfoils=&whichfoils($max,$answer,$randomize);
   if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {    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 {        } else {
   $result.='\vskip 0 mm ';    $result.='\vskip 0 mm \item ';
       }        }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {         if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
  $result.='Correct:<b>';    if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: ';}
       } else {        } else {
  $result.='Incorrect:';   $result.='Incorrect:';
       }        }
       $result.=$Apache::response::foilgroup{$name.'.text'}."</input>\n";        if ($target ne 'tex') {
     $result.=$Apache::response::foilgroup{$name.'.text'}."</input>\n";
         } else {
     $result.=$Apache::response::foilgroup{$name.'.text'};
         }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {        if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
  $result.='</b>';    if ($target ne 'tex') { $result.='</b>';}
       }        }
     }      }
   } else {    } else {
Line 295  sub displayfoils { Line 317  sub displayfoils {
 }  }
   
 sub displayanswers {  sub displayanswers {
   my ($max,$answer)=@_;    my ($max,$answer,$randomize)=@_;
   my @whichopt = &whichfoils($max,$answer);    my @whichopt = &whichfoils($max,$answer,$randomize);
   my $result=&Apache::response::answer_header('radiobuttonresponse');    my $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',
Line 360  sub start_foil { Line 382  sub start_foil {
     $result.=&Apache::edit::text_arg('Name:','name',$token);      $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.=&Apache::edit::select_or_text_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::select_or_text_arg('Location:','location',
          ['random','bottom','top'],$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') {
      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,       my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
   'value','name');    'value','name','location');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }     } 
   return $result;    return $result;
Line 377  sub end_foil { Line 401  sub end_foil {
     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);
         my $location =&Apache::lonxml::get_param('location',$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() ) {     && !&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;
    $Apache::response::conceptgroup{"$name.location"} = $location;
       } else {        } else {
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
  $Apache::response::foilgroup{"$name.value"} = $value;   $Apache::response::foilgroup{"$name.value"} = $value;
  $Apache::response::foilgroup{"$name.text"} = $text;   $Apache::response::foilgroup{"$name.text"} = $text;
    $Apache::response::foilgroup{"$name.location"} = $location;
       }        }
     }      }
   }    }
Removed from v.1.45  
changed lines
  Added in v.1.48

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