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

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

version 1.34, 2002/01/07 18:03:57 version 1.40, 2002/05/03 19:44:13
Line 30 Line 30
 package Apache::radiobuttonresponse;  package Apache::radiobuttonresponse;
 use strict;  use strict;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));    &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
 }  }
   
Line 45  sub start_radiobuttonresponse { Line 45  sub start_radiobuttonresponse {
     $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.=&Apache::edit::start_table($token).
       '<tr><td>'.&Apache::lonxml::description($token)."</td><td>Delete:".   '<tr><td>'.&Apache::lonxml::description($token)."</td><td>Delete:".
  &Apache::edit::deletelist($target,$token)   &Apache::edit::deletelist($target,$token)
   ."</td><td>&nbsp</td></tr><tr><td colspan=\"3\">\n";   ."</td><td>&nbsp".&Apache::edit::end_row()
     $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').          .&Apache::edit::start_spanning_row();
       "</td></tr>";  
     $result.="<tr><td colspan=\"3\">\n";      $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
    &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');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     } elsif ($target eq 'tex') {
         $result .= '\begin{enumerate}';
   }    }
   return $result;    return $result;
 }  }
Line 63  sub end_radiobuttonresponse { Line 66  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(); }
     if ($target eq 'tex') { $result .= '\end{enumerate}'; }
   &Apache::response::end_response;    &Apache::response::end_response;
   pop @Apache::lonxml::namespace;    pop @Apache::lonxml::namespace;
   &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));    &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
Line 122  sub end_foilgroup { Line 126  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' || $target eq 'answer') {    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
     my $style = $Apache::lonhomework::type;      my $style = $Apache::lonhomework::type;
     if ( $style eq 'survey' ) {      if ( $style eq 'survey' ) {
       if ($target eq 'web' || $target eq 'answer') {        if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
  $result=&displayallfoils();   $result=&displayallfoils();
       } elsif ( $target eq 'grade' ) {        } elsif ( $target eq 'grade' ) {
  $result=&storesurvey();   $result=&storesurvey();
Line 138  sub end_foilgroup { Line 142  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");
       if ($target eq 'web') {        if ($target eq 'web' || $target eq 'tex') {
  $result=&displayfoils($max,$answer);   $result=&displayfoils($target,$max,$answer);
       } elsif ($target eq 'answer' ) {        } elsif ($target eq 'answer' ) {
  $result=&displayanswers($max,$answer);   $result=&displayanswers($max,$answer);
       } elsif ( $target eq 'grade') {        } elsif ( $target eq 'grade') {
Line 209  sub whichfoils { Line 213  sub whichfoils {
       push (@falselist,$name);        push (@falselist,$name);
     } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {      } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
     } else {      } else {
       &Apache::lonxml::error("Unknown state $Apache::response::foilgroup{$name.'.value'} for $name in <foilgroup>");        &Apache::lonxml::error(&HTML::Entites::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
     }      }
   }    }
   my $whichtrue = int(rand($#truelist+1));    my $whichtrue = int(rand($#truelist+1));
   &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");    &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
   my @whichfalse =();    my @whichfalse =();
   while ((($#whichfalse+1) < $max) && ($#falselist > -1)) {    while ((($#whichfalse+1) < $max-1) && ($#falselist > -1)) {
     &Apache::lonxml::debug("Have $#whichfalse max is $max");      &Apache::lonxml::debug("Have $#whichfalse max is $max");
     my $afalse=int(rand($#falselist+1));      my $afalse=int(rand($#falselist+1));
     &Apache::lonxml::debug("From $#falselist elms, picking $afalse");      &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
Line 229  sub whichfoils { Line 233  sub whichfoils {
 }  }
   
 sub displayfoils {  sub displayfoils {
   my ($max,$answer)=@_;    my ($target,$max,$answer)=@_;
   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/ ) {
     foreach my $name (@whichfoils) {      foreach my $name (@whichfoils) {
       $result.="<br />";        if ($target ne 'tex') {
     $result.="<br />";
         }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {         if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
  $result.='Correct';   $result.='Correct';
       } else {        } else {
Line 250  sub displayfoils { Line 256  sub displayfoils {
     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);
     foreach my $name (@whichfoils) {      foreach my $name (@whichfoils) {
        $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";        if ($target ne 'tex') {
       if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }    $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
       $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";    if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
     $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
         } else {
     $result .= $Apache::response::foilgroup{$name.'.text'};
         }
       $temp++;        $temp++;
     }      }
   }    }
   return $result."<br />";    if ($target ne 'tex') { $result.="<br />"; }
     return $result;
 }  }
   
 sub displayanswers {  sub displayanswers {
Line 279  sub start_conceptgroup { Line 290  sub start_conceptgroup {
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);      $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50').      $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50').
       "</td></tr><tr><td colspan=\"3\">\n";   &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,      my $constructtag=&Apache::edit::get_new_args($token,$parstack,
  $safeeval,'concept');   $safeeval,'concept');
Line 292  sub end_conceptgroup { Line 303  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' || $target eq 'answer' ) {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex') {
     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));
Line 318  sub insert_conceptgroup { Line 329  sub insert_conceptgroup {
 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') {    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_arg('Correct Option:','value',
        ['unused','true','false'],$token);         ['unused','true','false'],$token);
       $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');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      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') { $text=&Apache::lonxml::endredirection; }    if ($target eq 'web' || $target eq 'tex') { $text=&Apache::lonxml::endredirection; }
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex') {
     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.34  
changed lines
  Added in v.1.40

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