Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.57 and 1.67

version 1.57, 2002/10/17 17:13:44 version 1.67, 2003/04/07 22:28:08
Line 42  sub start_radiobuttonresponse { Line 42  sub start_radiobuttonresponse {
   &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));    &Apache::lonxml::register('Apache::radiobuttonresponse',('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=();
   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' ) {
Line 86  sub start_foilgroup { Line 87  sub start_foilgroup {
   &Apache::response::setrandomnumber();    &Apache::response::setrandomnumber();
   if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {    if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
       $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';        $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
       &Apache::lonxml::increment_counter();  
   }    }
   return $result;    return $result;
 }  }
Line 111  sub grade_response { Line 111  sub grade_response {
   #keep the random numbers the same must always call this    #keep the random numbers the same must always call this
   my ($answer,@whichfoils)=&whichfoils($max,$randomize);    my ($answer,@whichfoils)=&whichfoils($max,$randomize);
   if (!defined($ENV{'form.submitted'})) { return; }    if (!defined($ENV{'form.submitted'})) { return; }
   my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};    my $response;
     if ($ENV{'form.submitted'} eq 'scantron') {
         my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,
         'H'=>7,'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,
         'O'=>14,'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,
         'V'=>21,'W'=>22,'X'=>23,'Y'=>24,'Z'=>25);
         $response = $ENV{'scantron.'.$Apache::lonxml::counter.'.answer'};
         $response = $let_to_num{$response};
     } else {
         $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'];
Line 159  sub end_foilgroup { Line 169  sub end_foilgroup {
       }        }
     }      }
   }    }
     &Apache::lonxml::increment_counter();
   return $result;    return $result;
 }  }
   
Line 277  sub whichfoils { Line 288  sub whichfoils {
     #pick a true statement      #pick a true statement
     my $whichtrue = int(&Math::Random::random_uniform() * ($#truelist+1));      my $whichtrue = int(&Math::Random::random_uniform() * ($#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 $numinserted;  
     my (@toplist, @bottomlist);      my (@toplist, @bottomlist);
     my $topcount=0;      my $topcount=0;
     # assign everyone to either toplist/bottomlist or whichfalse      # assign everyone to either toplist/bottomlist or whichfalse
     # which false is randomized, toplist bottomlist are in order      # which false is randomized, toplist bottomlist are in order
     while ((($numinserted) < $max-1) && ($#falselist > -1)) {      while ((($#whichfalse) < $max-2) && ($#falselist > -1)) {
  &Apache::lonxml::debug("Have $#whichfalse max is $max");   &Apache::lonxml::debug("Have $#whichfalse max is $max");
  my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1));   my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1));
  &Apache::lonxml::debug("From $#falselist elms, picking $afalse");   &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
Line 344  sub displayfoils { Line 354  sub displayfoils {
   my $result;    my $result;
   
   my ($answer,@whichfoils)=&whichfoils($max,$randomize);    my ($answer,@whichfoils)=&whichfoils($max,$randomize);
   if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {    my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
     my $status=$Apache::inputtags::status[-1];
     if ( ($target ne 'tex') &&
          (($solved =~ /^correct/) || ($status 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 \item ';    $result.='\item \vskip -2 mm  ';
       }        }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {         if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
   if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: ';}    if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: \textbf{';}
       } else {        } else {
  $result.='Incorrect:';   $result.='Incorrect:';
       }        }
Line 362  sub displayfoils { Line 376  sub displayfoils {
   $result.=$Apache::response::foilgroup{$name.'.text'};    $result.=$Apache::response::foilgroup{$name.'.text'};
       }        }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {        if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
   if ($target ne 'tex') { $result.='</b>';}    if ($target ne 'tex') { $result.='</b>';} else {$result.='}';}
       }        }
     }      }
   } else {    } else {
     my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z');      my @alphabet = ('A'..'Z');
     my $i = 0;      my $i = 0;
     my $temp=0;        my $temp=0;  
     my $id=$Apache::inputtags::response['-1'];      my $id=$Apache::inputtags::response['-1'];
Line 378  sub displayfoils { Line 392  sub displayfoils {
   $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 (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";
   if ($Apache::lonhomework::type eq 'exam') {  
       $result .= '<table border="1"><tr><td>A: &nbsp;&nbsp;Correct</td><td>B: &nbsp;&nbsp;Incorrect</td></tr></table>';  
   }  
       } else {        } else {
   if ($Apache::lonhomework::type eq 'exam') {    if ($Apache::lonhomework::type eq 'exam') {
       $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';        $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
       $i++;        $i++;
   } else {    } else {
       $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};        $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
   }    }
       }        }
       $temp++;        $temp++;
Line 441  sub end_conceptgroup { Line 452  sub end_conceptgroup {
       my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);        my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
       $Apache::response::foilgroup{"$name.concept"} = $concept;        $Apache::response::foilgroup{"$name.concept"} = $concept;
       &Apache::lonxml::debug("Selecting $name in $concept");        &Apache::lonxml::debug("Selecting $name in $concept");
         my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
         push(@{ $Apache::hint::radiobutton{"$part_id.concepts"} },$concept);
         $Apache::hint::radiobutton{"$part_id.concept.$concept"}=
     $Apache::response::conceptgroup{'names'};
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result=&Apache::edit::end_table();      $result=&Apache::edit::end_table();

Removed from v.1.57  
changed lines
  Added in v.1.67


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